Merge pull request #30 from Haz001/coding

version 1.0.1
Haz001 · Dec 16, 2021 · fbfb998 · fbfb998
2 parents c961b88 + ea73bbf
commit fbfb998
Show file tree

Hide file tree

Showing 14 changed files with 221 additions and 149 deletions.
diff --git a/.gitignore b/.gitignore
@@ -22,4 +22,5 @@
 !.vscode/*.code-snippets
 
 # End of https://www.toptal.com/developers/gitignore/api/visualstudiocode
-.DS_Store
+.DS_Store
+error.log
diff --git a/error.log b/error.log
@@ -0,0 +1,3 @@
+2021/12/16 12:10:50 [error] 393007#393007: *1 FastCGI sent in stderr: "PHP message: PHP Notice:  Undefined index: passwordCsv in /var/www/passman/public_html/upload.php on line 20PHP message: PHP Stack trace:PHP message: PHP   1. {main}() /var/www/passman/public_html/upload.php:0PHP message: PHP Notice:  Trying to access array offset on value of type null in /var/www/passman/public_html/upload.php on line 20PHP message: PHP Stack trace:PHP message: PHP   1. {main}() /var/www/passman/public_html/upload.php:0PHP message: PHP Warning:  file_get_contents(): Filename cannot be empty in /var/www/passman/public_html/upload.php on line 20PHP message: PHP Stack trace:PHP message: PHP   1. {main}() /var/www/passman/public_html/upload.php:0PHP message: PHP   2. file_get_contents($filename = NULL) /var/www/passman/public_html/upload.php:20PHP message: PHP Notice:  Undefined index: passwordCsv in /var/www/passman/public_html/upload.php on line 21PHP message: PHP Stack trace:PHP message: PHP   1. {main}() /var/www/passman/public_html/upload.php:0PHP message: PHP Notice:  Trying to access array offset on value of type null in /var/www/passman/public_html/upload.php on line 21PHP message: PHP Stack trace:PHP message: PHP   1. {main}() /var/www/passman/public_html/upload.php:0" while reading response header from upstream, client: 194.80.64.241, server: passman.harrysy.red, request: "POST /upload.php HTTP/2.0", upstream: "fastcgi://unix:/run/php/php7.4-fpm.sock:", host: "passman.harrysy.red", referrer: "https://passman.harrysy.red/upload.php"
+2021/12/16 12:10:58 [error] 393007#393007: *1 FastCGI sent in stderr: "PHP message: PHP Notice:  Trying to access array offset on value of type int in /var/www/passman/public_html/scripts/functions.php on line 415PHP message: PHP Stack trace:PHP message: PHP   1. {main}() /var/www/passman/public_html/upload.php:0PHP message: PHP   2. addWebsite($conn = class mysqli { public $affected_rows = -1; public $client_info = 'mysqlnd 7.4.25'; public $client_version = 70425; public $connect_errno = 0; public $connect_error = NULL; public $errno = 0; public $error = ''; public $error_list = []; public $field_count = 1; public $host_info = 'Localhost via UNIX socket'; public $info = NULL; public $insert_id = 0; public $server_info = '5.5.5-10.5.12-MariaDB-0+deb11u1'; public $server_version = 100512; public $sqlstate = '00000'; public $protocol_version = 10; public $thread_id = 13152; public $warning_count = 0 }, $user_identifier = 21, $wb_name = 'https://benforino.co.uk/login', $wb_address = 'https://benforino.co.uk/login') /var/www/passman/public_html/upload.php:55PHP message: PHP Notice:  Trying to access array offset on value of type int in /var/www/passman/public_html/scripts/functions.php on line 416PHP message: PHP Stack trace:PHP message: PHP   1. {main}() /var/www/passman/public_html/upload.php:0PHP message: PHP   2. addWebsite($conn = class mysqli { public $affected_rows = -1; public $client_info = 'mysqlnd 7.4.25'; public $client_version = 70425; public $connect_errno = 0; public $connect_error = NULL; public $errno = 0; public $error = ''; public $error_list = []; public $field_count = 1; public $host_info = 'Localhost via UNIX socket'; public $info = NULL; public $insert_id = 0; public $server_info = '5.5.5-10.5.12-MariaDB-0+deb11u1'; public $server_version = 100512; public $sqlstate = '00000'; public $protocol_version = 10; public $thread_id = 13152; public $warning_count = 0 }, $user_identifier = 21, $wb_name = 'https://benforino.co.uk/login', $wb_address = 'https://benforino.co.uk/login') /var/www/passman/pub
+2021/12/16 12:15:00 [error] 393007#393007: *5 FastCGI sent in stderr: "PHP message: PHP Notice:  Trying to access array offset on value of type int in /var/www/passman/public_html/scripts/functions.php on line 415PHP message: PHP Stack trace:PHP message: PHP   1. {main}() /var/www/passman/public_html/upload.php:0PHP message: PHP   2. addWebsite($conn = class mysqli { public $affected_rows = -1; public $client_info = 'mysqlnd 7.4.25'; public $client_version = 70425; public $connect_errno = 0; public $connect_error = NULL; public $errno = 0; public $error = ''; public $error_list = []; public $field_count = 1; public $host_info = 'Localhost via UNIX socket'; public $info = NULL; public $insert_id = 0; public $server_info = '5.5.5-10.5.12-MariaDB-0+deb11u1'; public $server_version = 100512; public $sqlstate = '00000'; public $protocol_version = 10; public $thread_id = 13154; public $warning_count = 0 }, $user_identifier = 21, $wb_name = 'https://benforino.co.uk/login', $wb_address = 'https://benforino.co.uk/login') /var/www/passman/public_html/upload.php:55PHP message: PHP Notice:  Trying to access array offset on value of type int in /var/www/passman/public_html/scripts/functions.php on line 416PHP message: PHP Stack trace:PHP message: PHP   1. {main}() /var/www/passman/public_html/upload.php:0PHP message: PHP   2. addWebsite($conn = class mysqli { public $affected_rows = -1; public $client_info = 'mysqlnd 7.4.25'; public $client_version = 70425; public $connect_errno = 0; public $connect_error = NULL; public $errno = 0; public $error = ''; public $error_list = []; public $field_count = 1; public $host_info = 'Localhost via UNIX socket'; public $info = NULL; public $insert_id = 0; public $server_info = '5.5.5-10.5.12-MariaDB-0+deb11u1'; public $server_version = 100512; public $sqlstate = '00000'; public $protocol_version = 10; public $thread_id = 13154; public $warning_count = 0 }, $user_identifier = 21, $wb_name = 'https://benforino.co.uk/login', $wb_address = 'https://benforino.co.uk/login') /var/www/passman/pub
diff --git a/public_html/account.php b/public_html/account.php
@@ -15,6 +15,12 @@
         <input required type="date" name="dob" placeholder="Date of Birth">
         <input required type="text" name="mobile" placeholder="Mobile Number">
         <button type="button" name="submit" id="submit">Update Details</button>
+        <button id="switch">Change Password</button>
+    </form>
+    <form class="inline-form" id="passform" style="display: none">
+        <input required type="password" name="oldPassword" placeholder="Current Password">
+        <input required type="password" name="newPassword" placeholder="New Password">
+        <button type="button" id="submitPass">Update Password</button>
     </form>
     <div>
         <p id="output"></p>

diff --git a/public_html/footer.php b/public_html/footer.php
@@ -1,9 +1,11 @@
 </body>
 <footer>
-	<h3><a href=""> Contact Us</a></h3>
-	<h3><a href=""> Report a Bug</a></h3>
-	<h3><a href=""> Documentation</a> </h3>
-	<h3><a href="/LICENSE.txt"> Copyright (c) 2021, PassMan Team<br /> All rights reserved</a></h3>
+
+	<h3 style="margin-left:20px;"><a href="/contact.php">Contact Us</a></h3>
+	<h3 style="margin-left:20px;"><a href="/reportabug.php">Report a Bug</a></h3>
+	<h3 style="margin-left:20px;"><a href="/upload.php">Upload CSV</a></h3>
+	<h3 style="margin-left:20px;"><a href="/docs.pdf">Documentation</a> </h3>
+	<h3 style="margin-left:20px;"><a href="/LICENSE.txt"> Copyright (c) 2021, PassMan Team<br /> All rights reserved</a></h3>
 </footer>
 
 <script>

diff --git a/public_html/main.php b/public_html/main.php
@@ -10,9 +10,8 @@
             <h1 class="mainSection1Title">Website Name</h1>
             <!--<input type="search" class="mainSearch" value="Search">-->
             <button id="mainAddImport" class="mainAddImport">Add</button>
-			<a onclick="refresh()" href="#">Refresh</a>
+			<button onclick="refresh()" href="#">Refresh</button>
             <div id="list">
-                <button class="websiteName">Amazon</button>
             </div>
 
         </div>
@@ -21,7 +20,6 @@
         <div class="mainSection2" id="mainSection2">
             <div id="mainUserButtons" class="mainUserName">
 				<div id="accounts">
-					<button value="hello" class="name">Username</button>
 				</div>
 				<div style="width:100%;display:flex;">
 					<button onclick="makeOverlayPassword()" class="name">add</button>

diff --git a/public_html/scripts/accountScript.js b/public_html/scripts/accountScript.js
@@ -42,6 +42,29 @@ $(document).ready(function () {
 			});
 		}
 	});
+	$("#switch").click(function (e) {
+		e.preventDefault();
+		$("#user_details").hide();
+		$("#passform").show();
+	});
+	$("#submitPass").click(function (e) {
+		e.preventDefault();
+		$.ajax({
+			type: "POST",
+			url: "scripts/manageAccount.php",
+			data: $("#passform").serialize() + "&request=changePassword",
+			dataType: "json",
+			success: function (response) {
+				console.log(response);
+				if (response["result"] != "errpr") {
+					$("#output").html("Password updated succesfully");
+				} else {
+					$("#output").html("There was an error");
+				}
+				refresh();
+			},
+		});
+	});
 });
 function getDetails() {
 	$.ajax({

diff --git a/public_html/scripts/emailContents b/public_html/scripts/emailContents
diff --git a/public_html/scripts/errorHandle.js b/public_html/scripts/errorHandle.js
@@ -36,6 +36,7 @@ $(document).ready(function () {
 });
 
 function errorMsg($_GET) {
+	//Gets the error message returned and outputs it
 	switch ($_GET["error"]) {
 		case "ef":
 			displayErrorMsg(