From 0c00e55ac80df10c26adc39a83b135b11c6eafbe Mon Sep 17 00:00:00 2001
From: Ryan Torok <11rytorok3900@gmail.com>
Date: Thu, 21 Jun 2018 17:06:51 -0500
Subject: [PATCH] first commit: some account management files

---
 .idea/misc.xml                      |   6 +
 .idea/modules.xml                   |   8 +
 .idea/paintbrush.org.iml            |   8 +
 .idea/sqldialects.xml               |   6 +
 .idea/vcs.xml                       |   6 +
 .idea/workspace.xml                 | 345 ++++++++++++++++++++++++++++
 public_html/acct/SaltRepeat.php     |  14 ++
 public_html/acct/changePassword.php |  40 ++++
 public_html/acct/createAccount.php  |  57 +++++
 public_html/acct/getLocalSalt.php   |  44 ++++
 public_html/acct/login.php          |  49 ++++
 public_html/acct/testQuery.php      |  39 ++++
 public_html/acct/updateSerFile.php  |  32 +++
 public_html/index.php               |  13 ++
 14 files changed, 667 insertions(+)
 create mode 100644 .idea/misc.xml
 create mode 100644 .idea/modules.xml
 create mode 100644 .idea/paintbrush.org.iml
 create mode 100644 .idea/sqldialects.xml
 create mode 100644 .idea/vcs.xml
 create mode 100644 .idea/workspace.xml
 create mode 100644 public_html/acct/SaltRepeat.php
 create mode 100644 public_html/acct/changePassword.php
 create mode 100755 public_html/acct/createAccount.php
 create mode 100644 public_html/acct/getLocalSalt.php
 create mode 100755 public_html/acct/login.php
 create mode 100644 public_html/acct/testQuery.php
 create mode 100644 public_html/acct/updateSerFile.php
 create mode 100755 public_html/index.php

diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 0000000..28a804d
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="JavaScriptSettings">
+    <option name="languageLevel" value="ES6" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000..67be7d1
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/paintbrush.org.iml" filepath="$PROJECT_DIR$/.idea/paintbrush.org.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/paintbrush.org.iml b/.idea/paintbrush.org.iml
new file mode 100644
index 0000000..c956989
--- /dev/null
+++ b/.idea/paintbrush.org.iml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/.idea/sqldialects.xml b/.idea/sqldialects.xml
new file mode 100644
index 0000000..c85ae9a
--- /dev/null
+++ b/.idea/sqldialects.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="SqlDialectMappings">
+    <file url="file://$PROJECT_DIR$/public_html/acct/createAccount.php" dialect="MySQL" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..94a25f7
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100644
index 0000000..74d6f73
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,345 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ChangeListManager">
+    <list default="true" id="b700ff9b-acbb-4c6e-96e7-4587a66a4e61" name="Default" comment="" />
+    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
+    <option name="TRACKING_ENABLED" value="true" />
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="FileEditorManager">
+    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
+      <file leaf-file-name="login.php" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/public_html/acct/login.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="405">
+              <caret line="32" column="47" lean-forward="true" selection-start-line="32" selection-start-column="47" selection-end-line="32" selection-end-column="47" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="getLocalSalt.php" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/public_html/acct/getLocalSalt.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="465">
+              <caret line="36" column="9" lean-forward="true" selection-start-line="36" selection-start-column="9" selection-end-line="36" selection-end-column="9" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="changePassword.php" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/public_html/acct/changePassword.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="345">
+              <caret line="28" column="32" lean-forward="true" selection-start-line="28" selection-start-column="32" selection-end-line="28" selection-end-column="32" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="updateSerFile.php" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/public_html/acct/updateSerFile.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="390">
+              <caret line="31" selection-start-line="31" selection-end-line="31" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="createAccount.php" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/public_html/acct/createAccount.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="210">
+              <caret line="19" column="51" selection-start-line="19" selection-start-column="51" selection-end-line="19" selection-end-column="51" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="testQuery.php" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/public_html/acct/testQuery.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="390">
+              <caret line="26" column="122" selection-start-line="26" selection-start-column="122" selection-end-line="26" selection-end-column="122" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="SaltRepeat.php" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/public_html/acct/SaltRepeat.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="105">
+              <caret line="12" column="11" selection-start-line="12" selection-start-column="11" selection-end-line="12" selection-end-column="11" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+    </leaf>
+  </component>
+  <component name="IdeDocumentHistory">
+    <option name="CHANGED_PATHS">
+      <list>
+        <option value="$PROJECT_DIR$/public_html/index.html" />
+        <option value="$PROJECT_DIR$/public_html/acct/update_userdata.php" />
+        <option value="$PROJECT_DIR$/public_html/acct/testQuery.php" />
+        <option value="$PROJECT_DIR$/public_html/acct/SaltRepeat.php" />
+        <option value="$PROJECT_DIR$/public_html/acct/createAccount.php" />
+        <option value="$PROJECT_DIR$/public_html/acct/getLocalSalt.php" />
+        <option value="$PROJECT_DIR$/public_html/acct/login.php" />
+        <option value="$PROJECT_DIR$/public_html/acct/updateSerFile.php" />
+        <option value="$PROJECT_DIR$/public_html/acct/changePassword.php" />
+      </list>
+    </option>
+  </component>
+  <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
+  <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
+  <component name="JsGulpfileManager">
+    <detection-done>true</detection-done>
+    <sorting>DEFINITION_ORDER</sorting>
+  </component>
+  <component name="NodePackageJsonFileManager">
+    <packageJsonPaths />
+  </component>
+  <component name="PhpServers">
+    <servers />
+  </component>
+  <component name="ProjectFrameBounds" extendedState="6">
+    <option name="x" value="989" />
+    <option name="y" value="-4" />
+    <option name="width" value="931" />
+    <option name="height" value="1084" />
+  </component>
+  <component name="ProjectView">
+    <navigator proportions="" version="1">
+      <foldersAlwaysOnTop value="true" />
+    </navigator>
+    <panes>
+      <pane id="Scope" />
+      <pane id="ProjectPane">
+        <subPane>
+          <expand>
+            <path>
+              <item name="paintbrush.org" type="b2602c69:ProjectViewProjectNode" />
+              <item name="paintbrush.org" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="paintbrush.org" type="b2602c69:ProjectViewProjectNode" />
+              <item name="paintbrush.org" type="462c0819:PsiDirectoryNode" />
+              <item name="public_html" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="paintbrush.org" type="b2602c69:ProjectViewProjectNode" />
+              <item name="paintbrush.org" type="462c0819:PsiDirectoryNode" />
+              <item name="public_html" type="462c0819:PsiDirectoryNode" />
+              <item name="acct" type="462c0819:PsiDirectoryNode" />
+            </path>
+          </expand>
+          <select />
+        </subPane>
+      </pane>
+    </panes>
+  </component>
+  <component name="PropertiesComponent">
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+    <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
+    <property name="nodejs_npm_path_reset_for_default_project" value="true" />
+  </component>
+  <component name="RunDashboard">
+    <option name="ruleStates">
+      <list>
+        <RuleState>
+          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
+        </RuleState>
+        <RuleState>
+          <option name="name" value="StatusDashboardGroupingRule" />
+        </RuleState>
+      </list>
+    </option>
+  </component>
+  <component name="SvnConfiguration">
+    <configuration />
+  </component>
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="b700ff9b-acbb-4c6e-96e7-4587a66a4e61" name="Default" comment="" />
+      <created>1529459392777</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1529459392777</updated>
+      <workItem from="1529459395647" duration="6339000" />
+      <workItem from="1529517393382" duration="14420000" />
+      <workItem from="1529585859431" duration="11961000" />
+    </task>
+    <servers />
+  </component>
+  <component name="TimeTrackingManager">
+    <option name="totallyTimeSpent" value="32720000" />
+  </component>
+  <component name="ToolWindowManager">
+    <frame x="58" y="-11" width="1863" height="1092" extended-state="6" />
+    <editor active="true" />
+    <layout>
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.15529285" />
+      <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Event Log" order="7" side_tool="true" />
+      <window_info anchor="right" id="Database" order="3" />
+      <window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Version Control" order="7" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Run" order="2" />
+      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
+      <window_info anchor="bottom" id="Terminal" order="7" />
+      <window_info id="Favorites" order="2" side_tool="true" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
+      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
+      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
+      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
+      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
+      <window_info anchor="bottom" id="Message" order="0" />
+      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
+      <window_info anchor="bottom" id="Find" order="1" />
+    </layout>
+  </component>
+  <component name="TypeScriptGeneratedFilesManager">
+    <option name="version" value="1" />
+  </component>
+  <component name="VcsContentAnnotationSettings">
+    <option name="myLimit" value="2678400000" />
+  </component>
+  <component name="editorHistoryManager">
+    <entry file="file://$PROJECT_DIR$/public_html/acct/login.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="285">
+          <caret line="24" column="71" selection-start-line="24" selection-start-column="71" selection-end-line="24" selection-end-column="71" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/public_html/acct/getLocalSalt.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="390">
+          <caret line="31" column="24" lean-forward="true" selection-start-line="31" selection-start-column="24" selection-end-line="31" selection-end-column="24" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/public_html/acct/changePassword.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="45">
+          <caret line="8" selection-start-line="8" selection-end-line="8" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/public_html/acct/update_userdata.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="225">
+          <caret line="20" column="82" selection-start-line="20" selection-start-column="82" selection-end-line="20" selection-end-column="82" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/public_html/acct/createAccount.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="45">
+          <caret line="8" selection-start-line="8" selection-end-line="8" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/public_html/acct/testQuery.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="390">
+          <caret line="26" column="122" selection-start-line="26" selection-start-column="122" selection-end-line="26" selection-end-column="122" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/public_html/acct/SaltRepeat.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="90">
+          <caret line="11" selection-start-line="11" selection-end-line="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/public_html/acct/login.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="120">
+          <caret line="13" column="28" selection-start-line="13" selection-start-column="28" selection-end-line="13" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/public_html/acct/update_userdata.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="225">
+          <caret line="20" column="82" lean-forward="true" selection-start-line="20" selection-start-column="82" selection-end-line="20" selection-end-column="82" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/public_html/acct/testQuery.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="105">
+          <caret line="7" selection-start-line="7" selection-end-line="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/public_html/acct/createAccount.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="660">
+          <caret line="49" column="17" lean-forward="true" selection-start-line="49" selection-start-column="17" selection-end-line="49" selection-end-column="17" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/public_html/index.html" />
+    <entry file="file://$PROJECT_DIR$/public_html/acct/testQuery.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="390">
+          <caret line="26" column="122" selection-start-line="26" selection-start-column="122" selection-end-line="26" selection-end-column="122" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/public_html/acct/createAccount.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="210">
+          <caret line="19" column="51" selection-start-line="19" selection-start-column="51" selection-end-line="19" selection-end-column="51" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/public_html/acct/SaltRepeat.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="105">
+          <caret line="12" column="11" selection-start-line="12" selection-start-column="11" selection-end-line="12" selection-end-column="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/public_html/acct/update_userdata.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="225">
+          <caret line="20" column="82" selection-start-line="20" selection-start-column="82" selection-end-line="20" selection-end-column="82" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/public_html/acct/getLocalSalt.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="465">
+          <caret line="36" column="9" lean-forward="true" selection-start-line="36" selection-start-column="9" selection-end-line="36" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/public_html/acct/login.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="405">
+          <caret line="32" column="47" lean-forward="true" selection-start-line="32" selection-start-column="47" selection-end-line="32" selection-end-column="47" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/public_html/acct/updateSerFile.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="390">
+          <caret line="31" selection-start-line="31" selection-end-line="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/public_html/acct/changePassword.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="345">
+          <caret line="28" column="32" lean-forward="true" selection-start-line="28" selection-start-column="32" selection-end-line="28" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+  </component>
+</project>
\ No newline at end of file
diff --git a/public_html/acct/SaltRepeat.php b/public_html/acct/SaltRepeat.php
new file mode 100644
index 0000000..392a731
--- /dev/null
+++ b/public_html/acct/SaltRepeat.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: rtorok
+ * Date: 6/20/18
+ * Time: 10:45 PM
+ */
+
+error_reporting(E_ALL);
+ini_set('display_errors', 1);
+
+$salt = $_POST['salt'];
+echo $salt;
+
diff --git a/public_html/acct/changePassword.php b/public_html/acct/changePassword.php
new file mode 100644
index 0000000..fe405db
--- /dev/null
+++ b/public_html/acct/changePassword.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: rtorok
+ * Date: 6/20/18
+ * Time: 3:19 PM
+ */
+
+error_reporting(E_ALL);
+ini_set('display_errors', 1);
+
+$id = (is_numeric($_POST['id']) ? (int)$_POST['id'] : 0);
+$password = $_POST['password'];
+$salt = $_POST['salt'];
+
+$hash = password_hash($password, PASSWORD_DEFAULT);
+
+//create connection
+$servername = "localhost:3306";
+$connection = new mysqli($servername, 'java', 'B584xha1eM*gFA', 'paintbrush_server');
+
+if ($connection->connect_error) {
+    die("Connection failed: " . $connection->connect_error);
+}
+
+//echo $id;
+// prepare database update
+$stmt = $connection->prepare("UPDATE users SET password = ?, salt = ? WHERE id = ?");
+$stmt->bind_param("ssi", $hash, $salt, $id);
+$stmt->execute();
+$error = $connection->error;
+if (strlen($error) > 0) {
+    echo $error;
+} else {
+    if ($id == 0) {
+        echo "invalid id";
+    } else {
+        echo "done";
+    }
+}
diff --git a/public_html/acct/createAccount.php b/public_html/acct/createAccount.php
new file mode 100755
index 0000000..6896d2c
--- /dev/null
+++ b/public_html/acct/createAccount.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: rtorok
+ * Date: 6/18/18
+ * Time: 2:01 PM
+ */
+
+error_reporting(E_ALL);
+ini_set('display_errors', 1);
+
+$username = $_POST['username'];
+$password = $_POST['password'];
+$salt = $_POST['salt'];
+$first = $_POST['first'];
+$last = $_POST['last'];
+$email = $_POST['email'];
+$schoolCode = $_POST['schoolcode'];
+
+$hash = password_hash($password, PASSWORD_DEFAULT);
+
+//create connection
+$servername = "localhost:3306";
+$connection = new mysqli($servername, 'java', 'B584xha1eM*gFA', 'paintbrush_server');
+
+if ($connection->connect_error) {
+    die("Connection failed: " . $connection->connect_error);
+}
+
+//check validity of school code if there is one
+if (strlen($schoolCode) > 0) {
+
+    $stmt = $connection->prepare("SELECT schoolcode FROM users WHERE schoolcode = ? ;");
+    $stmt->bind_param("s", $schoolCode);
+    $stmt->execute();
+
+    $exists = false;
+    if ($fetch = $stmt->fetch()) {
+        $exists = true;
+    }
+
+    if (!$exists) {
+        die("badSC");
+    }
+} else {
+    $schoolCode = "0";
+}
+
+
+// prepare database insertion
+$stmt = $connection->prepare("INSERT INTO users VALUE (null, ?, ?, ?, ?, ?, ?, ?, null );");
+$stmt->bind_param("sssssss", $username, $hash, $salt, $first, $last, $email, $schoolCode);
+$stmt->execute();
+echo $connection->error;
+$result = $stmt->fetch();
+
+echo "done";
\ No newline at end of file
diff --git a/public_html/acct/getLocalSalt.php b/public_html/acct/getLocalSalt.php
new file mode 100644
index 0000000..ca65c82
--- /dev/null
+++ b/public_html/acct/getLocalSalt.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: rtorok
+ * Date: 6/20/18
+ * Time: 1:58 PM
+ */
+
+
+error_reporting(E_ALL);
+ini_set('display_errors', 1);
+
+$username = $_POST['username'];
+
+//create connection
+$servername = "localhost:3306";
+$connection = new mysqli($servername, 'java', 'B584xha1eM*gFA', 'paintbrush_server');
+
+if ($connection->connect_error) {
+    die("Connection failed: " . $connection->connect_error);
+}
+
+// get the user's salt
+
+$stmt = $connection->prepare("SELECT salt FROM users WHERE username = ?");
+$stmt->bind_param("s", $username);
+$stmt->execute();
+$result = $stmt->get_result();
+$atLeastOne = false;
+while ($row = $result->fetch_row()) {
+    $atLeastOne = true;
+    echo $row[0] . "\n";
+}
+
+if (!$atLeastOne) {
+    //output a random string of characters, to hide that the username doesn't exist
+    try {
+        echo base64_encode(random_bytes(random_int(45, 65))) . "\n";
+    } catch (Exception $e) {
+    }
+}
+
+echo $connection->error;
+
diff --git a/public_html/acct/login.php b/public_html/acct/login.php
new file mode 100755
index 0000000..4225e20
--- /dev/null
+++ b/public_html/acct/login.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: rtorok
+ * Date: 6/18/18
+ * Time: 4:36 PM
+ */
+
+
+error_reporting(E_ALL);
+ini_set('display_errors', 1);
+
+$username = $_POST['username'];
+$passwordAttempt = $_POST['password'];
+$needFile = $_POST['needfile'];
+
+//create connection
+$servername = 'localhost:3306';
+$connection = new mysqli($servername, 'java', 'B584xha1eM*gFA', 'paintbrush_server');
+
+if ($connection->connect_error) {
+    die("Connection failed!");
+}
+
+$stmt = $connection->prepare("SELECT * FROM users WHERE username = ?");
+$stmt->bind_param("s", $username);
+$stmt->execute();
+
+
+$allResults = $stmt->get_result();
+while($result = $allResults->fetch_row()) {
+    //verify password
+    $encryptedPassword = $result[2]; //password
+    $match = password_verify($passwordAttempt, $encryptedPassword);
+    if ($match) {
+        echo $result[0] . " "; //id
+        //get the rest of the user details
+        if ($needFile == "true") {
+            $serFile = $result[8];
+            if (strlen($serFile) == 0)
+                echo "true";
+            else
+                echo $serFile;
+        } else {
+            echo "true";
+        }
+        echo "\n";
+    }
+}
\ No newline at end of file
diff --git a/public_html/acct/testQuery.php b/public_html/acct/testQuery.php
new file mode 100644
index 0000000..e8ac2e6
--- /dev/null
+++ b/public_html/acct/testQuery.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: rtorok
+ * Date: 6/19/18
+ * Time: 10:41 PM
+ */
+error_reporting(E_ALL);
+ini_set('display_errors', 1);
+
+
+//create connection
+$servername = "localhost:3306";
+$connection = new mysqli($servername, 'java', 'B584xha1eM*gFA', 'paintbrush_server');
+
+if ($connection->connect_error) {
+    die("Connection failed: " . $connection->connect_error);
+}
+
+try {
+    $bytes = random_bytes(50);
+} catch (Exception $e) {
+}
+echo $bytes . "<br>";
+
+// do a test query
+$stmt = $connection->prepare("INSERT INTO users VALUE (null, 'test4', 'pass', ?, 'first', 'last', 'email', '0', null );");
+$stmt->bind_param("s", $bytes);
+$stmt->execute();
+
+//$stmt = $connection->prepare("SELECT 1,2,3 FROM dual;");
+$stmt = $connection->prepare("SELECT salt FROM users WHERE username = 'test4' ;");
+$stmt->execute();
+$result = $stmt->get_result();
+$row = $result->fetch_row();
+echo $row[0] . "<br>";
+
+echo $bytes == $row[0];
+
diff --git a/public_html/acct/updateSerFile.php b/public_html/acct/updateSerFile.php
new file mode 100644
index 0000000..7acf32d
--- /dev/null
+++ b/public_html/acct/updateSerFile.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: rtorok
+ * Date: 6/21/18
+ * Time: 1:26 PM
+ */
+
+error_reporting(E_ALL);
+ini_set('display_errors', 1);
+
+$id = (is_numeric($_POST['id']) ? (int)$_POST['id'] : 0);
+$serFile = $_POST['serfile'];
+
+//create connection
+$servername = "localhost:3306";
+$connection = new mysqli($servername, 'java', 'B584xha1eM*gFA', 'paintbrush_server');
+
+if ($connection->connect_error) {
+    die("Connection failed: " . $connection->connect_error);
+}
+
+
+// prepare database update
+$stmt = $connection->prepare("UPDATE users SET userData = ? WHERE id = ?");
+$stmt->bind_param("si", $serFile, $id);
+$stmt->execute();
+$error = $connection->error;
+if (strlen($error) > 0) {
+    echo $error . "\n";
+}
+echo "done";
diff --git a/public_html/index.php b/public_html/index.php
new file mode 100755
index 0000000..f264b3f
--- /dev/null
+++ b/public_html/index.php
@@ -0,0 +1,13 @@
+<?php
+echo ('<p>This is php output</p>');
+
+?>
+
+<html>
+  <head>
+    <title>Paintbrush LMS Home Page</title>
+  </head>
+  <body>
+    <p>This is a web server used for the function of the Paintbrush LMS client program. Please visit our home page for more information.</p>
+  </body>
+</html>