From dc5b76189497c2ef8bdf0438f2a04438e06fdae0 Mon Sep 17 00:00:00 2001 From: Zaphster Date: Thu, 10 Nov 2016 15:01:41 -0600 Subject: [PATCH 001/416] created security.php include this file at the top of all files where we require the user to be logged in --- security.php | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 security.php diff --git a/security.php b/security.php new file mode 100644 index 000000000..047e73df2 --- /dev/null +++ b/security.php @@ -0,0 +1,6 @@ + From de7ba3f84979abf58670588f4e05ad306fc04031 Mon Sep 17 00:00:00 2001 From: Zaphster Date: Thu, 10 Nov 2016 15:03:02 -0600 Subject: [PATCH 002/416] session start added --- security.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/security.php b/security.php index 047e73df2..9d2f9c1b9 100644 --- a/security.php +++ b/security.php @@ -1,5 +1,5 @@ Date: Thu, 10 Nov 2016 15:06:12 -0600 Subject: [PATCH 003/416] Add files via upload --- connection.php | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 connection.php diff --git a/connection.php b/connection.php new file mode 100644 index 000000000..456742525 --- /dev/null +++ b/connection.php @@ -0,0 +1,6 @@ + \ No newline at end of file From 6c69099f2e7a38037b46ff4a1ebfcd51a8621d85 Mon Sep 17 00:00:00 2001 From: nihr43 Date: Thu, 10 Nov 2016 15:10:14 -0600 Subject: [PATCH 004/416] Create insertFile.php --- insertFile.php | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 insertFile.php diff --git a/insertFile.php b/insertFile.php new file mode 100644 index 000000000..6853ec8de --- /dev/null +++ b/insertFile.php @@ -0,0 +1,22 @@ +connect_error) { + die("Connection failed: " . $conn->connect_error); +} + +// prepare and bind +$stmt = $conn->prepare("INSERT INTO file (groupid, path, activeuserflag) VALUES (?, ?, ?, ?)"); +$stmt->bind_param("sss", $username, $hashedpassword, $usertypeid, $activeuserflag); + +//execute +$stmt->execute(); +$stmt->close(); +$conn->close(); +?> From 3f2fdb356558f9b5e07568d47f7a6cdd29057ed4 Mon Sep 17 00:00:00 2001 From: Jared Date: Thu, 10 Nov 2016 15:16:50 -0600 Subject: [PATCH 005/416] fix --- index.html | 5 ----- 1 file changed, 5 deletions(-) diff --git a/index.html b/index.html index 88d2be11e..42ea26620 100644 --- a/index.html +++ b/index.html @@ -7,13 +7,8 @@

RADs(Research Analysis and Database for Scientists)

Hello World!

- -<<<<<<< HEAD
Upload
-======= -

Search bar

->>>>>>> jvbkw8 From 25bdae15bc84d9e446c60e542d515c9c41d2f5e1 Mon Sep 17 00:00:00 2001 From: Zaphster Date: Thu, 10 Nov 2016 15:17:33 -0600 Subject: [PATCH 006/416] session added --- login.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/login.php b/login.php index 84e2b355e..a4d132439 100644 --- a/login.php +++ b/login.php @@ -1,6 +1,6 @@ @@ -56,6 +56,7 @@ && !empty($userPaswword)) { if ($user == $row['username'] && $userPaswword == $row['password'] ) { + $_SESSION[NAME] = $row['username']; header("location: index.html"); }else { From 1a49a512574821f3707725757c5956c3d63df562 Mon Sep 17 00:00:00 2001 From: Zaphster Date: Thu, 10 Nov 2016 15:26:11 -0600 Subject: [PATCH 007/416] blah --- login.php | 1 + 1 file changed, 1 insertion(+) diff --git a/login.php b/login.php index a4d132439..f0a01e08b 100644 --- a/login.php +++ b/login.php @@ -56,6 +56,7 @@ && !empty($userPaswword)) { if ($user == $row['username'] && $userPaswword == $row['password'] ) { + echo "hey you logged in successfully"; $_SESSION[NAME] = $row['username']; header("location: index.html"); From 3015d378836d53d7d90ab0001d06722c60150e3a Mon Sep 17 00:00:00 2001 From: Zaphster Date: Thu, 10 Nov 2016 15:29:19 -0600 Subject: [PATCH 008/416] Update login.php --- login.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/login.php b/login.php index f0a01e08b..2512d5289 100644 --- a/login.php +++ b/login.php @@ -61,7 +61,7 @@ header("location: index.html"); }else { - $action = 'Wrong username or password'; + echo 'Wrong username or password'; } } ?> From 5a1c03a1adfc70905323130a45739e3f07a1c802 Mon Sep 17 00:00:00 2001 From: Zaphster Date: Thu, 10 Nov 2016 15:31:02 -0600 Subject: [PATCH 009/416] Update login.php --- login.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/login.php b/login.php index 2512d5289..f9705e200 100644 --- a/login.php +++ b/login.php @@ -52,7 +52,7 @@ $result = mysqli_query($link, $sql); $row = mysql_fetch_array($query); - if (isset($_POST['login']) && !empty($user) + if (isset($_POST['submit']) && !empty($user) && !empty($userPaswword)) { if ($user == $row['username'] && $userPaswword == $row['password'] ) { From 3e48c075685a8396cbbf47dc654feae7d1c66882 Mon Sep 17 00:00:00 2001 From: Zaphster Date: Thu, 10 Nov 2016 15:37:58 -0600 Subject: [PATCH 010/416] Update login.php --- login.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/login.php b/login.php index f9705e200..ec5a15f08 100644 --- a/login.php +++ b/login.php @@ -48,7 +48,8 @@ $userPaswword = $_POST['password']; $action = ''; $link = mysqli_connect("$servername", "$username", "$password", "$dbname") or die ("Connection Error " . mysqli_error($link)); - $sql = "SELECT username, passsword FROM user WHERE username = '$user' AND password= '$password';"; + //TODO: hash password! + $sql = "SELECT username FROM user WHERE username = '$user' AND password= '$password';"; $result = mysqli_query($link, $sql); $row = mysql_fetch_array($query); From abb7c180acb241a506413b1de83ff4edabcd34c9 Mon Sep 17 00:00:00 2001 From: Zaphster Date: Thu, 10 Nov 2016 15:40:26 -0600 Subject: [PATCH 011/416] Update login.php --- login.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/login.php b/login.php index ec5a15f08..1dfbb1531 100644 --- a/login.php +++ b/login.php @@ -45,7 +45,7 @@
Date: Thu, 10 Nov 2016 15:41:58 -0600 Subject: [PATCH 012/416] Update login.php --- login.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/login.php b/login.php index 1dfbb1531..217e8a197 100644 --- a/login.php +++ b/login.php @@ -45,18 +45,18 @@
Date: Thu, 10 Nov 2016 15:43:49 -0600 Subject: [PATCH 013/416] Update login.php --- login.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/login.php b/login.php index 217e8a197..9c0f00ef7 100644 --- a/login.php +++ b/login.php @@ -56,7 +56,7 @@ if (isset($_POST['submit']) && !empty($user) && !empty($user_password)) { - if ($user == $row['username'] && $user_password == $row['password'] ) { + if ($user_password == $row['password'] ) { echo "hey you logged in successfully"; $_SESSION[NAME] = $row['username']; header("location: index.html"); From 7606f92a4666dcd9a37e4cde7b00c1b28e8d6df0 Mon Sep 17 00:00:00 2001 From: Zaphster Date: Thu, 10 Nov 2016 15:45:51 -0600 Subject: [PATCH 014/416] Update login.php --- login.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/login.php b/login.php index 9c0f00ef7..945f0404e 100644 --- a/login.php +++ b/login.php @@ -51,7 +51,7 @@ //TODO: hash password! $sql = "SELECT username FROM user WHERE username = '$user' AND password= '$user_password';"; $result = mysqli_query($link, $sql); - $row = mysql_fetch_array($query); + $row = mysqli_fetch_assoc($result); if (isset($_POST['submit']) && !empty($user) && !empty($user_password)) { From 498ee8e9aab5377a427dc98d448a4d026289bf11 Mon Sep 17 00:00:00 2001 From: Zaphster Date: Thu, 10 Nov 2016 15:47:42 -0600 Subject: [PATCH 015/416] Create loginVerify.php --- loginVerify.php | 95 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 95 insertions(+) create mode 100644 loginVerify.php diff --git a/loginVerify.php b/loginVerify.php new file mode 100644 index 000000000..8510f4543 --- /dev/null +++ b/loginVerify.php @@ -0,0 +1,95 @@ + + + + + + + + + + + + + + + + + RADs Login + + + + + + + + + + + + + + + + + + +
+ +
+
+
+

Login

+
+
+ +
+
+ +
+
+ +
+
+ +
+ +
+ + + + + + + + + + + + From 231bc350475817a6dd873d32a0039b0a6ea8edaa Mon Sep 17 00:00:00 2001 From: Zaphster Date: Thu, 10 Nov 2016 15:58:58 -0600 Subject: [PATCH 016/416] Update login.php --- login.php | 103 ++++++++++++++++++------------------------------------ 1 file changed, 34 insertions(+), 69 deletions(-) diff --git a/login.php b/login.php index 945f0404e..09db1b4b6 100644 --- a/login.php +++ b/login.php @@ -1,10 +1,3 @@ - - - @@ -20,81 +13,53 @@ RADs Login - - - - - - - - - - - - -
- -
-
-
-

Login

-
-
- -
-
- -
-
- -
-
- -
+
+
+
+

Login

+
+
+ +
+
+ +
+
+ +
+
- - - +
- + + From 0c0f8856e52a3bb5e8c9ca3037142371e4157890 Mon Sep 17 00:00:00 2001 From: Zaphster Date: Thu, 10 Nov 2016 16:04:06 -0600 Subject: [PATCH 017/416] Update login.php --- login.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/login.php b/login.php index 09db1b4b6..f13bec2d6 100644 --- a/login.php +++ b/login.php @@ -24,10 +24,10 @@

Login

- +
- +
@@ -46,8 +46,12 @@ - - - - -
- query($sql); + $row = $result->fetch_assoc(); + if ($username == $row['username'] ) { $_SESSION[NAME] = $row['username']; - header("location: index.html"); - - }else { - echo 'Wrong username or password'; - } - } - ?> -
-
-
-

Login

- -
- -
-
- -
-
- -
- - -
- -
- - - - - - - - - - - - + echo $success; + }else { + echo $failure; + } +?> From 38762fb6751b2cd897ac5c91a27967c9e4cf92fa Mon Sep 17 00:00:00 2001 From: Zaphster Date: Thu, 10 Nov 2016 16:15:02 -0600 Subject: [PATCH 019/416] Update login.php --- login.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/login.php b/login.php index f13bec2d6..32e8a91c9 100644 --- a/login.php +++ b/login.php @@ -54,7 +54,7 @@ function verifyLogin(){ method: "POST", success: function(html){ if(html.success == true){ - window.location.replace("index.php"); + window.location.replace("index.html"); } else { alert(html); } From 3626e823fe725288b32c5ecb8396afd560ecc377 Mon Sep 17 00:00:00 2001 From: Zaphster Date: Thu, 10 Nov 2016 16:16:49 -0600 Subject: [PATCH 020/416] Update login.php --- login.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/login.php b/login.php index 32e8a91c9..8794cccdc 100644 --- a/login.php +++ b/login.php @@ -22,7 +22,7 @@

Login

-
+
@@ -46,6 +46,7 @@ From b2a010b8a70cc10b6bde5e84b0e5d09adf24a4f7 Mon Sep 17 00:00:00 2001 From: Zaphster Date: Thu, 10 Nov 2016 16:36:12 -0600 Subject: [PATCH 030/416] Update login.php --- login.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/login.php b/login.php index 84728f4fe..9dd827cbd 100644 --- a/login.php +++ b/login.php @@ -50,7 +50,7 @@ function verifyLogin(){ var username = $('#user').val(); var userpassword = $('#password').val(); $.ajax({ - url: "verifyLogin.php", + url: "loginVerify.php", data: {username:username, userpassword:userpassword}, method: "POST", success: function(html){ From 79f35bed8ceb028515f51fade76b4c8fdc2a3a82 Mon Sep 17 00:00:00 2001 From: Zaphster Date: Thu, 10 Nov 2016 16:38:29 -0600 Subject: [PATCH 031/416] Update login.php --- login.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/login.php b/login.php index 9dd827cbd..e071f5a87 100644 --- a/login.php +++ b/login.php @@ -37,6 +37,8 @@
+
+
@@ -58,7 +60,7 @@ function verifyLogin(){ if(html.success == true){ window.location.replace("index.html"); } else { - alert(html); + $('#error').html("Invalid username or password."); } }, error: function(html){ From 4568685d612d80faa86404a8e9c296ac3c62d69b Mon Sep 17 00:00:00 2001 From: Zaphster Date: Thu, 10 Nov 2016 16:42:17 -0600 Subject: [PATCH 032/416] Update loginVerify.php --- loginVerify.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/loginVerify.php b/loginVerify.php index bd4e1c7c8..d7f1bfcd5 100644 --- a/loginVerify.php +++ b/loginVerify.php @@ -1,5 +1,5 @@ query($sql); $row = $result->fetch_assoc(); + //$failure .= ', username: "'.$username.'", password: "'.$userpassword if ($username == $row['username'] ) { $_SESSION[NAME] = $row['username']; echo $success; From ba71761c758cc80f7dc6641da769321cff7d2dae Mon Sep 17 00:00:00 2001 From: Zaphster Date: Thu, 10 Nov 2016 16:42:51 -0600 Subject: [PATCH 033/416] Update loginVerify.php --- loginVerify.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loginVerify.php b/loginVerify.php index d7f1bfcd5..d2a190e2a 100644 --- a/loginVerify.php +++ b/loginVerify.php @@ -1,5 +1,5 @@ Date: Thu, 10 Nov 2016 16:44:27 -0600 Subject: [PATCH 034/416] Update loginVerify.php --- loginVerify.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/loginVerify.php b/loginVerify.php index d2a190e2a..5778e73cb 100644 --- a/loginVerify.php +++ b/loginVerify.php @@ -1,8 +1,8 @@ query($sql); $row = $result->fetch_assoc(); //$failure .= ', username: "'.$username.'", password: "'.$userpassword - if ($username == $row['username'] ) { + if ($user_name == $row['username'] ) { $_SESSION[NAME] = $row['username']; echo $success; exit(); From 36fa5ddf20e654fd16f0796672dbcd57b67001e5 Mon Sep 17 00:00:00 2001 From: Zaphster Date: Thu, 10 Nov 2016 16:47:15 -0600 Subject: [PATCH 035/416] Update loginVerify.php --- loginVerify.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/loginVerify.php b/loginVerify.php index 5778e73cb..992449578 100644 --- a/loginVerify.php +++ b/loginVerify.php @@ -1,5 +1,5 @@ query($sql); $row = $result->fetch_assoc(); - //$failure .= ', username: "'.$username.'", password: "'.$userpassword + $failure .= ', username: "'.$user_name.'", password: "'.$user_password.'", sql: "'.$sql.'"}'; if ($user_name == $row['username'] ) { $_SESSION[NAME] = $row['username']; echo $success; From a213fe49fc489a6d120b96055c28840596d8131d Mon Sep 17 00:00:00 2001 From: Zaphster Date: Thu, 10 Nov 2016 16:49:15 -0600 Subject: [PATCH 036/416] Update loginVerify.php --- loginVerify.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loginVerify.php b/loginVerify.php index 992449578..f248e01db 100644 --- a/loginVerify.php +++ b/loginVerify.php @@ -3,7 +3,7 @@ $success = "{success:true}"; $user_name = $_POST['username']; $user_password = $_POST['userpassword']; - if(!$username or !$userpassword){ + if(!$user_name or !$user_password){ echo $failure; exit(); } From 072ce62f2a854b677876b8b9999e7fcc26a61201 Mon Sep 17 00:00:00 2001 From: Zaphster Date: Thu, 10 Nov 2016 16:52:24 -0600 Subject: [PATCH 037/416] Update loginVerify.php --- loginVerify.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loginVerify.php b/loginVerify.php index f248e01db..23345d574 100644 --- a/loginVerify.php +++ b/loginVerify.php @@ -4,7 +4,7 @@ $user_name = $_POST['username']; $user_password = $_POST['userpassword']; if(!$user_name or !$user_password){ - echo $failure; + echo $failure."}"; exit(); } session_start(); // session starts with the help of this function From 6b4e8c6842ed10495fd4c8aeded1f38b4b6d217b Mon Sep 17 00:00:00 2001 From: Zaphster Date: Thu, 10 Nov 2016 17:01:18 -0600 Subject: [PATCH 038/416] Update login.php --- login.php | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/login.php b/login.php index e071f5a87..028162faa 100644 --- a/login.php +++ b/login.php @@ -22,12 +22,12 @@

Login

- +
- +
@@ -47,27 +47,27 @@ From f1869156622c590d1e0d4f5e25f567b93f6bf1f0 Mon Sep 17 00:00:00 2001 From: Zaphster Date: Thu, 10 Nov 2016 17:01:52 -0600 Subject: [PATCH 039/416] Update login.php --- login.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/login.php b/login.php index 028162faa..ac1f5edd3 100644 --- a/login.php +++ b/login.php @@ -37,7 +37,7 @@
-
+
- From 2a386d80a5b8a309d69d38b5ccf45b07f2d5bf9d Mon Sep 17 00:00:00 2001 From: Zaphster Date: Thu, 10 Nov 2016 17:07:33 -0600 Subject: [PATCH 042/416] Update login.php --- login.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/login.php b/login.php index ac7638f1b..f6f10ace6 100644 --- a/login.php +++ b/login.php @@ -37,7 +37,7 @@
-
+
From d41d5b657370c83fc96764de6f5ace5705aff057 Mon Sep 17 00:00:00 2001 From: Zaphster Date: Thu, 10 Nov 2016 17:09:55 -0600 Subject: [PATCH 043/416] Update login.php --- login.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/login.php b/login.php index f6f10ace6..6dc8ea34c 100644 --- a/login.php +++ b/login.php @@ -50,4 +50,11 @@ + From a2fb76cc1ed429c5cab133b807964acaa1a6aaf2 Mon Sep 17 00:00:00 2001 From: Zaphster Date: Thu, 10 Nov 2016 17:11:20 -0600 Subject: [PATCH 044/416] Update login.php --- login.php | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/login.php b/login.php index 6dc8ea34c..c6508b5e5 100644 --- a/login.php +++ b/login.php @@ -37,11 +37,7 @@
-
- -
+
From 6ddb9ea4bb9f35aaf36fac8848920e47f82dbbe6 Mon Sep 17 00:00:00 2001 From: Zaphster Date: Thu, 10 Nov 2016 17:13:40 -0600 Subject: [PATCH 045/416] Update login.php --- login.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/login.php b/login.php index c6508b5e5..fc015c320 100644 --- a/login.php +++ b/login.php @@ -37,7 +37,7 @@
-
+
From 94018bc20f66dbda464ba827c4559c83e73ed88f Mon Sep 17 00:00:00 2001 From: Zaphster Date: Thu, 10 Nov 2016 17:16:13 -0600 Subject: [PATCH 046/416] Update login.php --- login.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/login.php b/login.php index fc015c320..17ef1eb04 100644 --- a/login.php +++ b/login.php @@ -35,10 +35,8 @@
- -
- +
From 5ca9357e34ae2fc0b0a34131577a80010b255159 Mon Sep 17 00:00:00 2001 From: Zaphster Date: Thu, 10 Nov 2016 17:17:23 -0600 Subject: [PATCH 047/416] Update login.php --- login.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/login.php b/login.php index 17ef1eb04..8d3bd6b49 100644 --- a/login.php +++ b/login.php @@ -35,7 +35,7 @@ -
+
From 7b4639b58e878e7138ba48a43beebb370969dd50 Mon Sep 17 00:00:00 2001 From: Zaphster Date: Thu, 10 Nov 2016 17:21:05 -0600 Subject: [PATCH 048/416] Update login.php --- login.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/login.php b/login.php index 8d3bd6b49..6e28f1dfb 100644 --- a/login.php +++ b/login.php @@ -33,9 +33,11 @@ - -
+ +
+
+
From 471d3e7b3aefdfcfc71d2ae14a08a31c0a3a5889 Mon Sep 17 00:00:00 2001 From: Zaphster Date: Thu, 10 Nov 2016 17:21:28 -0600 Subject: [PATCH 049/416] Update login.php --- login.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/login.php b/login.php index 6e28f1dfb..ad537426a 100644 --- a/login.php +++ b/login.php @@ -37,7 +37,7 @@
-
+
From 670d690bf791d9d7b4d500f7dd74caaca86d5a9c Mon Sep 17 00:00:00 2001 From: Zaphster Date: Thu, 10 Nov 2016 19:09:58 -0600 Subject: [PATCH 050/416] Create DBConn.php DBConn is a class to be used for easy prepared statements --- DBConn.php | 281 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 281 insertions(+) create mode 100644 DBConn.php diff --git a/DBConn.php b/DBConn.php new file mode 100644 index 000000000..72f980e8d --- /dev/null +++ b/DBConn.php @@ -0,0 +1,281 @@ +connectToDatabase(); + } + + function connectToDatabase() + { + $dsn = "mysql:dbname=db;host=localhost"; + $user = "root"; + $password = ""; + try{ + $this->conn = new PDO($dsn, $user, $password); + } + catch(Exception $e) + { + $this->errors[] = $e->getMessage(); + return false; + } + return true; + } + + function close() + { + $this->conn = NULL; + } + + function rowCount() + { + return $this->numRows; + } + + function update($query, $newValues = array(), $whereValues = array()) + { //echo "update function parameters passed in
newValues: ".print_r($newValues, true)."
whereValues: ".print_r($whereValues, true).""; + $this->numRows = 0; + $this->errors = array(); + if(!is_array($newValues)) + { + $newValues = (array)$newValues; + } + if(!is_array($whereValues)) + { + $whereValues = (array)$whereValues; + } + $newValues = $this->clean($newValues); + $whereValues = $this->clean($whereValues); + try{ + //echo "preparing update
"; + if (($stmt = $this->conn->prepare($query)) === false) + { + $this->errors[] = "Error preparing update query: ".$query.PHP_EOL."Values: ".print_r($newValues, true).print_r($whereValues, true); + $messageArray = $stmt->errorInfo(); + $this->errors[] = $messageArray[2]; + return false; + } + $count = 1; + if (count($newValues)>0) + {//echo "new values count > 0.
"; + foreach($newValues as $key=>&$value) + { + //echo "binding value: $value
"; + if(($stmt->bindParam($count, $value)) === false) + { + $this->errors[] = "Error binding 'new' parameters for update statement: ".$query.PHP_EOL."Values: ".print_r($newValues, true).print_r($whereValues, true); + $messageArray = $stmt->errorInfo(); + $this->errors[] = $messageArray[2]; + return false; + } + $count++; + } + } + if (count($whereValues)>0) + {//echo "where values count > 0.
"; + foreach($whereValues as $key=>&$value) + {//echo "binding value: $value
"; + if(($stmt->bindParam($count, $value)) === false) + { + $this->errors[] = "Error binding 'where' parameters for update statement: ".$query.PHP_EOL."Values: ".print_r($newValues, true).print_r($whereValues, true); + $messageArray = $stmt->errorInfo(); + $this->errors[] = $messageArray[2]; + return false; + } + $count++; + } + } + if (($stmt->execute()) === false) + { + $this->errors[] = "Error executing update statement: ".$query.PHP_EOL."Values: ".print_r($newValues, true).print_r($whereValues, true); + $messageArray = $stmt->errorInfo(); + $this->errors[] = $messageArray[2]; + return false; + } + //echo "statement executed
"; + } + catch(Exception $e) + { + $this->errors[] = $e->getMessage(); + return false; + } + $this->numRows = $stmt->rowCount(); + //echo "update statement should have been successful
"; + return true; + } + + function insert($query, $values = array()) + { + $this->numRows = 0; + $this->errors = array(); + if(!is_array($values)) + { + $values = (array)$values; + } + $values = $this->clean($values); + try{ + if (($stmt = $this->conn->prepare($query)) === false) + { + $this->errors[] = "Error preparing insert query: ".$query.PHP_EOL."Values: ".print_r($values, true); + $messageArray = $stmt->errorInfo(); + $this->errors[] = $messageArray[2]; + return false; + } + if (count($values)>0) + { + foreach($values as $key=>&$value) + { + if(($stmt->bindParam($key + 1, $value)) === false) + { + $this->errors[] = "Error binding parameters for insert statement: ".$query.PHP_EOL."Values: ".print_r($values, true); + $messageArray = $stmt->errorInfo(); + $this->errors[] = $messageArray[2]; + return false; + } + } + } + if (($stmt->execute()) === false) + { + $this->errors[] = "Error executing insert statement: ".$query.PHP_EOL."Values: ".print_r($values, true); + $messageArray = $stmt->errorInfo(); + $this->errors[] = $messageArray[2]; + return false; + } + } + catch(Exception $e) + { + $this->errors[] = $e->getMessage(); + return false; + } + $this->numRows = $stmt->rowCount(); + return true; + } + + + function select($query, $values = array()) + { + $this->numRows = 0; + $this->errors = array(); + if(!is_array($values)) + { + $values = (array)$values; + } + $values = $this->clean($values); + try{ + if (($stmt = $this->conn->prepare($query)) === false) + { + $this->errors[] = "Error preparing select query: ".$query.PHP_EOL."Values: ".print_r($values, true); + $messageArray = $stmt->errorInfo(); + $this->errors[] = $messageArray[2]; + return false; + } + if(count($values)>0) + { + foreach($values as $key=>&$value) + { + if(($stmt->bindParam($key + 1, $value)) === false) + { + $this->errors[] = "Error binding parameters for select statement: ".$query.PHP_EOL."Values: ".print_r($values, true); + $messageArray = $stmt->errorInfo(); + $this->errors[] = $messageArray[2]; + return false; + } + } + } + if (($stmt->execute()) === false) + { + $this->errors[] = "Error executing select statement: ".$query.PHP_EOL."Values: ".print_r($values, true); + $messageArray = $stmt->errorInfo(); + $this->errors[] = $messageArray[2]; + return false; + } + if (($rows = $stmt->fetchAll(PDO::FETCH_ASSOC)) === false) + { + $this->errors[] = "Error fetching rows for query: ".$query.PHP_EOL."Values: ".print_r($values, true); + $messageArray = $stmt->errorInfo(); + $this->errors[] = $messageArray[2]; + return false; + } + } + catch(Exception $e) + { + $this->errors[] = $e->getMessage(); + return false; + } + $this->numRows = count($rows); + return $rows; + } + + function delete($query, $values = array()) + { + $this->numRows = 0; + $this->errors = array(); + if(!is_array($values)) + { + $values = (array)$values; + } + $values = $this->clean($values); + try{ + if (($stmt = $this->conn->prepare($query)) === false) + { + $this->errors[] = "Error preparing delete query: ".$query.PHP_EOL."Values: ".print_r($values, true); + $messageArray = $stmt->errorInfo(); + $this->errors[] = $messageArray[2]; + return false; + } + if (count($values)>0) + { + foreach($values as $key=>&$value) + { + if(($stmt->bindParam($key + 1, $value)) === false) + { + $this->errors[] = "Error binding parameters for delete statement: ".$query.PHP_EOL."Values: ".print_r($values, true); + $messageArray = $stmt->errorInfo(); + $this->errors[] = $messageArray[2]; + return false; + } + } + } + if (($stmt->execute()) === false) + { + $this->errors[] = "Error executing delete statement: ".$query.PHP_EOL."Values: ".print_r($values, true); + $messageArray = $stmt->errorInfo(); + $this->errors[] = $messageArray[2]; + return false; + } + } + catch(Exception $e) + { + $this->errors[] = $e->getMessage(); + return false; + } + $this->numRows = $stmt->rowCount(); + return true; + } + + function getErrors() + { + return $this->errors; + } + + function clean($values = array()) + {//echo "in clean, values passed in: 
".print_r($values, true)."

"; + $cleanValues = array(); + foreach($values as $key=>$value) + { + if (is_array($value)) + { + $cleanValues[$key] = $this->clean($value); + } + else + { + $cleanValues[$key] = htmlspecialchars($value); + } + } + return $cleanValues; + } +} +?> From d5ccb48d7fdafc9faaef91994a152604e712dc93 Mon Sep 17 00:00:00 2001 From: Zaphster Date: Thu, 10 Nov 2016 19:19:54 -0600 Subject: [PATCH 051/416] Update loginVerify.php --- loginVerify.php | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/loginVerify.php b/loginVerify.php index 4e2ecbc0a..a1c1eecb8 100644 --- a/loginVerify.php +++ b/loginVerify.php @@ -1,30 +1,32 @@ query($sql); - $row = $result->fetch_assoc(); - $failure .= ', username: "'.$user_name.'", password: "'.$user_password.'", sql: "'.$sql.'"}'; - if ($user_name == $row['username'] ) { - $_SESSION[NAME] = $row['username']; + $sql = "SELECT username FROM user WHERE username = ? AND password= ?;"; + $rows = $dbconn->select($sql, array($user_name, $user_password)); + if(count($errors = $dbconn->getErrors()) > 0){ + foreach($errors as $error){ + echo $error."
"; + } + } +// $result = $conn->query($sql); +// $row = $result->fetch_assoc(); + if ($user_name == $rows['username'] ) { + $_SESSION[NAME] = $user_name; header("Location: index.html"); - //echo $success; exit(); } else { header("Location: login.php?error=Invalid username or password"); - //echo $failure; exit(); } ?> From 7ec21a8116011fbbdd74ec00b4177513d31ce87d Mon Sep 17 00:00:00 2001 From: nihr43 Date: Thu, 10 Nov 2016 19:20:50 -0600 Subject: [PATCH 052/416] Delete insertFile.php --- insertFile.php | 22 ---------------------- 1 file changed, 22 deletions(-) delete mode 100644 insertFile.php diff --git a/insertFile.php b/insertFile.php deleted file mode 100644 index 6853ec8de..000000000 --- a/insertFile.php +++ /dev/null @@ -1,22 +0,0 @@ -connect_error) { - die("Connection failed: " . $conn->connect_error); -} - -// prepare and bind -$stmt = $conn->prepare("INSERT INTO file (groupid, path, activeuserflag) VALUES (?, ?, ?, ?)"); -$stmt->bind_param("sss", $username, $hashedpassword, $usertypeid, $activeuserflag); - -//execute -$stmt->execute(); -$stmt->close(); -$conn->close(); -?> From 16511aee4f5d8cb977ee37cc817af76dfb595ea6 Mon Sep 17 00:00:00 2001 From: nihr43 Date: Thu, 10 Nov 2016 19:21:10 -0600 Subject: [PATCH 053/416] Create insertFile.php --- DML/insertFile.php | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 DML/insertFile.php diff --git a/DML/insertFile.php b/DML/insertFile.php new file mode 100644 index 000000000..423d868cd --- /dev/null +++ b/DML/insertFile.php @@ -0,0 +1,18 @@ +connect_error) { + die("Connection failed: " . $conn->connect_error); +} +// prepare and bind +$stmt = $conn->prepare("INSERT INTO file (groupid, path, activeuserflag) VALUES (?, ?, ?, ?)"); +$stmt->bind_param("sss", $username, $hashedpassword, $usertypeid, $activeuserflag); +//execute +$stmt->execute(); +$stmt->close(); +$conn->close(); +?> From 323098eb1abf851e798b40aebe601d9de419d4f0 Mon Sep 17 00:00:00 2001 From: Zaphster Date: Thu, 10 Nov 2016 19:25:51 -0600 Subject: [PATCH 054/416] Update loginVerify.php --- loginVerify.php | 37 +++++++++++++++++++++---------------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/loginVerify.php b/loginVerify.php index a1c1eecb8..24d89e372 100644 --- a/loginVerify.php +++ b/loginVerify.php @@ -10,23 +10,28 @@ $conn = new mysqli($servername, $username, $password); require_once "DBConn.php"; $dbconn = new DBConn(); - //$link = mysqli_connect("$servername", "$username", "$password", "$dbname") or die ("Connection Error " . mysqli_error($link)); - //TODO: hash password! - $sql = "SELECT username FROM user WHERE username = ? AND password= ?;"; - $rows = $dbconn->select($sql, array($user_name, $user_password)); - if(count($errors = $dbconn->getErrors()) > 0){ - foreach($errors as $error){ - echo $error."
"; + if($dbconn->connectToDatabase()){ + //$link = mysqli_connect("$servername", "$username", "$password", "$dbname") or die ("Connection Error " . mysqli_error($link)); + //TODO: hash password! + $sql = "SELECT username FROM user WHERE username = ? AND password= ?;"; + $rows = $dbconn->select($sql, array($user_name, $user_password)); + if(count($errors = $dbconn->getErrors()) > 0){ + foreach($errors as $error){ + echo $error."
"; + } } - } -// $result = $conn->query($sql); -// $row = $result->fetch_assoc(); - if ($user_name == $rows['username'] ) { - $_SESSION[NAME] = $user_name; - header("Location: index.html"); - exit(); - } else { - header("Location: login.php?error=Invalid username or password"); + // $result = $conn->query($sql); + // $row = $result->fetch_assoc(); + if ($user_name == $rows['username'] ) { + $_SESSION[NAME] = $user_name; + header("Location: index.html"); + exit(); + } else { + header("Location: login.php?error=Invalid username or password"); + exit(); + } + } else { //bad connection + header("Location: login.php?error=Could not connect. Try again later."); exit(); } ?> From c98663baa8983e7eee06960d1b0fca276cd75cad Mon Sep 17 00:00:00 2001 From: Zaphster Date: Thu, 10 Nov 2016 19:30:27 -0600 Subject: [PATCH 055/416] Update loginVerify.php --- loginVerify.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/loginVerify.php b/loginVerify.php index 24d89e372..347890a05 100644 --- a/loginVerify.php +++ b/loginVerify.php @@ -11,6 +11,7 @@ require_once "DBConn.php"; $dbconn = new DBConn(); if($dbconn->connectToDatabase()){ + echo "connected to db
"; //$link = mysqli_connect("$servername", "$username", "$password", "$dbname") or die ("Connection Error " . mysqli_error($link)); //TODO: hash password! $sql = "SELECT username FROM user WHERE username = ? AND password= ?;"; @@ -19,14 +20,18 @@ foreach($errors as $error){ echo $error."
"; } + } else { + echo "no errors after select statement
"; } // $result = $conn->query($sql); // $row = $result->fetch_assoc(); if ($user_name == $rows['username'] ) { $_SESSION[NAME] = $user_name; - header("Location: index.html"); + echo "success
"; + //header("Location: index.html"); exit(); } else { + echo "no user found, or password is incorrect
"; header("Location: login.php?error=Invalid username or password"); exit(); } From 659f10e48541261281adbfefdeaa07d15c0db2bb Mon Sep 17 00:00:00 2001 From: Zaphster Date: Thu, 10 Nov 2016 19:36:14 -0600 Subject: [PATCH 056/416] Update loginVerify.php --- loginVerify.php | 1 + 1 file changed, 1 insertion(+) diff --git a/loginVerify.php b/loginVerify.php index 347890a05..fb8e48451 100644 --- a/loginVerify.php +++ b/loginVerify.php @@ -1,4 +1,5 @@ Date: Thu, 10 Nov 2016 19:39:35 -0600 Subject: [PATCH 057/416] Update DBConn.php --- DBConn.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/DBConn.php b/DBConn.php index 72f980e8d..fc07fda42 100644 --- a/DBConn.php +++ b/DBConn.php @@ -38,7 +38,7 @@ function rowCount() function update($query, $newValues = array(), $whereValues = array()) { //echo "update function parameters passed in
newValues: ".print_r($newValues, true)."
whereValues: ".print_r($whereValues, true).""; $this->numRows = 0; - $this->errors = array(); + $this->errors = array(); if(!is_array($newValues)) { $newValues = (array)$newValues; @@ -110,7 +110,7 @@ function update($query, $newValues = array(), $whereValues = array()) function insert($query, $values = array()) { $this->numRows = 0; - $this->errors = array(); + $this->errors = array(); if(!is_array($values)) { $values = (array)$values; @@ -158,7 +158,7 @@ function insert($query, $values = array()) function select($query, $values = array()) { $this->numRows = 0; - $this->errors = array(); + $this->errors = array(); if(!is_array($values)) { $values = (array)$values; @@ -212,7 +212,7 @@ function select($query, $values = array()) function delete($query, $values = array()) { $this->numRows = 0; - $this->errors = array(); + $this->errors = array(); if(!is_array($values)) { $values = (array)$values; From 148fb9458a83141fa6b2e93927b6d0736f0250ec Mon Sep 17 00:00:00 2001 From: Zaphster Date: Thu, 10 Nov 2016 19:40:31 -0600 Subject: [PATCH 058/416] Update loginVerify.php --- loginVerify.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/loginVerify.php b/loginVerify.php index fb8e48451..becd7aec9 100644 --- a/loginVerify.php +++ b/loginVerify.php @@ -8,9 +8,12 @@ } session_start(); // session starts with the help of this function //include "connection.php"; - $conn = new mysqli($servername, $username, $password); + //$conn = new mysqli($servername, $username, $password); + echo "session started"; require_once "DBConn.php"; + echo "dbconn included"; $dbconn = new DBConn(); + echo "dbconn created"; if($dbconn->connectToDatabase()){ echo "connected to db
"; //$link = mysqli_connect("$servername", "$username", "$password", "$dbname") or die ("Connection Error " . mysqli_error($link)); From 03d9fb93238922a5d6e33a165a9fe4c114cafba8 Mon Sep 17 00:00:00 2001 From: Zaphster Date: Thu, 10 Nov 2016 19:43:33 -0600 Subject: [PATCH 059/416] Update DBConn.php --- DBConn.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DBConn.php b/DBConn.php index fc07fda42..fe00c3633 100644 --- a/DBConn.php +++ b/DBConn.php @@ -6,7 +6,7 @@ class DBConn{ function __construct() { - $this->connectToDatabase(); + return $this->connectToDatabase(); } function connectToDatabase() From 68753f7201cd9dd346272d14ec7302d7fe942bac Mon Sep 17 00:00:00 2001 From: Zaphster Date: Thu, 10 Nov 2016 19:45:24 -0600 Subject: [PATCH 060/416] Update DBConn.php --- DBConn.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DBConn.php b/DBConn.php index fe00c3633..fc07fda42 100644 --- a/DBConn.php +++ b/DBConn.php @@ -6,7 +6,7 @@ class DBConn{ function __construct() { - return $this->connectToDatabase(); + $this->connectToDatabase(); } function connectToDatabase() From b4ba70803c080b6a55d8af907c3804565cb9537c Mon Sep 17 00:00:00 2001 From: Zaphster Date: Thu, 10 Nov 2016 19:45:53 -0600 Subject: [PATCH 061/416] Update loginVerify.php --- loginVerify.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/loginVerify.php b/loginVerify.php index becd7aec9..e0bcf68fa 100644 --- a/loginVerify.php +++ b/loginVerify.php @@ -9,12 +9,12 @@ session_start(); // session starts with the help of this function //include "connection.php"; //$conn = new mysqli($servername, $username, $password); - echo "session started"; + //echo "session started"; require_once "DBConn.php"; echo "dbconn included"; $dbconn = new DBConn(); echo "dbconn created"; - if($dbconn->connectToDatabase()){ + //if($dbconn->connectToDatabase()){ echo "connected to db
"; //$link = mysqli_connect("$servername", "$username", "$password", "$dbname") or die ("Connection Error " . mysqli_error($link)); //TODO: hash password! @@ -39,8 +39,8 @@ header("Location: login.php?error=Invalid username or password"); exit(); } - } else { //bad connection + //} else { //bad connection header("Location: login.php?error=Could not connect. Try again later."); exit(); - } + //} ?> From c867a132893d155cb3e1be0206b69d24a73217f6 Mon Sep 17 00:00:00 2001 From: Zaphster Date: Thu, 10 Nov 2016 19:48:51 -0600 Subject: [PATCH 062/416] Update loginVerify.php --- loginVerify.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/loginVerify.php b/loginVerify.php index e0bcf68fa..b3bc4ec2d 100644 --- a/loginVerify.php +++ b/loginVerify.php @@ -10,6 +10,11 @@ //include "connection.php"; //$conn = new mysqli($servername, $username, $password); //echo "session started"; + if(class_exists('PDO')){ + echo "pdo exists"; + } else { + echo "pdo does not exist"; + } require_once "DBConn.php"; echo "dbconn included"; $dbconn = new DBConn(); From 2d4abdda6cd501969f8c33ef738526f4da20ae69 Mon Sep 17 00:00:00 2001 From: nihr43 Date: Fri, 11 Nov 2016 01:53:47 +0000 Subject: [PATCH 063/416] refactored homepage --- index.html | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/index.html b/index.html index 42ea26620..478e1d3c2 100644 --- a/index.html +++ b/index.html @@ -1,14 +1,27 @@ - + - Final Project Group 2 + RADs(Research Analysis and Database for Scientists) + + + + + -

RADs(Research Analysis and Database for Scientists)

-

Hello World!

-
- Upload -
+ +
+

Welcome to RADs

+

Research Analysis and Database for Scientists

+ +
+ From 0c95376ed161773a52716ec2aebafe6271596621 Mon Sep 17 00:00:00 2001 From: Zaphster Date: Thu, 10 Nov 2016 20:00:11 -0600 Subject: [PATCH 064/416] Update loginVerify.php --- loginVerify.php | 74 ++++++++++++++++++++++++------------------------- 1 file changed, 36 insertions(+), 38 deletions(-) diff --git a/loginVerify.php b/loginVerify.php index b3bc4ec2d..c444bc85a 100644 --- a/loginVerify.php +++ b/loginVerify.php @@ -7,45 +7,43 @@ exit(); } session_start(); // session starts with the help of this function - //include "connection.php"; - //$conn = new mysqli($servername, $username, $password); + include "connection.php"; + $conn = new mysqli($servername, $username, $password); //echo "session started"; - if(class_exists('PDO')){ - echo "pdo exists"; - } else { - echo "pdo does not exist"; - } - require_once "DBConn.php"; - echo "dbconn included"; - $dbconn = new DBConn(); - echo "dbconn created"; +// if(class_exists('PDO')){ +// echo "pdo exists"; +// } else { +// echo "pdo does not exist"; +// } +// require_once "DBConn.php"; +// echo "dbconn included"; +// $dbconn = new DBConn(); +// echo "dbconn created"; //if($dbconn->connectToDatabase()){ - echo "connected to db
"; - //$link = mysqli_connect("$servername", "$username", "$password", "$dbname") or die ("Connection Error " . mysqli_error($link)); - //TODO: hash password! - $sql = "SELECT username FROM user WHERE username = ? AND password= ?;"; - $rows = $dbconn->select($sql, array($user_name, $user_password)); - if(count($errors = $dbconn->getErrors()) > 0){ - foreach($errors as $error){ - echo $error."
"; - } - } else { - echo "no errors after select statement
"; - } - // $result = $conn->query($sql); - // $row = $result->fetch_assoc(); - if ($user_name == $rows['username'] ) { - $_SESSION[NAME] = $user_name; - echo "success
"; - //header("Location: index.html"); - exit(); - } else { - echo "no user found, or password is incorrect
"; - header("Location: login.php?error=Invalid username or password"); - exit(); - } - //} else { //bad connection - header("Location: login.php?error=Could not connect. Try again later."); +// echo "connected to db
"; + //$link = mysqli_connect("$servername", "$username", "$password", "$dbname") or die ("Connection Error " . mysqli_error($link)); + //TODO: hash password! + $sql = "SELECT username FROM user WHERE username = '$user_name' and password = '$user_password'"; + //$sql = "SELECT username FROM user WHERE username = ? AND password= ?;"; +// $row = $dbconn->select($sql, array($user_name, $user_password)); +// if(count($errors = $dbconn->getErrors()) > 0){ +// foreach($errors as $error){ +// echo $error."
"; +// } +// } else { +// echo "no errors after select statement
"; +// } + $result = $conn->query($sql); + $row = $result->fetch_assoc(); + if ($user_name == $row['username'] ) { + $_SESSION[NAME] = $user_name; + //echo "success
"; + header("Location: index.html"); + exit(); + } else { +// echo "no user found, or password is incorrect
"; + header("Location: login.php?error=Invalid username or password"); exit(); - //} + } +//} ?> From 2b3f2332639c1f5367c2702c8be3703cf14dc6a7 Mon Sep 17 00:00:00 2001 From: Zaphster Date: Thu, 10 Nov 2016 20:02:16 -0600 Subject: [PATCH 065/416] Update loginVerify.php --- loginVerify.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loginVerify.php b/loginVerify.php index c444bc85a..e0b5c5cc2 100644 --- a/loginVerify.php +++ b/loginVerify.php @@ -1,5 +1,5 @@ Date: Thu, 10 Nov 2016 20:05:50 -0600 Subject: [PATCH 066/416] Update loginVerify.php --- loginVerify.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loginVerify.php b/loginVerify.php index e0b5c5cc2..076996e75 100644 --- a/loginVerify.php +++ b/loginVerify.php @@ -23,7 +23,7 @@ // echo "connected to db
"; //$link = mysqli_connect("$servername", "$username", "$password", "$dbname") or die ("Connection Error " . mysqli_error($link)); //TODO: hash password! - $sql = "SELECT username FROM user WHERE username = '$user_name' and password = '$user_password'"; + $sql = "SELECT username FROM db.user WHERE username = '$user_name' and password = '$user_password';"; //$sql = "SELECT username FROM user WHERE username = ? AND password= ?;"; // $row = $dbconn->select($sql, array($user_name, $user_password)); // if(count($errors = $dbconn->getErrors()) > 0){ From 8b1b1d0d1fe0efd7ff1471666f263d392ed23ea2 Mon Sep 17 00:00:00 2001 From: Zaphster Date: Thu, 10 Nov 2016 20:08:57 -0600 Subject: [PATCH 067/416] Update login.php --- login.php | 1 + 1 file changed, 1 insertion(+) diff --git a/login.php b/login.php index ad537426a..8e78c59d3 100644 --- a/login.php +++ b/login.php @@ -31,6 +31,7 @@
+
From 945f31010b709bd7201febf7df5a5feebd31c5d9 Mon Sep 17 00:00:00 2001 From: Zaphster Date: Thu, 10 Nov 2016 20:11:17 -0600 Subject: [PATCH 068/416] Create signup.php --- signup.php | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 signup.php diff --git a/signup.php b/signup.php new file mode 100644 index 000000000..d7be6adc8 --- /dev/null +++ b/signup.php @@ -0,0 +1,59 @@ + + + + + + + + + + + + + + RADs Signup + + + + + + +
+
+
+

Login

+
+
+ +
+
+ +
+
+ +
+
+ +
+
+
+
+
+
+
+
+ + + + + + + + From bb59b94005dd61cceb01d9ce124d377c01ab09ee Mon Sep 17 00:00:00 2001 From: Zaphster Date: Thu, 10 Nov 2016 20:27:20 -0600 Subject: [PATCH 069/416] Create signupVerify.php --- signupVerify.php | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 signupVerify.php diff --git a/signupVerify.php b/signupVerify.php new file mode 100644 index 000000000..e80219a8c --- /dev/null +++ b/signupVerify.php @@ -0,0 +1,20 @@ +query($sql) or header("Location: signup.php?error=Connection error"); + if($conn->affected_rows != 1){ + header("Location: signup.php?error=Information not stored"); + } + header("Location: login.php"); +?> From a334c8be6d7f9e2d994b5ed4e807fbd38ae04c0f Mon Sep 17 00:00:00 2001 From: Zaphster Date: Thu, 10 Nov 2016 20:30:00 -0600 Subject: [PATCH 070/416] Update login.php --- login.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/login.php b/login.php index 8e78c59d3..e6a056d6c 100644 --- a/login.php +++ b/login.php @@ -31,7 +31,7 @@
- + Sign Up
From d720a858a75a9eb52563fba0ca94c79ca1eec0b5 Mon Sep 17 00:00:00 2001 From: Zaphster Date: Thu, 10 Nov 2016 20:31:11 -0600 Subject: [PATCH 071/416] Update signup.php --- signup.php | 1 + 1 file changed, 1 insertion(+) diff --git a/signup.php b/signup.php index d7be6adc8..c708dc2d9 100644 --- a/signup.php +++ b/signup.php @@ -34,6 +34,7 @@
+ Login
From be8dbc098837a3561ef740e67b4976fd017fe419 Mon Sep 17 00:00:00 2001 From: Zaphster Date: Thu, 10 Nov 2016 20:39:17 -0600 Subject: [PATCH 072/416] Update login.php --- login.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/login.php b/login.php index e6a056d6c..62da2f64f 100644 --- a/login.php +++ b/login.php @@ -38,7 +38,7 @@
-
+
@@ -49,7 +49,7 @@ + + + + + +
+

Welcome to RADs

+

Research Analysis and Database for Scientists

+ +
+

Firstname:

+

Lastname:

+

username:

+
+ + + From a81d30c5f1d93978c4672ccdf43ede485be4f91f Mon Sep 17 00:00:00 2001 From: nihr43 Date: Thu, 10 Nov 2016 21:02:11 -0600 Subject: [PATCH 089/416] Rename accountInfo.php to account.php --- accountInfo.php => account.php | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename accountInfo.php => account.php (100%) diff --git a/accountInfo.php b/account.php similarity index 100% rename from accountInfo.php rename to account.php From d3c9535d1b39b9d143a1f1688d3cce86542c73a7 Mon Sep 17 00:00:00 2001 From: Zaphster Date: Thu, 10 Nov 2016 21:02:27 -0600 Subject: [PATCH 090/416] Update signupVerify.php --- signupVerify.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/signupVerify.php b/signupVerify.php index d02860642..35cb13b30 100644 --- a/signupVerify.php +++ b/signupVerify.php @@ -13,7 +13,7 @@ include "connection.php"; $conn = new mysqli($servername, $username, $password); $usernamecheck = "select * from user where username = '$user_name'"; - $result = $conn->query($sql); + $result = $conn->query($usernamecheck); if($result->num_rows != 0){ header("Location: signup.php?error=Username already exists"); exit(); From 9dcdce0919ec5e1d23019e43b922fc62ce5b22bf Mon Sep 17 00:00:00 2001 From: nihr43 Date: Thu, 10 Nov 2016 21:02:48 -0600 Subject: [PATCH 091/416] Update upload.html --- upload.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/upload.html b/upload.html index a20b1d351..b2fd2af5d 100644 --- a/upload.html +++ b/upload.html @@ -22,7 +22,7 @@

Upload Manifest

  • Home
  • Upload
  • Search Manifests
    • -
  • Account
    • +
  • Account
  • Logout
    • From 6baabd7dbb9dd66156dd0ccba8d008e3fa5a2b3e Mon Sep 17 00:00:00 2001 From: nihr43 Date: Thu, 10 Nov 2016 21:04:23 -0600 Subject: [PATCH 092/416] added accounts link --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index a33bd881b..c839b7bd7 100644 --- a/index.html +++ b/index.html @@ -18,7 +18,7 @@

    Welcome to RADs

  • Home
  • Upload
  • Search Manifests
    • -
  • Account
    • +
  • Account
  • Logout

    • From d7e9e9d1c353377b54aadec4d5e9704242c773a3 Mon Sep 17 00:00:00 2001 From: Zaphster Date: Thu, 10 Nov 2016 21:04:26 -0600 Subject: [PATCH 093/416] Update signupVerify.php --- signupVerify.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/signupVerify.php b/signupVerify.php index 35cb13b30..d813ed466 100644 --- a/signupVerify.php +++ b/signupVerify.php @@ -13,11 +13,15 @@ include "connection.php"; $conn = new mysqli($servername, $username, $password); $usernamecheck = "select * from user where username = '$user_name'"; + echo $usernamecheck; $result = $conn->query($usernamecheck); if($result->num_rows != 0){ header("Location: signup.php?error=Username already exists"); exit(); } + while($row = $result->fetch_assoc()){ + echo $row[username]; + }exit(); $hashedPassword = password_hash($user_password, PASSWORD_DEFAULT); $sql = "INSERT into (username, hashedpassword) values ($user_name, $hashedPassword);"; //echo $sql;exit(); From d21787e4e7f8f46ae0f68612f4fdbcd05943ff73 Mon Sep 17 00:00:00 2001 From: nihr43 Date: Thu, 10 Nov 2016 21:05:22 -0600 Subject: [PATCH 094/416] changed title --- account.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/account.php b/account.php index 3e30c9f2e..f76a8a08a 100644 --- a/account.php +++ b/account.php @@ -12,8 +12,8 @@
    -

    Welcome to RADs

    -

    Research Analysis and Database for Scientists

    +

    Account information

    +

    -

    Firstname:

    -

    Lastname:

    -

    username:

    +

    Firstname:

    +

    Lastname:

    +

    username:

    From 03c03bbabf8d8096e9435839d7535c76853b1513 Mon Sep 17 00:00:00 2001 From: Zaphster Date: Thu, 10 Nov 2016 21:05:59 -0600 Subject: [PATCH 095/416] Update signupVerify.php --- signupVerify.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/signupVerify.php b/signupVerify.php index d813ed466..c142f1f39 100644 --- a/signupVerify.php +++ b/signupVerify.php @@ -12,7 +12,7 @@ } include "connection.php"; $conn = new mysqli($servername, $username, $password); - $usernamecheck = "select * from user where username = '$user_name'"; + $usernamecheck = "select * from db.user where username = '$user_name';"; echo $usernamecheck; $result = $conn->query($usernamecheck); if($result->num_rows != 0){ @@ -23,7 +23,7 @@ echo $row[username]; }exit(); $hashedPassword = password_hash($user_password, PASSWORD_DEFAULT); - $sql = "INSERT into (username, hashedpassword) values ($user_name, $hashedPassword);"; + $sql = "INSERT into db.user (username, hashedpassword) values ($user_name, $hashedPassword);"; //echo $sql;exit(); $conn->query($sql); if($conn->affected_rows != 1){ From f4cdbed080bde1f9c26b57a9894d536a3f369e66 Mon Sep 17 00:00:00 2001 From: Zaphster Date: Thu, 10 Nov 2016 21:07:27 -0600 Subject: [PATCH 096/416] Update signupVerify.php --- signupVerify.php | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/signupVerify.php b/signupVerify.php index c142f1f39..cae4c49a1 100644 --- a/signupVerify.php +++ b/signupVerify.php @@ -13,15 +13,12 @@ include "connection.php"; $conn = new mysqli($servername, $username, $password); $usernamecheck = "select * from db.user where username = '$user_name';"; - echo $usernamecheck; + //echo $usernamecheck; $result = $conn->query($usernamecheck); if($result->num_rows != 0){ header("Location: signup.php?error=Username already exists"); exit(); } - while($row = $result->fetch_assoc()){ - echo $row[username]; - }exit(); $hashedPassword = password_hash($user_password, PASSWORD_DEFAULT); $sql = "INSERT into db.user (username, hashedpassword) values ($user_name, $hashedPassword);"; //echo $sql;exit(); From 949b6e609b73ea277f1d22343bcd275ddf867315 Mon Sep 17 00:00:00 2001 From: Zaphster Date: Thu, 10 Nov 2016 21:08:11 -0600 Subject: [PATCH 097/416] Update signupVerify.php --- signupVerify.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/signupVerify.php b/signupVerify.php index cae4c49a1..5276c5766 100644 --- a/signupVerify.php +++ b/signupVerify.php @@ -20,7 +20,7 @@ exit(); } $hashedPassword = password_hash($user_password, PASSWORD_DEFAULT); - $sql = "INSERT into db.user (username, hashedpassword) values ($user_name, $hashedPassword);"; + $sql = "INSERT into db.user (username, hashedpassword) values ('$user_name', '$hashedPassword');"; //echo $sql;exit(); $conn->query($sql); if($conn->affected_rows != 1){ From a9d6f7c52e0c5c4174a546fedd635737ab150a37 Mon Sep 17 00:00:00 2001 From: Zaphster Date: Thu, 10 Nov 2016 21:10:33 -0600 Subject: [PATCH 098/416] Update signupVerify.php --- signupVerify.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/signupVerify.php b/signupVerify.php index 5276c5766..eb0ee7f96 100644 --- a/signupVerify.php +++ b/signupVerify.php @@ -27,5 +27,7 @@ header("Location: signup.php?error=Information not stored"); exit(); } - //header("Location: login.php"); + session_start(); + $_SESSION[NAME] = $user_name; + header("Location: index.html"); ?> From 4ba9171744ccba0a0aabd084c7054a7ce12d6dba Mon Sep 17 00:00:00 2001 From: Zaphster Date: Thu, 10 Nov 2016 21:13:13 -0600 Subject: [PATCH 099/416] Update loginVerify.php --- loginVerify.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/loginVerify.php b/loginVerify.php index 076996e75..6dbdd0bb7 100644 --- a/loginVerify.php +++ b/loginVerify.php @@ -23,7 +23,7 @@ // echo "connected to db
    "; //$link = mysqli_connect("$servername", "$username", "$password", "$dbname") or die ("Connection Error " . mysqli_error($link)); //TODO: hash password! - $sql = "SELECT username FROM db.user WHERE username = '$user_name' and password = '$user_password';"; + $sql = "SELECT username, hashedpassword FROM db.user WHERE username = '$user_name';"; //$sql = "SELECT username FROM user WHERE username = ? AND password= ?;"; // $row = $dbconn->select($sql, array($user_name, $user_password)); // if(count($errors = $dbconn->getErrors()) > 0){ @@ -35,7 +35,8 @@ // } $result = $conn->query($sql); $row = $result->fetch_assoc(); - if ($user_name == $row['username'] ) { + //if ($user_name == $row['username'] ) { + if(password_verify($user_password, $row['hashedpassword']){ $_SESSION[NAME] = $user_name; //echo "success
    "; header("Location: index.html"); From 89e1d50f62d56ac1592f0c823d0c3c1c4a06d210 Mon Sep 17 00:00:00 2001 From: Zaphster Date: Thu, 10 Nov 2016 21:14:10 -0600 Subject: [PATCH 100/416] Update loginVerify.php --- loginVerify.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loginVerify.php b/loginVerify.php index 6dbdd0bb7..110a6ab07 100644 --- a/loginVerify.php +++ b/loginVerify.php @@ -36,7 +36,7 @@ $result = $conn->query($sql); $row = $result->fetch_assoc(); //if ($user_name == $row['username'] ) { - if(password_verify($user_password, $row['hashedpassword']){ + if(password_verify($user_password, $row['hashedpassword'])){ $_SESSION[NAME] = $user_name; //echo "success
    "; header("Location: index.html"); From 1ddc57579d1a6a40e4f0f81f4a83394d32719746 Mon Sep 17 00:00:00 2001 From: Zaphster Date: Thu, 10 Nov 2016 21:18:05 -0600 Subject: [PATCH 101/416] Update upload.html --- upload.html | 3 +++ 1 file changed, 3 insertions(+) diff --git a/upload.html b/upload.html index b2fd2af5d..93e8ae2d5 100644 --- a/upload.html +++ b/upload.html @@ -1,3 +1,6 @@ + From 4ba88cb5eae064799d205d1b1b80feff823a5876 Mon Sep 17 00:00:00 2001 From: Zaphster Date: Thu, 10 Nov 2016 21:19:02 -0600 Subject: [PATCH 102/416] Rename upload.html to upload.html.php --- upload.html => upload.html.php | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename upload.html => upload.html.php (100%) diff --git a/upload.html b/upload.html.php similarity index 100% rename from upload.html rename to upload.html.php From 8621e81619afb2103ef682eafabf32f8430b7584 Mon Sep 17 00:00:00 2001 From: Zaphster Date: Thu, 10 Nov 2016 21:19:52 -0600 Subject: [PATCH 103/416] Rename upload.html.php to upload.php --- upload.html.php => upload.php | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename upload.html.php => upload.php (100%) diff --git a/upload.html.php b/upload.php similarity index 100% rename from upload.html.php rename to upload.php From 440cb3e3942031100eba41ddfccc939298a66b09 Mon Sep 17 00:00:00 2001 From: Zaphster Date: Thu, 10 Nov 2016 21:20:22 -0600 Subject: [PATCH 104/416] Update index.html --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index c839b7bd7..c49da85b2 100644 --- a/index.html +++ b/index.html @@ -16,7 +16,7 @@

    Welcome to RADs

    Research Analysis and Database for Scientists

    • Home
      • -
    • Upload
      • +
    • Upload
    • Search Manifests
    • Account
    • Logout
      • From 0c68aca7cc438ea3bf1bd3f07b436f2d23afee4e Mon Sep 17 00:00:00 2001 From: Zaphster Date: Thu, 10 Nov 2016 21:25:22 -0600 Subject: [PATCH 105/416] Create logout.php --- logout.php | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 logout.php diff --git a/logout.php b/logout.php new file mode 100644 index 000000000..d4c63a621 --- /dev/null +++ b/logout.php @@ -0,0 +1,6 @@ + From e614d854577229a8010c9051b02dbebfaec3ff34 Mon Sep 17 00:00:00 2001 From: Zaphster Date: Thu, 10 Nov 2016 21:26:25 -0600 Subject: [PATCH 106/416] Update index.html --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index c49da85b2..8ef904707 100644 --- a/index.html +++ b/index.html @@ -19,7 +19,7 @@

      Welcome to RADs

    • Upload
    • Search Manifests
    • Account
      • -
    • Logout
      • +
    • Logout

    The goal of this application is to facilitate the research of computational social scientists and data scientists alike by serving as a repository for datasets and metadata following the Open Community Data eXchange (OCDX) specification.

    From d384f4561618f14f6021399c7b4c1225c7f324e4 Mon Sep 17 00:00:00 2001 From: Zaphster Date: Thu, 10 Nov 2016 21:28:05 -0600 Subject: [PATCH 107/416] Update upload.php --- upload.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/upload.php b/upload.php index 93e8ae2d5..d9250c44a 100644 --- a/upload.php +++ b/upload.php @@ -26,7 +26,7 @@
  • Upload
  • Search Manifests
  • Account
    • -
  • Logout
    • +
  • Logout
    • From 3158807bd17e702736245527e967bc0067ce3aa6 Mon Sep 17 00:00:00 2001 From: Zaphster Date: Thu, 10 Nov 2016 21:28:39 -0600 Subject: [PATCH 108/416] Update upload.php --- upload.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/upload.php b/upload.php index d9250c44a..fc8bfa477 100644 --- a/upload.php +++ b/upload.php @@ -23,7 +23,7 @@
    +
    From 305929d3b58bda549a99a9fc6feb1e044223043f Mon Sep 17 00:00:00 2001 From: Zaphster Date: Thu, 17 Nov 2016 15:18:18 -0600 Subject: [PATCH 177/416] Update header.php --- header.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/header.php b/header.php index ad67daf22..2de393068 100644 --- a/header.php +++ b/header.php @@ -23,7 +23,7 @@ } ?> -
    +

    ">Logout

    -
    +
    From 5a37c49af4c92febf46777d0a0f6b9eeb6c808fa Mon Sep 17 00:00:00 2001 From: Zaphster Date: Thu, 17 Nov 2016 15:19:28 -0600 Subject: [PATCH 178/416] Update header.php --- header.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/header.php b/header.php index 2de393068..174a23861 100644 --- a/header.php +++ b/header.php @@ -48,4 +48,4 @@
  • Logout
    • -
    +
    From 12e339e0c2b9075c1ec6338ab0c1a1db5ab7c25a Mon Sep 17 00:00:00 2001 From: Zaphster Date: Thu, 17 Nov 2016 15:21:33 -0600 Subject: [PATCH 179/416] Update header.php --- header.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/header.php b/header.php index 174a23861..b2b44bc54 100644 --- a/header.php +++ b/header.php @@ -48,4 +48,4 @@
  • Logout
    • -
    +
    From 520c6190d0dd88e6268a938fda4d7fb8be91628b Mon Sep 17 00:00:00 2001 From: Zaphster Date: Thu, 17 Nov 2016 15:23:41 -0600 Subject: [PATCH 180/416] Update header.php --- header.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/header.php b/header.php index b2b44bc54..4c84c06dd 100644 --- a/header.php +++ b/header.php @@ -22,7 +22,7 @@ break; } ?> - +

    Date: Thu, 17 Nov 2016 15:25:18 -0600 Subject: [PATCH 181/416] Update header.php --- header.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/header.php b/header.php index 4c84c06dd..8a524ddf4 100644 --- a/header.php +++ b/header.php @@ -48,4 +48,4 @@
  • Logout

    • -
    +
    From eaba4fbfb0e34c6415bffaaf9f4c71d9320f7d0d Mon Sep 17 00:00:00 2001 From: Zaphster Date: Thu, 17 Nov 2016 15:31:15 -0600 Subject: [PATCH 182/416] Update header.php --- header.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/header.php b/header.php index 8a524ddf4..6e5d7f10a 100644 --- a/header.php +++ b/header.php @@ -48,4 +48,5 @@
  • Logout
    • -
    +
    +
    From 3b4b64d563653bee06bcea2cbbd63cc34e062913 Mon Sep 17 00:00:00 2001 From: Zaphster Date: Thu, 17 Nov 2016 15:41:09 -0600 Subject: [PATCH 183/416] Update header.php --- header.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/header.php b/header.php index 6e5d7f10a..2b76f7bb3 100644 --- a/header.php +++ b/header.php @@ -23,7 +23,7 @@ } ?>
    -
    +


    -
      +
      • Home
      • Upload
      • Search Manifests
        • From 61620c2b39fad119a62d268d60833aa40b41de9d Mon Sep 17 00:00:00 2001 From: Zaphster Date: Thu, 17 Nov 2016 15:43:33 -0600 Subject: [PATCH 184/416] Update header.php --- header.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/header.php b/header.php index 2b76f7bb3..9ab3ae9e2 100644 --- a/header.php +++ b/header.php @@ -48,5 +48,5 @@
      • Logout
    -
    +
    From 8f3457b59821fc8bb7c222e56f5e0c99e0c178ed Mon Sep 17 00:00:00 2001 From: Zaphster Date: Thu, 17 Nov 2016 15:46:05 -0600 Subject: [PATCH 185/416] Update header.php --- header.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/header.php b/header.php index 9ab3ae9e2..83f17e852 100644 --- a/header.php +++ b/header.php @@ -23,8 +23,8 @@ } ?>
    -
    -

    +

    Date: Thu, 17 Nov 2016 15:55:00 -0600 Subject: [PATCH 186/416] Update header.php --- header.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/header.php b/header.php index 83f17e852..2a5c18d4c 100644 --- a/header.php +++ b/header.php @@ -23,7 +23,7 @@ } ?>
    -
    +

    Date: Thu, 17 Nov 2016 15:55:40 -0600 Subject: [PATCH 187/416] Update header.php --- header.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/header.php b/header.php index 2a5c18d4c..4c4c64a77 100644 --- a/header.php +++ b/header.php @@ -22,7 +22,7 @@ break; } ?> -
    +

    Date: Thu, 17 Nov 2016 15:56:51 -0600 Subject: [PATCH 188/416] Update header.php --- header.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/header.php b/header.php index 4c4c64a77..bfa93e03a 100644 --- a/header.php +++ b/header.php @@ -1,5 +1,5 @@ From 57996bc3357d330e3d308f83e30b0e42181b4f1c Mon Sep 17 00:00:00 2001 From: Zaphster Date: Thu, 17 Nov 2016 16:00:09 -0600 Subject: [PATCH 189/416] Update upload.php --- upload.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/upload.php b/upload.php index 534e79ae2..110ead66f 100644 --- a/upload.php +++ b/upload.php @@ -1,5 +1,6 @@ @@ -14,9 +15,7 @@ - +

    From 0f623c77e03e1451f9a453ec80a495a10820fac1 Mon Sep 17 00:00:00 2001 From: Zaphster Date: Thu, 17 Nov 2016 16:01:25 -0600 Subject: [PATCH 190/416] Update upload.php --- upload.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/upload.php b/upload.php index 110ead66f..5dbafe34b 100644 --- a/upload.php +++ b/upload.php @@ -1,6 +1,6 @@ @@ -15,8 +15,9 @@ - - +


    From 5c8fc4b61a05c19f7d5a1b89ba5f55ffb91df557 Mon Sep 17 00:00:00 2001 From: Zaphster Date: Thu, 17 Nov 2016 16:02:30 -0600 Subject: [PATCH 191/416] Update header.php --- header.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/header.php b/header.php index bfa93e03a..9d035d5df 100644 --- a/header.php +++ b/header.php @@ -34,7 +34,7 @@ } ?>


    -
      +
      • Home
      • Upload
      • Search Manifests
        • From 85146f1eb95e783f980afe2f9cecfecda86b4fd7 Mon Sep 17 00:00:00 2001 From: Zaphster Date: Thu, 17 Nov 2016 16:03:10 -0600 Subject: [PATCH 192/416] Update header.php --- header.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/header.php b/header.php index 9d035d5df..374d7a9a9 100644 --- a/header.php +++ b/header.php @@ -34,7 +34,7 @@ } ?>


    -
      +
      • Home
      • Upload
      • Search Manifests
        • From c3219a21417373ff45713f05d909b2f9a9d4247e Mon Sep 17 00:00:00 2001 From: Zaphster Date: Fri, 18 Nov 2016 18:02:25 -0600 Subject: [PATCH 193/416] PDO, testing Updated to use PDO class. Testing now returns useful JSON --- loginVerify.php | 58 +++++++++++++++++++++++++++++++------------------ 1 file changed, 37 insertions(+), 21 deletions(-) diff --git a/loginVerify.php b/loginVerify.php index a98e99fba..cd76e4b86 100644 --- a/loginVerify.php +++ b/loginVerify.php @@ -7,45 +7,61 @@ exit(); } session_start(); // session starts with the help of this function - include "connection.php"; - $conn = new mysqli($servername, $username, $password); +// include "connection.php"; +// $conn = new mysqli($servername, $username, $password); //echo "session started"; // if(class_exists('PDO')){ // echo "pdo exists"; // } else { // echo "pdo does not exist"; // } -// require_once "DBConn.php"; + require_once "DBConn.php"; // echo "dbconn included"; -// $dbconn = new DBConn(); + $dbconn = new DBConn(); // echo "dbconn created"; - //if($dbconn->connectToDatabase()){ + if($dbconn->connectToDatabase()){ // echo "connected to db
        "; //$link = mysqli_connect("$servername", "$username", "$password", "$dbname") or die ("Connection Error " . mysqli_error($link)); - //TODO: hash password! - $sql = "SELECT username, isadmin, hashedpassword FROM db.user WHERE BINARY username = '$user_name' and activeuserflag = 1;"; - //$sql = "SELECT username FROM user WHERE username = ? AND password= ?;"; -// $row = $dbconn->select($sql, array($user_name, $user_password)); -// if(count($errors = $dbconn->getErrors()) > 0){ -// foreach($errors as $error){ -// echo $error."
        "; -// } -// } else { + + //$sql = "SELECT username, isadmin, hashedpassword FROM db.user WHERE BINARY username = '$user_name' and activeuserflag = 1;"; + $sql = "SELECT username, isadmin, hashedpassword FROM db.user WHERE BINARY username = ? AND activeuserflag = 1;"; + $row = $dbconn->select($sql, array($user_name)); + $errorstring = ""; + if(count($errors = $dbconn->getErrors()) > 0){ + foreach($errors as $error){ + $errorstring .= $error."
        "; + } + $errorstring = rtrim($errorstring, "
        "); + } //else { // echo "no errors after select statement
        "; // } - $result = $conn->query($sql); - $row = $result->fetch_assoc(); - //if ($user_name == $row['username'] ) { +// $result = $conn->query($sql); +// $row = $result->fetch_assoc(); + if(password_verify($user_password, $row['hashedpassword'])){ $_SESSION['NAME'] = $user_name; $_SESSION['ADMIN'] = $row['isadmin']; //echo "success
        "; - header("Location: index.php"); + if(isset($_POST['test']){ + echo "{success: true, + name: '$user_name', + isadmin: $row['isadmin'], + error: 0}"; + } else { + header("Location: index.php"); + } exit(); } else { -// echo "no user found, or password is incorrect
        "; - header("Location: login.php?error=Invalid username or password"); - exit(); + if(isset($_POST['test']){ + echo "{success: false, + name: '$user_name', + isadmin: $row['isadmin'], + error: '$errorstring'}"; + } else { +// echo "no user found, or password is incorrect
        "; + header("Location: login.php?error=Invalid username or password"); + exit(); + } } //} ?> From 1bde136a830558c7af91ce803185c5cc8dfa3a5a Mon Sep 17 00:00:00 2001 From: Zaphster Date: Fri, 18 Nov 2016 18:05:33 -0600 Subject: [PATCH 194/416] deleted master just kidding --- loginVerify.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loginVerify.php b/loginVerify.php index cd76e4b86..0b12ba187 100644 --- a/loginVerify.php +++ b/loginVerify.php @@ -42,7 +42,7 @@ $_SESSION['NAME'] = $user_name; $_SESSION['ADMIN'] = $row['isadmin']; //echo "success
        "; - if(isset($_POST['test']){ + if(isset($_POST['test'])){ echo "{success: true, name: '$user_name', isadmin: $row['isadmin'], From 301e0cb0d3d225d2225d85e3f888b271a6e303d0 Mon Sep 17 00:00:00 2001 From: Zaphster Date: Fri, 18 Nov 2016 18:06:35 -0600 Subject: [PATCH 195/416] Update loginVerify.php --- loginVerify.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/loginVerify.php b/loginVerify.php index 0b12ba187..1f3467f9a 100644 --- a/loginVerify.php +++ b/loginVerify.php @@ -44,8 +44,8 @@ //echo "success
        "; if(isset($_POST['test'])){ echo "{success: true, - name: '$user_name', - isadmin: $row['isadmin'], + name: '".$user_name."', + isadmin: '".$row['isadmin']."', error: 0}"; } else { header("Location: index.php"); From 0e924d38692a5b2fdc28ed07499c3eb57d38e62b Mon Sep 17 00:00:00 2001 From: Zaphster Date: Fri, 18 Nov 2016 18:06:58 -0600 Subject: [PATCH 196/416] Update loginVerify.php --- loginVerify.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loginVerify.php b/loginVerify.php index 1f3467f9a..cee65ebf2 100644 --- a/loginVerify.php +++ b/loginVerify.php @@ -52,7 +52,7 @@ } exit(); } else { - if(isset($_POST['test']){ + if(isset($_POST['test'])){ echo "{success: false, name: '$user_name', isadmin: $row['isadmin'], From 4d9d2661def9028566a997ca631631a0df4c08fa Mon Sep 17 00:00:00 2001 From: Zaphster Date: Fri, 18 Nov 2016 18:07:45 -0600 Subject: [PATCH 197/416] Update loginVerify.php --- loginVerify.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/loginVerify.php b/loginVerify.php index cee65ebf2..8cf5962a8 100644 --- a/loginVerify.php +++ b/loginVerify.php @@ -54,9 +54,9 @@ } else { if(isset($_POST['test'])){ echo "{success: false, - name: '$user_name', - isadmin: $row['isadmin'], - error: '$errorstring'}"; + name: '".$user_name."', + isadmin: '".$row['isadmin']."', + error: '".$errorstring."'}"; } else { // echo "no user found, or password is incorrect
        "; header("Location: login.php?error=Invalid username or password"); From a63b30992d1018b25d6ffb935bb6caa2ac09227c Mon Sep 17 00:00:00 2001 From: Zaphster Date: Fri, 18 Nov 2016 18:11:07 -0600 Subject: [PATCH 198/416] Update loginVerify.php --- loginVerify.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loginVerify.php b/loginVerify.php index 8cf5962a8..dbd0b771e 100644 --- a/loginVerify.php +++ b/loginVerify.php @@ -60,8 +60,8 @@ } else { // echo "no user found, or password is incorrect
        "; header("Location: login.php?error=Invalid username or password"); - exit(); } + exit(); } //} ?> From 80d205b7b3228a3c5a53ae247dec947172d3b41c Mon Sep 17 00:00:00 2001 From: Zaphster Date: Fri, 18 Nov 2016 18:20:38 -0600 Subject: [PATCH 199/416] Update loginVerify.php --- loginVerify.php | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/loginVerify.php b/loginVerify.php index dbd0b771e..bff5f93b2 100644 --- a/loginVerify.php +++ b/loginVerify.php @@ -1,5 +1,4 @@ Date: Fri, 18 Nov 2016 18:21:05 -0600 Subject: [PATCH 200/416] Update loginVerify.php --- loginVerify.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loginVerify.php b/loginVerify.php index bff5f93b2..d2844a2c6 100644 --- a/loginVerify.php +++ b/loginVerify.php @@ -13,7 +13,7 @@ echo "pdo exists"; } else { echo "pdo does not exist"; - } + }exit(); require_once "DBConn.php"; // echo "dbconn included"; $dbconn = new DBConn(); From bc773769a6b6c996cc5005100ca2b0196d8e1938 Mon Sep 17 00:00:00 2001 From: Zaphster Date: Fri, 18 Nov 2016 18:21:53 -0600 Subject: [PATCH 201/416] Update loginVerify.php --- loginVerify.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loginVerify.php b/loginVerify.php index d2844a2c6..4f025a9c9 100644 --- a/loginVerify.php +++ b/loginVerify.php @@ -62,5 +62,5 @@ } exit(); } -//} +} ?> From 85526a7536ca87df9f736a31c6de67851109f462 Mon Sep 17 00:00:00 2001 From: Zaphster Date: Fri, 18 Nov 2016 18:22:14 -0600 Subject: [PATCH 202/416] Update loginVerify.php --- loginVerify.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/loginVerify.php b/loginVerify.php index 4f025a9c9..0d3504b64 100644 --- a/loginVerify.php +++ b/loginVerify.php @@ -9,11 +9,11 @@ // include "connection.php"; // $conn = new mysqli($servername, $username, $password); //echo "session started"; - if(class_exists('PDO')){ - echo "pdo exists"; - } else { - echo "pdo does not exist"; - }exit(); +// if(class_exists('PDO')){ +// echo "pdo exists"; +// } else { +// echo "pdo does not exist"; +// }exit(); require_once "DBConn.php"; // echo "dbconn included"; $dbconn = new DBConn(); From d77903cc42d900c56a5f1c624618abbf31f4992d Mon Sep 17 00:00:00 2001 From: Zaphster Date: Fri, 18 Nov 2016 18:46:53 -0600 Subject: [PATCH 203/416] Update loginVerify.php --- loginVerify.php | 85 +++++++++++++++++++++++++------------------------ 1 file changed, 43 insertions(+), 42 deletions(-) diff --git a/loginVerify.php b/loginVerify.php index 0d3504b64..7b3143a4f 100644 --- a/loginVerify.php +++ b/loginVerify.php @@ -19,48 +19,49 @@ $dbconn = new DBConn(); // echo "dbconn created"; if($dbconn->connectToDatabase()){ -// echo "connected to db
        "; - //$link = mysqli_connect("$servername", "$username", "$password", "$dbname") or die ("Connection Error " . mysqli_error($link)); + // echo "connected to db
        "; + //$link = mysqli_connect("$servername", "$username", "$password", "$dbname") or die ("Connection Error " . mysqli_error($link)); - //$sql = "SELECT username, isadmin, hashedpassword FROM db.user WHERE BINARY username = '$user_name' and activeuserflag = 1;"; - $sql = "SELECT username, isadmin, hashedpassword FROM db.user WHERE BINARY username = ? AND activeuserflag = 1;"; - $row = $dbconn->select($sql, array($user_name)); - $errorstring = ""; - if(count($errors = $dbconn->getErrors()) > 0){ - foreach($errors as $error){ - $errorstring .= $error."
        "; - } - $errorstring = rtrim($errorstring, "
        "); - } //else { -// echo "no errors after select statement
        "; -// } -// $result = $conn->query($sql); -// $row = $result->fetch_assoc(); + //$sql = "SELECT username, isadmin, hashedpassword FROM db.user WHERE BINARY username = '$user_name' and activeuserflag = 1;"; + $sql = "SELECT username, isadmin, hashedpassword FROM db.user WHERE BINARY username = ? AND activeuserflag = 1;"; + if(($row = $dbconn->select($sql, array($user_name))) != false){ + $errorstring = ""; + if(count($errors = $dbconn->getErrors()) > 0){ + foreach($errors as $error){ + $errorstring .= $error."
        "; + } + $errorstring = rtrim($errorstring, "
        "); + } //else { + // echo "no errors after select statement
        "; + // } + // $result = $conn->query($sql); + // $row = $result->fetch_assoc(); - if(password_verify($user_password, $row['hashedpassword'])){ - $_SESSION['NAME'] = $user_name; - $_SESSION['ADMIN'] = $row['isadmin']; - //echo "success
        "; - if(isset($_POST['test'])){ - echo "{success: true, - name: '".$user_name."', - isadmin: '".$row['isadmin']."', - error: 0}"; - } else { - header("Location: index.php"); - } - exit(); - } else { - if(isset($_POST['test'])){ - echo "{success: false, - name: '".$user_name."', - isadmin: '".$row['isadmin']."', - error: '".$errorstring."'}"; - } else { -// echo "no user found, or password is incorrect
        "; - header("Location: login.php?error=Invalid username or password"); - } - exit(); - } -} + if(password_verify($user_password, $row['hashedpassword'])){ + $_SESSION['NAME'] = $user_name; + $_SESSION['ADMIN'] = $row['isadmin']; + //echo "success
        "; + if(isset($_POST['test'])){ + echo "{success: true, + name: '".$user_name."', + isadmin: '".$row['isadmin']."', + error: 0}"; + } else { + header("Location: index.php"); + } + exit(); + } else { + if(isset($_POST['test'])){ + echo "{success: false, + name: '".$user_name."', + isadmin: '".$row['isadmin']."', + error: '".$errorstring."'}"; + } else { + // echo "no user found, or password is incorrect
        "; + header("Location: login.php?error=Invalid username or password"); + } + exit(); + } + } else {echo "row returned is false. query error: ".print_r($dbconn->getErrors(), true); + } else {echo "could not connect to DB";} ?> From b38f9c81aa2e6eb71f03f9c09f49ac2451e562ac Mon Sep 17 00:00:00 2001 From: Zaphster Date: Fri, 18 Nov 2016 18:47:32 -0600 Subject: [PATCH 204/416] Update loginVerify.php --- loginVerify.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loginVerify.php b/loginVerify.php index 7b3143a4f..c27241c77 100644 --- a/loginVerify.php +++ b/loginVerify.php @@ -62,6 +62,6 @@ } exit(); } - } else {echo "row returned is false. query error: ".print_r($dbconn->getErrors(), true); + } else {echo "row returned is false. query error: ".print_r($dbconn->getErrors(), true);} } else {echo "could not connect to DB";} ?> From d1c45a53b764a945435fc688d23b136b582cbf09 Mon Sep 17 00:00:00 2001 From: Zaphster Date: Fri, 18 Nov 2016 18:51:31 -0600 Subject: [PATCH 205/416] Update loginVerify.php --- loginVerify.php | 76 ++++++++++++++++++++++++------------------------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/loginVerify.php b/loginVerify.php index c27241c77..1020b196f 100644 --- a/loginVerify.php +++ b/loginVerify.php @@ -24,44 +24,44 @@ //$sql = "SELECT username, isadmin, hashedpassword FROM db.user WHERE BINARY username = '$user_name' and activeuserflag = 1;"; $sql = "SELECT username, isadmin, hashedpassword FROM db.user WHERE BINARY username = ? AND activeuserflag = 1;"; - if(($row = $dbconn->select($sql, array($user_name))) != false){ - $errorstring = ""; - if(count($errors = $dbconn->getErrors()) > 0){ - foreach($errors as $error){ - $errorstring .= $error."
        "; - } - $errorstring = rtrim($errorstring, "
        "); - } //else { - // echo "no errors after select statement
        "; - // } - // $result = $conn->query($sql); - // $row = $result->fetch_assoc(); - - if(password_verify($user_password, $row['hashedpassword'])){ - $_SESSION['NAME'] = $user_name; - $_SESSION['ADMIN'] = $row['isadmin']; - //echo "success
        "; - if(isset($_POST['test'])){ - echo "{success: true, - name: '".$user_name."', - isadmin: '".$row['isadmin']."', - error: 0}"; - } else { - header("Location: index.php"); - } - exit(); - } else { - if(isset($_POST['test'])){ - echo "{success: false, - name: '".$user_name."', - isadmin: '".$row['isadmin']."', - error: '".$errorstring."'}"; - } else { - // echo "no user found, or password is incorrect
        "; - header("Location: login.php?error=Invalid username or password"); - } - exit(); + $row = $dbconn->select($sql, array($user_name))) + $errorstring = ""; + if(count($errors = $dbconn->getErrors()) > 0){ + foreach($errors as $error){ + $errorstring .= $error."
        "; } - } else {echo "row returned is false. query error: ".print_r($dbconn->getErrors(), true);} + $errorstring = rtrim($errorstring, "
        "); + } //else { + // echo "no errors after select statement
        "; + // } + // $result = $conn->query($sql); + // $row = $result->fetch_assoc(); + + if(password_verify($user_password, $row['hashedpassword'])){ + $_SESSION['NAME'] = $user_name; + $_SESSION['ADMIN'] = $row['isadmin']; + //echo "success
        "; +// if(isset($_POST['test'])){ + echo "{success: true, + name: '".$user_name."', + isadmin: '".$row['isadmin']."', + error: 0}"; +// } else { +// header("Location: index.php"); +// } + exit(); + } else { + //if(isset($_POST['test'])){ + echo "{success: false, + name: '".$user_name."', + isadmin: '".$row['isadmin']."', + error: '".$errorstring."'}"; + //} else { + // echo "no user found, or password is incorrect
        "; + // header("Location: login.php?error=Invalid username or password"); + //} + exit(); + } +// } else {echo "row returned is false. query error: ".print_r($dbconn->getErrors(), true);} } else {echo "could not connect to DB";} ?> From 6cf716130ad27fedf0b7559432dfe219c01b2b86 Mon Sep 17 00:00:00 2001 From: Zaphster Date: Fri, 18 Nov 2016 18:52:00 -0600 Subject: [PATCH 206/416] Update loginVerify.php --- loginVerify.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loginVerify.php b/loginVerify.php index 1020b196f..957bb16da 100644 --- a/loginVerify.php +++ b/loginVerify.php @@ -24,7 +24,7 @@ //$sql = "SELECT username, isadmin, hashedpassword FROM db.user WHERE BINARY username = '$user_name' and activeuserflag = 1;"; $sql = "SELECT username, isadmin, hashedpassword FROM db.user WHERE BINARY username = ? AND activeuserflag = 1;"; - $row = $dbconn->select($sql, array($user_name))) + $row = $dbconn->select($sql, array($user_name)) $errorstring = ""; if(count($errors = $dbconn->getErrors()) > 0){ foreach($errors as $error){ From 771aee3c60a5153d64371256a7e294b0c5ea0b18 Mon Sep 17 00:00:00 2001 From: Zaphster Date: Fri, 18 Nov 2016 18:52:26 -0600 Subject: [PATCH 207/416] Update loginVerify.php --- loginVerify.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loginVerify.php b/loginVerify.php index 957bb16da..e7016691f 100644 --- a/loginVerify.php +++ b/loginVerify.php @@ -24,7 +24,7 @@ //$sql = "SELECT username, isadmin, hashedpassword FROM db.user WHERE BINARY username = '$user_name' and activeuserflag = 1;"; $sql = "SELECT username, isadmin, hashedpassword FROM db.user WHERE BINARY username = ? AND activeuserflag = 1;"; - $row = $dbconn->select($sql, array($user_name)) + $row = $dbconn->select($sql, array($user_name)); $errorstring = ""; if(count($errors = $dbconn->getErrors()) > 0){ foreach($errors as $error){ From 439ade60da4c4a51e9b3aaab0d6c8742ec6fd27f Mon Sep 17 00:00:00 2001 From: Zaphster Date: Fri, 18 Nov 2016 18:53:15 -0600 Subject: [PATCH 208/416] Update loginVerify.php --- loginVerify.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loginVerify.php b/loginVerify.php index e7016691f..af1e54040 100644 --- a/loginVerify.php +++ b/loginVerify.php @@ -37,7 +37,7 @@ // $result = $conn->query($sql); // $row = $result->fetch_assoc(); - if(password_verify($user_password, $row['hashedpassword'])){ + if($row && password_verify($user_password, $row['hashedpassword'])){ $_SESSION['NAME'] = $user_name; $_SESSION['ADMIN'] = $row['isadmin']; //echo "success
        "; From 2a9902bd28e1bb32b9a20d0e8079bcd05d6cc0b6 Mon Sep 17 00:00:00 2001 From: Zaphster Date: Fri, 18 Nov 2016 18:55:41 -0600 Subject: [PATCH 209/416] Update loginVerify.php --- loginVerify.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/loginVerify.php b/loginVerify.php index af1e54040..b5f60c569 100644 --- a/loginVerify.php +++ b/loginVerify.php @@ -36,8 +36,8 @@ // } // $result = $conn->query($sql); // $row = $result->fetch_assoc(); - - if($row && password_verify($user_password, $row['hashedpassword'])){ + echo "
        ".print_r($row, true)."
        "; + if(isset($row['hashedpassword']) and isset($row['isadmin']) && password_verify($user_password, $row['hashedpassword'])){ $_SESSION['NAME'] = $user_name; $_SESSION['ADMIN'] = $row['isadmin']; //echo "success
        "; @@ -54,7 +54,6 @@ //if(isset($_POST['test'])){ echo "{success: false, name: '".$user_name."', - isadmin: '".$row['isadmin']."', error: '".$errorstring."'}"; //} else { // echo "no user found, or password is incorrect
        "; From b9c8c870f7cce92ed774b0f44e773850d257dde2 Mon Sep 17 00:00:00 2001 From: Zaphster Date: Fri, 18 Nov 2016 19:00:53 -0600 Subject: [PATCH 210/416] Update loginVerify.php --- loginVerify.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loginVerify.php b/loginVerify.php index b5f60c569..aa8b0c5fe 100644 --- a/loginVerify.php +++ b/loginVerify.php @@ -37,7 +37,7 @@ // $result = $conn->query($sql); // $row = $result->fetch_assoc(); echo "
        ".print_r($row, true)."
        "; - if(isset($row['hashedpassword']) and isset($row['isadmin']) && password_verify($user_password, $row['hashedpassword'])){ + if(isset($row['hashedpassword']) and password_verify($user_password, $row['hashedpassword'])){ $_SESSION['NAME'] = $user_name; $_SESSION['ADMIN'] = $row['isadmin']; //echo "success
        "; From 14fce1d01043ffe7a6f52377a6ea5c2e0ec6508a Mon Sep 17 00:00:00 2001 From: Zaphster Date: Fri, 18 Nov 2016 19:02:24 -0600 Subject: [PATCH 211/416] Update loginVerify.php --- loginVerify.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/loginVerify.php b/loginVerify.php index aa8b0c5fe..cabe3ab7f 100644 --- a/loginVerify.php +++ b/loginVerify.php @@ -37,6 +37,8 @@ // $result = $conn->query($sql); // $row = $result->fetch_assoc(); echo "
        ".print_r($row, true)."
        "; + echo "
        isset row hashedpassword: ".isset($row['hashedpassword']); + echo "
        password verify: ".password_verify($user_password, $row['hashedpassword']); if(isset($row['hashedpassword']) and password_verify($user_password, $row['hashedpassword'])){ $_SESSION['NAME'] = $user_name; $_SESSION['ADMIN'] = $row['isadmin']; From dc4f66c7bd54b7c87c3674f34002670adc0da6c7 Mon Sep 17 00:00:00 2001 From: Zaphster Date: Fri, 18 Nov 2016 19:03:28 -0600 Subject: [PATCH 212/416] Update loginVerify.php --- loginVerify.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/loginVerify.php b/loginVerify.php index cabe3ab7f..513437eb5 100644 --- a/loginVerify.php +++ b/loginVerify.php @@ -24,7 +24,8 @@ //$sql = "SELECT username, isadmin, hashedpassword FROM db.user WHERE BINARY username = '$user_name' and activeuserflag = 1;"; $sql = "SELECT username, isadmin, hashedpassword FROM db.user WHERE BINARY username = ? AND activeuserflag = 1;"; - $row = $dbconn->select($sql, array($user_name)); + $rows = $dbconn->select($sql, array($user_name)); + $row = $rows[0]; $errorstring = ""; if(count($errors = $dbconn->getErrors()) > 0){ foreach($errors as $error){ From fe302fc3c4e5593aeb3f78e2cf08c6970991426d Mon Sep 17 00:00:00 2001 From: Zaphster Date: Fri, 18 Nov 2016 19:04:59 -0600 Subject: [PATCH 213/416] Update loginVerify.php --- loginVerify.php | 42 +++++++++--------------------------------- 1 file changed, 9 insertions(+), 33 deletions(-) diff --git a/loginVerify.php b/loginVerify.php index 513437eb5..40f5e5aff 100644 --- a/loginVerify.php +++ b/loginVerify.php @@ -6,23 +6,9 @@ exit(); } session_start(); // session starts with the help of this function -// include "connection.php"; -// $conn = new mysqli($servername, $username, $password); - //echo "session started"; -// if(class_exists('PDO')){ -// echo "pdo exists"; -// } else { -// echo "pdo does not exist"; -// }exit(); require_once "DBConn.php"; -// echo "dbconn included"; $dbconn = new DBConn(); -// echo "dbconn created"; if($dbconn->connectToDatabase()){ - // echo "connected to db
        "; - //$link = mysqli_connect("$servername", "$username", "$password", "$dbname") or die ("Connection Error " . mysqli_error($link)); - - //$sql = "SELECT username, isadmin, hashedpassword FROM db.user WHERE BINARY username = '$user_name' and activeuserflag = 1;"; $sql = "SELECT username, isadmin, hashedpassword FROM db.user WHERE BINARY username = ? AND activeuserflag = 1;"; $rows = $dbconn->select($sql, array($user_name)); $row = $rows[0]; @@ -32,38 +18,28 @@ $errorstring .= $error."
        "; } $errorstring = rtrim($errorstring, "
        "); - } //else { - // echo "no errors after select statement
        "; - // } - // $result = $conn->query($sql); - // $row = $result->fetch_assoc(); - echo "
        ".print_r($row, true)."
        "; - echo "
        isset row hashedpassword: ".isset($row['hashedpassword']); - echo "
        password verify: ".password_verify($user_password, $row['hashedpassword']); + } if(isset($row['hashedpassword']) and password_verify($user_password, $row['hashedpassword'])){ $_SESSION['NAME'] = $user_name; $_SESSION['ADMIN'] = $row['isadmin']; - //echo "success
        "; -// if(isset($_POST['test'])){ + if(isset($_POST['test'])){ echo "{success: true, name: '".$user_name."', isadmin: '".$row['isadmin']."', error: 0}"; -// } else { -// header("Location: index.php"); -// } + } else { + header("Location: index.php"); + } exit(); } else { - //if(isset($_POST['test'])){ + if(isset($_POST['test'])){ echo "{success: false, name: '".$user_name."', error: '".$errorstring."'}"; - //} else { - // echo "no user found, or password is incorrect
        "; - // header("Location: login.php?error=Invalid username or password"); - //} + } else { + header("Location: login.php?error=Invalid username or password"); + } exit(); } -// } else {echo "row returned is false. query error: ".print_r($dbconn->getErrors(), true);} } else {echo "could not connect to DB";} ?> From 0e1561a44b973cc60d90b448bd4792e8efc7bf1b Mon Sep 17 00:00:00 2001 From: Zaphster Date: Fri, 18 Nov 2016 19:25:01 -0600 Subject: [PATCH 214/416] Create loginTests.php --- loginTests.php | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 loginTests.php diff --git a/loginTests.php b/loginTests.php new file mode 100644 index 000000000..f2a02f718 --- /dev/null +++ b/loginTests.php @@ -0,0 +1,31 @@ + + +
        +
        From 30e18028b4f76443b4a0eacd422b4b551f1734d7 Mon Sep 17 00:00:00 2001 From: Zaphster Date: Fri, 18 Nov 2016 19:27:32 -0600 Subject: [PATCH 215/416] Update loginTests.php --- loginTests.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loginTests.php b/loginTests.php index f2a02f718..7a1052aab 100644 --- a/loginTests.php +++ b/loginTests.php @@ -13,7 +13,7 @@ {test:true, username:"tesTIng", userpassword: "test", expected:false}, //username with capitals changed, password that would work for username: testing {test:true, username:"testing", userpassword: "teSt", expected:false}, //valid username, password with capitals changed {test:true, username:"admin", userpassword: "admin", expected:true}, //another valid username and password - {test:true, username:"admin;delete from user where username = 'testing';": "admin", expected:false}, //sql injection!!! + {test:true, username:"admin;delete from user where username = 'testing';", "admin", expected:false}, //sql injection!!! {test:true, username:"testing", userpassword: "test", expected:true} //test if the known account is still there after the sql injection attempt ] for(var i = 0; i < loginCredentials.length; i++){ From dd35c0b453c3e402f7076ed36e13ed527e142786 Mon Sep 17 00:00:00 2001 From: Zaphster Date: Fri, 18 Nov 2016 19:28:54 -0600 Subject: [PATCH 216/416] Update loginVerify.php --- loginVerify.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/loginVerify.php b/loginVerify.php index 40f5e5aff..50b484ee3 100644 --- a/loginVerify.php +++ b/loginVerify.php @@ -5,6 +5,9 @@ header("Location: login.php?error=Invalid username or password"); exit(); } + if(isset($_POST['test'])){ + header("Content-Type: application/json"); + } session_start(); // session starts with the help of this function require_once "DBConn.php"; $dbconn = new DBConn(); From 6f3dce61612c451f756eb6f4d7e5d82e0c28784b Mon Sep 17 00:00:00 2001 From: Zaphster Date: Fri, 18 Nov 2016 19:29:38 -0600 Subject: [PATCH 217/416] Update loginTests.php --- loginTests.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loginTests.php b/loginTests.php index 7a1052aab..060857ab9 100644 --- a/loginTests.php +++ b/loginTests.php @@ -13,7 +13,7 @@ {test:true, username:"tesTIng", userpassword: "test", expected:false}, //username with capitals changed, password that would work for username: testing {test:true, username:"testing", userpassword: "teSt", expected:false}, //valid username, password with capitals changed {test:true, username:"admin", userpassword: "admin", expected:true}, //another valid username and password - {test:true, username:"admin;delete from user where username = 'testing';", "admin", expected:false}, //sql injection!!! + {test:true, username:"admin;delete from user where username = 'testing';", userpassword:"admin", expected:false}, //sql injection!!! {test:true, username:"testing", userpassword: "test", expected:true} //test if the known account is still there after the sql injection attempt ] for(var i = 0; i < loginCredentials.length; i++){ From 5b30d95ac6b3201189a80c47070ba5ded6e9481c Mon Sep 17 00:00:00 2001 From: Zaphster Date: Fri, 18 Nov 2016 19:30:22 -0600 Subject: [PATCH 218/416] Update loginTests.php --- loginTests.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/loginTests.php b/loginTests.php index 060857ab9..7934f97b7 100644 --- a/loginTests.php +++ b/loginTests.php @@ -23,7 +23,9 @@ success: function(html){ $('#results').append($('
        ').html("success: " + html.success + " username: " + html.name + " isadmin: " + html.isadmin + " dberrors: " + html.error)); }, - error: + error: function(html){ + console.log("ajax error"); + } }); } From 665da84de6de93f1baee2755a2fa52ba44f57fc5 Mon Sep 17 00:00:00 2001 From: Zaphster Date: Fri, 18 Nov 2016 19:31:15 -0600 Subject: [PATCH 219/416] Update loginTests.php --- loginTests.php | 1 + 1 file changed, 1 insertion(+) diff --git a/loginTests.php b/loginTests.php index 7934f97b7..2cd8dd158 100644 --- a/loginTests.php +++ b/loginTests.php @@ -4,6 +4,7 @@ header("Location: login.php"); } ?> + -
        -
        + + + + + + + + + +
        Test PassedLogin SuccessExpected Success?UsernameAdmin?DB Errors
        From 436e2f241a9ce6d61558df791cca8be6efae2fd4 Mon Sep 17 00:00:00 2001 From: Zaphster Date: Fri, 18 Nov 2016 20:27:19 -0600 Subject: [PATCH 241/416] Update loginTests.php --- loginTests.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/loginTests.php b/loginTests.php index 02a2501c5..2cb41aae6 100644 --- a/loginTests.php +++ b/loginTests.php @@ -45,6 +45,10 @@ }); } + + + + From e18d99a8dee2415bf54753ab19318f193817990e Mon Sep 17 00:00:00 2001 From: Zaphster Date: Fri, 18 Nov 2016 20:31:10 -0600 Subject: [PATCH 242/416] Update loginTests.php --- loginTests.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/loginTests.php b/loginTests.php index 2cb41aae6..3ee8e7106 100644 --- a/loginTests.php +++ b/loginTests.php @@ -25,7 +25,11 @@ success: function(html){ //var html = JSON.parse(returnedhtml); var newRow = $(''); - newRow.append($('
        Test Passed
        ').html(html.test_passed)) + var testPassed = "success"; + if(html.test_passed == "false"){ + testPassed = "danger"; + } + newRow.append($('').html(html.test_passed).addClass(testPassed)) .append($('').html(html.login_success)) .append($('').html(html.login_expected)) .append($('').html(html.username)) @@ -49,7 +53,7 @@ - +
        $_POST['expected'], "test_passed"=>$passed, "username"=>$user_name, + "password"=>$user_password, "error"=>$errorstring); echo json_encode($returnarray); // echo "{login_success: 'false', @@ -58,6 +59,7 @@ "login_expected"=>$_POST['expected'], "test_passed"=>$passed, "username"=>$user_name, + "password"=>$user_password, "isadmin"=>$row['isadmin'], "error"=>$errorstring); echo json_encode($returnarray); @@ -81,6 +83,7 @@ "login_expected"=>$_POST['expected'], "test_passed"=>$passed, "username"=>$user_name, + "password"=>$user_password, "error"=>$errorstring); echo json_encode($returnarray); // echo "{login_success: 'false', From c0982864155014c09211ceed3392ac6944de4a64 Mon Sep 17 00:00:00 2001 From: Zaphster Date: Fri, 18 Nov 2016 20:34:18 -0600 Subject: [PATCH 244/416] Update loginTests.php --- loginTests.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loginTests.php b/loginTests.php index 3ee8e7106..2b855865c 100644 --- a/loginTests.php +++ b/loginTests.php @@ -53,7 +53,7 @@ -
        From b41d94df995739326492f8efbe2d85b004c5cf66 Mon Sep 17 00:00:00 2001 From: Zaphster Date: Fri, 18 Nov 2016 20:38:51 -0600 Subject: [PATCH 245/416] Update loginTests.php --- loginTests.php | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/loginTests.php b/loginTests.php index 2b855865c..8363f04b6 100644 --- a/loginTests.php +++ b/loginTests.php @@ -1,9 +1,3 @@ - -
        Test Passed Login Success
        +
        From d4f0624182488d7c4054b344d6428a409f3cede5 Mon Sep 17 00:00:00 2001 From: Zaphster Date: Fri, 18 Nov 2016 20:39:45 -0600 Subject: [PATCH 246/416] Update loginTests.php --- loginTests.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/loginTests.php b/loginTests.php index 8363f04b6..4666aa2a3 100644 --- a/loginTests.php +++ b/loginTests.php @@ -8,7 +8,7 @@ {test:true, username:"tesTIng", userpassword: "test", expected:"false"}, //username with capitals changed, password that would work for username: testing {test:true, username:"testing", userpassword: "teSt", expected:"false"}, //valid username, password with capitals changed {test:true, username:"admin", userpassword: "admin", expected:"true"}, //another valid username and password - {test:true, username:"admin;delete from user where username = 'testing';", userpassword:"admin", expected:"true"}, //sql injection!!! + {test:true, username:"admin;delete from user where username = 'testing';", userpassword:"admin", expected:"false"}, //sql injection!!! {test:true, username:"testing", userpassword: "test", expected:"true"} //test if the known account is still there after the sql injection attempt ] for(var i = 0; i < loginCredentials.length; i++){ @@ -26,6 +26,7 @@ .append($(' + From 7a855a27e43771306a76619e0bb8161728d0ceac Mon Sep 17 00:00:00 2001 From: Zaphster Date: Fri, 18 Nov 2016 20:43:51 -0600 Subject: [PATCH 248/416] Update loginTests.php --- loginTests.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loginTests.php b/loginTests.php index 4aa694e21..fa6269c8f 100644 --- a/loginTests.php +++ b/loginTests.php @@ -39,7 +39,7 @@ } - +
        Test Passed Login Success').html(html.login_success)) .append($('').html(html.login_expected)) .append($('').html(html.username)) + .append($('').html(html.password)) .append($('').html(html.isadmin)) .append($('').html(html.error)) .addClass(testPassed); From b2798168d3d4f3ca8e56205b531538d0b0293dee Mon Sep 17 00:00:00 2001 From: Zaphster Date: Fri, 18 Nov 2016 20:41:21 -0600 Subject: [PATCH 247/416] Update loginTests.php --- loginTests.php | 1 + 1 file changed, 1 insertion(+) diff --git a/loginTests.php b/loginTests.php index 4666aa2a3..4aa694e21 100644 --- a/loginTests.php +++ b/loginTests.php @@ -48,6 +48,7 @@ Login Success Expected Success? UsernamePassword Admin? DB Errors
        From 71a401ed74ef5eee895d50fcdf58dd16ea26f9fb Mon Sep 17 00:00:00 2001 From: Zaphster Date: Fri, 18 Nov 2016 20:45:06 -0600 Subject: [PATCH 249/416] Update loginTests.php --- loginTests.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/loginTests.php b/loginTests.php index fa6269c8f..7b0fa5e89 100644 --- a/loginTests.php +++ b/loginTests.php @@ -30,7 +30,7 @@ .append($(' - + - - + + From 548bfcac0fead196f0e874c5559fa347ea80891f Mon Sep 17 00:00:00 2001 From: Zaphster Date: Sun, 27 Nov 2016 17:21:38 -0600 Subject: [PATCH 257/416] Update account.php --- account.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/account.php b/account.php index 4a7c4ba86..bb77c3152 100644 --- a/account.php +++ b/account.php @@ -63,7 +63,7 @@ - + From 1d78e790d2e66d3bc854c45398643f0c76a6ee35 Mon Sep 17 00:00:00 2001 From: Zaphster Date: Sun, 27 Nov 2016 17:24:00 -0600 Subject: [PATCH 258/416] Update account.php --- account.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/account.php b/account.php index bb77c3152..66df8f2c2 100644 --- a/account.php +++ b/account.php @@ -12,7 +12,7 @@ color: #f00; font-style: normal; } -#error #success{ +#error, #success{ position:fixed; top:15px; right:15px; From c63c170e191f770c7c2142edae518128755c60a4 Mon Sep 17 00:00:00 2001 From: Zaphster Date: Sun, 27 Nov 2016 17:27:18 -0600 Subject: [PATCH 259/416] Update account.php --- account.php | 1 + 1 file changed, 1 insertion(+) diff --git a/account.php b/account.php index 66df8f2c2..3ffc74bd2 100644 --- a/account.php +++ b/account.php @@ -16,6 +16,7 @@ position:fixed; top:15px; right:15px; + z-index:60000; } From c8c41706c3f2fb6cfd18b72e34834456eef87743 Mon Sep 17 00:00:00 2001 From: Zaphster Date: Sun, 27 Nov 2016 17:41:35 -0600 Subject: [PATCH 260/416] Update account.php --- account.php | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/account.php b/account.php index 3ffc74bd2..a8a18b6a2 100644 --- a/account.php +++ b/account.php @@ -33,8 +33,8 @@ -
        -
        + +
        - - - + + + Date: Sun, 27 Nov 2016 18:07:55 -0600 Subject: [PATCH 261/416] Create editUser.php --- editUser.php | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 editUser.php diff --git a/editUser.php b/editUser.php new file mode 100644 index 000000000..3f3dff43a --- /dev/null +++ b/editUser.php @@ -0,0 +1,24 @@ +connectToDatabase()){ + switch($_POST['action']){ + case "resetPassword": + break; + case "activateUser": + break; + case "deactivateUser": + break; + case "toggleAdmin": + break; + default: + echo "{error: 'Action requested is not clear. ".$_POST['action']."}"; + } +} else { + echo "{error: 'Could not connect. Try again later'}"; +} +?> From 59c5df180dc2f84f23a4857bf620a41738297cdf Mon Sep 17 00:00:00 2001 From: Zaphster Date: Sun, 27 Nov 2016 18:09:44 -0600 Subject: [PATCH 262/416] Update editUser.php --- editUser.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/editUser.php b/editUser.php index 3f3dff43a..dd0608041 100644 --- a/editUser.php +++ b/editUser.php @@ -8,12 +8,16 @@ if($conn->connectToDatabase()){ switch($_POST['action']){ case "resetPassword": + echo "{success: 'Resetting Password'}"; break; case "activateUser": + echo "{success: 'Activating User'}"; break; case "deactivateUser": + echo "{success: 'Deactivating User'}"; break; case "toggleAdmin": + echo "{success: 'Toggling Admin'}"; break; default: echo "{error: 'Action requested is not clear. ".$_POST['action']."}"; From dbaacd58d93a1e396ef107af672e26e51a0712e9 Mon Sep 17 00:00:00 2001 From: Zaphster Date: Sun, 27 Nov 2016 18:13:58 -0600 Subject: [PATCH 263/416] Update account.php --- account.php | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/account.php b/account.php index a8a18b6a2..1d24c4534 100644 --- a/account.php +++ b/account.php @@ -79,12 +79,14 @@ From 363d657c1564798e4bb0457701777f73b7e43207 Mon Sep 17 00:00:00 2001 From: Zaphster Date: Sun, 27 Nov 2016 21:22:19 -0600 Subject: [PATCH 277/416] Update account.php --- account.php | 37 ++++++++++++++++++++----------------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/account.php b/account.php index a3c0936fb..67c916d9e 100644 --- a/account.php +++ b/account.php @@ -33,8 +33,8 @@ - - + +
        + + From a17b7e7c0b7434d6dfccad881706ad49de1f4506 Mon Sep 17 00:00:00 2001 From: Zaphster Date: Sat, 3 Dec 2016 15:31:19 -0600 Subject: [PATCH 379/416] Update header.php --- header.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/header.php b/header.php index d3ebcfa05..259d54620 100644 --- a/header.php +++ b/header.php @@ -48,5 +48,5 @@
      • Logout
        • -
        +
        From a2e8b54dd1e3bfb236644c367550d0249feddb24 Mon Sep 17 00:00:00 2001 From: nihr43 Date: Sat, 3 Dec 2016 15:35:15 -0600 Subject: [PATCH 380/416] Update upload.php --- upload.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/upload.php b/upload.php index 17facd66b..38d61a5f1 100644 --- a/upload.php +++ b/upload.php @@ -45,6 +45,12 @@ function checkForm(form) form.inputfield.focus(); return false; } + if(form.file[0].value == "") + { + alert("Error: Input is empty!"); + form.inputfield.focus(); + return false; + } else { // validation was successful From c5c396c3f104e22d086cecc43e49ba32cbb35159 Mon Sep 17 00:00:00 2001 From: Zaphster Date: Sat, 3 Dec 2016 15:36:07 -0600 Subject: [PATCH 381/416] Update header.php --- header.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/header.php b/header.php index 259d54620..ed88b4633 100644 --- a/header.php +++ b/header.php @@ -48,5 +48,5 @@
      • Logout
        • -
        +
        From ee162b480272e8c0e1fb67709989cc7e3b468058 Mon Sep 17 00:00:00 2001 From: nihr43 Date: Sat, 3 Dec 2016 15:38:54 -0600 Subject: [PATCH 382/416] Update upload.php --- upload.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/upload.php b/upload.php index 38d61a5f1..04a2a0e75 100644 --- a/upload.php +++ b/upload.php @@ -23,7 +23,7 @@
        - +
        Manifest Name:
        @@ -45,7 +45,7 @@ function checkForm(form) form.inputfield.focus(); return false; } - if(form.file[0].value == "") + if(form.file.value == "") { alert("Error: Input is empty!"); form.inputfield.focus(); From af6e9f591f99a2a812f6e3ddb47f6069a77e0241 Mon Sep 17 00:00:00 2001 From: nihr43 Date: Sat, 3 Dec 2016 15:43:00 -0600 Subject: [PATCH 383/416] Update upload.php --- upload.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/upload.php b/upload.php index 04a2a0e75..747f8218f 100644 --- a/upload.php +++ b/upload.php @@ -20,6 +20,10 @@ ?>

        +
        + Success! Indicates a successful or positive action. +
        +
        From 1d6e5bd2c6677b6d2e508fa31448d6506e5ad80c Mon Sep 17 00:00:00 2001 From: nihr43 Date: Sat, 3 Dec 2016 15:58:01 -0600 Subject: [PATCH 384/416] Update upload.php --- upload.php | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/upload.php b/upload.php index 747f8218f..f60d7826a 100644 --- a/upload.php +++ b/upload.php @@ -20,9 +20,22 @@ ?>

        -
        - Success! Indicates a successful or positive action. -
        +'; + echo 'Success! {$_GET["error"]}.': + echo '
        '; + else + { + echo '
        '; + echo 'Success! All files uploaded.'; + echo '
        '; + } + + +?> +
        @@ -45,13 +58,13 @@ function checkForm(form) // validation fails if the input is blank if(form.inputfield.value == "") { - alert("Error: Input is empty!"); + alert("No manifest name"); form.inputfield.focus(); return false; } if(form.file.value == "") { - alert("Error: Input is empty!"); + alert("No files selected"); form.inputfield.focus(); return false; } From 02d7829ceb8383f1e4500b1c996c6286d4902db0 Mon Sep 17 00:00:00 2001 From: nihr43 Date: Sat, 3 Dec 2016 15:58:36 -0600 Subject: [PATCH 385/416] Update upload.php --- upload.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/upload.php b/upload.php index f60d7826a..a77895f14 100644 --- a/upload.php +++ b/upload.php @@ -21,7 +21,7 @@

        '; echo 'Success! {$_GET["error"]}.': From a754d2b00acdb6ee918f9fca63f2a41fe7fb2673 Mon Sep 17 00:00:00 2001 From: Zaphster Date: Sat, 3 Dec 2016 15:58:43 -0600 Subject: [PATCH 386/416] Update doupload.php --- doupload.php | 42 ++++++++++++++++++++++++++++++------------ 1 file changed, 30 insertions(+), 12 deletions(-) diff --git a/doupload.php b/doupload.php index a86fc8eba..e4d30e7ee 100644 --- a/doupload.php +++ b/doupload.php @@ -19,7 +19,8 @@ $max_file_size = 1024*10000; //1mb? - +$numFilesNotUploaded = 0; +$error = array(); if(isset($_POST) and $_SERVER['REQUEST_METHOD'] == "POST"){ //set manifest name for all @@ -28,12 +29,14 @@ //insert manifest name and get its id $stmt = $conn->prepare("INSERT INTO manifest(name) VALUES (?)"); $stmt->bind_param("s", $manifestname); - $stmt->execute(); + if(!$stmt->execute()){ + $error[] = "Manifest name not stored."; + break; + } $manifestid = mysqli_insert_id($conn); // for each file foreach ($_FILES['files']['name'] as $f => $name) { - //echo $name; //echo "
        "; //continue; @@ -43,7 +46,7 @@ } if ($_FILES['files']['error'][$f] == 0) { if ($_FILES['files']['size'][$f] > $max_file_size) { - $message[] = "$name is too large!."; + $error[] = "$name is too large!."; continue; // Skip large files } @@ -51,23 +54,38 @@ //for each file do these things $binaryData = file_get_contents($_FILES['files']['tmp_name'][$f]); $owner = $_SESSION['NAME']; - $null = NULL; - - - - + $null = NULL; //this made it all work // prepare and bind - $stmt = $conn->prepare("INSERT INTO files (data,name,owner, manifestid) VALUES (?, ?, ?, ?)"); + //$stmt = $conn->prepare("INSERT INTO files (data, name, owner, manifestid) VALUES (?, ?, ?, ?)"); + $stmt = $conn->prepare("INSERT into files (data, nam, owner, manifestid) VALUES(?, ?, ?, ?)"); $stmt->bind_param("bssi", $null, $name, $owner, $manifestid); $stmt->send_long_data(0, $binaryData); //this made it all work - $stmt->execute(); + if(!$stmt->execute()){ + $numFilesNotUploaded++; + } } } } +} else { + $error = "No files uploaded."; +} +if($numFilesNotUploaded > 0){ + $plural = ($numFilesNotUploaded > 1)? "s":""; + $error[] = $numFilesNotUploaded." file".$plural." not uploaded."; +} +foreach($error as $msg){ + $errorMsg .= $msg."
        "; +} +if(isset($errorMsg)){ + $errorMsg = rtrim($errorMsg, "
        "); } $stmt->close(); $conn->close(); -header( 'Location: /Group2Final/upload.php' ) ; +if(isset($errorMsg)){ + header( 'Location: /Group2Final/upload.php?error='.$errorMsg ) ; +}else{ + header('Location: /Group2Final/upload.php'); +} ?> From 99a7a4e6ead3c5398daf01e0d707498f6891ff02 Mon Sep 17 00:00:00 2001 From: nihr43 Date: Sat, 3 Dec 2016 15:59:07 -0600 Subject: [PATCH 387/416] Update upload.php --- upload.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/upload.php b/upload.php index a77895f14..9d355ea52 100644 --- a/upload.php +++ b/upload.php @@ -24,7 +24,7 @@ if (isset ($_GET["error"])) { echo '
        '; - echo 'Success! {$_GET["error"]}.': + echo 'Success! {$_GET["error"]}.'; echo '
        '; else { From 1d6ae14813fcbc649eaebcef769556c15d280b4a Mon Sep 17 00:00:00 2001 From: nihr43 Date: Sat, 3 Dec 2016 15:59:47 -0600 Subject: [PATCH 388/416] Update upload.php --- upload.php | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/upload.php b/upload.php index 9d355ea52..1784b6e71 100644 --- a/upload.php +++ b/upload.php @@ -22,16 +22,17 @@
        '; - echo 'Success! {$_GET["error"]}.'; - echo '
        '; + { + echo '
        '; + echo 'Success! {$_GET["error"]}.'; + echo '
        '; + } else - { - echo '
        '; - echo 'Success! All files uploaded.'; - echo '
        '; - } + { + echo '
        '; + echo 'Success! All files uploaded.'; + echo '
        '; + } ?> From 50f288235297626ed4c448d360342df885db1592 Mon Sep 17 00:00:00 2001 From: Zaphster Date: Sat, 3 Dec 2016 16:01:48 -0600 Subject: [PATCH 389/416] Update doupload.php --- doupload.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/doupload.php b/doupload.php index e4d30e7ee..b7cd19138 100644 --- a/doupload.php +++ b/doupload.php @@ -20,6 +20,7 @@ $numFilesNotUploaded = 0; +$numFilesUploaded; $error = array(); if(isset($_POST) and $_SERVER['REQUEST_METHOD'] == "POST"){ @@ -63,6 +64,8 @@ $stmt->send_long_data(0, $binaryData); //this made it all work if(!$stmt->execute()){ $numFilesNotUploaded++; + } else { + $numFilesUploaded++; } } } @@ -86,6 +89,6 @@ if(isset($errorMsg)){ header( 'Location: /Group2Final/upload.php?error='.$errorMsg ) ; }else{ - header('Location: /Group2Final/upload.php'); + header('Location: /Group2Final/upload.php?success='.$numFilesUploaded); } ?> From 7b694619a635b6cf1d1f03d48d94d17654398e70 Mon Sep 17 00:00:00 2001 From: nihr43 Date: Sat, 3 Dec 2016 16:05:40 -0600 Subject: [PATCH 390/416] Update upload.php --- upload.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/upload.php b/upload.php index 1784b6e71..88d427173 100644 --- a/upload.php +++ b/upload.php @@ -21,19 +21,23 @@

        '; echo 'Success! {$_GET["error"]}.'; echo '
        '; } - else + else if (isset ($_GET["success"])) { + if ($_GET["success"] >= 1) + { + $s = "s"; //if plural + } echo '
        '; - echo 'Success! All files uploaded.'; + echo 'Success! {$_GET["success"]} file{$s} uploaded.'; echo '
        '; - } - + } ?> From adcc5651378c9bfe075f9dbf645d6a4f6bf7403e Mon Sep 17 00:00:00 2001 From: Zaphster Date: Sat, 3 Dec 2016 16:07:01 -0600 Subject: [PATCH 391/416] Update doupload.php --- doupload.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doupload.php b/doupload.php index b7cd19138..84d8f5f6a 100644 --- a/doupload.php +++ b/doupload.php @@ -58,13 +58,13 @@ $null = NULL; //this made it all work // prepare and bind - //$stmt = $conn->prepare("INSERT INTO files (data, name, owner, manifestid) VALUES (?, ?, ?, ?)"); - $stmt = $conn->prepare("INSERT into files (data, nam, owner, manifestid) VALUES(?, ?, ?, ?)"); + $stmt = $conn->prepare("INSERT INTO files (data, name, owner, manifestid) VALUES (?, ?, ?, ?)"); $stmt->bind_param("bssi", $null, $name, $owner, $manifestid); $stmt->send_long_data(0, $binaryData); //this made it all work if(!$stmt->execute()){ $numFilesNotUploaded++; } else { + $numFilesNotUploaded++; $numFilesUploaded++; } } From fab2c56256603c1a9caa880006ee3ee6d50535c0 Mon Sep 17 00:00:00 2001 From: nihr43 Date: Sat, 3 Dec 2016 16:09:17 -0600 Subject: [PATCH 392/416] Update upload.php --- upload.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/upload.php b/upload.php index 88d427173..3a155092d 100644 --- a/upload.php +++ b/upload.php @@ -25,17 +25,17 @@ if (isset ($_GET["error"])) { echo '
        '; - echo 'Success! {$_GET["error"]}.'; + echo "Error! {$_GET['error']}"; echo '
        '; } - else if (isset ($_GET["success"])) + else if (isset ($_GET['success'])) { - if ($_GET["success"] >= 1) + if ($_GET['success'] >= 1) { $s = "s"; //if plural } echo '
        '; - echo 'Success! {$_GET["success"]} file{$s} uploaded.'; + echo "Success! {$_GET['success']} file{$s} uploaded."; echo '
        '; } From 02382b100f97ed9b7751ccfe45585353a44337be Mon Sep 17 00:00:00 2001 From: Zaphster Date: Sat, 3 Dec 2016 16:10:15 -0600 Subject: [PATCH 393/416] Update doupload.php --- doupload.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doupload.php b/doupload.php index 84d8f5f6a..e2a881bbc 100644 --- a/doupload.php +++ b/doupload.php @@ -71,8 +71,9 @@ } } } else { - $error = "No files uploaded."; + $error[] = "No files uploaded."; } +$error[]="random extra error"; if($numFilesNotUploaded > 0){ $plural = ($numFilesNotUploaded > 1)? "s":""; $error[] = $numFilesNotUploaded." file".$plural." not uploaded."; From 2935581c018c694e57f3c88e4564b7cd59451163 Mon Sep 17 00:00:00 2001 From: Zaphster Date: Sat, 3 Dec 2016 16:10:57 -0600 Subject: [PATCH 394/416] Update doupload.php --- doupload.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/doupload.php b/doupload.php index e2a881bbc..38990f1cd 100644 --- a/doupload.php +++ b/doupload.php @@ -64,7 +64,6 @@ if(!$stmt->execute()){ $numFilesNotUploaded++; } else { - $numFilesNotUploaded++; $numFilesUploaded++; } } @@ -73,7 +72,6 @@ } else { $error[] = "No files uploaded."; } -$error[]="random extra error"; if($numFilesNotUploaded > 0){ $plural = ($numFilesNotUploaded > 1)? "s":""; $error[] = $numFilesNotUploaded." file".$plural." not uploaded."; From 068f369706185eaf9c879d37a36228bd042e76db Mon Sep 17 00:00:00 2001 From: Zaphster Date: Sat, 3 Dec 2016 16:29:10 -0600 Subject: [PATCH 395/416] Update doupload.php --- doupload.php | 72 ++++++++++++++++++++++++++++++---------------------- 1 file changed, 42 insertions(+), 30 deletions(-) diff --git a/doupload.php b/doupload.php index 38990f1cd..78efca5ea 100644 --- a/doupload.php +++ b/doupload.php @@ -27,6 +27,16 @@ //set manifest name for all $manifestname = $_POST["manifestname"]; + $stmt = $conn->prepare("SELECT name FROM manifest where name = ?"); + $stmt->bind_param("s", $manifestname); + if(!$stmt->execute()){ + $error[] = "Problem when checking if manifest name exists"; + } + $mcheck = ""; + $stmt->bind_result($mcheck); + while($stmt->fetch()){ + $error[] = "Manifest name ".$mcheck." already exists."; + } //insert manifest name and get its id $stmt = $conn->prepare("INSERT INTO manifest(name) VALUES (?)"); $stmt->bind_param("s", $manifestname); @@ -36,38 +46,40 @@ } $manifestid = mysqli_insert_id($conn); - // for each file - foreach ($_FILES['files']['name'] as $f => $name) { - //echo $name; - //echo "
        "; - //continue; - - if ($_FILES['files']['error'][$f] == 4) { - continue; // Skip file if any error found - } - if ($_FILES['files']['error'][$f] == 0) { - if ($_FILES['files']['size'][$f] > $max_file_size) { - $error[] = "$name is too large!."; - continue; // Skip large files - } + if(count($error) == 0){ + // for each file + foreach ($_FILES['files']['name'] as $f => $name) { + //echo $name; + //echo "
        "; + //continue; + + if ($_FILES['files']['error'][$f] == 4) { + continue; // Skip file if any error found + } + if ($_FILES['files']['error'][$f] == 0) { + if ($_FILES['files']['size'][$f] > $max_file_size) { + $error[] = "$name is too large!"; + continue; // Skip large files + } + + else{ // No error found + //for each file do these things + $binaryData = file_get_contents($_FILES['files']['tmp_name'][$f]); + $owner = $_SESSION['NAME']; + $null = NULL; //this made it all work - else{ // No error found - //for each file do these things - $binaryData = file_get_contents($_FILES['files']['tmp_name'][$f]); - $owner = $_SESSION['NAME']; - $null = NULL; //this made it all work - - // prepare and bind - $stmt = $conn->prepare("INSERT INTO files (data, name, owner, manifestid) VALUES (?, ?, ?, ?)"); - $stmt->bind_param("bssi", $null, $name, $owner, $manifestid); - $stmt->send_long_data(0, $binaryData); //this made it all work - if(!$stmt->execute()){ - $numFilesNotUploaded++; - } else { - $numFilesUploaded++; + // prepare and bind + $stmt = $conn->prepare("INSERT INTO files (data, name, owner, manifestid) VALUES (?, ?, ?, ?)"); + $stmt->bind_param("bssi", $null, $name, $owner, $manifestid); + $stmt->send_long_data(0, $binaryData); //this made it all work + if(!$stmt->execute()){ + $numFilesNotUploaded++; + } else { + $numFilesUploaded++; + } } - } - } + } + } } } else { $error[] = "No files uploaded."; From 87555c27b1fa76996f0cd01c8a2864d8fe0da54d Mon Sep 17 00:00:00 2001 From: Zaphster Date: Sat, 3 Dec 2016 16:32:31 -0600 Subject: [PATCH 396/416] Update doupload.php --- doupload.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doupload.php b/doupload.php index 78efca5ea..0c0bf18d9 100644 --- a/doupload.php +++ b/doupload.php @@ -16,7 +16,7 @@ } -$max_file_size = 1024*10000; //1mb? +$max_file_size = 1024000*10000; //1mb? $numFilesNotUploaded = 0; From a7fd98804ea9ea184410bd84c697800e1954d61e Mon Sep 17 00:00:00 2001 From: Zaphster Date: Sat, 3 Dec 2016 16:37:21 -0600 Subject: [PATCH 397/416] Update doupload.php --- doupload.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/doupload.php b/doupload.php index 0c0bf18d9..b5d0f26d9 100644 --- a/doupload.php +++ b/doupload.php @@ -20,7 +20,7 @@ $numFilesNotUploaded = 0; -$numFilesUploaded; +$numFilesUploaded = 0; $error = array(); if(isset($_POST) and $_SERVER['REQUEST_METHOD'] == "POST"){ @@ -84,6 +84,9 @@ } else { $error[] = "No files uploaded."; } +if($numFilesUploaded == 0){ + $error[] = "No files uploaded"; +} if($numFilesNotUploaded > 0){ $plural = ($numFilesNotUploaded > 1)? "s":""; $error[] = $numFilesNotUploaded." file".$plural." not uploaded."; @@ -99,7 +102,7 @@ $conn->close(); if(isset($errorMsg)){ header( 'Location: /Group2Final/upload.php?error='.$errorMsg ) ; -}else{ +}else if{ header('Location: /Group2Final/upload.php?success='.$numFilesUploaded); } ?> From 2f93048160d6229cbdbc9701c0a7dbdec4601646 Mon Sep 17 00:00:00 2001 From: Zaphster Date: Sat, 3 Dec 2016 16:37:48 -0600 Subject: [PATCH 398/416] Update doupload.php --- doupload.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doupload.php b/doupload.php index b5d0f26d9..f5a235f62 100644 --- a/doupload.php +++ b/doupload.php @@ -102,7 +102,7 @@ $conn->close(); if(isset($errorMsg)){ header( 'Location: /Group2Final/upload.php?error='.$errorMsg ) ; -}else if{ +}else{ header('Location: /Group2Final/upload.php?success='.$numFilesUploaded); } ?> From 5164c55fb619292141cad761dabb8a7c048be2fd Mon Sep 17 00:00:00 2001 From: Zaphster Date: Sat, 3 Dec 2016 16:40:35 -0600 Subject: [PATCH 399/416] Update search.php --- search.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/search.php b/search.php index 1b2be429d..9a0b0040e 100644 --- a/search.php +++ b/search.php @@ -142,7 +142,7 @@ ?>
        - + From c0b557a975e2496db9c16bc5ca27727dceff8fae Mon Sep 17 00:00:00 2001 From: Zaphster Date: Sat, 3 Dec 2016 16:41:45 -0600 Subject: [PATCH 400/416] Update search.php --- search.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/search.php b/search.php index 9a0b0040e..67e388696 100644 --- a/search.php +++ b/search.php @@ -153,7 +153,7 @@ - + From 7902e5d2596385862371120f76ff211abe6106cb Mon Sep 17 00:00:00 2001 From: Zaphster Date: Sat, 3 Dec 2016 17:27:20 -0600 Subject: [PATCH 401/416] delete empty manifests --- search.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/search.php b/search.php index 67e388696..ebc8d6898 100644 --- a/search.php +++ b/search.php @@ -15,6 +15,14 @@ $db_link = new mysqli('localhost', 'root', '', 'db'); $query = "delete from files where id={$_POST["deleteid"]};" or die('Error, query failed');; $result = mysqli_query($db_link, $query); + $query = "select count(files.id) as numFiles, manifest.id from manifest left join files on files.manifestid = manifest.id group by manifest.id;"; + $result = mysqli_query($db_link, $query); + while($row = mysqli_fetch_assoc($result)){ + if($row['numFiles'] == 0){ + $query = "DELETE from manifest where id = $row['id'];"; + $result = mysqli_query($db_link, $query); + } + } mysqli_close($db_link); From 5308ed2b223a7ff32d9978c4bdd50e25d4787816 Mon Sep 17 00:00:00 2001 From: Zaphster Date: Sat, 3 Dec 2016 17:29:20 -0600 Subject: [PATCH 402/416] Update search.php --- search.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/search.php b/search.php index ebc8d6898..043f8be0c 100644 --- a/search.php +++ b/search.php @@ -20,7 +20,7 @@ while($row = mysqli_fetch_assoc($result)){ if($row['numFiles'] == 0){ $query = "DELETE from manifest where id = $row['id'];"; - $result = mysqli_query($db_link, $query); + mysqli_query($db_link, $query); } } From ace2ff5c4049b44b749e7a1d67637ca1f45b54a5 Mon Sep 17 00:00:00 2001 From: Zaphster Date: Sat, 3 Dec 2016 17:32:48 -0600 Subject: [PATCH 403/416] Update search.php --- search.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/search.php b/search.php index 043f8be0c..8f0553cfa 100644 --- a/search.php +++ b/search.php @@ -19,7 +19,7 @@ $result = mysqli_query($db_link, $query); while($row = mysqli_fetch_assoc($result)){ if($row['numFiles'] == 0){ - $query = "DELETE from manifest where id = $row['id'];"; + $query = "DELETE from manifest where id = ".$row['id']; mysqli_query($db_link, $query); } } From 540b5598f4b2421907af0c2c45eef75b307e1514 Mon Sep 17 00:00:00 2001 From: Zaphster Date: Sat, 3 Dec 2016 17:41:43 -0600 Subject: [PATCH 404/416] Update header.php --- header.php | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/header.php b/header.php index ed88b4633..ed510ea3e 100644 --- a/header.php +++ b/header.php @@ -19,8 +19,14 @@ $account_active = "active"; break; case "/Group2Final/logout.php": - $logout = "active"; + $logout_active = "active"; break; + case "/Group2Final/login.php": + $login_active = "active"; + break; + case "/Group2Final/signup.php": + $signup_active = "active"; + break; } ?>
        @@ -44,8 +50,17 @@
      • Account Manager
        • -
      • Logout
        • +
      • Logout
        • + +
      • Login
        • +
      • Sign Up
        • +
        From 6e07c1b9f7455d61251e06ce641cf06425e344d2 Mon Sep 17 00:00:00 2001 From: Zaphster Date: Sat, 3 Dec 2016 17:43:08 -0600 Subject: [PATCH 405/416] Update login.php --- login.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/login.php b/login.php index 30cb84763..5b319b343 100644 --- a/login.php +++ b/login.php @@ -23,6 +23,9 @@ +
        From fa356952269ff8123b53792a8ed796ff3ce31ec0 Mon Sep 17 00:00:00 2001 From: Zaphster Date: Sat, 3 Dec 2016 17:43:45 -0600 Subject: [PATCH 406/416] Update signup.php --- signup.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/signup.php b/signup.php index 8e132fdc4..d1d0f11d6 100644 --- a/signup.php +++ b/signup.php @@ -23,6 +23,9 @@ +
        From e2551ba57f15ae81669df54d89b1c2663e4e6c25 Mon Sep 17 00:00:00 2001 From: Zaphster Date: Sat, 3 Dec 2016 17:45:06 -0600 Subject: [PATCH 407/416] Update signup.php --- signup.php | 1 - 1 file changed, 1 deletion(-) diff --git a/signup.php b/signup.php index d1d0f11d6..5c8e040cc 100644 --- a/signup.php +++ b/signup.php @@ -42,7 +42,6 @@
        - Login
        From 5201565c316427f2e9643fe0865f555d7afbaa27 Mon Sep 17 00:00:00 2001 From: Zaphster Date: Sat, 3 Dec 2016 17:45:19 -0600 Subject: [PATCH 408/416] Update login.php --- login.php | 1 - 1 file changed, 1 deletion(-) diff --git a/login.php b/login.php index 5b319b343..1dacc9315 100644 --- a/login.php +++ b/login.php @@ -39,7 +39,6 @@
        - Sign Up
        From b4d4f43718ba7eebd655d8babd2ba33957d33fe7 Mon Sep 17 00:00:00 2001 From: Zaphster Date: Sat, 3 Dec 2016 17:51:51 -0600 Subject: [PATCH 409/416] Update header.php --- header.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/header.php b/header.php index ed510ea3e..1e1ed5625 100644 --- a/header.php +++ b/header.php @@ -42,8 +42,14 @@ ?>
        • Home
          • -
        • Upload
          • -
        • Search Manifests
          • + +
        • Upload
          • +
        • Search Manifests
          • + From 45fcae621554d906309dc3dcc78a7e94942ad786 Mon Sep 17 00:00:00 2001 From: Zaphster Date: Sat, 3 Dec 2016 18:00:30 -0600 Subject: [PATCH 410/416] Update security.php --- security.php | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/security.php b/security.php index 7ba9465cd..a709c21ca 100644 --- a/security.php +++ b/security.php @@ -1,6 +1,19 @@ num_rows){ + $requireLogin = true; + } + +} +if($requireLogin){ header("Location: /Group2Final/login.php"); } ?> From 27a434dd14369879471b9cbfe4c40b83fcb95407 Mon Sep 17 00:00:00 2001 From: Zaphster Date: Sat, 3 Dec 2016 18:02:57 -0600 Subject: [PATCH 411/416] Update security.php --- security.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/security.php b/security.php index a709c21ca..acfbb7220 100644 --- a/security.php +++ b/security.php @@ -6,9 +6,9 @@ } else { include "connection.php"; $conn = new mysqli($servername, $username, $password, $dbname); - $query = "SELECT * from user where username = ".$_SESSION['NAME']." and activeuserflag = 1"; + $query = "SELECT * from user where username = '".$_SESSION['NAME']."' and activeuserflag = 1"; $r = mysqli_query($conn, $query); - if(!$r->num_rows){ + if($r->num_rows != 1){ $requireLogin = true; } From 5a44380006705f64ed77454aea2267cda84186ec Mon Sep 17 00:00:00 2001 From: Zaphster Date: Sat, 3 Dec 2016 18:05:06 -0600 Subject: [PATCH 412/416] Update security.php --- security.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/security.php b/security.php index acfbb7220..c26d006c0 100644 --- a/security.php +++ b/security.php @@ -6,7 +6,7 @@ } else { include "connection.php"; $conn = new mysqli($servername, $username, $password, $dbname); - $query = "SELECT * from user where username = '".$_SESSION['NAME']."' and activeuserflag = 1"; + $query = "SELECT * from user where BINARY username = '".$_SESSION['NAME']."' and activeuserflag = 1"; $r = mysqli_query($conn, $query); if($r->num_rows != 1){ $requireLogin = true; From f41f3b25cf2542d6a245e0709eff8a89a82271a5 Mon Sep 17 00:00:00 2001 From: Zaphster Date: Sat, 3 Dec 2016 18:06:34 -0600 Subject: [PATCH 413/416] Update security.php --- security.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/security.php b/security.php index c26d006c0..3f2b04d43 100644 --- a/security.php +++ b/security.php @@ -10,6 +10,9 @@ $r = mysqli_query($conn, $query); if($r->num_rows != 1){ $requireLogin = true; + } else { + $row = mysql_fetch_assoc($r); + $_SESSION['ADMIN'] = $row['isadmin']; } } From 28189297d59fdec3e875c73e010418e76cba963c Mon Sep 17 00:00:00 2001 From: Zaphster Date: Sat, 3 Dec 2016 18:09:57 -0600 Subject: [PATCH 414/416] Update account.php --- account.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/account.php b/account.php index 67c916d9e..bd820693e 100644 --- a/account.php +++ b/account.php @@ -1,5 +1,8 @@ From ee8306438dd209c29b388540e8fd9fccb3e76015 Mon Sep 17 00:00:00 2001 From: nihr43 Date: Sat, 3 Dec 2016 18:12:01 -0600 Subject: [PATCH 415/416] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 64b506175..cfb3690f0 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ http://138.197.129.215/Group2Final/login.php ### Operating System - FreeBSD was chosen for its reliability, security, and predictability in updates and releases. It is a proven solution as shown by its use by companies such as Netflix and Yahoo, incidentally accounting for more than a third of all internet traffic in 2015 in north america. (www.applieinsider.com) + FreeBSD was chosen for its reliability, security, and predictability in updates and releases. It is a proven solution as shown by its use by companies such as Netflix and Yahoo, incidentally accounting for more than a third of all internet traffic in 2015 in north america. ### Database and Webserver From 6c8ba47111a0828a49cc64f65e36f598fdd13e07 Mon Sep 17 00:00:00 2001 From: Zaphster Date: Sat, 3 Dec 2016 18:14:10 -0600 Subject: [PATCH 416/416] Update security.php --- security.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/security.php b/security.php index 3f2b04d43..095ee30f1 100644 --- a/security.php +++ b/security.php @@ -11,7 +11,7 @@ if($r->num_rows != 1){ $requireLogin = true; } else { - $row = mysql_fetch_assoc($r); + $row = mysqli_fetch_assoc($r); $_SESSION['ADMIN'] = $row['isadmin']; }
        ').html(html.isadmin)) .append($('').html(html.error)) .addClass(testPassed); - $('#results').append(newRow); + $('#results').addChild(newRow); }, error: function(jqxhr, errortext, errornum){ console.log("ajax error: " + errortext); @@ -42,7 +42,7 @@ - +
        @@ -52,4 +52,6 @@ + +
        Test Passed Login SuccessAdmin? DB Errors
        From 891e130d20f1491671ff0dcff43eaa11ca423fbc Mon Sep 17 00:00:00 2001 From: Zaphster Date: Fri, 18 Nov 2016 20:46:23 -0600 Subject: [PATCH 250/416] Update loginTests.php --- loginTests.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loginTests.php b/loginTests.php index 7b0fa5e89..27adf277b 100644 --- a/loginTests.php +++ b/loginTests.php @@ -30,7 +30,7 @@ .append($('        		').html(html.isadmin)) .append($('').html(html.error)) .addClass(testPassed); - $('#results').addChild(newRow); + $('#results').append(newRow); }, error: function(jqxhr, errortext, errornum){ console.log("ajax error: " + errortext); From 726d45f8ed63ccfc3dae990e4b6113ee82804491 Mon Sep 17 00:00:00 2001 From: nihr43 Date: Sun, 27 Nov 2016 14:00:58 -0600 Subject: [PATCH 251/416] Update doupload.php --- doupload.php | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/doupload.php b/doupload.php index f6b15a534..5960fd486 100644 --- a/doupload.php +++ b/doupload.php @@ -15,7 +15,7 @@ //$valid_formats = array("jpg", "png", "gif", "zip", "bmp"); $max_file_size = 1024*100; //100 kb -//$path = "uploads/"; // Upload directory +$path = "data/"; // Upload directory //$count = 0; if(isset($_POST) and $_SERVER['REQUEST_METHOD'] == "POST"){ @@ -33,22 +33,25 @@ // $message[] = "$name is not a valid format"; // continue; // Skip invalid file formats // } - else{ // No error found! Move uploaded files + else{ // No error found Move uploaded files // if(move_uploaded_file($_FILES["files"]["tmp_name"][$f], $path.$name)) // $count++; // Number of successfully uploaded file echo $name; echo " accepted"; echo "
        "; - $binaryData = addslashes (file_get_contents($_FILES['files']['tmp_name'][$f])); - $sql = "INSERT INTO files (data,name) VALUES ('{$binaryData}', '{$name}')"; + //$binaryData = addslashes (file_get_contents($_FILES['files']['tmp_name'][$f])); + //$sql = "INSERT INTO files (data,name) VALUES ('{$binaryData}', '{$name}')"; + + $sql = "INSERT INTO files (name) VALUES ('{$name}')"; echo "
        "; echo $sql; // prepare and bind - $stmt = $conn->prepare("INSERT INTO files (data,name) VALUES (?, ?)"); - $stmt->bind_param("ss", $binaryData, $name); - - //execute + //$stmt = $conn->prepare("INSERT INTO files (data,name) VALUES (?, ?)"); + //$stmt->bind_param("ss", $binaryData, $name); + + $stmt = $conn->prepare("INSERT INTO files (name) VALUES (?)"); + $stmt->bind_param("s", $name); $stmt->execute(); } } From b7c37bb91a9de1d1724067d7766f766c29d62e95 Mon Sep 17 00:00:00 2001 From: nihr43 Date: Sun, 27 Nov 2016 14:14:06 -0600 Subject: [PATCH 252/416] Update doupload.php --- doupload.php | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/doupload.php b/doupload.php index 5960fd486..27d0709fd 100644 --- a/doupload.php +++ b/doupload.php @@ -15,7 +15,7 @@ //$valid_formats = array("jpg", "png", "gif", "zip", "bmp"); $max_file_size = 1024*100; //100 kb -$path = "data/"; // Upload directory +//$path = "data/"; // Upload directory //$count = 0; if(isset($_POST) and $_SERVER['REQUEST_METHOD'] == "POST"){ @@ -39,19 +39,16 @@ echo $name; echo " accepted"; echo "
        "; - //$binaryData = addslashes (file_get_contents($_FILES['files']['tmp_name'][$f])); - //$sql = "INSERT INTO files (data,name) VALUES ('{$binaryData}', '{$name}')"; + $binaryData = addslashes (file_get_contents($_FILES['files']['tmp_name'][$f])); + $sql = "INSERT INTO files (data,name) VALUES ('{$binaryData}', '{$name}')"; - $sql = "INSERT INTO files (name) VALUES ('{$name}')"; + //$sql = "INSERT INTO files (name) VALUES ('{$name}')"; echo "
        "; echo $sql; // prepare and bind - //$stmt = $conn->prepare("INSERT INTO files (data,name) VALUES (?, ?)"); - //$stmt->bind_param("ss", $binaryData, $name); - - $stmt = $conn->prepare("INSERT INTO files (name) VALUES (?)"); - $stmt->bind_param("s", $name); + $stmt = $conn->prepare("INSERT INTO files (data,name) VALUES (?, ?)"); + $stmt->bind_param("ss", $binaryData, $name); $stmt->execute(); } } From 09d2c3cfcbb9bc799ff8d37b9b63fd6273ad1749 Mon Sep 17 00:00:00 2001 From: nihr43 Date: Sun, 27 Nov 2016 14:20:03 -0600 Subject: [PATCH 253/416] set binary type in prepared statement --- doupload.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doupload.php b/doupload.php index 27d0709fd..22187f6b8 100644 --- a/doupload.php +++ b/doupload.php @@ -48,7 +48,7 @@ // prepare and bind $stmt = $conn->prepare("INSERT INTO files (data,name) VALUES (?, ?)"); - $stmt->bind_param("ss", $binaryData, $name); + $stmt->bind_param("bs", $binaryData, $name); $stmt->execute(); } } From be960fe398b39967f7be49521099f7baae309740 Mon Sep 17 00:00:00 2001 From: mrkgh6 Date: Sun, 27 Nov 2016 16:39:53 -0600 Subject: [PATCH 254/416] Add files via upload --- pagemap.png | Bin 0 -> 57377 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 pagemap.png diff --git a/pagemap.png b/pagemap.png new file mode 100644 index 0000000000000000000000000000000000000000..0d0bc577e3dbbeef0a3f7269a51b4e9cb5c4bb4d GIT binary patch literal 57377 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

        }obl`aa*;l*OB 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 SBq|jAcTnG0uSCZ# Date: Sun, 27 Nov 2016 17:07:04 -0600 Subject: [PATCH 255/416] Update account.php --- account.php | 89 ++++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 81 insertions(+), 8 deletions(-) diff --git a/account.php b/account.php index 9c4d66d81..27ad48d3d 100644 --- a/account.php +++ b/account.php @@ -11,8 +11,8 @@ input[type=checkbox]:checked + label { color: #f00; font-style: normal; -} - +} + RADs(Research Analysis and Database for Scientists) @@ -27,13 +27,86 @@ +

        +
        -

        Firstname:

        -

        Lastname:

        - - -

        username:

        +connectToDatabase()){ + $q = "SELECT id, username, isadmin, activeuserflag from db.user"; + $rows = $conn->select($q); + $Yes = "Yes"; + $No = "No"; + if($rows){ + ?> + + + + + + + + + + + + + + + + + + + + + +
        UsernameActive User?Admin User?Activate/DeactivateAdmin ControlReset Password
        Reset Password
        +
        - + From 5be9169db90e57227e3f4c0de99743cab3d7945c Mon Sep 17 00:00:00 2001 From: Zaphster Date: Sun, 27 Nov 2016 17:17:23 -0600 Subject: [PATCH 256/416] Update account.php --- account.php | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/account.php b/account.php index 27ad48d3d..4a7c4ba86 100644 --- a/account.php +++ b/account.php @@ -12,6 +12,11 @@ color: #f00; font-style: normal; } +#error #success{ + position:fixed; + top:15px; + right:15px; +} RADs(Research Analysis and Database for Scientists) @@ -54,12 +59,12 @@ foreach($rows as $row){ ?>
        Reset Password
        Reset Password
        Reset Password
        Reset Password
        Reset Password
        Download You Are Not The Owner