diff --git a/.idea/workspace.xml b/.idea/workspace.xml index d752935eb4f8b2f60fee45eb60e15bc5bba6297c..1a62e093770833f4feedea1b480a82728b544697 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -22,30 +22,48 @@ </component> <component name="FileEditorManager"> <leaf> - <file leaf-file-name="createUser.php" pinned="false" current-in-tab="false"> + <file leaf-file-name="createUser.php" pinned="false" current-in-tab="true"> <entry file="file://$PROJECT_DIR$/studentview/database/createUser.php"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="-26.258064"> - <caret line="37" column="0" selection-start-line="37" selection-start-column="0" selection-end-line="37" selection-end-column="0" /> + <state vertical-scroll-proportion="0.52510285"> + <caret line="29" column="1" selection-start-line="29" selection-start-column="1" selection-end-line="29" selection-end-column="1" /> <folding> <element signature="e#6#92#0#PHP" expanded="true" /> - <marker date="1519639139065" expanded="true" signature="346:445" placeholder="SELECT (u.to... users" /> - <marker date="1519639139065" expanded="true" signature="674:741" placeholder="INSERT INTO `users`... " /> - <marker date="1519639139065" expanded="true" signature="674:742" placeholder="INSERT INTO `users`... " /> - <marker date="1519639139065" expanded="true" signature="674:758" placeholder="INSERT INTO `users`... " /> - <marker date="1519639139065" expanded="true" signature="674:778" placeholder="INSERT INTO `users`... " /> - <marker date="1519639139065" expanded="true" signature="674:815" placeholder="INSERT INTO `users`... " /> - <marker date="1519639139065" expanded="true" signature="674:816" placeholder="INSERT INTO `users`... " /> + <marker date="1519643596337" expanded="true" signature="322:370" placeholder="SELECT (u.em... users" /> + <marker date="1519643596337" expanded="true" signature="322:382" placeholder="SELECT (u.em... users" /> + <marker date="1519643596337" expanded="true" signature="589:688" placeholder="SELECT (u.to... users" /> + <marker date="1519643596337" expanded="true" signature="917:984" placeholder="INSERT INTO `users`... " /> + <marker date="1519643596337" expanded="true" signature="917:985" placeholder="INSERT INTO `users`... " /> + <marker date="1519643596337" expanded="true" signature="917:1001" placeholder="INSERT INTO `users`... " /> + <marker date="1519643596337" expanded="true" signature="917:1021" placeholder="INSERT INTO `users`... " /> + <marker date="1519643596337" expanded="true" signature="917:1058" placeholder="INSERT INTO `users`... " /> + <marker date="1519643596337" expanded="true" signature="917:1059" placeholder="INSERT INTO `users`... " /> </folding> </state> </provider> </entry> </file> - <file leaf-file-name="overview.php" pinned="false" current-in-tab="true"> + <file leaf-file-name="userExists.php" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/studentview/database/userExists.php"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="-9.935484"> + <caret line="14" column="0" selection-start-line="14" selection-start-column="0" selection-end-line="22" selection-end-column="1" /> + <folding> + <element signature="e#6#92#0#PHP" expanded="true" /> + <marker date="1519639068104" expanded="true" signature="219:282" placeholder="SELECT (`pas... users" /> + <marker date="1519639068104" expanded="true" signature="219:286" placeholder="SELECT (`pas... users" /> + <marker date="1519639068104" expanded="true" signature="219:299" placeholder="SELECT (`pas... users" /> + <marker date="1519639068104" expanded="true" signature="219:314" placeholder="SELECT (u.to... users" /> + </folding> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="overview.php" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/studentview/pages/overview.php"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.17307693"> - <caret line="9" column="26" selection-start-line="9" selection-start-column="26" selection-end-line="9" selection-end-column="26" /> + <state vertical-scroll-proportion="-1.5098039"> + <caret line="7" column="49" selection-start-line="7" selection-start-column="49" selection-end-line="7" selection-end-column="49" /> <folding> <element signature="n#style#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> <element signature="n#style#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> @@ -72,6 +90,7 @@ <element signature="n#style#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> <element signature="n#style#0;n#tr#0;n#tbody#0;n#table#0;n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> <element signature="n#style#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#2;n#div#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> + <marker date="1519639344138" expanded="true" signature="76:115" placeholder="..." /> <marker date="1519639344138" expanded="true" signature="128:194" placeholder="SELECT (`nam... users" /> </folding> </state> @@ -81,70 +100,22 @@ <file leaf-file-name="index.php" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/studentview/index.php"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="-20.580645"> - <caret line="29" column="42" selection-start-line="29" selection-start-column="42" selection-end-line="29" selection-end-column="42" /> + <state vertical-scroll-proportion="-22.709677"> + <caret line="32" column="14" selection-start-line="26" selection-start-column="12" selection-end-line="32" selection-end-column="14" /> <folding> - <marker date="1519637410325" expanded="true" signature="1376:1435" placeholder="..." /> + <marker date="1519643459904" expanded="true" signature="1376:1435" placeholder="..." /> </folding> </state> </provider> </entry> </file> - <file leaf-file-name="register.html" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/studentview/register.html"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="-19.161291"> - <caret line="27" column="29" selection-start-line="27" selection-start-column="29" selection-end-line="27" selection-end-column="29" /> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="register.js" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/studentview/assets/js/register.js"> + <file leaf-file-name="register.php" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/studentview/register.php"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="5" column="7" selection-start-line="5" selection-start-column="7" selection-end-line="5" selection-end-column="7" /> + <state vertical-scroll-proportion="-21.290323"> + <caret line="30" column="38" selection-start-line="30" selection-start-column="38" selection-end-line="30" selection-end-column="38" /> <folding> - <element signature="e#0#42#0" expanded="false" /> - </folding> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="myGroupsInit.js" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/studentview/assets/js/myGroupsInit.js"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="3" column="0" selection-start-line="3" selection-start-column="0" selection-end-line="7" selection-end-column="3" /> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="config.php" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/studentview/database/config.php"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="-6.387097"> - <caret line="9" column="0" selection-start-line="9" selection-start-column="0" selection-end-line="9" selection-end-column="0" /> - <folding> - <element signature="e#6#92#0#PHP" expanded="true" /> - </folding> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="userExists.php" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/studentview/database/userExists.php"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="-17.032259"> - <caret line="24" column="0" selection-start-line="24" selection-start-column="0" selection-end-line="24" selection-end-column="50" /> - <folding> - <element signature="e#6#92#0#PHP" expanded="true" /> - <marker date="1519639068104" expanded="true" signature="219:282" placeholder="SELECT (`pas... users" /> - <marker date="1519639068104" expanded="true" signature="219:286" placeholder="SELECT (`pas... users" /> - <marker date="1519639068104" expanded="true" signature="219:299" placeholder="SELECT (`pas... users" /> - <marker date="1519639068104" expanded="true" signature="219:314" placeholder="SELECT (u.to... users" /> + <marker date="1519643468369" expanded="true" signature="1758:1827" placeholder="..." /> </folding> </state> </provider> @@ -174,8 +145,9 @@ <option value="$PROJECT_DIR$/studentview/database/config.php" /> <option value="$PROJECT_DIR$/studentview/index.php" /> <option value="$PROJECT_DIR$/studentview/database/userExists.php" /> - <option value="$PROJECT_DIR$/studentview/database/createUser.php" /> <option value="$PROJECT_DIR$/studentview/pages/overview.php" /> + <option value="$PROJECT_DIR$/studentview/register.php" /> + <option value="$PROJECT_DIR$/studentview/database/createUser.php" /> </list> </option> </component> @@ -794,12 +766,12 @@ <created>1519386118701</created> <option name="number" value="Default" /> <updated>1519386118701</updated> - <workItem from="1519386120301" duration="9434000" /> + <workItem from="1519386120301" duration="11498000" /> </task> <servers /> </component> <component name="TimeTrackingManager"> - <option name="totallyTimeSpent" value="9434000" /> + <option name="totallyTimeSpent" value="11498000" /> </component> <component name="ToolWindowManager"> <frame x="-9" y="-9" width="2578" height="1410" extended-state="6" /> @@ -853,9 +825,45 @@ <watches-manager /> </component> <component name="editorHistoryManager"> + <entry file="file://$PROJECT_DIR$/studentview/pages/overview.php"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="-1.5098039"> + <caret line="7" column="49" selection-start-line="7" selection-start-column="49" selection-end-line="7" selection-end-column="49" /> + <folding> + <element signature="n#style#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> + <element signature="n#style#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> + <element signature="n#style#0;n#ul#0;n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> + <element signature="n#style#0;n#h3#0;n#li#0;n#ul#0;n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> + <element signature="n#style#0;n#li#1;n#ul#0;n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> + <element signature="n#style#0;n#a#0;n#li#1;n#ul#0;n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> + <element signature="n#style#0;n#li#2;n#ul#0;n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> + <element signature="n#style#0;n#a#0;n#li#2;n#ul#0;n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> + <element signature="n#style#0;n#li#3;n#ul#0;n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> + <element signature="n#style#0;n#a#0;n#li#3;n#ul#0;n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> + <element signature="n#style#0;n#ul#0;n#div#1;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> + <element signature="n#style#0;n#h3#0;n#li#0;n#ul#0;n#div#1;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> + <element signature="n#style#0;n#li#1;n#ul#0;n#div#1;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> + <element signature="n#style#0;n#a#0;n#li#1;n#ul#0;n#div#1;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> + <element signature="n#style#0;n#li#2;n#ul#0;n#div#1;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> + <element signature="n#style#0;n#a#0;n#li#2;n#ul#0;n#div#1;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> + <element signature="n#style#0;n#li#3;n#ul#0;n#div#1;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> + <element signature="n#style#0;n#a#0;n#li#3;n#ul#0;n#div#1;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> + <element signature="n#style#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> + <element signature="n#style#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> + <element signature="n#style#0;n#table#0;n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> + <element signature="n#style#0;n#tr#0;n#tbody#0;n#table#0;n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> + <element signature="n#style#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> + <element signature="n#style#0;n#tr#0;n#tbody#0;n#table#0;n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> + <element signature="n#style#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#2;n#div#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> + <marker date="1519639344138" expanded="true" signature="76:115" placeholder="..." /> + <marker date="1519639344138" expanded="true" signature="128:194" placeholder="SELECT (`nam... users" /> + </folding> + </state> + </provider> + </entry> <entry file="file://$PROJECT_DIR$/studentview/assets/js/myGroupsInit.js"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> + <state vertical-scroll-proportion="0.052969504"> <caret line="3" column="0" selection-start-line="3" selection-start-column="0" selection-end-line="7" selection-end-column="3" /> <folding /> </state> @@ -863,7 +871,7 @@ </entry> <entry file="file://$PROJECT_DIR$/studentview/assets/js/register.js"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> + <state vertical-scroll-proportion="0.052969504"> <caret line="5" column="7" selection-start-line="5" selection-start-column="7" selection-end-line="5" selection-end-column="7" /> <folding> <element signature="e#0#42#0" expanded="false" /> @@ -873,7 +881,7 @@ </entry> <entry file="file://$PROJECT_DIR$/studentview/database/config.php"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="-6.387097"> + <state vertical-scroll-proportion="0.16296296"> <caret line="9" column="0" selection-start-line="9" selection-start-column="0" selection-end-line="9" selection-end-column="0" /> <folding> <element signature="e#6#92#0#PHP" expanded="true" /> @@ -883,43 +891,28 @@ </entry> <entry file="file://$PROJECT_DIR$/studentview/index.php"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="-20.580645"> - <caret line="29" column="42" selection-start-line="29" selection-start-column="42" selection-end-line="29" selection-end-column="42" /> + <state vertical-scroll-proportion="-22.709677"> + <caret line="32" column="14" selection-start-line="26" selection-start-column="12" selection-end-line="32" selection-end-column="14" /> <folding> - <marker date="1519637410325" expanded="true" signature="1376:1435" placeholder="..." /> + <marker date="1519643459904" expanded="true" signature="1376:1435" placeholder="..." /> </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/studentview/register.html"> + <entry file="file://$PROJECT_DIR$/studentview/register.php"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="-19.161291"> - <caret line="27" column="29" selection-start-line="27" selection-start-column="29" selection-end-line="27" selection-end-column="29" /> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/studentview/database/createUser.php"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="-26.258064"> - <caret line="37" column="0" selection-start-line="37" selection-start-column="0" selection-end-line="37" selection-end-column="0" /> + <state vertical-scroll-proportion="-21.290323"> + <caret line="30" column="38" selection-start-line="30" selection-start-column="38" selection-end-line="30" selection-end-column="38" /> <folding> - <element signature="e#6#92#0#PHP" expanded="true" /> - <marker date="1519639139065" expanded="true" signature="346:445" placeholder="SELECT (u.to... users" /> - <marker date="1519639139065" expanded="true" signature="674:741" placeholder="INSERT INTO `users`... " /> - <marker date="1519639139065" expanded="true" signature="674:742" placeholder="INSERT INTO `users`... " /> - <marker date="1519639139065" expanded="true" signature="674:758" placeholder="INSERT INTO `users`... " /> - <marker date="1519639139065" expanded="true" signature="674:778" placeholder="INSERT INTO `users`... " /> - <marker date="1519639139065" expanded="true" signature="674:815" placeholder="INSERT INTO `users`... " /> - <marker date="1519639139065" expanded="true" signature="674:816" placeholder="INSERT INTO `users`... " /> + <marker date="1519643468369" expanded="true" signature="1758:1827" placeholder="..." /> </folding> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/studentview/database/userExists.php"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="-17.032259"> - <caret line="24" column="0" selection-start-line="24" selection-start-column="0" selection-end-line="24" selection-end-column="50" /> + <state vertical-scroll-proportion="-9.935484"> + <caret line="14" column="0" selection-start-line="14" selection-start-column="0" selection-end-line="22" selection-end-column="1" /> <folding> <element signature="e#6#92#0#PHP" expanded="true" /> <marker date="1519639068104" expanded="true" signature="219:282" placeholder="SELECT (`pas... users" /> @@ -930,37 +923,21 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/studentview/pages/overview.php"> + <entry file="file://$PROJECT_DIR$/studentview/database/createUser.php"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.17307693"> - <caret line="9" column="26" selection-start-line="9" selection-start-column="26" selection-end-line="9" selection-end-column="26" /> + <state vertical-scroll-proportion="0.52510285"> + <caret line="29" column="1" selection-start-line="29" selection-start-column="1" selection-end-line="29" selection-end-column="1" /> <folding> - <element signature="n#style#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> - <element signature="n#style#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> - <element signature="n#style#0;n#ul#0;n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> - <element signature="n#style#0;n#h3#0;n#li#0;n#ul#0;n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> - <element signature="n#style#0;n#li#1;n#ul#0;n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> - <element signature="n#style#0;n#a#0;n#li#1;n#ul#0;n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> - <element signature="n#style#0;n#li#2;n#ul#0;n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> - <element signature="n#style#0;n#a#0;n#li#2;n#ul#0;n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> - <element signature="n#style#0;n#li#3;n#ul#0;n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> - <element signature="n#style#0;n#a#0;n#li#3;n#ul#0;n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> - <element signature="n#style#0;n#ul#0;n#div#1;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> - <element signature="n#style#0;n#h3#0;n#li#0;n#ul#0;n#div#1;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> - <element signature="n#style#0;n#li#1;n#ul#0;n#div#1;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> - <element signature="n#style#0;n#a#0;n#li#1;n#ul#0;n#div#1;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> - <element signature="n#style#0;n#li#2;n#ul#0;n#div#1;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> - <element signature="n#style#0;n#a#0;n#li#2;n#ul#0;n#div#1;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> - <element signature="n#style#0;n#li#3;n#ul#0;n#div#1;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> - <element signature="n#style#0;n#a#0;n#li#3;n#ul#0;n#div#1;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> - <element signature="n#style#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> - <element signature="n#style#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> - <element signature="n#style#0;n#table#0;n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> - <element signature="n#style#0;n#tr#0;n#tbody#0;n#table#0;n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> - <element signature="n#style#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> - <element signature="n#style#0;n#tr#0;n#tbody#0;n#table#0;n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> - <element signature="n#style#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#2;n#div#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> - <marker date="1519639344138" expanded="true" signature="128:194" placeholder="SELECT (`nam... users" /> + <element signature="e#6#92#0#PHP" expanded="true" /> + <marker date="1519643596337" expanded="true" signature="322:370" placeholder="SELECT (u.em... users" /> + <marker date="1519643596337" expanded="true" signature="322:382" placeholder="SELECT (u.em... users" /> + <marker date="1519643596337" expanded="true" signature="589:688" placeholder="SELECT (u.to... users" /> + <marker date="1519643596337" expanded="true" signature="917:984" placeholder="INSERT INTO `users`... " /> + <marker date="1519643596337" expanded="true" signature="917:985" placeholder="INSERT INTO `users`... " /> + <marker date="1519643596337" expanded="true" signature="917:1001" placeholder="INSERT INTO `users`... " /> + <marker date="1519643596337" expanded="true" signature="917:1021" placeholder="INSERT INTO `users`... " /> + <marker date="1519643596337" expanded="true" signature="917:1058" placeholder="INSERT INTO `users`... " /> + <marker date="1519643596337" expanded="true" signature="917:1059" placeholder="INSERT INTO `users`... " /> </folding> </state> </provider> diff --git a/studentview/database/createUser.php b/studentview/database/createUser.php index ef6ac277c670b94d3070158f0d15b47a2c18f38a..3326d88bc6519f471b4dc0617969adef690d9fcb 100644 --- a/studentview/database/createUser.php +++ b/studentview/database/createUser.php @@ -20,6 +20,15 @@ $token = uniqid(); $db->query("use fltrail;"); +$query = "SELECT (u.email) from users u where u.email = \"".$email."\";"; + +$queryObj = mysqli_query($db, $query); +$result = mysqli_fetch_object($queryObj); +if ($result) { + header("Location: ../register.php?emailExists=true"); + die(); +} + // if user exists login $query = "SELECT (u.token) from users u where u.password = \"".$password. "\" and u.email=\"" .$email."\";"; diff --git a/studentview/index.php b/studentview/index.php index 0045cf2b86e7367bc9324838fb0772b6bf04112e..b77768f2109c4c68ef160c0f9c5488403d291e80 100644 --- a/studentview/index.php +++ b/studentview/index.php @@ -32,7 +32,7 @@ } ?> </div> - <a href="register.html" class="forgot">registrieren</a></form> + <a href="register.php" class="forgot">registrieren</a></form> </div> diff --git a/studentview/register.html b/studentview/register.php similarity index 85% rename from studentview/register.html rename to studentview/register.php index 1522271c991ead21c9d854f99d94ab0147627747..3ae1c204b4b4dad0828d97264d9d2ebaa2936802 100644 --- a/studentview/register.html +++ b/studentview/register.php @@ -25,6 +25,15 @@ <!--<div class="form-group"><input class="form-control" type="password" name="password" placeholder="Password wiederholen"></div>--> <div class="form-group"><button class="btn btn-primary btn-block" type="submit">Log In</button></div> + <div class="form-group"> + <?php + if (isset($_GET['emailExists'])) { + echo "<div class=\"alert alert-danger\" role=\"alert\"> + Es existiert ein Nutzer mit dieser Email! + </div>"; + } + ?> + </div> <a href="index.php" class="forgot">einloggen</a></form> </div> <script src="assets/js/jquery.min.js"></script>