From 5b4c93b3c34032838a9530737833396044c8f587 Mon Sep 17 00:00:00 2001 From: Kevin Nobel Date: Tue, 10 Jan 2017 15:15:12 +0100 Subject: [PATCH 001/400] Removed .idea folder --- website/.idea/website.iml => .idea/WebDB.iml | 0 {website/.idea => .idea}/modules.xml | 2 +- .idea/vcs.xml | 6 ++ website/.idea/workspace.xml | 99 +++++++++++++------- 4 files changed, 70 insertions(+), 37 deletions(-) rename website/.idea/website.iml => .idea/WebDB.iml (100%) rename {website/.idea => .idea}/modules.xml (59%) create mode 100644 .idea/vcs.xml diff --git a/website/.idea/website.iml b/.idea/WebDB.iml similarity index 100% rename from website/.idea/website.iml rename to .idea/WebDB.iml diff --git a/website/.idea/modules.xml b/.idea/modules.xml similarity index 59% rename from website/.idea/modules.xml rename to .idea/modules.xml index b9ceecd..e1b2ef9 100644 --- a/website/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,7 +2,7 @@ - + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/website/.idea/workspace.xml b/website/.idea/workspace.xml index ce86dc8..0ff983c 100644 --- a/website/.idea/workspace.xml +++ b/website/.idea/workspace.xml @@ -14,23 +14,15 @@ - - - + + + - - - - - - - - - - - - - + + + + + @@ -52,7 +44,7 @@ true DEFINITION_ORDER - + @@ -125,6 +131,12 @@ + project + + + + + @@ -158,32 +170,34 @@ - - + - - - + + + + - - + + - - + + @@ -199,19 +213,32 @@ - + - - - + + + + + - + + + - - - + + + + + + + + + + + + -- 2.49.1 From 40ce3d57b39fc89e2c27a79817c4f8912fb211b6 Mon Sep 17 00:00:00 2001 From: Kevin Nobel Date: Tue, 10 Jan 2017 17:09:11 +0100 Subject: [PATCH 002/400] Added profile view. (WIP) --- website/styles/main.css | 29 ++++++++++++++++++- website/styles/profile.css | 40 ++++++++++++++++++++++++++ website/views/head.php | 3 +- website/views/profile.php | 58 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 128 insertions(+), 2 deletions(-) create mode 100644 website/styles/profile.css create mode 100644 website/views/profile.php diff --git a/website/styles/main.css b/website/styles/main.css index d110eb8..4f3597f 100644 --- a/website/styles/main.css +++ b/website/styles/main.css @@ -5,8 +5,12 @@ last update: 10-01-2017 Website: myhyvesbookplus.tk -----------------------------------------------------------------------------*/ +.profile-picture { + border-radius: 50%; +} + body { - background-color: white; + background-color: #B78996; color: #333; font-family: Arial, sans-serif; } @@ -82,4 +86,27 @@ table { td { text-align: left; font-weight: normal; +} + +/* Custom title box, appears instantaneously */ +a:hover { + position: relative; +} + +a[data-title]:hover:after { + content: attr(data-title); + padding: 4px 4px; + color: #FFFFFF; + position: absolute; + left: 0; + top: 100%; + z-index: 20; + white-space: nowrap; + -moz-border-radius: 5px; + -webkit-border-radius: 5px; + border-radius: 5px; + -moz-box-shadow: 0px 0px 4px #222; + -webkit-box-shadow: 0px 0px 4px #222; + box-shadow: 0px 0px 4px #222; + background-color: #333; } \ No newline at end of file diff --git a/website/styles/profile.css b/website/styles/profile.css new file mode 100644 index 0000000..e586b14 --- /dev/null +++ b/website/styles/profile.css @@ -0,0 +1,40 @@ + + +.profile-box { + min-height: 150px; + padding: 25px; + background-color: #FFFFFF; +} + +.profile-box .profile-picture { + width: 150px; + height: 150px; + margin: 0 20px 20px 0; +} + +.profile-box .profile-username { + padding-top: 50px; +} + +.item-box { + width: calc(50% - 60px); + margin: 20px 0 0 0; + padding: 25px; + background-color: #FFFFFF; +} + +.item-box .profile-picture { + width: 25px; +} + +.post-box { + float: left; + width: 250px; + margin: 20px 20px 0 0; + padding: 25px; + background-color: #FFFFFF; +} + +.post-box img { + width: 250px; +} \ No newline at end of file diff --git a/website/views/head.php b/website/views/head.php index a20ed51..2ecd8e0 100644 --- a/website/views/head.php +++ b/website/views/head.php @@ -5,6 +5,7 @@ diff --git a/website/views/profile.php b/website/views/profile.php new file mode 100644 index 0000000..e050cce --- /dev/null +++ b/website/views/profile.php @@ -0,0 +1,58 @@ +
+
+ +

[gebruikersnaam]

+

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec dictum turpis quam, eu ultrices sapien hendrerit tincidunt. Nunc aliquam neque turpis, id porta quam iaculis id. Sed suscipit, nisl a fermentum congue, nunc augue finibus lectus, id varius nunc purus nec dolor. Integer laoreet tellus sit amet sapien auctor congue. Mauris laoreet eu elit vel rhoncus. Nam et tortor arcu. Maecenas sit amet leo quis tellus varius gravida. Sed quis fermentum odio, sed dictum nulla. Donec aliquam rutrum orci cursus tempus. Quisque sit amet ipsum eget velit aliquam facilisis ultricies quis ligula. Nunc nisi lacus, luctus non bibendum quis, sagittis sit amet odio.

+
+ +
+

Vrienden

+

+ [gebruikersnaam]'s profielfoto + [gebruikersnaam]'s profielfoto + [gebruikersnaam]'s profielfoto + [gebruikersnaam]'s profielfoto + [gebruikersnaam]'s profielfoto + ...en nog 25 anderen! +

+
+ +
+

Groepen

+

+ [groepsnaam]'s logo + [groepsnaam]'s logo + [groepsnaam]'s logo + [groepsnaam]'s logo + [groepsnaam]'s logo + ...en nog 6 anderen! +

+
+ +
+

Tekst

+

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec dictum turpis quam, eu ultrices sapien hendrerit tincidunt. Nunc aliquam neque turpis, id porta quam iaculis id. Sed suscipit, nisl a fermentum congue, nunc augue finibus lectus, id varius nunc purus nec dolor. Integer laoreet tellus sit amet sapien auctor congue. Mauris laoreet eu elit vel rhoncus. Nam et tortor arcu. Maecenas sit amet leo quis tellus varius gravida. Sed quis fermentum odio, sed dictum nulla. Donec aliquam rutrum orci cursus tempus. Quisque sit amet ipsum eget velit aliquam facilisis ultricies quis ligula. Nunc nisi lacus, luctus non bibendum quis, sagittis sit amet odio.

+
+ +
+

Afbeelding

+ Foto van [gebruikersnaam] +
+ +
+

Video

+ +
+ +
+

Post

+ +
+ +
+

Post

+
+ +
\ No newline at end of file -- 2.49.1 From 17d1f96a020331b18e9bec0b716ff412353760fa Mon Sep 17 00:00:00 2001 From: Marijn Jansen Date: Wed, 11 Jan 2017 11:14:07 +0100 Subject: [PATCH 003/400] Merge with current master --- website/styles/chat.css | 23 +++++++++++++++++------ website/styles/main.css | 7 +------ website/views/chat.php | 12 ++++++++++++ 3 files changed, 30 insertions(+), 12 deletions(-) diff --git a/website/styles/chat.css b/website/styles/chat.css index 9b836cc..640bb1d 100644 --- a/website/styles/chat.css +++ b/website/styles/chat.css @@ -1,14 +1,22 @@ .chat { text-align: center; + padding-top: 15px; } .chat-history { /*border: solid #845663;*/ width: 80%; height: 500px; - margin: 20px auto; + margin: auto auto; background-color: white; vertical-align: bottom; + overflow-y: scroll; + padding: 5px 0; + border-radius: 10px; +} + +.chat-field { + padding: 15px; } .chat-field input { @@ -22,31 +30,34 @@ .chat-field input[type="submit"] { width: 60px; - + background-color: #845663; + color: white; + padding: 5px; } + .chat-message { width: 100%; - height: 40px; + min-height: 40px; padding-top: 10px; + clear: both; } .chat-message-self, .chat-message-other { + text-align: left; border-radius: 20px; padding: 10px 12px; - min-width: 10%; max-width: 45%; } .chat-message-self { - text-align: right; float: right; + margin-right: 10px; background-color: darkgreen; color: white; } .chat-message-other { - text-align: left; float: left; margin-left: 10px; background-color: aquamarine; diff --git a/website/styles/main.css b/website/styles/main.css index ed8f200..cd0e0f4 100644 --- a/website/styles/main.css +++ b/website/styles/main.css @@ -16,7 +16,7 @@ body { } .content { - margin-top: 95px; + margin-top: 80px; } ::selection { @@ -36,11 +36,6 @@ body { border: 0; } -input[type="submit"], button { - background-color: #845663; - color: white; - padding: 5px; -} input[type="text"] { padding: 5px; diff --git a/website/views/chat.php b/website/views/chat.php index 29e643c..d6e6644 100644 --- a/website/views/chat.php +++ b/website/views/chat.php @@ -13,6 +13,18 @@
Hi!
+
+
The Quick Brown fox jumps over the lazy dog.
+
+
+
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+
+
+
Hi!
+
+
+
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+
-- 2.49.1 From ee7a91a6aafee8b5ea7ebedf522481f167ef0d9e Mon Sep 17 00:00:00 2001 From: Kevin Nobel Date: Wed, 11 Jan 2017 11:26:42 +0100 Subject: [PATCH 004/400] Commit before merge --- website/styles/profile.css | 6 ++++++ website/views/profile.php | 2 ++ 2 files changed, 8 insertions(+) diff --git a/website/styles/profile.css b/website/styles/profile.css index e586b14..a65408b 100644 --- a/website/styles/profile.css +++ b/website/styles/profile.css @@ -37,4 +37,10 @@ .post-box img { width: 250px; +} + +.post-box .post-date { + float: right; + color: #aaaaaa; + font-size: 0.8em; } \ No newline at end of file diff --git a/website/views/profile.php b/website/views/profile.php index e050cce..1d4070a 100644 --- a/website/views/profile.php +++ b/website/views/profile.php @@ -32,11 +32,13 @@

Tekst

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec dictum turpis quam, eu ultrices sapien hendrerit tincidunt. Nunc aliquam neque turpis, id porta quam iaculis id. Sed suscipit, nisl a fermentum congue, nunc augue finibus lectus, id varius nunc purus nec dolor. Integer laoreet tellus sit amet sapien auctor congue. Mauris laoreet eu elit vel rhoncus. Nam et tortor arcu. Maecenas sit amet leo quis tellus varius gravida. Sed quis fermentum odio, sed dictum nulla. Donec aliquam rutrum orci cursus tempus. Quisque sit amet ipsum eget velit aliquam facilisis ultricies quis ligula. Nunc nisi lacus, luctus non bibendum quis, sagittis sit amet odio.

+

Enkele minuten geleden geplaatst

Afbeelding

Foto van [gebruikersnaam] +

Gisteren geplaatst

-- 2.49.1 From cd93dcb7194886ea1439b37e46be44da5c4297fc Mon Sep 17 00:00:00 2001 From: Kevin Nobel Date: Wed, 11 Jan 2017 14:00:10 +0100 Subject: [PATCH 005/400] Small changes to profile page, added friend request button --- website/img/add-friend.png | Bin 0 -> 676 bytes website/profile.php | 18 ++++++++ website/styles/main.css | 4 +- website/styles/profile.css | 22 ++++++++-- website/views/profile.php | 82 +++++++++++++++++++++++++++---------- 5 files changed, 99 insertions(+), 27 deletions(-) create mode 100644 website/img/add-friend.png create mode 100644 website/profile.php diff --git a/website/img/add-friend.png b/website/img/add-friend.png new file mode 100644 index 0000000000000000000000000000000000000000..87d1d4431c08c20f46133c245b92f6c7c2c9583f GIT binary patch literal 676 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*1mUKs7M+SzC{oH>NS%G|oWRD45bDP46hOx7_4S6Fo+k-*%fF5lweBoc6VW5Sk5Uj7}P}D}aLRC7!;n><<~ac?~4&<3Ao?U|=lrba4!^INdwxtaeMH$kFpY zKKo9kr712I5EJQ4T0Nz;^{7VVEzSA{oi|4h9g|l`$#m6}o^8l2zck!Oq}6Ciz$eSk zn?KB|ocBES%*{RTcYdE&ZMEHfl8WIOxk6F?zJ|X^YKQ-A4+?TE-2FIb@)O<)#gk^r z|2fxfD4hQKNW_B)(q@vTtdo~iDsZP%JeZcb|K7>H8`D}Rye(#&BeADv%43^6?sE+1 zA2jdqxEUUGWqDXHuVL!k4Za~a<(^J*VJ>9r@GL3JwA>?9_&)S>+x;^J?vlASQcW$^ zaVJ-9EsRXkI=<=4?xvXzXY5v0e*Mq?QZ0v@kEtn=^ZWyAlc(!dOxffdyO&5ef6wS% zwdVjghmGgku%&*ND-Z6H_L4TyeiichqNbvtN5J8AlVAT$-!nb+QrPR3%0(^_n^(WY7Gp0cwy0*$|wcR#Ki=l*&+EUaps!mtCBk aSdglhUz9%kosASw5re0zpUXO@geCwvC;-y{ literal 0 HcmV?d00001 diff --git a/website/profile.php b/website/profile.php new file mode 100644 index 0000000..0ecdda1 --- /dev/null +++ b/website/profile.php @@ -0,0 +1,18 @@ + + + + + + + diff --git a/website/styles/main.css b/website/styles/main.css index c44b249..a410cdf 100644 --- a/website/styles/main.css +++ b/website/styles/main.css @@ -20,8 +20,8 @@ body { } .content { - margin-top: 80px; - margin-left: 256px; + margin: 80px 0 20px 256px; + padding: 20px; } ::selection { diff --git a/website/styles/profile.css b/website/styles/profile.css index a65408b..da4cc64 100644 --- a/website/styles/profile.css +++ b/website/styles/profile.css @@ -1,4 +1,6 @@ - +.profile-box, .item-box, .post-box { + box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24); +} .profile-box { min-height: 150px; @@ -23,8 +25,9 @@ background-color: #FFFFFF; } -.item-box .profile-picture { - width: 25px; +.posts { + background-color: red; + margin-top: 20px; } .post-box { @@ -43,4 +46,17 @@ float: right; color: #aaaaaa; font-size: 0.8em; +} + +.friend-request { + float: right; + padding: 10px; + border-radius: 3px; + background-color: #845663; + color: #FFFFFF; + transition-duration: 250ms; +} + +.friend-request:hover { + background-color: #B78996; } \ No newline at end of file diff --git a/website/views/profile.php b/website/views/profile.php index 1d4070a..408f93a 100644 --- a/website/views/profile.php +++ b/website/views/profile.php @@ -1,6 +1,9 @@
+
+

Als vriend toevoegen

+

[gebruikersnaam]

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec dictum turpis quam, eu ultrices sapien hendrerit tincidunt. Nunc aliquam neque turpis, id porta quam iaculis id. Sed suscipit, nisl a fermentum congue, nunc augue finibus lectus, id varius nunc purus nec dolor. Integer laoreet tellus sit amet sapien auctor congue. Mauris laoreet eu elit vel rhoncus. Nam et tortor arcu. Maecenas sit amet leo quis tellus varius gravida. Sed quis fermentum odio, sed dictum nulla. Donec aliquam rutrum orci cursus tempus. Quisque sit amet ipsum eget velit aliquam facilisis ultricies quis ligula. Nunc nisi lacus, luctus non bibendum quis, sagittis sit amet odio.

@@ -29,32 +32,67 @@

-
-

Tekst

-

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec dictum turpis quam, eu ultrices sapien hendrerit tincidunt. Nunc aliquam neque turpis, id porta quam iaculis id. Sed suscipit, nisl a fermentum congue, nunc augue finibus lectus, id varius nunc purus nec dolor. Integer laoreet tellus sit amet sapien auctor congue. Mauris laoreet eu elit vel rhoncus. Nam et tortor arcu. Maecenas sit amet leo quis tellus varius gravida. Sed quis fermentum odio, sed dictum nulla. Donec aliquam rutrum orci cursus tempus. Quisque sit amet ipsum eget velit aliquam facilisis ultricies quis ligula. Nunc nisi lacus, luctus non bibendum quis, sagittis sit amet odio.

-

Enkele minuten geleden geplaatst

-
+
+
+

Tekst

+

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec dictum turpis quam, eu ultrices sapien hendrerit tincidunt. Mauris laoreet eu elit vel rhoncus. Nam et tortor arcu. Maecenas sit amet leo quis tellus varius gravida. Sed quis fermentum odio, sed dictum nulla. Donec aliquam rutrum orci cursus tempus. Quisque sit amet ipsum eget velit aliquam facilisis ultricies quis ligula. Nunc nisi lacus, luctus non bibendum quis, sagittis sit amet odio.

+

Enkele minuten geleden geplaatst

+
-
-

Afbeelding

- Foto van [gebruikersnaam] -

Gisteren geplaatst

-
+
+

Tekst

+

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec dictum turpis quam, eu ultrices sapien hendrerit tincidunt. Nunc aliquam neque turpis, id porta quam iaculis id. Sed suscipit, nisl a fermentum congue, nunc augue finibus lectus, id varius nunc purus nec dolor. Integer laoreet tellus sit amet sapien auctor congue. Mauris laoreet eu elit vel rhoncus. Nam et tortor arcu. Maecenas sit amet leo quis tellus varius gravida. Sed quis fermentum odio, sed dictum nulla. Donec aliquam rutrum orci cursus tempus. Quisque sit amet ipsum eget velit aliquam facilisis ultricies quis ligula. Nunc nisi lacus, luctus non bibendum quis, sagittis sit amet odio.

+

Enkele minuten geleden geplaatst

+
-
-

Video

- -
+
+

Tekst

+

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec dictum turpis quam, eu ultrices sapien hendrerit tincidunt. Nunc aliquam neque turpis, id porta quam iaculis id. Sed suscipit, nisl a fermentum congue, nunc augue finibus lectus, id varius nunc purus nec dolor. Integer laoreet tellus sit amet sapien auctor congue. Sed quis fermentum odio, sed dictum nulla. Donec aliquam rutrum orci cursus tempus. Quisque sit amet ipsum eget velit aliquam facilisis ultricies quis ligula. Nunc nisi lacus, luctus non bibendum quis, sagittis sit amet odio.

+

Enkele minuten geleden geplaatst

+
-
-

Post

- -
+
+

Tekst

+

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec dictum turpis quam, eu ultrices sapien hendrerit tincidunt. Nunc aliquam neque turpis, id porta quam iaculis id. Sed suscipit, nisl a fermentum congue, nunc augue finibus lectus, id varius nunc purus nec dolor. Integer laoreet tellus sit amet sapien auctor congue. Mauris laoreet eu elit vel rhoncus. Nam et tortor arcu. Maecenas sit amet leo quis tellus varius gravida. Sed quis fermentum odio, sed dictum nulla.

+

Enkele minuten geleden geplaatst

+
-
-

Post

+
+

Tekst

+

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec dictum turpis quam, eu ultrices sapien hendrerit tincidunt. Nunc aliquam neque turpis, id porta quam iaculis id. Sed suscipit, nisl a fermentum congue, nunc augue finibus lectus, id varius nunc purus nec dolor. Integer laoreet tellus sit amet sapien auctor congue. Mauris laoreet eu elit vel rhoncus. Nam et tortor arcu. Maecenas sit amet leo quis tellus varius gravida. Sed quis fermentum odio, sed dictum nulla. Donec aliquam rutrum orci cursus tempus. Quisque sit amet ipsum eget velit aliquam facilisis ultricies quis ligula. Nunc nisi lacus, luctus non bibendum quis, sagittis sit amet odio.

+

Enkele minuten geleden geplaatst

+
+ +
+

Tekst

+

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec dictum turpis quam, eu ultrices sapien hendrerit tincidunt. Nunc aliquam neque turpis, id porta quam iaculis id. Sed suscipit, nisl a fermentum congue, nunc augue finibus lectus, id varius nunc purus nec dolor. Integer laoreet tellus sit amet sapien auctor congue. Mauris laoreet eu elit vel rhoncus. Nam et tortor arcu. Maecenas sit amet leo quis tellus varius gravida. Quisque sit amet ipsum eget velit aliquam facilisis ultricies quis ligula. Nunc nisi lacus, luctus non bibendum quis, sagittis sit amet odio.

+

Enkele minuten geleden geplaatst

+
+ +
+

Tekst

+

Integer laoreet tellus sit amet sapien auctor congue. Mauris laoreet eu elit vel rhoncus. Nam et tortor arcu. Maecenas sit amet leo quis tellus varius gravida. Sed quis fermentum odio, sed dictum nulla. Donec aliquam rutrum orci cursus tempus. Quisque sit amet ipsum eget velit aliquam facilisis ultricies quis ligula. Nunc nisi lacus, luctus non bibendum quis, sagittis sit amet odio.

+

Enkele minuten geleden geplaatst

+
+ +
+

Afbeelding

+ Foto van [gebruikersnaam] +

Gisteren geplaatst

+
+ +
+

Post

+ +

Maandag geplaatst

+
+ +
+

Post

+

4 Januari geplaatst

+
\ No newline at end of file -- 2.49.1 From eecdcad53883fe7515e7abb80fffee36c99ecbad Mon Sep 17 00:00:00 2001 From: Marijn Jansen Date: Wed, 11 Jan 2017 14:04:04 +0100 Subject: [PATCH 006/400] "before merge" --- website/chat.php | 2 +- website/styles/chat.css | 82 ++++++++++++++++++++++++------------- website/views/chat-view.php | 43 +++++++++++++++++++ website/views/chat.php | 41 ------------------- 4 files changed, 98 insertions(+), 70 deletions(-) create mode 100644 website/views/chat-view.php delete mode 100644 website/views/chat.php diff --git a/website/chat.php b/website/chat.php index b94e08c..e7b5af5 100644 --- a/website/chat.php +++ b/website/chat.php @@ -12,7 +12,7 @@ include("views/main.php"); /* Add your view files here. */ - include("views/chat.php"); + include("views/chat-view.php"); ?> diff --git a/website/styles/chat.css b/website/styles/chat.css index 640bb1d..c26366a 100644 --- a/website/styles/chat.css +++ b/website/styles/chat.css @@ -1,38 +1,44 @@ +/* Overall chat-screen */ .chat { text-align: center; - padding-top: 15px; + padding: 15px 0; + width: 100% } -.chat-history { - /*border: solid #845663;*/ - width: 80%; - height: 500px; - margin: auto auto; +.chat-left { + float: left; + width: 20%; + height: 100%; + margin-left: 10px; + margin-right: 10px; + +} +.chat-list, .chat-history { + border-radius: 20px; + width: 100%; background-color: white; +} + + +/* List of chats. */ +.chat-list { + height: 600px; + overflow-y: auto; + padding: 10px; +} + +.chat-right { + width: 75%; vertical-align: bottom; - overflow-y: scroll; - padding: 5px 0; - border-radius: 10px; + float: right; + margin-right: 10px; } -.chat-field { - padding: 15px; -} - -.chat-field input { - border-radius: 8px; -} - -.chat-field input[type="text"] { - width: calc(75% - 60px); - -} - -.chat-field input[type="submit"] { - width: 60px; - background-color: #845663; - color: white; - padding: 5px; +/* Chat history. */ +.chat-history { + height: 600px; + overflow-y: auto; + padding-bottom: 10px; } .chat-message { @@ -51,7 +57,6 @@ .chat-message-self { float: right; - margin-right: 10px; background-color: darkgreen; color: white; @@ -61,4 +66,25 @@ float: left; margin-left: 10px; background-color: aquamarine; +} + +/* Chat reply field */ + +.chat-field { + padding: 15px; +} + +.chat-field input { + border-radius: 8px; +} + +.chat-field input[type="text"] { + width: calc(100% - 80px); +} + +.chat-field input[type="submit"] { + width: 60px; + background-color: #845663; + color: white; + padding: 5px; } \ No newline at end of file diff --git a/website/views/chat-view.php b/website/views/chat-view.php new file mode 100644 index 0000000..1e3f7f1 --- /dev/null +++ b/website/views/chat-view.php @@ -0,0 +1,43 @@ +
+
+
+
+ Friends? +
+
+ +
+
+
+
Hi!
+
+
+
Hi!
+
+
+
How it's going?
+
+
+
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+
+
+
Hi!
+
+
+
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+
+
+ + + + + +
+
+
\ No newline at end of file diff --git a/website/views/chat.php b/website/views/chat.php deleted file mode 100644 index d6e6644..0000000 --- a/website/views/chat.php +++ /dev/null @@ -1,41 +0,0 @@ -
-
-
-
-
Hi!
-
-
-
Hi!
-
-
-
How it's going?
-
-
-
Hi!
-
-
-
The Quick Brown fox jumps over the lazy dog.
-
-
-
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
-
-
-
Hi!
-
-
-
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
-
- -
-
- - -
-
-
\ No newline at end of file -- 2.49.1 From 38079cbcafa60b73335e372f1b091a0e85975201 Mon Sep 17 00:00:00 2001 From: Marijn Jansen Date: Wed, 11 Jan 2017 14:38:07 +0100 Subject: [PATCH 007/400] Added Friend list in chat. --- website/styles/chat.css | 6 +++++- website/views/chat-view.php | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/website/styles/chat.css b/website/styles/chat.css index c26366a..82e3e6d 100644 --- a/website/styles/chat.css +++ b/website/styles/chat.css @@ -19,12 +19,16 @@ background-color: white; } - /* List of chats. */ .chat-list { height: 600px; overflow-y: auto; padding: 10px; + text-align: left; +} + +.chat-conversation { + margin: 5px; } .chat-right { diff --git a/website/views/chat-view.php b/website/views/chat-view.php index 1e3f7f1..00f39fb 100644 --- a/website/views/chat-view.php +++ b/website/views/chat-view.php @@ -2,7 +2,11 @@
- Friends? +
Chats
+
+ + Rudolf Leslo +
-- 2.49.1 From b8e61e641a48ec6576001bd1e6fd9a8933d9f9eb Mon Sep 17 00:00:00 2001 From: Kevin Nobel Date: Wed, 11 Jan 2017 15:09:24 +0100 Subject: [PATCH 008/400] Fixed tooltip bug (only worked with hyperlinks before --- website/styles/main.css | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/website/styles/main.css b/website/styles/main.css index e43e5d3..69629f5 100644 --- a/website/styles/main.css +++ b/website/styles/main.css @@ -125,11 +125,12 @@ td { } /* Custom title box, appears instantaneously */ -a:hover { +a:hover, img:hover, span:hover, div:hover { position: relative; } -a[data-title]:hover:after { +a[data-title]:hover:after, img[data-title]:hover:after, span[data-title]:hover:after, +div[data-title]:hover:after{ content: attr(data-title); padding: 4px 4px; color: #FFFFFF; @@ -145,4 +146,7 @@ a[data-title]:hover:after { -webkit-box-shadow: 0px 0px 4px #222; box-shadow: 0px 0px 4px #222; background-color: #333; + font-size: 15px; + line-height: normal; + font-family: Arial, sans-serif; } -- 2.49.1 From b4c7bfb1ef72c1c81d72c7885511f2572846e013 Mon Sep 17 00:00:00 2001 From: Kevin Nobel Date: Wed, 11 Jan 2017 15:11:42 +0100 Subject: [PATCH 009/400] We now use inline-flex for the post grid instead of float left. --- website/profile.php | 31 +++++++------ website/styles/profile.css | 11 +++-- website/views/profile.php | 92 +++++++++++++++++++++++--------------- 3 files changed, 78 insertions(+), 56 deletions(-) diff --git a/website/profile.php b/website/profile.php index 0ecdda1..2dc9891 100644 --- a/website/profile.php +++ b/website/profile.php @@ -1,18 +1,21 @@ - - - + + - + /* Add your view files here. */ + include("views/profile.php"); + + /* This adds the footer. */ + include("views/footer.php"); + ?> + diff --git a/website/styles/profile.css b/website/styles/profile.css index da4cc64..da6913b 100644 --- a/website/styles/profile.css +++ b/website/styles/profile.css @@ -26,23 +26,22 @@ } .posts { - background-color: red; - margin-top: 20px; + z-index: -1; } .post-box { - float: left; + display: inline-flex; width: 250px; margin: 20px 20px 0 0; padding: 25px; background-color: #FFFFFF; } -.post-box img { +.post img { width: 250px; } -.post-box .post-date { +.post .post-date { float: right; color: #aaaaaa; font-size: 0.8em; @@ -51,7 +50,7 @@ .friend-request { float: right; padding: 10px; - border-radius: 3px; + border-radius: 5px; background-color: #845663; color: #FFFFFF; transition-duration: 250ms; diff --git a/website/views/profile.php b/website/views/profile.php index 408f93a..d1f87bd 100644 --- a/website/views/profile.php +++ b/website/views/profile.php @@ -23,75 +23,95 @@

Groepen

- [groepsnaam]'s logo - [groepsnaam]'s logo - [groepsnaam]'s logo - [groepsnaam]'s logo - [groepsnaam]'s logo + [groepsnaam]'s logo + [groepsnaam]'s logo + [groepsnaam]'s logo + [groepsnaam]'s logo + [groepsnaam]'s logo ...en nog 6 anderen!

-

Tekst

-

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec dictum turpis quam, eu ultrices sapien hendrerit tincidunt. Mauris laoreet eu elit vel rhoncus. Nam et tortor arcu. Maecenas sit amet leo quis tellus varius gravida. Sed quis fermentum odio, sed dictum nulla. Donec aliquam rutrum orci cursus tempus. Quisque sit amet ipsum eget velit aliquam facilisis ultricies quis ligula. Nunc nisi lacus, luctus non bibendum quis, sagittis sit amet odio.

-

Enkele minuten geleden geplaatst

+
+

Tekst

+

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec dictum turpis quam, eu ultrices sapien hendrerit tincidunt. Mauris laoreet eu elit vel rhoncus. Nam et tortor arcu. Maecenas sit amet leo quis tellus varius gravida. Sed quis fermentum odio, sed dictum nulla. Donec aliquam rutrum orci cursus tempus. Quisque sit amet ipsum eget velit aliquam facilisis ultricies quis ligula. Nunc nisi lacus, luctus non bibendum quis, sagittis sit amet odio.

+

Enkele minuten geleden geplaatst

+
-

Tekst

-

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec dictum turpis quam, eu ultrices sapien hendrerit tincidunt. Nunc aliquam neque turpis, id porta quam iaculis id. Sed suscipit, nisl a fermentum congue, nunc augue finibus lectus, id varius nunc purus nec dolor. Integer laoreet tellus sit amet sapien auctor congue. Mauris laoreet eu elit vel rhoncus. Nam et tortor arcu. Maecenas sit amet leo quis tellus varius gravida. Sed quis fermentum odio, sed dictum nulla. Donec aliquam rutrum orci cursus tempus. Quisque sit amet ipsum eget velit aliquam facilisis ultricies quis ligula. Nunc nisi lacus, luctus non bibendum quis, sagittis sit amet odio.

-

Enkele minuten geleden geplaatst

+
+

Tekst

+

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec dictum turpis quam, eu ultrices sapien hendrerit tincidunt. Nunc aliquam neque turpis, id porta quam iaculis id. Sed suscipit, nisl a fermentum congue, nunc augue finibus lectus, id varius nunc purus nec dolor. Integer laoreet tellus sit amet sapien auctor congue. Mauris laoreet eu elit vel rhoncus. Nam et tortor arcu. Maecenas sit amet leo quis tellus varius gravida. Sed quis fermentum odio, sed dictum nulla. Donec aliquam rutrum orci cursus tempus. Quisque sit amet ipsum eget velit aliquam facilisis ultricies quis ligula. Nunc nisi lacus, luctus non bibendum quis, sagittis sit amet odio.

+

Enkele minuten geleden geplaatst

+
-

Tekst

-

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec dictum turpis quam, eu ultrices sapien hendrerit tincidunt. Nunc aliquam neque turpis, id porta quam iaculis id. Sed suscipit, nisl a fermentum congue, nunc augue finibus lectus, id varius nunc purus nec dolor. Integer laoreet tellus sit amet sapien auctor congue. Sed quis fermentum odio, sed dictum nulla. Donec aliquam rutrum orci cursus tempus. Quisque sit amet ipsum eget velit aliquam facilisis ultricies quis ligula. Nunc nisi lacus, luctus non bibendum quis, sagittis sit amet odio.

-

Enkele minuten geleden geplaatst

+
+

Tekst

+

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec dictum turpis quam, eu ultrices sapien hendrerit tincidunt. Nunc aliquam neque turpis, id porta quam iaculis id. Sed suscipit, nisl a fermentum congue, nunc augue finibus lectus, id varius nunc purus nec dolor. Integer laoreet tellus sit amet sapien auctor congue. Sed quis fermentum odio, sed dictum nulla. Donec aliquam rutrum orci cursus tempus. Quisque sit amet ipsum eget velit aliquam facilisis ultricies quis ligula. Nunc nisi lacus, luctus non bibendum quis, sagittis sit amet odio.

+

Enkele minuten geleden geplaatst

+
-

Tekst

-

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec dictum turpis quam, eu ultrices sapien hendrerit tincidunt. Nunc aliquam neque turpis, id porta quam iaculis id. Sed suscipit, nisl a fermentum congue, nunc augue finibus lectus, id varius nunc purus nec dolor. Integer laoreet tellus sit amet sapien auctor congue. Mauris laoreet eu elit vel rhoncus. Nam et tortor arcu. Maecenas sit amet leo quis tellus varius gravida. Sed quis fermentum odio, sed dictum nulla.

-

Enkele minuten geleden geplaatst

+
+

Tekst

+

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec dictum turpis quam, eu ultrices sapien hendrerit tincidunt. Nunc aliquam neque turpis, id porta quam iaculis id. Sed suscipit, nisl a fermentum congue, nunc augue finibus lectus, id varius nunc purus nec dolor. Integer laoreet tellus sit amet sapien auctor congue. Mauris laoreet eu elit vel rhoncus. Nam et tortor arcu. Maecenas sit amet leo quis tellus varius gravida. Sed quis fermentum odio, sed dictum nulla.

+

Enkele minuten geleden geplaatst

+
-

Tekst

-

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec dictum turpis quam, eu ultrices sapien hendrerit tincidunt. Nunc aliquam neque turpis, id porta quam iaculis id. Sed suscipit, nisl a fermentum congue, nunc augue finibus lectus, id varius nunc purus nec dolor. Integer laoreet tellus sit amet sapien auctor congue. Mauris laoreet eu elit vel rhoncus. Nam et tortor arcu. Maecenas sit amet leo quis tellus varius gravida. Sed quis fermentum odio, sed dictum nulla. Donec aliquam rutrum orci cursus tempus. Quisque sit amet ipsum eget velit aliquam facilisis ultricies quis ligula. Nunc nisi lacus, luctus non bibendum quis, sagittis sit amet odio.

-

Enkele minuten geleden geplaatst

+
+

Tekst

+

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec dictum turpis quam, eu ultrices sapien hendrerit tincidunt. Nunc aliquam neque turpis, id porta quam iaculis id. Sed suscipit, nisl a fermentum congue, nunc augue finibus lectus, id varius nunc purus nec dolor. Integer laoreet tellus sit amet sapien auctor congue. Mauris laoreet eu elit vel rhoncus. Nam et tortor arcu. Maecenas sit amet leo quis tellus varius gravida. Sed quis fermentum odio, sed dictum nulla. Donec aliquam rutrum orci cursus tempus. Quisque sit amet ipsum eget velit aliquam facilisis ultricies quis ligula. Nunc nisi lacus, luctus non bibendum quis, sagittis sit amet odio.

+

Enkele minuten geleden geplaatst

+
-

Tekst

-

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec dictum turpis quam, eu ultrices sapien hendrerit tincidunt. Nunc aliquam neque turpis, id porta quam iaculis id. Sed suscipit, nisl a fermentum congue, nunc augue finibus lectus, id varius nunc purus nec dolor. Integer laoreet tellus sit amet sapien auctor congue. Mauris laoreet eu elit vel rhoncus. Nam et tortor arcu. Maecenas sit amet leo quis tellus varius gravida. Quisque sit amet ipsum eget velit aliquam facilisis ultricies quis ligula. Nunc nisi lacus, luctus non bibendum quis, sagittis sit amet odio.

-

Enkele minuten geleden geplaatst

+
+

Tekst

+

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec dictum turpis quam, eu ultrices sapien hendrerit tincidunt. Nunc aliquam neque turpis, id porta quam iaculis id. Sed suscipit, nisl a fermentum congue, nunc augue finibus lectus, id varius nunc purus nec dolor. Integer laoreet tellus sit amet sapien auctor congue. Mauris laoreet eu elit vel rhoncus. Nam et tortor arcu. Maecenas sit amet leo quis tellus varius gravida. Quisque sit amet ipsum eget velit aliquam facilisis ultricies quis ligula. Nunc nisi lacus, luctus non bibendum quis, sagittis sit amet odio.

+

Enkele minuten geleden geplaatst

+
-

Tekst

-

Integer laoreet tellus sit amet sapien auctor congue. Mauris laoreet eu elit vel rhoncus. Nam et tortor arcu. Maecenas sit amet leo quis tellus varius gravida. Sed quis fermentum odio, sed dictum nulla. Donec aliquam rutrum orci cursus tempus. Quisque sit amet ipsum eget velit aliquam facilisis ultricies quis ligula. Nunc nisi lacus, luctus non bibendum quis, sagittis sit amet odio.

-

Enkele minuten geleden geplaatst

+
+

Tekst

+

Integer laoreet tellus sit amet sapien auctor congue. Mauris laoreet eu elit vel rhoncus. Nam et tortor arcu. Maecenas sit amet leo quis tellus varius gravida. Sed quis fermentum odio, sed dictum nulla. Donec aliquam rutrum orci cursus tempus. Quisque sit amet ipsum eget velit aliquam facilisis ultricies quis ligula. Nunc nisi lacus, luctus non bibendum quis, sagittis sit amet odio.

+

Enkele minuten geleden geplaatst

+
-

Afbeelding

- Foto van [gebruikersnaam] -

Gisteren geplaatst

+
+

Afbeelding

+ Foto van [gebruikersnaam] +

Gisteren geplaatst

+
-

Post

- -

Maandag geplaatst

+
+

Post

+ +

Maandag geplaatst

+
-

Post

-

4 Januari geplaatst

+
+

Post

+

4 Januari geplaatst

+
-- 2.49.1 From 1e6e454de426aad23543eb46a892a2381885f035 Mon Sep 17 00:00:00 2001 From: Marijn Jansen Date: Wed, 11 Jan 2017 15:26:01 +0100 Subject: [PATCH 010/400] Small changes --- .idea/inspectionProfiles/Project_Default.xml | 22 +++++++++++++++++++ projectplan/projectplan.pdf | Bin 44797 -> 44839 bytes website/styles/chat.css | 4 ++-- website/views/chat-view.php | 16 +++++++++----- 4 files changed, 34 insertions(+), 8 deletions(-) create mode 100644 .idea/inspectionProfiles/Project_Default.xml diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml new file mode 100644 index 0000000..f08a78f --- /dev/null +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -0,0 +1,22 @@ + + + + \ No newline at end of file diff --git a/projectplan/projectplan.pdf b/projectplan/projectplan.pdf index d8683619251f2d24f031f970b50aa69f78f93f36..e41b19d7edf00e6d51fc296410aa7724192b642f 100644 GIT binary patch delta 29801 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�k8umlQy0WF$nzakw7W({WJ{ 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 tM4$m@W^ej`3;OW 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 diff --git a/website/styles/chat.css b/website/styles/chat.css index 82e3e6d..fe1c5a5 100644 --- a/website/styles/chat.css +++ b/website/styles/chat.css @@ -13,14 +13,14 @@ margin-right: 10px; } -.chat-list, .chat-history { +.chat-recent, .chat-history { border-radius: 20px; width: 100%; background-color: white; } /* List of chats. */ -.chat-list { +.chat-recent { height: 600px; overflow-y: auto; padding: 10px; diff --git a/website/views/chat-view.php b/website/views/chat-view.php index 00f39fb..297dabc 100644 --- a/website/views/chat-view.php +++ b/website/views/chat-view.php @@ -1,13 +1,17 @@

-
+
+ + Rudolf Leslo +
+
+ + Henk de Boer +
+
@@ -35,7 +39,7 @@
Date: Wed, 11 Jan 2017 15:29:47 +0100 Subject: [PATCH 011/400] Fixed chat size. It is all fixed, litteraly. --- .idea/WebDB.iml | 10 ++++++++++ website/styles/chat.css | 17 +++++++++++------ website/views/chat-view.php | 29 ++++++++++++++++++----------- 3 files changed, 39 insertions(+), 17 deletions(-) diff --git a/.idea/WebDB.iml b/.idea/WebDB.iml index b313593..0d7f9d7 100644 --- a/.idea/WebDB.iml +++ b/.idea/WebDB.iml @@ -14,5 +14,15 @@ + + + + + + + + + + \ No newline at end of file diff --git a/website/styles/chat.css b/website/styles/chat.css index 82e3e6d..f7476bb 100644 --- a/website/styles/chat.css +++ b/website/styles/chat.css @@ -1,16 +1,21 @@ /* Overall chat-screen */ .chat { + position: fixed; + top: 80px; + left: 256px; text-align: center; padding: 15px 0; - width: 100% + width: calc(100% - 256px); + height: calc(100% - 120px); + display: inline-flex; } .chat-left { - float: left; - width: 20%; + width: 256px; height: 100%; margin-left: 10px; margin-right: 10px; + display: inline-flex; } .chat-list, .chat-history { @@ -32,16 +37,16 @@ } .chat-right { - width: 75%; + width: calc(100% - 256px - 40px); + height: calc(100% - 80px); vertical-align: bottom; - float: right; margin-right: 10px; } /* Chat history. */ .chat-history { - height: 600px; overflow-y: auto; + height: 100%; padding-bottom: 10px; } diff --git a/website/views/chat-view.php b/website/views/chat-view.php index 00f39fb..2f5d7a0 100644 --- a/website/views/chat-view.php +++ b/website/views/chat-view.php @@ -30,18 +30,25 @@
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+
+
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+
+
+
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+
+
+
+ + + +
- -
- - -
\ No newline at end of file -- 2.49.1 From 49e64cfb55cef3f4a2c19568637467f2870ce278 Mon Sep 17 00:00:00 2001 From: Marijn Jansen Date: Wed, 11 Jan 2017 15:33:22 +0100 Subject: [PATCH 012/400] Fixed double chat field --- website/views/chat-view.php | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/website/views/chat-view.php b/website/views/chat-view.php index 710b6a3..d0a3f53 100644 --- a/website/views/chat-view.php +++ b/website/views/chat-view.php @@ -45,7 +45,7 @@
- -
- - -
\ No newline at end of file -- 2.49.1 From a2f51aa05e3b4d6d2754e8aa0d90c5729d44dec9 Mon Sep 17 00:00:00 2001 From: Marijn Jansen Date: Wed, 11 Jan 2017 15:36:55 +0100 Subject: [PATCH 013/400] Updated Header links --- website/img/{Logo.png => top-logo.png} | Bin website/views/header.php | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) rename website/img/{Logo.png => top-logo.png} (100%) diff --git a/website/img/Logo.png b/website/img/top-logo.png similarity index 100% rename from website/img/Logo.png rename to website/img/top-logo.png diff --git a/website/views/header.php b/website/views/header.php index 6636f09..45cb2b9 100644 --- a/website/views/header.php +++ b/website/views/header.php @@ -1,6 +1,6 @@
-- 2.49.1 From 1fb6c90fa6748f2dd91112a812f289278fd1329d Mon Sep 17 00:00:00 2001 From: Marijn Jansen Date: Wed, 18 Jan 2017 16:41:45 +0100 Subject: [PATCH 128/400] Session Start doubble fixes --- website/views/header.php | 1 - 1 file changed, 1 deletion(-) diff --git a/website/views/header.php b/website/views/header.php index 12877b6..bb809ee 100644 --- a/website/views/header.php +++ b/website/views/header.php @@ -1,5 +1,4 @@ Date: Thu, 19 Jan 2017 11:00:55 +0100 Subject: [PATCH 129/400] Ignore .idea folder --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 49adb33..9479d1a 100644 --- a/.gitignore +++ b/.gitignore @@ -8,7 +8,7 @@ # Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 - +.idea/* # User-specific stuff: .idea/workspace.xml .idea/tasks.xml -- 2.49.1 From ff19b5e1b9d33ae2f3d6c374a1e762997f52c2e9 Mon Sep 17 00:00:00 2001 From: Marijn Jansen Date: Thu, 19 Jan 2017 11:01:29 +0100 Subject: [PATCH 130/400] Settings messages now uses a Class (: --- website/public/settings.php | 12 ++---- website/queries/settings.php | 67 ++++++++++++++++++++++----------- website/views/settings-view.php | 6 +-- 3 files changed, 53 insertions(+), 32 deletions(-) diff --git a/website/public/settings.php b/website/public/settings.php index 2f91690..c3645f1 100644 --- a/website/public/settings.php +++ b/website/public/settings.php @@ -5,6 +5,7 @@ include("../views/head.php"); include_once("../queries/connect.php"); include_once("../queries/settings.php"); + $_SESSION["userID"] = 2; ?> "; } + + $randomUser = selectRandomNotFriendUser($_SESSION["userID"])["username"]; + + echo " +
  • +
    + +
    +
    • + "; if ($i > 1) { $i -= 1; echo " -
  • - En nog $i anderen... -
    • "; +
  • + En nog $i anderen... +
    • + "; } + ?> @@ -87,17 +106,28 @@ // Echo the friend. echo " - -
  • -
    - PF - $name -
    -
    • -     +
  • +
    + +
    +
    • "; } - if ($i > 3) { + + if ($i == 0) { + echo "
  • +
    + Je hoort nergens bij. +
    +
    • "; + } else if ($i > 3) { $i -= 3; echo "
  • -- 2.49.1 From daff2f41faf4b0f8b7def9edc294aace9976f068 Mon Sep 17 00:00:00 2001 From: Hendrik Date: Fri, 20 Jan 2017 12:29:34 +0100 Subject: [PATCH 156/400] minor fix --- website/views/adminpanel.php | 7 ------- 1 file changed, 7 deletions(-) diff --git a/website/views/adminpanel.php b/website/views/adminpanel.php index 86c674a..52681a4 100644 --- a/website/views/adminpanel.php +++ b/website/views/adminpanel.php @@ -99,15 +99,8 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") { changeMultipleGroupStatusByID($db, $_POST["checkbox-group"], $_POST["groupbatchactions"]); } -<<<<<<< HEAD if (isset($_POST["pageselect"])) { $currentpage = $_POST["pageselect"]; -======= - if (!empty($_POST["actions"]) && !empty($_POST["userID"])) { - changeUserStatusByID($_POST["userID"], $_POST["actions"]); - } elseif (!empty($_POST["actions"]) && !empty($_POST["groupID"])) { - changeGroupStatusByID($_POST["groupID"], $_POST["actions"]); ->>>>>>> master } } -- 2.49.1 From eb1fc154015d8477041aee70a05c2561f8983196 Mon Sep 17 00:00:00 2001 From: Joey Lai Date: Fri, 20 Jan 2017 12:32:39 +0100 Subject: [PATCH 157/400] script on right lines --- website/public/login.php | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/website/public/login.php b/website/public/login.php index 65babdf..3d37da7 100644 --- a/website/public/login.php +++ b/website/public/login.php @@ -7,6 +7,18 @@ include_once("../queries/checkInput.php") ?> + + - - - -- 2.49.1 From 6c41e825fe4527ca83949d647183d70eb34466c4 Mon Sep 17 00:00:00 2001 From: Lars van Hijfte Date: Fri, 20 Jan 2017 12:53:23 +0100 Subject: [PATCH 158/400] Removed absolute path --- website/views/head.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/website/views/head.php b/website/views/head.php index e267d61..bb6eec4 100644 --- a/website/views/head.php +++ b/website/views/head.php @@ -1,17 +1,17 @@ MyHyvesbook+ - - - - + + + + Date: Fri, 20 Jan 2017 12:58:34 +0100 Subject: [PATCH 159/400] fix queries for global and prepared --- website/queries/group_page.php | 43 ++++++++++++++++++++-------------- website/queries/user.php | 29 ++++++++++++++--------- website/views/adminpanel.php | 16 ++++++------- 3 files changed, 52 insertions(+), 36 deletions(-) diff --git a/website/queries/group_page.php b/website/queries/group_page.php index 44d346c..ef7af07 100644 --- a/website/queries/group_page.php +++ b/website/queries/group_page.php @@ -1,7 +1,7 @@ query(" + $q = $GLOBALS["db"]->prepare(" SELECT `group_page`.`name`, `group_page`.`picture`, @@ -11,12 +11,16 @@ function selectGroupById($groupID) { FROM `group_page` WHERE - `group_page`.`groupID` = $groupID + `group_page`.`groupID` = :groupID "); + + $q->bindParam(':groupID', $groupID); + $q->execute(); + return $q; } function select20GroupsFromN($n) { - return $GLOBALS["db"]->query(" + $q = $GLOBALS["db"]->prepare(" SELECT `group_page`.`groupID`, `group_page`.`name`, @@ -29,12 +33,16 @@ function select20GroupsFromN($n) { ORDER BY `group_page`.`name` ASC LIMIT - $n, 20 + :n, 20 "); + + $q->bindParam(':n', $n); + $q->execute(); + return $q; } function select20GroupsByStatusFromN($n, $status) { - return $GLOBALS["db"]->query(" + $q = $GLOBALS["db"]->prepare(" SELECT `group_page`.`groupID`, `group_page`.`name`, @@ -45,12 +53,17 @@ function select20GroupsByStatusFromN($n, $status) { FROM `group_page` WHERE - `group_page`.`status` = $status + `group_page`.`status` = :status ORDER BY `group_page`.`name` ASC LIMIT - $n, 20 + :n, 20 "); + + $q->bindParam(':status', $status); + $q->bindParam(':n', $n); + $q->execute(); + return $q; } function search20GroupsFromNByStatus($n, $keyword, $status) { @@ -80,8 +93,8 @@ function search20GroupsFromNByStatus($n, $keyword, $status) { return $q; } -function searchSomeGroupsByStatus($db, $n, $m, $keyword, $status) { - $q = $db->prepare(" +function searchSomeGroupsByStatus($n, $m, $keyword, $status) { + $q = $GLOBALS['db']->prepare(" SELECT `groupID`, `name`, @@ -108,8 +121,8 @@ function searchSomeGroupsByStatus($db, $n, $m, $keyword, $status) { return $q; } -function countSomeGroupsByStatus($db, $keyword, $status) { - $q = $db->prepare(" +function countSomeGroupsByStatus($keyword, $status) { + $q = $GLOBALS['db']->prepare(" SELECT COUNT(*) FROM @@ -141,11 +154,9 @@ function changeGroupStatusByID($id, $status) { return $q; } -<<<<<<< HEAD - -function changeMultipleGroupStatusByID($db, $ids, $status) { - $q = $db->prepare(" +function changeMultipleGroupStatusByID($ids, $status) { + $q = $GLOBALS['db']->prepare(" UPDATE `group_page` SET @@ -163,5 +174,3 @@ function changeMultipleGroupStatusByID($db, $ids, $status) { ?> -======= ->>>>>>> master diff --git a/website/queries/user.php b/website/queries/user.php index 71cef11..719a40f 100644 --- a/website/queries/user.php +++ b/website/queries/user.php @@ -87,7 +87,7 @@ function selectAllUserPosts($userID) { } function select20UsersFromN($n) { - return $GLOBALS["db"]->query(" + $q = $GLOBALS["db"]->prepare(" SELECT `userID`, `username`, @@ -99,8 +99,12 @@ function select20UsersFromN($n) { `role`, `username` LIMIT - $n, 20 + :n, 20 "); + + $q->bindParam(':n', $n); + $q->execute(); + return $q; } function search20UsersFromN($n, $keyword) { @@ -155,8 +159,8 @@ function search20UsersFromNByStatus($n, $keyword, $status) { return $q; } -function searchSomeUsersByStatus($db, $n, $m, $keyword, $status) { - $q = $db->prepare(" +function searchSomeUsersByStatus($n, $m, $keyword, $status) { + $q = $GLOBALS["db"]->prepare(" SELECT `userID`, `username`, @@ -184,8 +188,8 @@ function searchSomeUsersByStatus($db, $n, $m, $keyword, $status) { return $q; } -function countSomeUsersByStatus($db, $keyword, $status) { - $q = $db->prepare(" +function countSomeUsersByStatus($keyword, $status) { + $q = $GLOBALS["db"]->prepare(" SELECT COUNT(*) FROM @@ -208,20 +212,23 @@ function countSomeUsersByStatus($db, $keyword, $status) { function changeUserStatusByID($id, $status) { - $q = $GLOBALS["db"]->query(" + $q = $GLOBALS["db"]->prepare(" UPDATE `user` SET - `role` = $status + `role` = :status WHERE - `userID` = $id + `userID` = :id "); + $q->bindParam(':status', $status); + $q->bindParam(':id', $id); + $q->execute(); return $q; } -function changeMultipleUserStatusByID($db, $ids, $status) { - $q = $db->prepare(" +function changeMultipleUserStatusByID($ids, $status) { + $q = $GLOBALS["db"]->prepare(" UPDATE `user` SET diff --git a/website/views/adminpanel.php b/website/views/adminpanel.php index 52681a4..af23dae 100644 --- a/website/views/adminpanel.php +++ b/website/views/adminpanel.php @@ -84,19 +84,19 @@ if (isset($_GET["groupstatus"])) { if ($_SERVER["REQUEST_METHOD"] == "POST") { if (isset($_POST["actions"]) && isset($_POST["userID"])) { - changeUserStatusByID($db, $_POST["userID"], $_POST["actions"]); + changeUserStatusByID($_POST["userID"], $_POST["actions"]); } if (isset($_POST["actions"]) && isset($_POST["groupID"])) { - changeGroupStatusByID($db, $_POST["groupID"], $_POST["actions"]); + changeGroupStatusByID($_POST["groupID"], $_POST["actions"]); } if (isset($_POST["batchactions"]) && isset($_POST["checkbox-user"])) { - changeMultipleUserStatusByID($db, $_POST["checkbox-user"], $_POST["batchactions"]); + changeMultipleUserStatusByID($_POST["checkbox-user"], $_POST["batchactions"]); } if (isset($_POST["groupbatchactions"]) && isset($_POST["checkbox-group"])) { - changeMultipleGroupStatusByID($db, $_POST["checkbox-group"], $_POST["groupbatchactions"]); + changeMultipleGroupStatusByID($_POST["checkbox-group"], $_POST["groupbatchactions"]); } if (isset($_POST["pageselect"])) { @@ -226,9 +226,9 @@ function test_input($data) {
    fetchColumn(); $mincount = min($listm, $countresults); @@ -277,7 +277,7 @@ function test_input($data) { $listm = $currentpage * $perpage; if ($pagetype == 'user') { - $q = searchSomeUsersByStatus($db, $listn, $listm, $search, $status); + $q = searchSomeUsersByStatus($listn, $listm, $search, $status); while($user = $q->fetch(PDO::FETCH_ASSOC)) { $userID = $user['userID']; @@ -316,7 +316,7 @@ function test_input($data) { "); } } else { - $q = searchSomeGroupsByStatus($db, $listn, $listm, $search, $groupstatus); + $q = searchSomeGroupsByStatus($listn, $listm, $search, $groupstatus); while ($group = $q->fetch(PDO::FETCH_ASSOC)) { $groupID = $group['groupID']; -- 2.49.1 From bfdf9e989b2a724f505975d9ab79ccef106e937d Mon Sep 17 00:00:00 2001 From: "K. Nobel" Date: Fri, 20 Jan 2017 13:07:47 +0100 Subject: [PATCH 160/400] Fixed profile page, now shows current user when no username is given in get variable. --- website/public/profile.php | 61 ++++++------------------------------ website/queries/nicetime.php | 39 +++++++++++++++++++++++ 2 files changed, 49 insertions(+), 51 deletions(-) create mode 100644 website/queries/nicetime.php diff --git a/website/public/profile.php b/website/public/profile.php index f3f499b..0fe2feb 100644 --- a/website/public/profile.php +++ b/website/public/profile.php @@ -1,45 +1,16 @@ + + + + + + + $unix_date) { - $difference = $now - $unix_date; - $tense = "geleden"; - } else { - $difference = $unix_date - $now; - $tense = "vanaf nu"; - } - - for($i = 0; $difference >= $lengths[$i] && $i < count($lengths) - 1; $i++) { - $difference /= $lengths[$i]; - } - - $difference = round($difference); - - if($difference != 1) { - $period = $multiple_periods[$i]; - } else { - $period = $single_periods[$i]; - } - - return "$difference $period $tense"; -} +include("../queries/nicetime.php"); if(empty($_GET["username"])) { $userID = $_SESSION["userID"]; @@ -52,18 +23,6 @@ $profile_friends = selectAllFriends($userID); $profile_groups = selectAllUserGroups($userID); $posts = selectAllUserPosts($userID); -?> - - - - - - - - - $unix_date) { +$difference = $now - $unix_date; +$tense = "geleden"; +} else { +$difference = $unix_date - $now; +$tense = "vanaf nu"; +} + +for($i = 0; $difference >= $lengths[$i] && $i < count($lengths) - 1; $i++) { +$difference /= $lengths[$i]; +} + +$difference = round($difference); + +if($difference != 1) { +$period = $multiple_periods[$i]; +} else { +$period = $single_periods[$i]; +} + +return "$difference $period $tense"; +} \ No newline at end of file -- 2.49.1 From 6418b2b679fdaee5f70da8dddf6321989ea5ea5d Mon Sep 17 00:00:00 2001 From: Hendrik Date: Fri, 20 Jan 2017 13:14:28 +0100 Subject: [PATCH 161/400] move js to /js --- website/public/js/admin.js | 44 +++++++++++++++++++++++++++++++ website/views/adminpanel.php | 50 ++---------------------------------- 2 files changed, 46 insertions(+), 48 deletions(-) create mode 100644 website/public/js/admin.js diff --git a/website/public/js/admin.js b/website/public/js/admin.js new file mode 100644 index 0000000..2055123 --- /dev/null +++ b/website/public/js/admin.js @@ -0,0 +1,44 @@ +window.onload = function() { + changeFilter(); +}; + +function checkAll(allbox) { + var checkboxes = document.getElementsByClassName('checkbox-list'); + + for (var i = 0; i < checkboxes.length; i++) { + if (checkboxes[i].type == 'checkbox') { + checkboxes[i].checked = allbox.checked; + } + } +} + +function checkCheckAll(allbox) { + var checkboxes = document.getElementsByClassName('checkbox-list'); + var checked = true; + + for (var i = 0; i < checkboxes.length; i++) { + if (checkboxes[i].type == 'checkbox') { + if (checkboxes[i].checked == false) { + checked = false; + break; + } + } + } + allbox.checked = checked; +} + +function changeFilter() { + if (document.getElementById('group').checked) { + document.getElementById('admin-filter').style.display = 'none'; + document.getElementById('admin-groupfilter').style.display = 'inline-block'; + + document.getElementById('admin-batchactions').style.display = 'none'; + document.getElementById('admin-groupbatchactions').style.display = 'inline-block'; + } else { + document.getElementById('admin-filter').style.display = 'inline-block'; + document.getElementById('admin-groupfilter').style.display = 'none'; + + document.getElementById('admin-batchactions').style.display = 'inline-block'; + document.getElementById('admin-groupbatchactions').style.display = 'none'; + } +} diff --git a/website/views/adminpanel.php b/website/views/adminpanel.php index af23dae..fde8237 100644 --- a/website/views/adminpanel.php +++ b/website/views/adminpanel.php @@ -3,53 +3,7 @@ Admin Panel - + fetchColumn(); $mincount = min($listm, $countresults); -- 2.49.1 From 61c148e127bade2b031d75264504a84754b70200 Mon Sep 17 00:00:00 2001 From: Lars van Hijfte Date: Fri, 20 Jan 2017 13:30:40 +0100 Subject: [PATCH 162/400] Made chat xss prove --- website/public/API/loadMessages.php | 7 +++---- website/public/API/sendMessage.php | 15 +++++++-------- website/public/js/chat.js | 6 +----- 3 files changed, 11 insertions(+), 17 deletions(-) diff --git a/website/public/API/loadMessages.php b/website/public/API/loadMessages.php index fef9db7..1c6b942 100644 --- a/website/public/API/loadMessages.php +++ b/website/public/API/loadMessages.php @@ -3,11 +3,10 @@ session_start(); require_once("../../queries/connect.php"); require_once("../../queries/private_message.php"); +require_once("../../queries/checkInput.php"); if (isset($_POST["lastID"]) && $_POST["lastID"] != "") { - - echo getNewChatMessages($_POST["lastID"], $_POST["destination"]); - + echo getNewChatMessages(test_input($_POST["lastID"]), test_input($_POST["destination"])); } else { - echo getOldChatMessages($_POST["destination"]); + echo getOldChatMessages(test_input($_POST["destination"])); } \ No newline at end of file diff --git a/website/public/API/sendMessage.php b/website/public/API/sendMessage.php index d1bc758..c5d47d1 100644 --- a/website/public/API/sendMessage.php +++ b/website/public/API/sendMessage.php @@ -3,16 +3,15 @@ session_start(); require_once("../../queries/connect.php"); require_once("../../queries/private_message.php"); +require_once("../../queries/checkInput.php"); -if (isset($_POST["destination"]) && - isset($_POST["content"])) { - - if (sendMessage($_POST["destination"], $_POST["content"])) { - echo $_POST["content"] . " is naar " . $_POST["destination"] . " gestuurd"; +if (!empty(test_input($_POST["destination"])) && + !empty(test_input($_POST["content"]))) { + if (sendMessage(test_input($_POST["destination"]), test_input($_POST["content"]))) { + echo 1; } else { - echo "YOU FAILED!!!"; + echo 0; } - } else { - echo "maybe dont try to hax the system?"; + echo 0; } \ No newline at end of file diff --git a/website/public/js/chat.js b/website/public/js/chat.js index 75eb32e..6c420a1 100644 --- a/website/public/js/chat.js +++ b/website/public/js/chat.js @@ -10,7 +10,6 @@ function loadMessages() { $("#lastIDForm").serialize() ).done(function(data) { if (data && data != "[]") { - console.log(data); messages = JSON.parse(data); addMessages(messages); $("#lastID").val(messages[messages.length - 1].messageID); @@ -23,13 +22,10 @@ function loadMessages() { function sendMessage() { - console.log($("#sendMessageForm").serialize()); $.post( "API/sendMessage.php", $("#sendMessageForm").serialize() - ).done(function( data ) { - console.log(data); - }); + ); $("#newContent").val(""); } -- 2.49.1 From b7620fe4dbe3cdaf595eb71087b485e4bbeaf81e Mon Sep 17 00:00:00 2001 From: "K. Nobel" Date: Fri, 20 Jan 2017 14:05:20 +0100 Subject: [PATCH 163/400] Moved .htaccess --- website/.htaccess | 14 -------------- website/public/.htaccess | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 14 deletions(-) delete mode 100644 website/.htaccess create mode 100644 website/public/.htaccess diff --git a/website/.htaccess b/website/.htaccess deleted file mode 100644 index 5c0147b..0000000 --- a/website/.htaccess +++ /dev/null @@ -1,14 +0,0 @@ -Options +FollowSymLinks -RewriteEngine On - -ErrorDocument 404 /error404.jpg - -RewriteCond %{SCRIPT_FILENAME} !-d -RewriteCond %{SCRIPT_FILENAME} !-f - -# Resolve .php file for extensionless php urls -RewriteRule ^([^/.]+)$ $1.php [L] - -RewriteRule ^([^/.]+)\/$ $1.php [L] - -RewriteRule ^profile/([A-z0-9]+)\/?$ profile.php?username=$1 [NC] \ No newline at end of file diff --git a/website/public/.htaccess b/website/public/.htaccess new file mode 100644 index 0000000..69fda24 --- /dev/null +++ b/website/public/.htaccess @@ -0,0 +1,14 @@ +#Options +FollowSymLinks +#RewriteEngine On +# +#ErrorDocument 404 /error404.jpg +# +#RewriteCond %{SCRIPT_FILENAME} !-d +#RewriteCond %{SCRIPT_FILENAME} !-f +# +## Resolve .php file for extensionless php urls +#RewriteRule ^([^/.]+)$ $1.php [L] +# +#RewriteRule ^([^/.]+)\/$ $1.php [L] +# +#RewriteRule ^profile/([A-z0-9]+)\/?$ profile.php?username=$1 [NC] \ No newline at end of file -- 2.49.1 From f9c55323ad54047ab80381499fef430b3f49fd8b Mon Sep 17 00:00:00 2001 From: "K. Nobel" Date: Fri, 20 Jan 2017 14:09:04 +0100 Subject: [PATCH 164/400] Made friends and groups clickable. --- website/views/profile.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/website/views/profile.php b/website/views/profile.php index 6c273a6..47b880d 100644 --- a/website/views/profile.php +++ b/website/views/profile.php @@ -13,7 +13,7 @@

    fetch()) { - echo "${friend["username"]}"; + echo "${friend["username"]}"; } @@ -29,7 +29,7 @@

    fetch()) { - echo "${group["name"]}s logo"; + echo "${group["name"]}s logo"; } if($groups->rowCount() === 0) { -- 2.49.1 From 0e5f7dc9fb4e7581bef3d1f85ef1231ad9ad71c0 Mon Sep 17 00:00:00 2001 From: "K. Nobel" Date: Fri, 20 Jan 2017 14:10:32 +0100 Subject: [PATCH 165/400] Fixed no friends text and no groups text. --- website/views/profile.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/website/views/profile.php b/website/views/profile.php index 47b880d..83ac799 100644 --- a/website/views/profile.php +++ b/website/views/profile.php @@ -17,7 +17,7 @@ } - if($friends->rowCount() === 0) { + if($profile_friends->rowCount() === 0) { echo "

    Deze gebruiker heeft nog geen vrienden gemaakt.

    "; } ?> @@ -32,7 +32,7 @@ echo "${group["name"]}s logo"; } - if($groups->rowCount() === 0) { + if($profile_groups->rowCount() === 0) { echo "

    Deze gebruiker is nog geen lid van een groep.

    "; } ?> -- 2.49.1 From adb7f2f37db78f7099b3fedbcfe48d783c9c91a7 Mon Sep 17 00:00:00 2001 From: "K. Nobel" Date: Fri, 20 Jan 2017 14:31:49 +0100 Subject: [PATCH 166/400] Fixed .htaccess --- website/public/.htaccess | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/website/public/.htaccess b/website/public/.htaccess index 69fda24..5c0147b 100644 --- a/website/public/.htaccess +++ b/website/public/.htaccess @@ -1,14 +1,14 @@ -#Options +FollowSymLinks -#RewriteEngine On -# -#ErrorDocument 404 /error404.jpg -# -#RewriteCond %{SCRIPT_FILENAME} !-d -#RewriteCond %{SCRIPT_FILENAME} !-f -# -## Resolve .php file for extensionless php urls -#RewriteRule ^([^/.]+)$ $1.php [L] -# -#RewriteRule ^([^/.]+)\/$ $1.php [L] -# -#RewriteRule ^profile/([A-z0-9]+)\/?$ profile.php?username=$1 [NC] \ No newline at end of file +Options +FollowSymLinks +RewriteEngine On + +ErrorDocument 404 /error404.jpg + +RewriteCond %{SCRIPT_FILENAME} !-d +RewriteCond %{SCRIPT_FILENAME} !-f + +# Resolve .php file for extensionless php urls +RewriteRule ^([^/.]+)$ $1.php [L] + +RewriteRule ^([^/.]+)\/$ $1.php [L] + +RewriteRule ^profile/([A-z0-9]+)\/?$ profile.php?username=$1 [NC] \ No newline at end of file -- 2.49.1 From 6478ce920f56a1fe1b004b99ef253cdc6fe10a1e Mon Sep 17 00:00:00 2001 From: "K. Nobel" Date: Fri, 20 Jan 2017 14:40:21 +0100 Subject: [PATCH 167/400] Fixed .htaccess --- website/public/.htaccess | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/website/public/.htaccess b/website/public/.htaccess index 5c0147b..f08898a 100644 --- a/website/public/.htaccess +++ b/website/public/.htaccess @@ -9,6 +9,4 @@ RewriteCond %{SCRIPT_FILENAME} !-f # Resolve .php file for extensionless php urls RewriteRule ^([^/.]+)$ $1.php [L] -RewriteRule ^([^/.]+)\/$ $1.php [L] - -RewriteRule ^profile/([A-z0-9]+)\/?$ profile.php?username=$1 [NC] \ No newline at end of file +RewriteRule ^profile/([A-z0-9]+)$ profile.php?username=$1 [NC] \ No newline at end of file -- 2.49.1 From 42188609363a214a33a7df8a5bbd8c91a3e6334a Mon Sep 17 00:00:00 2001 From: Hendrik Date: Fri, 20 Jan 2017 14:43:04 +0100 Subject: [PATCH 168/400] remove testinput --- website/views/adminpanel.php | 6 ------ 1 file changed, 6 deletions(-) diff --git a/website/views/adminpanel.php b/website/views/adminpanel.php index fde8237..116512c 100644 --- a/website/views/adminpanel.php +++ b/website/views/adminpanel.php @@ -62,12 +62,6 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") { $listn = ($currentpage-1) * $perpage; $listm = $currentpage * $perpage; -function test_input($data) { - $data = trim($data); - $data = stripslashes($data); - $data = htmlspecialchars($data); - return $data; -} ?>
    -- 2.49.1 From ca28724274047a90649944303022a2d503cd45f7 Mon Sep 17 00:00:00 2001 From: "K. Nobel" Date: Fri, 20 Jan 2017 14:48:00 +0100 Subject: [PATCH 169/400] Fixed script tags and @import. Has to be absolute path in order to work with the .htaccess file. --- website/public/profile.php | 3 ++- website/views/head.php | 17 ++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/website/public/profile.php b/website/public/profile.php index 0fe2feb..6ede201 100644 --- a/website/public/profile.php +++ b/website/public/profile.php @@ -2,8 +2,9 @@ + diff --git a/website/views/head.php b/website/views/head.php index bb6eec4..4347650 100644 --- a/website/views/head.php +++ b/website/views/head.php @@ -1,17 +1,16 @@ MyHyvesbook+ - - - - + + + Date: Fri, 20 Jan 2017 14:55:47 +0100 Subject: [PATCH 170/400] Alpha 0.0.1 profile picture upload shizzle! --- website/public/settings.php | 3 ++- website/queries/settings.php | 28 +++++++++++++++++++++++++--- website/views/settings-view.php | 3 ++- 3 files changed, 29 insertions(+), 5 deletions(-) diff --git a/website/public/settings.php b/website/public/settings.php index 45e50d8..d52608b 100644 --- a/website/public/settings.php +++ b/website/public/settings.php @@ -22,12 +22,13 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") { $result = updateSettings(); break; case "password": - $result = updatePassword(); + $result = changePassword(); break; case "email": $result = changeEmail(); break; case "picture": + updateProfilePicture(); $result = $notImplemented; break; } diff --git a/website/queries/settings.php b/website/queries/settings.php index 7c92583..b85cae8 100644 --- a/website/queries/settings.php +++ b/website/queries/settings.php @@ -99,11 +99,11 @@ function updateSettings() { return new settingsMessage("happy", "Instellingen zijn opgeslagen."); } -function updatePassword() { +function changePassword() { $user = getPasswordHash(); if (password_verify($_POST["password-old"], $user["password"])) { if ($_POST["password-new"] == $_POST["password-confirm"] && (strlen($_POST["password-new"]) >= 8)) { - if (changePassword()) { + if (doChangePassword()) { return new settingsMessage("happy", "Wachtwoord gewijzigd."); } else { return new settingsMessage("angry", "Er is iets mis gegaan."); @@ -116,7 +116,7 @@ function updatePassword() { } } -function changePassword() { +function doChangePassword() { $stmt = $GLOBALS["db"]->prepare(" UPDATE `user` @@ -184,4 +184,26 @@ function doChangeEmail($email) { $stmt->bindParam(":userID", $_SESSION["userID"]); $stmt->execute(); return $stmt->rowCount(); +} + +function updateProfilePicture() { + $profilePictureDir = "/var/www/html/public/"; + $relativePath = "uploads/" . $_SESSION["userID"] . "_" . basename($_FILES["pp"]["name"]); + move_uploaded_file($_FILES['pp']['tmp_name'], $profilePictureDir . $relativePath); + setProfilePictureToDatabase("../" . $relativePath); +} + +function setProfilePictureToDatabase($url) { + $stmt = $GLOBALS["db"]->prepare(" + UPDATE + `user` + SET + `profilepicture` = :profilepicture + WHERE + `userID` = :userID + "); + + $stmt->bindParam(":profilepicture", $url); + $stmt->bindParam(":userID", $_SESSION["userID"]); + $stmt->execute(); } \ No newline at end of file diff --git a/website/views/settings-view.php b/website/views/settings-view.php index 6d9d660..f6c4e07 100644 --- a/website/views/settings-view.php +++ b/website/views/settings-view.php @@ -1,5 +1,6 @@
    @@ -68,7 +69,7 @@ $settings = getSettings();
    • -
    +
    Verander profielfoto
    • -- 2.49.1 From e547712b2a6020aaee8cb59ee4795287f82dfa74 Mon Sep 17 00:00:00 2001 From: "K. Nobel" Date: Fri, 20 Jan 2017 15:02:05 +0100 Subject: [PATCH 171/400] Changed links to absolute path. --- website/views/adminpanel.php | 2 +- website/views/header.php | 12 ++++++------ website/views/login-view.php | 4 ++-- website/views/login_head.php | 6 +++--- website/views/menu.php | 2 +- website/views/profile.php | 2 +- website/views/register-view.php | 2 +- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/website/views/adminpanel.php b/website/views/adminpanel.php index fde8237..e8efe6f 100644 --- a/website/views/adminpanel.php +++ b/website/views/adminpanel.php @@ -3,7 +3,7 @@ Admin Panel - +
      diff --git a/website/views/login-view.php b/website/views/login-view.php index 33fa7e9..7a023f0 100644 --- a/website/views/login-view.php +++ b/website/views/login-view.php @@ -1,6 +1,6 @@
      MyHyvesbook+
      @@ -46,6 +46,6 @@
      diff --git a/website/views/login_head.php b/website/views/login_head.php index a41e87e..645f919 100644 --- a/website/views/login_head.php +++ b/website/views/login_head.php @@ -3,9 +3,9 @@ MyHyvesbook+ + href="/styles/main.css"> - + href="/styles/index.css"> + diff --git a/website/views/menu.php b/website/views/menu.php index 88ae076..c6b030a 100644 --- a/website/views/menu.php +++ b/website/views/menu.php @@ -51,7 +51,7 @@ echo "
    • -
      +
      - - -- 2.49.1 From e7d63c2f572a79d6a2250e2f3ae23a57f6e370fc Mon Sep 17 00:00:00 2001 From: "K. Nobel" Date: Fri, 20 Jan 2017 15:34:01 +0100 Subject: [PATCH 173/400] Changed how name is displayed on profile page. --- website/public/styles/profile.css | 23 ++++------------------- website/views/profile.php | 7 ++++--- 2 files changed, 8 insertions(+), 22 deletions(-) diff --git a/website/public/styles/profile.css b/website/public/styles/profile.css index af1ed58..7437e4c 100644 --- a/website/public/styles/profile.css +++ b/website/public/styles/profile.css @@ -10,9 +10,12 @@ margin: 0 20px 20px 0; } -.profile-box .profile-username { +.profile-box h1.profile-username { padding-top: 50px; } +.profile-box h5.profile-username { + padding-top: 0; +} div.posts { padding-top: 20px; @@ -37,24 +40,6 @@ div.posts .post p.subscript { font-size: 8pt; } -/*.posts {*/ - /*z-index: -1;*/ - /*margin-right: 0;*/ - /*width: calc(100% + 15px);*/ -/*}*/ - -/*.post-box {*/ - /*display: inline-flex;*/ - /*margin: 20px 15px 0 0;*/ - /*padding: 25px;*/ - /*background-color: #FFFFFF;*/ -/*}*/ - -/*!* fullscreen *!*/ -/*.post-box {*/ - /*width: calc(25% - 69px);*/ -/*}*/ - @media only screen and (max-width: 1500px) { .post-box { width: calc(50% - 68px); diff --git a/website/views/profile.php b/website/views/profile.php index f8cdadd..1457dee 100644 --- a/website/views/profile.php +++ b/website/views/profile.php @@ -4,7 +4,8 @@

      Als vriend toevoegen

      -

      ()

      +

      +

      @@ -13,7 +14,7 @@

      fetch()) { - echo "${friend["username"]}"; + echo "${friend["username"]}"; } @@ -29,7 +30,7 @@

      fetch()) { - echo "${group["name"]}s logo"; + echo "${group["name"]}s logo"; } if($profile_groups->rowCount() === 0) { -- 2.49.1 From 587d0e6ac351787fe1d944b06c6a05b42e1952f1 Mon Sep 17 00:00:00 2001 From: Marijn Jansen Date: Fri, 20 Jan 2017 15:41:13 +0100 Subject: [PATCH 174/400] fixed crosssitescripting on settings pagw --- website/queries/settings.php | 8 ++++---- website/views/settings-view.php | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/website/queries/settings.php b/website/queries/settings.php index b85cae8..7d3bf9c 100644 --- a/website/queries/settings.php +++ b/website/queries/settings.php @@ -87,11 +87,11 @@ function updateSettings() { `userID` = :userID "); - $stmt->bindParam(":fname", $_POST["fname"]); - $stmt->bindParam(":lname", $_POST["lname"]); - $stmt->bindParam(":location", $_POST["location"]); + $stmt->bindParam(":fname", test_input($_POST["fname"])); + $stmt->bindParam(":lname", test_input($_POST["lname"])); + $stmt->bindParam(":location", test_input($_POST["location"])); $stmt->bindParam(":bday", $_POST["bday"]); - $stmt->bindParam(":bio", $_POST["bio"]); + $stmt->bindParam(":bio", test_input($_POST["bio"])); $stmt->bindParam(":userID", $_SESSION["userID"]); $stmt->execute(); diff --git a/website/views/settings-view.php b/website/views/settings-view.php index f6c4e07..1fa5278 100644 --- a/website/views/settings-view.php +++ b/website/views/settings-view.php @@ -1,6 +1,5 @@

      -- 2.49.1 From e17a55e82dff94723917a2393698892134aab18e Mon Sep 17 00:00:00 2001 From: Joey Lai Date: Fri, 20 Jan 2017 16:01:08 +0100 Subject: [PATCH 175/400] Fixed redirect to profile page after going back 1 page --- website/public/js/registerAndLogin.js | 8 ++++++++ website/public/login.php | 13 +------------ website/public/register.php | 6 ++++-- website/views/login_head.php | 1 + 4 files changed, 14 insertions(+), 14 deletions(-) create mode 100644 website/public/js/registerAndLogin.js diff --git a/website/public/js/registerAndLogin.js b/website/public/js/registerAndLogin.js new file mode 100644 index 0000000..8428440 --- /dev/null +++ b/website/public/js/registerAndLogin.js @@ -0,0 +1,8 @@ +function checkLoggedIn() { + if (confirm("You are already logged in!\nDo you want to logout?\nPress ok to logout.") == true) { + window.location.href = "logout.php"; + } else { + window.history.back(); + } + document.getElementById("demo").innerHTML = x; +} diff --git a/website/public/login.php b/website/public/login.php index b3da203..0d07413 100644 --- a/website/public/login.php +++ b/website/public/login.php @@ -4,20 +4,9 @@ include("../views/login_head.php"); require_once("../queries/connect.php"); include_once("../queries/login.php"); - include_once("../queries/checkInput.php") + include_once("../queries/checkInput.php"); ?> - - + -- 2.49.1 From 6ff70440e67ad96ef71867ef26ca1a1f3f90135c Mon Sep 17 00:00:00 2001 From: Joey Lai Date: Fri, 20 Jan 2017 16:14:32 +0100 Subject: [PATCH 176/400] history back -> profile.php --- website/public/js/registerAndLogin.js | 2 +- website/public/register.php | 2 +- website/views/login_head.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/website/public/js/registerAndLogin.js b/website/public/js/registerAndLogin.js index 8428440..0452d15 100644 --- a/website/public/js/registerAndLogin.js +++ b/website/public/js/registerAndLogin.js @@ -2,7 +2,7 @@ function checkLoggedIn() { if (confirm("You are already logged in!\nDo you want to logout?\nPress ok to logout.") == true) { window.location.href = "logout.php"; } else { - window.history.back(); + window.location.href = "profile.php"; } document.getElementById("demo").innerHTML = x; } diff --git a/website/public/register.php b/website/public/register.php index ec1f879..8c0f8e4 100644 --- a/website/public/register.php +++ b/website/public/register.php @@ -29,7 +29,7 @@ } else { $bday = test_input($_POST["bday"]); } -g + checkInputChoice("username", "username"); checkInputChoice("password", "longerEight"); checkInputChoice("confirmpassword", ""); diff --git a/website/views/login_head.php b/website/views/login_head.php index 7f1771a..05c9e38 100644 --- a/website/views/login_head.php +++ b/website/views/login_head.php @@ -7,6 +7,6 @@ - + -- 2.49.1 From 173ef3e50c2feceb27e715fddbfc33aac08ff5db Mon Sep 17 00:00:00 2001 From: Lars van Hijfte Date: Fri, 20 Jan 2017 16:17:56 +0100 Subject: [PATCH 177/400] Added a notification bar --- website/public/js/header.js | 24 ++++++++++++++++++++++-- website/public/styles/header.css | 22 +--------------------- website/public/styles/menu.css | 17 +++++++++++++++++ website/queries/friendship.php | 3 ++- website/views/header.php | 9 +++------ website/views/notification-center.php | 11 +++++++++++ 6 files changed, 56 insertions(+), 30 deletions(-) create mode 100644 website/views/notification-center.php diff --git a/website/public/js/header.js b/website/public/js/header.js index 797c56c..ceb6086 100644 --- a/website/public/js/header.js +++ b/website/public/js/header.js @@ -1,7 +1,27 @@ $(document).ready(function() { + // Hide notification center. $("#profile-menu-popup").hide(); + + // $("#own-profile-picture").click(function() { + // $("#profile-menu-popup").toggle(); + // $("#profile-hello-popup").toggle(); + // }); + $("#own-profile-picture").click(function() { - $("#profile-menu-popup").toggle(); - $("#profile-hello-popup").toggle(); + if($("#notification-center").css('right') == "-256px") { + // $(".content").animate({ + // marginRight: "256px" + // }, 500); + $("#notification-center").animate({ + right: "0px" + }, 500); + } else { + // $(".content").animate({ + // marginRight: "0px" + // }, 500); + $("#notification-center").animate({ + right: "-256px" + }, 500); + } }); }); diff --git a/website/public/styles/header.css b/website/public/styles/header.css index 84f308c..ddefdec 100644 --- a/website/public/styles/header.css +++ b/website/public/styles/header.css @@ -33,32 +33,12 @@ header { header div { display: inline-block; } - -#open-chat { - font-size: 32px; - line-height: 80px; - margin-right: 50px; -} - -.profile-menu { - font-size: 21px; -} - .profile-menu img { padding: 8px; height: 64px; width: 64px; } -#own-profile-picture, #profile-menu-popup span { +#own-profile-picture { cursor: pointer; } - -#profile-menu-popup { - padding: 5px; - - background: white; - color: #666; - - border-radius: 3px; -} diff --git a/website/public/styles/menu.css b/website/public/styles/menu.css index 4d4b8bb..b9e3904 100644 --- a/website/public/styles/menu.css +++ b/website/public/styles/menu.css @@ -42,4 +42,21 @@ height: 100%; padding: 0; text-align: left; +} + +#notification-center { + left: auto; + width: 256px; + right: -256px; +} + +#quick-links { + text-align: center; + box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24); +} + +#quick-links i { + color: #845663; + font-size: 42px; + padding: 7px; } \ No newline at end of file diff --git a/website/queries/friendship.php b/website/queries/friendship.php index 258699f..df6a917 100644 --- a/website/queries/friendship.php +++ b/website/queries/friendship.php @@ -15,13 +15,14 @@ function selectAllFriends($userID) { `user` INNER JOIN `friendship` + WHERE (`friendship`.`user1ID` = :userID AND `friendship`.`user2ID` = `user`.`userID` OR `friendship`.`user2ID` = :userID AND `friendship`.`user1ID` = `user`.`userID`) AND `role` != 5 AND - `status` = 1 + `status` = 1 "); $stmt->bindParam(':userID', $userID, PDO::PARAM_INT); diff --git a/website/views/header.php b/website/views/header.php index a58e5f0..2d65291 100644 --- a/website/views/header.php +++ b/website/views/header.php @@ -19,11 +19,6 @@ $userinfo = getHeaderInfo();
      -
      - | - | - -
      Hallo @@ -32,5 +27,7 @@ $userinfo = getHeaderInfo();
      "/>
      -
      + + + diff --git a/website/views/notification-center.php b/website/views/notification-center.php new file mode 100644 index 0000000..f4b4b5d --- /dev/null +++ b/website/views/notification-center.php @@ -0,0 +1,11 @@ + \ No newline at end of file -- 2.49.1 From 9152ae4f75b17fd7903ba10624f54560f337a637 Mon Sep 17 00:00:00 2001 From: Hendrik Date: Fri, 20 Jan 2017 16:18:09 +0100 Subject: [PATCH 178/400] add searching users, searching groups, remembering search options --- website/public/search.php | 6 +- website/public/styles/search.css | 5 ++ website/queries/group_page.php | 23 +++++- website/queries/user.php | 35 ++++++++- website/views/search-view.php | 120 +++++++++++++++++++------------ 5 files changed, 137 insertions(+), 52 deletions(-) diff --git a/website/public/search.php b/website/public/search.php index c314791..6cfadd8 100644 --- a/website/public/search.php +++ b/website/public/search.php @@ -1,7 +1,11 @@ - + diff --git a/website/public/styles/search.css b/website/public/styles/search.css index 4b2281c..b54723d 100644 --- a/website/public/styles/search.css +++ b/website/public/styles/search.css @@ -9,4 +9,9 @@ #search-friends-output { margin-right: 10px; +} + +.searchleft, .searchright { + display: inline-block; + vertical-align: top; } \ No newline at end of file diff --git a/website/queries/group_page.php b/website/queries/group_page.php index ef7af07..d704e8c 100644 --- a/website/queries/group_page.php +++ b/website/queries/group_page.php @@ -172,5 +172,26 @@ function changeMultipleGroupStatusByID($ids, $status) { return $q; } +function searchSomeGroups($n, $m, $search) { + $stmt = $GLOBALS["db"]->prepare(" + SELECT + `name`, + `picture` + FROM + `group_page` + WHERE + `name` LIKE :keyword + ORDER BY + `name` + LIMIT + :n, :m + "); -?> + $search = "%$search%"; + $stmt->bindParam(':keyword', $search); + $stmt->bindParam(':n', $n, PDO::PARAM_INT); + $stmt->bindParam(':m', $m, PDO::PARAM_INT); + $stmt->execute(); + return $stmt; +} +?> \ No newline at end of file diff --git a/website/queries/user.php b/website/queries/user.php index 398e2e4..114d673 100644 --- a/website/queries/user.php +++ b/website/queries/user.php @@ -252,12 +252,12 @@ function selectRandomNotFriendUser($userID) { FROM `user` WHERE - `userID` NOT IN (SELECT + `userID` NOT IN (SELECT `user1ID` FROM `friendship` WHERE `user1ID` = :userID) OR - `userID` NOT IN (SELECT + `userID` NOT IN (SELECT `user2ID` FROM `friendship` @@ -271,4 +271,33 @@ function selectRandomNotFriendUser($userID) { $stmt->bindParam(':userID', $userID, PDO::PARAM_INT); $stmt->execute(); return $stmt->fetch(); -} \ No newline at end of file +} + +function searchSomeUsers($n, $m, $search) { + $stmt = $GLOBALS["db"]->prepare(" + SELECT + `username`, + `profilepicture`, + `fname`, + `lname` + FROM + `user` + WHERE + `username` LIKE :keyword OR + `fname` LIKE :keyword OR + `lname` LIKE :keyword + ORDER BY + `fname`, + `lname`, + `username` + LIMIT + :n, :m + "); + + $search = "%$search%"; + $stmt->bindParam(':keyword', $search); + $stmt->bindParam(':n', $n, PDO::PARAM_INT); + $stmt->bindParam(':m', $m, PDO::PARAM_INT); + $stmt->execute(); + return $stmt; +} diff --git a/website/views/search-view.php b/website/views/search-view.php index b1418d1..0d650d4 100644 --- a/website/views/search-view.php +++ b/website/views/search-view.php @@ -1,3 +1,16 @@ + +
      @@ -7,72 +20,85 @@ + value= + >
      -
      +

      Gebruikers

      -
      - \ No newline at end of file +
      -- 2.49.1 From 18185020c3b4a389d623042050a8edafe622dc6a Mon Sep 17 00:00:00 2001 From: "K. Nobel" Date: Fri, 20 Jan 2017 16:18:12 +0100 Subject: [PATCH 179/400] Added improvements to profile page. --- website/public/styles/profile.css | 21 +++++++++++++-------- website/views/profile.php | 12 ++++++++++++ 2 files changed, 25 insertions(+), 8 deletions(-) diff --git a/website/public/styles/profile.css b/website/public/styles/profile.css index 7437e4c..9c07242 100644 --- a/website/public/styles/profile.css +++ b/website/public/styles/profile.css @@ -40,6 +40,19 @@ div.posts .post p.subscript { font-size: 8pt; } +div.posts .post form input, div.posts .post form textarea { + width: calc(100% - 15px); +} + +div.posts .post form input[type="submit"] { + width: 100%; +} + +div.posts .post form textarea.newpost { + margin: 15px 0 15px 0; + height: 100px; +} + @media only screen and (max-width: 1500px) { .post-box { width: calc(50% - 68px); @@ -53,14 +66,6 @@ div.posts .post p.subscript { } } -.post { - width: 100%; -} - -.post img { - width: 100%; -} - .post .post-date { float: right; color: #aaaaaa; diff --git a/website/views/profile.php b/website/views/profile.php index 1457dee..19bd908 100644 --- a/website/views/profile.php +++ b/website/views/profile.php @@ -42,6 +42,18 @@
      +
      +
      + + + +
      +
      + fetch()) { $nicetime = nicetime($post["creationdate"]); echo " -- 2.49.1 From ac96200d1642a663c61545de841af182285d9981 Mon Sep 17 00:00:00 2001 From: Marijn Jansen Date: Fri, 20 Jan 2017 16:20:34 +0100 Subject: [PATCH 180/400] Kind of works now: Profile update --- website/public/settings.php | 2 +- website/queries/settings.php | 12 +++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/website/public/settings.php b/website/public/settings.php index d52608b..06d17c0 100644 --- a/website/public/settings.php +++ b/website/public/settings.php @@ -29,7 +29,7 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") { break; case "picture": updateProfilePicture(); - $result = $notImplemented; + $result = new settingsMessage("happy", "Deze melding doet nog niks nuttigs."); break; } } diff --git a/website/queries/settings.php b/website/queries/settings.php index 7d3bf9c..0e6dff2 100644 --- a/website/queries/settings.php +++ b/website/queries/settings.php @@ -188,22 +188,28 @@ function doChangeEmail($email) { function updateProfilePicture() { $profilePictureDir = "/var/www/html/public/"; - $relativePath = "uploads/" . $_SESSION["userID"] . "_" . basename($_FILES["pp"]["name"]); + $relativePath = "uploads/profilepictures/" . $_SESSION["userID"] . "_" . basename($_FILES["pp"]["name"]); +// removeOldProfilePicture(); move_uploaded_file($_FILES['pp']['tmp_name'], $profilePictureDir . $relativePath); setProfilePictureToDatabase("../" . $relativePath); } +//function removeOldProfilePicture() { +// +// unlink("/var/www/html/public/uploads/profilepictures/" . $_SESSION["userID"] . "_*"); +//} + function setProfilePictureToDatabase($url) { $stmt = $GLOBALS["db"]->prepare(" UPDATE `user` SET - `profilepicture` = :profilepicture + `profilepicture` = :profilePicture WHERE `userID` = :userID "); - $stmt->bindParam(":profilepicture", $url); + $stmt->bindParam(":profilePicture", $url); $stmt->bindParam(":userID", $_SESSION["userID"]); $stmt->execute(); } \ No newline at end of file -- 2.49.1 From 2a44057233f4abb86eec42c419e566adcb5e7d2d Mon Sep 17 00:00:00 2001 From: Marijn Jansen Date: Sun, 22 Jan 2017 11:23:13 +0100 Subject: [PATCH 181/400] Changed binParam for bindValue --- website/queries/settings.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/website/queries/settings.php b/website/queries/settings.php index 0e6dff2..f4c7011 100644 --- a/website/queries/settings.php +++ b/website/queries/settings.php @@ -87,12 +87,12 @@ function updateSettings() { `userID` = :userID "); - $stmt->bindParam(":fname", test_input($_POST["fname"])); - $stmt->bindParam(":lname", test_input($_POST["lname"])); - $stmt->bindParam(":location", test_input($_POST["location"])); - $stmt->bindParam(":bday", $_POST["bday"]); - $stmt->bindParam(":bio", test_input($_POST["bio"])); - $stmt->bindParam(":userID", $_SESSION["userID"]); + $stmt->bindValue(":fname", test_input($_POST["fname"])); + $stmt->bindValue(":lname", test_input($_POST["lname"])); + $stmt->bindValue(":location", test_input($_POST["location"])); + $stmt->bindValue(":bday", $_POST["bday"]); + $stmt->bindValue(":bio", test_input($_POST["bio"])); + $stmt->bindValue(":userID", $_SESSION["userID"]); $stmt->execute(); -- 2.49.1 From 93b6835ea4400193d9a8fe98ecbafb7018ab4697 Mon Sep 17 00:00:00 2001 From: Lars van Hijfte Date: Mon, 23 Jan 2017 11:33:27 +0100 Subject: [PATCH 182/400] Changed style and added friendrequests --- website/public/API/loadMessages.php | 1 + website/public/API/loadNotifications.php | 8 +++ website/public/js/notifications.js | 34 ++++++++++++ website/public/profile.php | 2 +- website/public/styles/adminpanel.css | 4 +- website/public/styles/chat.css | 2 +- website/public/styles/header.css | 8 ++- website/public/styles/index.css | 2 +- website/public/styles/main.css | 71 +++++++++++++++++------- website/public/styles/menu.css | 12 +++- website/public/styles/profile.css | 16 +++++- website/queries/friendship.php | 33 ++++++++++- website/views/head.php | 17 +++--- website/views/header.php | 2 +- website/views/menu.php | 6 +- website/views/notification-center.php | 7 ++- 16 files changed, 178 insertions(+), 47 deletions(-) create mode 100644 website/public/API/loadNotifications.php create mode 100644 website/public/js/notifications.js diff --git a/website/public/API/loadMessages.php b/website/public/API/loadMessages.php index 1c6b942..e30acc8 100644 --- a/website/public/API/loadMessages.php +++ b/website/public/API/loadMessages.php @@ -1,6 +1,7 @@ \ +
      \ + \ +
      \ +
      • \ + "); + } +} + +function loadNotifications() { + $.post( + "API/loadNotifications.php" + ).done(function(data) { + if (data && data != "[]") { + showNotifications(JSON.parse(data), "friendrequestslist"); + } + }); + + setTimeout(loadNotifications, 10000); +} + +loadNotifications(); + diff --git a/website/public/profile.php b/website/public/profile.php index 6ede201..e4f1452 100644 --- a/website/public/profile.php +++ b/website/public/profile.php @@ -4,7 +4,7 @@ diff --git a/website/public/styles/adminpanel.css b/website/public/styles/adminpanel.css index b226cd3..4c5356f 100644 --- a/website/public/styles/adminpanel.css +++ b/website/public/styles/adminpanel.css @@ -6,7 +6,7 @@ .admin-title { margin: 10px; padding-bottom: 5px; - border-bottom: 4px solid #845663; + border-bottom: 4px solid #FBC02D; } .admin-panel input[type="radio"], input[type="checkbox"] { @@ -18,7 +18,7 @@ padding: 8px; vertical-align: top; border-radius: 10px; - border: 4px solid #845663; + border: 4px solid #FBC02D; box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24); } diff --git a/website/public/styles/chat.css b/website/public/styles/chat.css index e2fa7c9..f6060dd 100644 --- a/website/public/styles/chat.css +++ b/website/public/styles/chat.css @@ -83,7 +83,7 @@ .chat-field input[type="submit"] { width: auto; float: right; - background-color: #845663; + background-color: #FBC02D; color: white; padding: 5px 10px; border-radius: 0 10px 10px 0; diff --git a/website/public/styles/header.css b/website/public/styles/header.css index ddefdec..e39f204 100644 --- a/website/public/styles/header.css +++ b/website/public/styles/header.css @@ -8,21 +8,23 @@ header { width: 100%; color: white; - background-color: rgba(132,86,99, 0.98); + background-color: #FBC02D; box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24); } +#header-logo { + padding-left: 42px; +} #header-logo, #header-logo img { height: 80px; vertical-align: middle; line-height: 80px; - padding-left: 5px; } #header-search { - padding-left: 48px; + padding-left: 42px; } diff --git a/website/public/styles/index.css b/website/public/styles/index.css index 4b55904..6c12823 100644 --- a/website/public/styles/index.css +++ b/website/public/styles/index.css @@ -19,7 +19,7 @@ body { background-size: cover; background-attachment: fixed;*/ - /*background-color: #B78996;*/ + /*background-color: #EEE;*/ color: #333; font-family: Arial, sans-serif; } diff --git a/website/public/styles/main.css b/website/public/styles/main.css index 014d05b..062d5d9 100644 --- a/website/public/styles/main.css +++ b/website/public/styles/main.css @@ -18,7 +18,7 @@ html { body { height: 100%; - background-color: #B78996; + background-color: #EEE; color: #333; font-family: Arial, sans-serif; } @@ -37,11 +37,12 @@ h3 { } h4 { - font-size: 1.6em; + font-size: 1.2em; } h5 { - font-size: 1.4em; + font-size: 1.0em; + color: #666; } ul { @@ -54,12 +55,12 @@ p { /* Selection colors */ ::selection { - background: #845663; + background: #FBC02D; color: white; } ::-moz-selection { - background: #845663; + background: #FBC02D; color: white; } @@ -75,7 +76,7 @@ p { .platform { padding: 20px; margin-bottom: 10px; - border-radius: 10px; + border-radius: 5px; background-color: #FFFFFF; box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24); } @@ -143,7 +144,7 @@ button, input, select { cursor: pointer; border: none; font-size: 16px; - border-radius: 7px; + transition-duration: 250ms; } /* All textinput and sections */ @@ -151,19 +152,53 @@ textarea, input, select { padding: 0 5px; background: white; color: #333333; - border: 1px solid #845663; - border-radius: 7px; + border-radius: 5px; + border-bottom: 1px solid #4CAF50; font-size: 16px; + outline: none; + transition-duration: 250ms; +} + +textarea { + padding: 5px; + resize: none; +} + +textarea:hover, input:hover, select:hover { + border-radius: 10px; +} + +textarea:focus, input:focus, select:focus { + border-radius: 10px; + box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24); } /* All buttons */ button, input[type="submit"], input[type="reset"] { - background-color: #845663; + background-color: #FBC02D; color: white; padding: 0 10px; border: none; + border-radius: 5px; +} + +button:focus, +input[type="submit"]:focus, +input[type="reset"]:focus { + outline: none; +} + +button:active, +input[type="submit"]:active, +input[type="reset"]:active { + outline: none; + box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24) +} + +input[type="radio"] { + border-radius: 100%; } /* Tables */ @@ -190,19 +225,17 @@ img[data-title]:hover:after, span[data-title]:hover:after, div[data-title]:hover:after { content: attr(data-title); - padding: 4px 4px; + padding: 7px 7px; color: #FFFFFF; position: absolute; left: 0; - top: 100%; - z-index: 20; + top: 150%; + z-index: 200; white-space: nowrap; - -moz-border-radius: 5px; - -webkit-border-radius: 5px; - border-radius: 5px; - -moz-box-shadow: 0 0 4px #222; - -webkit-box-shadow: 0 0 4px #222; - box-shadow: 0 0 4px #222; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; + box-shadow: 0 14px 28px rgba(0,0,0,0.25), 0 10px 10px rgba(0,0,0,0.22); background-color: #333; font-size: 15px; line-height: normal; diff --git a/website/public/styles/menu.css b/website/public/styles/menu.css index b9e3904..69aa8a9 100644 --- a/website/public/styles/menu.css +++ b/website/public/styles/menu.css @@ -1,6 +1,7 @@ .menu { position: fixed; z-index: 50; + overflow-y: auto; left: 0; top: 80px; @@ -11,6 +12,10 @@ box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24); } +.menu section { + box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24); +} + .menu h4 { padding: 10px; } @@ -26,12 +31,13 @@ cursor: pointer; } -.friend-item { +.friend-item, .group-item { cursor: pointer; + transition-duration: 250ms; } .friend-item:hover, .group-item:hover { - background: #845663; + background: #FBC02D; color: white; } @@ -56,7 +62,7 @@ } #quick-links i { - color: #845663; + color: #4CAF50; font-size: 42px; padding: 7px; } \ No newline at end of file diff --git a/website/public/styles/profile.css b/website/public/styles/profile.css index 9c07242..f5dd6b1 100644 --- a/website/public/styles/profile.css +++ b/website/public/styles/profile.css @@ -14,7 +14,7 @@ padding-top: 50px; } .profile-box h5.profile-username { - padding-top: 0; + padding: 0 0 10px 0; } div.posts { @@ -28,6 +28,15 @@ div.posts div.post { margin: 20px 0 0 0; padding: 10px; width: calc(100% - 40px); + cursor: pointer; + transition-duration: 250ms; +} + +div.posts div.post:hover { + /*margin: 15px 0 0 -5px;*/ + /*padding: 15px;*/ + /*z-index: 20;*/ + box-shadow: 0 10px 20px rgba(0,0,0,0.19), 0 6px 6px rgba(0,0,0,0.23); } div.posts div.post img { @@ -76,11 +85,12 @@ div.posts .post form textarea.newpost { float: right; padding: 10px; border-radius: 5px; - background-color: #845663; + background-color: #4CAF50; color: #FFFFFF; transition-duration: 250ms; + cursor: pointer; } .profile-button:hover { - background-color: #B78996; + box-shadow: 0 10px 20px rgba(0,0,0,0.19), 0 6px 6px rgba(0,0,0,0.23); } \ No newline at end of file diff --git a/website/queries/friendship.php b/website/queries/friendship.php index df6a917..0deba63 100644 --- a/website/queries/friendship.php +++ b/website/queries/friendship.php @@ -22,11 +22,42 @@ function selectAllFriends($userID) { `friendship`.`user2ID` = :userID AND `friendship`.`user1ID` = `user`.`userID`) AND `role` != 5 AND - `status` = 1 + `status` = 1 "); $stmt->bindParam(':userID', $userID, PDO::PARAM_INT); $stmt->execute(); return $stmt; +} + +function selectAllFriendRequests() { + $stmt = $GLOBALS["db"]->prepare(" + SELECT + `userID`, + `username`, + IFNULL( + `profilepicture`, + '../img/notbad.jpg' + ) AS profilepicture, + `onlinestatus`, + `role` + FROM + `user` + INNER JOIN + `friendship` + + WHERE + (`friendship`.`user1ID` = :userID AND + `friendship`.`user2ID` = `user`.`userID` OR + `friendship`.`user2ID` = :userID AND + `friendship`.`user1ID` = `user`.`userID`) AND + `role` != 5 AND + `status` = 0 + "); + + $stmt->bindParam(':userID', $_SESSION["userID"], PDO::PARAM_INT); + $stmt->execute(); + + return json_encode($stmt->fetchAll()); } \ No newline at end of file diff --git a/website/views/head.php b/website/views/head.php index 4347650..044ac83 100644 --- a/website/views/head.php +++ b/website/views/head.php @@ -1,16 +1,17 @@ MyHyvesbook+ - - - + + + + MyHyvesbook+
    -
    +
    diff --git a/website/views/menu.php b/website/views/menu.php index a150848..b7651bd 100644 --- a/website/views/menu.php +++ b/website/views/menu.php @@ -1,5 +1,5 @@
    -
    - | - | - -
    Hallo @@ -32,5 +28,4 @@ $userinfo = getHeaderInfo();
    "/>
    -
    -- 2.49.1 From 7eec0cfa2ae345846e0556855d295fbe606c17c5 Mon Sep 17 00:00:00 2001 From: Lars van Hijfte Date: Mon, 23 Jan 2017 17:22:22 +0100 Subject: [PATCH 192/400] Begin chat change --- website/public/js/header.js | 8 -------- website/public/styles/chat.css | 10 ++++++---- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/website/public/js/header.js b/website/public/js/header.js index 093cc91..a0052c3 100644 --- a/website/public/js/header.js +++ b/website/public/js/header.js @@ -1,12 +1,4 @@ $(document).ready(function() { - // Hide notification center. - $("#profile-menu-popup").hide(); - - // $("#own-profile-picture").click(function() { - // $("#profile-menu-popup").toggle(); - // $("#profile-hello-popup").toggle(); - // }); - $("#own-profile-picture").click(function() { if($("#notification-center").css('right') == "-256px") { $(".content").animate({ diff --git a/website/public/styles/chat.css b/website/public/styles/chat.css index f6060dd..c7d0235 100644 --- a/website/public/styles/chat.css +++ b/website/public/styles/chat.css @@ -25,6 +25,7 @@ /* Chat history. */ .chat-history { overflow-y: auto; + overflow-x: hidden; height: 100%; padding: 10px; } @@ -46,14 +47,15 @@ .chat-message-self { float: right; margin-right: 10px; - background-color: darkgreen; + background-color: #FBC02D; color: white; } .chat-message-other { float: left; margin-left: 10px; - background-color: aquamarine; + background-color: #4CAF50; + color: white; } /* Chat reply field */ @@ -91,6 +93,6 @@ } .active-friend-chat { - background: aquamarine; - color: #333; + background: #4CAF50; + color: white; } \ No newline at end of file -- 2.49.1 From c4e4508b53d8e10687597cb083190149cea375f2 Mon Sep 17 00:00:00 2001 From: Lars van Hijfte Date: Tue, 24 Jan 2017 10:19:13 +0100 Subject: [PATCH 193/400] Changed admin layout and fixed for enums --- website/public/js/admin.js | 2 +- website/public/js/header.js | 6 +- website/public/styles/adminpanel.css | 66 ++-------- website/public/styles/chat.css | 8 +- website/public/styles/header.css | 4 +- website/views/adminpanel.php | 190 ++++++++++++--------------- 6 files changed, 109 insertions(+), 167 deletions(-) diff --git a/website/public/js/admin.js b/website/public/js/admin.js index 2055123..e3dfdd7 100644 --- a/website/public/js/admin.js +++ b/website/public/js/admin.js @@ -28,7 +28,7 @@ function checkCheckAll(allbox) { } function changeFilter() { - if (document.getElementById('group').checked) { + if ($('#pagetype').find(":selected").val() == "group") { document.getElementById('admin-filter').style.display = 'none'; document.getElementById('admin-groupfilter').style.display = 'inline-block'; diff --git a/website/public/js/header.js b/website/public/js/header.js index 23e4f0f..8d91d95 100644 --- a/website/public/js/header.js +++ b/website/public/js/header.js @@ -5,14 +5,14 @@ $(document).ready(function() { marginRight: "256px" }, 500); $(".chat-right").animate({ - width: "calc(100% - 512px - 40px)" + width: $(".chat-right").width() - 266 }, 500); $("#notification-center").animate({ right: "0px" }, 500); } else { $(".chat-right").animate({ - width: "calc(100% - 256px - 40px)" + width: $(".chat-right").width() + 266 }, 500); $(".content").animate({ marginRight: "0px" @@ -22,6 +22,4 @@ $(document).ready(function() { }, 500); } }); - - $("#own-profile-picture").click(); }); diff --git a/website/public/styles/adminpanel.css b/website/public/styles/adminpanel.css index 4c5356f..f9410e1 100644 --- a/website/public/styles/adminpanel.css +++ b/website/public/styles/adminpanel.css @@ -1,71 +1,33 @@ .admin-panel { - margin: auto; min-width: 800px; } -.admin-title { - margin: 10px; - padding-bottom: 5px; - border-bottom: 4px solid #FBC02D; -} - .admin-panel input[type="radio"], input[type="checkbox"] { + vertical-align: middle; height: auto; -} - -.admin-batchactions, .admin-groupbatchactions { - display: inline-block; - padding: 8px; - vertical-align: top; - border-radius: 10px; - border: 4px solid #FBC02D; - box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24); + margin: 2px; } .admin-searchform { display: inline-block; + width: 100%; } .admin-searchbar { - display: inline-block; - margin: 10px; - vertical-align: top; -} - -.admin-searchinput { - margin-bottom: 10px; -} - -.admin-filter, .admin-filtertype, .admin-groupfilter { - display: inline-block; - margin: 10px; - vertical-align: top; - margin-right: 50px; - margin-left: 50px; -} - -.admin-filter, .admin-groupfilter { - width: 120px; -} - -.admin-users { - margin: 10px; -} - -.admin-userheading { - width: auto; - float: left; -} - -.admin-pageui { - text-align: right; - float: right; - width: auto; margin-bottom: 20px; } -.usertitle { - width: 150px; +.admin-pageui { + display: inline-block; + width: 100%; +} + +.admin-pageselector { + display: inline-block; +} + +.admin-users { + margin-top: 50px; } .usertable { diff --git a/website/public/styles/chat.css b/website/public/styles/chat.css index c7d0235..16505f5 100644 --- a/website/public/styles/chat.css +++ b/website/public/styles/chat.css @@ -3,7 +3,7 @@ position: fixed; top: 80px; left: 256px; - padding: 15px 0; + padding: 20px 0; width: calc(100% - 256px); height: calc(100% - 120px); display: inline-flex; @@ -28,6 +28,8 @@ overflow-x: hidden; height: 100%; padding: 10px; + + word-wrap: break-word; } /* Chat-message takes the whole width of the chat area */ @@ -48,7 +50,7 @@ float: right; margin-right: 10px; background-color: #FBC02D; - color: white; + color: #333; } .chat-message-other { @@ -79,7 +81,6 @@ width: 100%; border: none; border-radius: 10px 0 0 10px; - box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24); } .chat-field input[type="submit"] { @@ -89,7 +90,6 @@ color: white; padding: 5px 10px; border-radius: 0 10px 10px 0; - box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24); } .active-friend-chat { diff --git a/website/public/styles/header.css b/website/public/styles/header.css index e39f204..0b70455 100644 --- a/website/public/styles/header.css +++ b/website/public/styles/header.css @@ -7,7 +7,9 @@ header { height: 80px; width: 100%; - color: white; + color: #FFF; + font-weight: bold; + letter-spacing: 1px; background-color: #FBC02D; box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24); } diff --git a/website/views/adminpanel.php b/website/views/adminpanel.php index e53d679..d97a9e8 100644 --- a/website/views/adminpanel.php +++ b/website/views/adminpanel.php @@ -1,16 +1,8 @@ - - - - - Admin Panel - - - - - + +
    -
    -

    User Management Panel

    -

    +
    Zoek naar gebruikers of groepen:
    " method="get"> +
    -

    Search

    -
    - + placeholder="Naam" + value=""> + Op: +
    - -
    -

    Show:

    - - > +
    +
    Type gebruiker:
    + > +
    + >
    - > + >
    - > + >
    - > + >
    - > + >
    - > + >
    -
    -

    Show:

    - +
    +
    Type groep:
    + > +
    >
    @@ -118,60 +143,12 @@ $listm = $currentpage * $perpage; >
    - -
    -

    Page Type:

    - - onchange="changeFilter()"> -
    - - onchange="changeFilter()"> - -
    - -
    -

    Batch Actions:

    -
    - -
    - -
    - -

    - -
    -
    - -
    -

    Batch Actions:

    -
    - -
    - -
    - -

    - -
    -
    -
    -
    -
    -

    Users:

    -
    -
    +

    Resultaat:

    + -

    Current page:

    -
    -

    -

    -

    + +
    + + + +
    +
    - - + + - - + + @@ -226,7 +207,6 @@ $listm = $currentpage * $perpage; if ($pagetype == 'user') { $q = searchSomeUsersByStatus($listn, $listm, $search, $status); - while($user = $q->fetch(PDO::FETCH_ASSOC)) { $userID = $user['userID']; $username = $user['username']; @@ -252,9 +232,9 @@ $listm = $currentpage * $perpage; action='$thispage' method='post'> -- 2.49.1 From 62a2b32c959154274aa71c8c312801da0f642f1a Mon Sep 17 00:00:00 2001 From: Marijn Jansen Date: Tue, 24 Jan 2017 12:12:48 +0100 Subject: [PATCH 194/400] Changed Alerts to Exceptions. --- website/public/settings.php | 39 ++++++----- website/queries/settings.php | 112 ++++++++++++++++---------------- website/views/settings-view.php | 4 +- 3 files changed, 82 insertions(+), 73 deletions(-) diff --git a/website/public/settings.php b/website/public/settings.php index b473f99..41affe6 100644 --- a/website/public/settings.php +++ b/website/public/settings.php @@ -12,23 +12,30 @@ getClass(); + $alertMessage = $w->getMessage(); } } include("../views/main.php"); diff --git a/website/queries/settings.php b/website/queries/settings.php index 1a5dacf..ef718a3 100644 --- a/website/queries/settings.php +++ b/website/queries/settings.php @@ -1,35 +1,34 @@ message = $message; - switch ($type) { - case "happy": - $this->class = "settings-message-happy"; - break; - case "angry": - $this->class = "settings-message-angry"; - break; - default: - $this->class = "settings-message"; - break; - } + abstract public function getClass(); +} + +class HappyWarning extends SettingsWarning { + + public function __construct($message = "Gelukt!", $code = 0, Exception $previous = null) + { + parent::__construct($message, $code, $previous); } public function getClass() { - return $this->class; + return "settings-message-happy"; + } +} + +class AngryWarning extends SettingsWarning { + public function __construct($message = "Er is iets fout gegaan.", $code = 0, Exception $previous = null) + { + parent::__construct($message, $code, $previous); } - public function getMessage() { - return $this->message; + public function getClass() { + return "settings-message-angry"; } } @@ -94,24 +93,19 @@ function updateSettings() { $stmt->bindValue(":bio", test_input($_POST["bio"])); $stmt->bindValue(":userID", $_SESSION["userID"]); $stmt->execute(); - - return new settingsMessage("happy", "Instellingen zijn opgeslagen."); + throw new HappyWarning("Instellingen zijn opgeslagen."); } function changePassword() { $user = getPasswordHash(); if (password_verify($_POST["password-old"], $user["password"])) { if ($_POST["password-new"] == $_POST["password-confirm"] && (strlen($_POST["password-new"]) >= 8)) { - if (doChangePassword()) { - return new settingsMessage("happy", "Wachtwoord gewijzigd."); - } else { - return new settingsMessage("angry", "Er is iets mis gegaan."); - } + doChangePassword(); } else { - return new settingsMessage("angry", "Wachtwoorden komen niet oveen."); + throw new AngryWarning("Wachtwoorden komen niet overeen."); } } else { - return new settingsMessage("angry", "Oud wachtwoord niet correct."); + throw new AngryWarning("Oud wachtwoord niet correct."); } } @@ -129,7 +123,12 @@ function doChangePassword() { $stmt->bindParam(":new_password", $hashed_password); $stmt->bindParam(":userID", $_SESSION["userID"]); $stmt->execute(); - return $stmt->rowCount(); + + if ($stmt->rowCount()) { + throw new HappyWarning("Wachtwoord gewijzigd."); + } else { + throw new AngryWarning(); + } } function changeEmail() { @@ -138,20 +137,13 @@ function changeEmail() { $email = strtolower($_POST["email"]); if (filter_var($email, FILTER_VALIDATE_EMAIL)) { //check if email exists - if (emailIsAvailableInDatabase($email)) { - if (doChangeEmail($email)) { - return new settingsMessage("happy", "Emailadres is veranderd."); - } else { - return new settingsMessage("angry", "Er is iets mis gegaan."); - } - } else { - return new settingsMessage("angry", "Emailadres bestaat al."); - } + emailIsAvailableInDatabase($email); + doChangeEmail($email); } else { - return new settingsMessage("angry", "Geef een geldig emailadres."); + throw new AngryWarning("Geef een geldig emailadres"); } } else { - return new settingsMessage("angry", "Emailadressen komen niet overeen."); + throw new AngryWarning("Emailadressen komen niet overeen."); } } @@ -167,7 +159,9 @@ function emailIsAvailableInDatabase($email) { $stmt->bindParam(":email", $email); $stmt->execute(); - return !$stmt->rowCount(); + if ($stmt->rowCount()) { + throw new AngryWarning("Emailadres wordt al gebruikt."); + } } function doChangeEmail($email) { @@ -182,18 +176,24 @@ function doChangeEmail($email) { $stmt->bindParam(":email", $email); $stmt->bindParam(":userID", $_SESSION["userID"]); $stmt->execute(); - return $stmt->rowCount(); +// return $stmt->rowCount(); + + if ($stmt->rowCount()) { + throw new HappyWarning("Emailadres is veranderd."); + } else { + throw new AngryWarning(); + } } -function updateProfilePicture() { +function updateAvatar() { $profilePictureDir = "/var/www/html/public/"; $relativePath = "uploads/profilepictures/" . $_SESSION["userID"] . "_" . basename($_FILES["pp"]["name"]); - removeOldProfilePicture(); + removeOldAvatar(); move_uploaded_file($_FILES['pp']['tmp_name'], $profilePictureDir . $relativePath); - setProfilePictureToDatabase("../" . $relativePath); + setAvatarToDatabase("../" . $relativePath); } -function removeOldProfilePicture() { +function removeOldAvatar() { $stmt = $GLOBALS["db"]->prepare(" SELECT `profilepicture` @@ -205,20 +205,22 @@ function removeOldProfilePicture() { $stmt->bindParam(":userID", $_SESSION["userID"]); $stmt->execute(); $old_avatar = $stmt->fetch()["profilepicture"]; - unlink("/var/www/html/public/uploads/" . $old_avatar); + if ($old_avatar != NULL) { + unlink("/var/www/html/public/uploads/" . $old_avatar); + } } -function setProfilePictureToDatabase($url) { +function setAvatarToDatabase($url) { $stmt = $GLOBALS["db"]->prepare(" UPDATE `user` SET - `profilepicture` = :profilePicture + `profilepicture` = :avatar WHERE `userID` = :userID "); - $stmt->bindParam(":profilePicture", $url); + $stmt->bindParam(":avatar", $url); $stmt->bindParam(":userID", $_SESSION["userID"]); $stmt->execute(); } \ No newline at end of file diff --git a/website/views/settings-view.php b/website/views/settings-view.php index 1fa5278..fe9c6da 100644 --- a/website/views/settings-view.php +++ b/website/views/settings-view.php @@ -6,8 +6,8 @@ $settings = getSettings();
    getClass()."'>". - $result->getMessage(). + echo "
    ". + $alertMessage . "
    "; } ?> -- 2.49.1 From 4579b98eb832a53d6fbca0f7a3d2902ad6c6f712 Mon Sep 17 00:00:00 2001 From: Marijn Jansen Date: Tue, 24 Jan 2017 13:54:08 +0100 Subject: [PATCH 195/400] Checks and resize on profile pictures :) --- website/public/settings.php | 10 +++---- website/queries/settings.php | 54 ++++++++++++++++++++++++------------ 2 files changed, 41 insertions(+), 23 deletions(-) diff --git a/website/public/settings.php b/website/public/settings.php index 41affe6..e40f042 100644 --- a/website/public/settings.php +++ b/website/public/settings.php @@ -12,28 +12,26 @@ getClass(); $alertMessage = $w->getMessage(); } diff --git a/website/queries/settings.php b/website/queries/settings.php index ef718a3..965665a 100644 --- a/website/queries/settings.php +++ b/website/queries/settings.php @@ -1,6 +1,5 @@ bindValue(":bio", test_input($_POST["bio"])); $stmt->bindValue(":userID", $_SESSION["userID"]); $stmt->execute(); - throw new HappyWarning("Instellingen zijn opgeslagen."); + throw new HappyAlert("Instellingen zijn opgeslagen."); } function changePassword() { @@ -102,10 +101,10 @@ function changePassword() { if ($_POST["password-new"] == $_POST["password-confirm"] && (strlen($_POST["password-new"]) >= 8)) { doChangePassword(); } else { - throw new AngryWarning("Wachtwoorden komen niet overeen."); + throw new AngryAlert("Wachtwoorden komen niet overeen."); } } else { - throw new AngryWarning("Oud wachtwoord niet correct."); + throw new AngryAlert("Oud wachtwoord niet correct."); } } @@ -125,9 +124,9 @@ function doChangePassword() { $stmt->execute(); if ($stmt->rowCount()) { - throw new HappyWarning("Wachtwoord gewijzigd."); + throw new HappyAlert("Wachtwoord gewijzigd."); } else { - throw new AngryWarning(); + throw new AngryAlert(); } } @@ -140,10 +139,10 @@ function changeEmail() { emailIsAvailableInDatabase($email); doChangeEmail($email); } else { - throw new AngryWarning("Geef een geldig emailadres"); + throw new AngryAlert("Geef een geldig emailadres"); } } else { - throw new AngryWarning("Emailadressen komen niet overeen."); + throw new AngryAlert("Emailadressen komen niet overeen."); } } @@ -160,7 +159,7 @@ function emailIsAvailableInDatabase($email) { $stmt->bindParam(":email", $email); $stmt->execute(); if ($stmt->rowCount()) { - throw new AngryWarning("Emailadres wordt al gebruikt."); + throw new AngryAlert("Emailadres wordt al gebruikt."); } } @@ -179,18 +178,22 @@ function doChangeEmail($email) { // return $stmt->rowCount(); if ($stmt->rowCount()) { - throw new HappyWarning("Emailadres is veranderd."); + throw new HappyAlert("Emailadres is veranderd."); } else { - throw new AngryWarning(); + throw new AngryAlert(); } } function updateAvatar() { $profilePictureDir = "/var/www/html/public/"; - $relativePath = "uploads/profilepictures/" . $_SESSION["userID"] . "_" . basename($_FILES["pp"]["name"]); + $relativePath = "uploads/profilepictures/" . $_SESSION["userID"] . "_avatar.png"; + + checkAvatarSize($_FILES["pp"]["tmp_name"]); + $scaledImg = scaleAvatar($_FILES["pp"]["tmp_name"]); removeOldAvatar(); - move_uploaded_file($_FILES['pp']['tmp_name'], $profilePictureDir . $relativePath); + imagepng($scaledImg, $profilePictureDir . $relativePath); setAvatarToDatabase("../" . $relativePath); + throw new HappyAlert("Profielfoto veranderd."); } function removeOldAvatar() { @@ -210,7 +213,7 @@ function removeOldAvatar() { } } -function setAvatarToDatabase($url) { +function setAvatarToDatabase(string $url) { $stmt = $GLOBALS["db"]->prepare(" UPDATE `user` @@ -223,4 +226,21 @@ function setAvatarToDatabase($url) { $stmt->bindParam(":avatar", $url); $stmt->bindParam(":userID", $_SESSION["userID"]); $stmt->execute(); +} + +function checkAvatarSize(string $img) { + $minResolution = 200; + $imgSize = getimagesize($img); + if ($imgSize[0] < $minResolution or $imgSize[1] < $minResolution) { + throw new AngryAlert("Afbeelding te klein, minimaal 200x200 pixels."); + } +} + +function scaleAvatar(string $imgLink, int $newWidth = 600) { + $img = imagecreatefromstring(file_get_contents($imgLink)); + if ($img) { + return imagescale($img, $newWidth); + } else { + throw new AngryAlert("Afbeelding wordt niet ondersteund."); + } } \ No newline at end of file -- 2.49.1 From c1359920e067347e3fe0ed15b108e91cc43b9148 Mon Sep 17 00:00:00 2001 From: Marijn Jansen Date: Tue, 24 Jan 2017 14:00:55 +0100 Subject: [PATCH 196/400] New Standard avatar --- website/public/img/avatar-standard.png | Bin 0 -> 100475 bytes website/public/img/notbad.jpg | Bin 24079 -> 0 bytes website/queries/friendship.php | 4 ++-- website/queries/header.php | 2 +- website/queries/user.php | 2 +- website/views/chat-view.php | 2 +- website/views/menu.php | 4 ++-- 7 files changed, 7 insertions(+), 7 deletions(-) create mode 100644 website/public/img/avatar-standard.png delete mode 100644 website/public/img/notbad.jpg diff --git a/website/public/img/avatar-standard.png b/website/public/img/avatar-standard.png new file mode 100644 index 0000000000000000000000000000000000000000..21ab818f1c31fc72ae9088b3620386b5cd28d7be GIT binary patch literal 100475 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 literal 0 HcmV?d00001 diff --git a/website/public/img/notbad.jpg b/website/public/img/notbad.jpg deleted file mode 100644 index eeea126059e5143b8eda2a1cc77cbc04ff3150e7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 24079 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 Date: Tue, 24 Jan 2017 14:26:15 +0100 Subject: [PATCH 197/400] FINALLY FIXED THE UNREAD CHAT MESSAGES! --- website/public/API/loadChatNotifications.php | 2 +- website/public/API/loadMessages.php | 2 ++ website/public/js/chat.js | 4 +-- website/public/js/notifications.js | 33 ++++++++++++++--- website/public/styles/chat.css | 38 ++++++++++++-------- website/public/styles/main.css | 20 +++++++++++ website/public/styles/menu.css | 10 ------ website/queries/friendship.php | 33 +++++++++++++++++ website/queries/private_message.php | 35 ++++++++++++++++++ website/views/chat-view.php | 13 ++++--- website/views/menu.php | 6 +++- website/views/notification-center.php | 10 +++++- 12 files changed, 167 insertions(+), 39 deletions(-) diff --git a/website/public/API/loadChatNotifications.php b/website/public/API/loadChatNotifications.php index 3b5835f..1415a2e 100644 --- a/website/public/API/loadChatNotifications.php +++ b/website/public/API/loadChatNotifications.php @@ -3,6 +3,6 @@ session_start(); require_once ("../../queries/connect.php"); -require_once ("../../queries/friendship.php"); +require_once ("../../queries/private_message.php"); echo selectAllUnreadChat(); \ No newline at end of file diff --git a/website/public/API/loadMessages.php b/website/public/API/loadMessages.php index e30acc8..a02de26 100644 --- a/website/public/API/loadMessages.php +++ b/website/public/API/loadMessages.php @@ -5,9 +5,11 @@ session_start(); require_once("../../queries/connect.php"); require_once("../../queries/private_message.php"); require_once("../../queries/checkInput.php"); +require_once("../../queries/friendship.php"); if (isset($_POST["lastID"]) && $_POST["lastID"] != "") { echo getNewChatMessages(test_input($_POST["lastID"]), test_input($_POST["destination"])); } else { echo getOldChatMessages(test_input($_POST["destination"])); + setLastVisited(test_input($_POST["destination"])); } \ No newline at end of file diff --git a/website/public/js/chat.js b/website/public/js/chat.js index 6c420a1..3c839e4 100644 --- a/website/public/js/chat.js +++ b/website/public/js/chat.js @@ -53,8 +53,8 @@ function switchUser(userID) { $(".destinationID").val(userID); $("#chat-history").html(""); $("#lastID").val(""); - $(".chat-left .friend-item").removeClass("active-friend-chat"); - $(".chat-left #friend-item-" + userID).addClass("active-friend-chat"); + $("#chat-recent-panel .friend-item").removeClass("active-friend-chat"); + $("#chat-left #friend-item-" + userID).addClass("active-friend-chat"); } function sayEmpty() { diff --git a/website/public/js/notifications.js b/website/public/js/notifications.js index 51a8c06..e3476b2 100644 --- a/website/public/js/notifications.js +++ b/website/public/js/notifications.js @@ -1,7 +1,7 @@ -function showNotifications(notifications, id) { - $("#" + id).html(""); +function showFriendNotifications(notifications) { + $("#friendrequestslist").html(""); for (i in notifications) { - $("#" + id).append(" \ + $("#friendrequestslist").append(" \

  • \
    \ \ + \ +
    • \ + "); + } +} + function loadNotifications() { $.post( "API/loadFriendRequestNotifications.php" ).done(function(data) { if (data && data != "[]") { - showNotifications(JSON.parse(data), "friendrequestslist"); + showFriendNotifications(JSON.parse(data)); } }); $.post( "API/loadChatNotifications.php" ).done(function(data) { if (data && data != "[]") { - showNotifications(JSON.parse(data), "unreadChatlist"); + showChatNotifications(JSON.parse(data)); } }); diff --git a/website/public/styles/chat.css b/website/public/styles/chat.css index 16505f5..6822d21 100644 --- a/website/public/styles/chat.css +++ b/website/public/styles/chat.css @@ -1,34 +1,38 @@ /* Overall chat-screen */ .chat { position: fixed; + top: 80px; left: 256px; - padding: 20px 0; width: calc(100% - 256px); height: calc(100% - 120px); - display: inline-flex; + + padding: 20px 0; + + display: inline-block; } -.chat-left { +#chat-recent-panel { width: 256px; height: calc(100% - 100px); - margin: 0 10px; - overflow-y: auto; -} -.chat-right { - width: calc(100% - 256px - 40px); - height: calc(100% - 80px); - margin-right: 10px; + display: inline-block; + + overflow-y: auto; } /* Chat history. */ -.chat-history { +#chat-history { overflow-y: auto; overflow-x: hidden; - height: 100%; + + width: calc(100% - 256px - 75px); + height: calc(100% - 80px); + padding: 10px; + display: inline-block; + word-wrap: break-word; } @@ -36,7 +40,13 @@ .chat-message { width: 100%; min-height: 40px; - padding-top: 10px; + padding: 10px 0; + clear: both; +} + +.chat-message::after { + content: ''; + display: table; clear: both; } @@ -63,7 +73,7 @@ /* Chat reply field */ .chat-field { - width: 100%; + width: calc(100% - 10px); display: table; } diff --git a/website/public/styles/main.css b/website/public/styles/main.css index 3e9b51d..8c50b19 100644 --- a/website/public/styles/main.css +++ b/website/public/styles/main.css @@ -242,3 +242,23 @@ div[data-title]:hover:after { line-height: normal; font-family: Arial, sans-serif; } + +.friend { + +} + + +.friend-item, .group-item { + cursor: pointer; + transition-duration: 250ms; +} + +.friend-item:hover, .group-item:hover { + background: #FBC02D; + box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24); +} + +.friend-name { + display: inline-block; + vertical-align: middle; +} diff --git a/website/public/styles/menu.css b/website/public/styles/menu.css index 25e4b91..ce294da 100644 --- a/website/public/styles/menu.css +++ b/website/public/styles/menu.css @@ -34,16 +34,6 @@ cursor: pointer; } -.friend-item, .group-item { - cursor: pointer; - transition-duration: 250ms; -} - -.friend-item:hover, .group-item:hover { - background: #FBC02D; - box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24); -} - .menu button { background: none; color: inherit; diff --git a/website/queries/friendship.php b/website/queries/friendship.php index 9a3a37c..fff3754 100644 --- a/website/queries/friendship.php +++ b/website/queries/friendship.php @@ -5,6 +5,7 @@ function selectAllFriends($userID) { SELECT `userID`, `username`, + LEFT(CONCAT(`user`.`fname`, ' ', `user`.`lname`), 20) as `name`, IFNULL( `profilepicture`, '../img/notbad.jpg' @@ -36,6 +37,7 @@ function selectAllFriendRequests() { SELECT `userID`, `username`, + LEFT(CONCAT(`user`.`fname`, ' ', `user`.`lname`), 20) as `name`, IFNULL( `profilepicture`, '../img/notbad.jpg' @@ -60,4 +62,35 @@ function selectAllFriendRequests() { $stmt->execute(); return json_encode($stmt->fetchAll()); +} + + +function setLastVisited($friend) { + $stmt = $GLOBALS["db"]->prepare(" + UPDATE + `friendship` + SET `friendship`.chatLastVisted1=( + CASE `user1ID` = :sessionUser + WHEN TRUE THEN NOW() + WHEN FALSE THEN `chatLastVisted1` + END + ), + `friendship`.`chatLastVisted2`=( + CASE `user2ID` = :sessionUser + WHEN TRUE THEN NOW() + WHEN FALSE THEN `chatLastVisted2` + END + ) + WHERE + `user1ID` = :sessionUser AND + `user2ID` = :friend OR + `user2ID` = :sessionUser AND + `user1ID` = :friend; + "); + + $stmt->bindParam(':sessionUser', $_SESSION["userID"], PDO::PARAM_INT); + $stmt->bindParam(':friend', $friend, PDO::PARAM_INT); + $stmt->execute(); + + return $stmt; } \ No newline at end of file diff --git a/website/queries/private_message.php b/website/queries/private_message.php index 46c21a3..2bb89ab 100644 --- a/website/queries/private_message.php +++ b/website/queries/private_message.php @@ -74,3 +74,38 @@ function getNewChatMessages($lastID, $destination) { return json_encode($stmt->fetchAll()); } + + +function selectAllUnreadChat() { + $stmt = $GLOBALS["db"]->prepare(" + SELECT + LEFT(CONCAT(`user`.`fname`, ' ', `user`.`lname`), 20) as `name`, + IFNULL( + `profilepicture`, + '../img/notbad.jpg' + ) AS profilepicture, + LEFT(`private_message`.`content`, 20) as `content` + FROM + `private_message`, + `friendship`, + `user` + WHERE + (`friendship`.user2ID = `private_message`.`origin` AND + `friendship`.user1ID = `private_message`.`destination` AND + `friendship`.chatLastVisted1 < `private_message`.`creationdate` OR + `friendship`.user1ID = `private_message`.`origin` AND + `friendship`.user2ID = `private_message`.`destination` AND + `friendship`.chatLastVisted2 < `private_message`.`creationdate`) AND + `private_message`.`origin` = `user`.`userID` AND + `private_message`.`destination` = :userID AND + `user`.`role` != 'banned' + + GROUP BY `user`.`userID` + "); + + $stmt->bindParam(':userID', $_SESSION["userID"]); + + $stmt->execute(); + + return json_encode($stmt->fetchAll()); +} \ No newline at end of file diff --git a/website/views/chat-view.php b/website/views/chat-view.php index 549a5ff..135f7f4 100644 --- a/website/views/chat-view.php +++ b/website/views/chat-view.php @@ -1,6 +1,6 @@
    - \ No newline at end of file -- 2.49.1 From dc11830c80472bbb2006473b995df2cc28754c94 Mon Sep 17 00:00:00 2001 From: Lars van Hijfte Date: Tue, 24 Jan 2017 14:32:43 +0100 Subject: [PATCH 198/400] Fixed name length --- website/queries/friendship.php | 4 ++-- website/queries/private_message.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/website/queries/friendship.php b/website/queries/friendship.php index dc1ce46..be0401a 100644 --- a/website/queries/friendship.php +++ b/website/queries/friendship.php @@ -5,7 +5,7 @@ function selectAllFriends($userID) { SELECT `userID`, `username`, - LEFT(CONCAT(`user`.`fname`, ' ', `user`.`lname`), 20) as `name`, + LEFT(CONCAT(`user`.`fname`, ' ', `user`.`lname`), 15) as `name`, IFNULL( `profilepicture`, '../img/avatar-standard.png' @@ -37,7 +37,7 @@ function selectAllFriendRequests() { SELECT `userID`, `username`, - LEFT(CONCAT(`user`.`fname`, ' ', `user`.`lname`), 20) as `name`, + LEFT(CONCAT(`user`.`fname`, ' ', `user`.`lname`), 15) as `name`, IFNULL( `profilepicture`, '../img/avatar-standard.png' diff --git a/website/queries/private_message.php b/website/queries/private_message.php index 2bb89ab..4fbb55d 100644 --- a/website/queries/private_message.php +++ b/website/queries/private_message.php @@ -79,12 +79,12 @@ function getNewChatMessages($lastID, $destination) { function selectAllUnreadChat() { $stmt = $GLOBALS["db"]->prepare(" SELECT - LEFT(CONCAT(`user`.`fname`, ' ', `user`.`lname`), 20) as `name`, + LEFT(CONCAT(`user`.`fname`, ' ', `user`.`lname`), 15) as `name`, IFNULL( `profilepicture`, '../img/notbad.jpg' ) AS profilepicture, - LEFT(`private_message`.`content`, 20) as `content` + LEFT(`private_message`.`content`, 15) as `content` FROM `private_message`, `friendship`, -- 2.49.1 From d44ddf2793168c126329e31f9e1c30bb9804343a Mon Sep 17 00:00:00 2001 From: "K. Nobel" Date: Tue, 24 Jan 2017 14:36:27 +0100 Subject: [PATCH 199/400] Added functionality for add friend buttons. --- website/public/edit_friendship.php | 30 ++++++++++++ website/public/profile.php | 5 +- website/public/styles/profile.css | 3 +- website/queries/friendship.php | 78 +++++++++++++++++++++++++++++- website/queries/user.php | 52 +++++++++++++++----- website/views/profile.php | 25 +++++++--- 6 files changed, 170 insertions(+), 23 deletions(-) create mode 100644 website/public/edit_friendship.php diff --git a/website/public/edit_friendship.php b/website/public/edit_friendship.php new file mode 100644 index 0000000..d88e264 --- /dev/null +++ b/website/public/edit_friendship.php @@ -0,0 +1,30 @@ +prepare(" SELECT @@ -21,8 +23,8 @@ function selectAllFriends($userID) { `friendship`.`user2ID` = `user`.`userID` OR `friendship`.`user2ID` = :userID AND `friendship`.`user1ID` = `user`.`userID`) AND - `role` != 5 AND - `status` = 1 + `role` != 'banned' AND + `status` = 'confirmed' "); $stmt->bindParam(':userID', $userID, PDO::PARAM_INT); @@ -60,4 +62,76 @@ function selectAllFriendRequests() { $stmt->execute(); return json_encode($stmt->fetchAll()); +} + +function getFriendshipStatus($userID) { + $stmt = $GLOBALS["db"]->prepare(" + SELECT + CASE `status` IS NULL + WHEN TRUE THEN 0 + WHEN FALSE THEN + CASE `status` = 'confirmed' + WHEN TRUE THEN + 1 + WHEN FALSE THEN + CASE `user1ID` = :me AND `user2ID` = :other + WHEN TRUE THEN + 2 + WHEN FALSE THEN + 3 + END + END + END AS `friend_state` + FROM + `friendship` + WHERE + `user1ID` = :other AND `user2ID` = :me OR + `user1ID` = :me AND `user2ID` = :other + "); + + $stmt->bindParam(':me', $_SESSION["userID"], PDO::PARAM_INT); + $stmt->bindParam(':other', $userID, PDO::PARAM_INT); + $stmt->execute(); + return $stmt->fetch()["friend_state"]; +} + +function requestFriendship($userID) { + $stmt = $GLOBALS["db"]->prepare(" + INSERT INTO `friendship` (user1ID, user2ID) + VALUES (:user1, :user2) + "); + + $stmt->bindParam(':user1', $_SESSION["userID"], PDO::PARAM_INT); + $stmt->bindParam(':user2', $userID, PDO::PARAM_INT); + $stmt->execute(); +} + +function removeFriendship($userID) { + $stmt = $GLOBALS["db"]->prepare(" + DELETE FROM `friendship` + WHERE + `user1ID` = :user1 AND + `user2ID` = :user2 OR + `user1ID` = :user2 AND + `user2ID` = :user1 + "); + + $stmt->bindParam(':user1', $_SESSION["userID"], PDO::PARAM_INT); + $stmt->bindParam(':user2', $userID, PDO::PARAM_INT); + $stmt->execute(); +} + +function acceptFriendship($userID) { + $stmt = $GLOBALS["db"]->prepare(" + UPDATE `friendship` + SET `status`='confirmed' + WHERE + `user1ID` = :user1 AND + `user2ID` = :user2 + LIMIT 1 + "); + + $stmt->bindParam(':user1', $userID, PDO::PARAM_INT); + $stmt->bindParam(':user2', $_SESSION["userID"], PDO::PARAM_INT); + $stmt->execute(); } \ No newline at end of file diff --git a/website/queries/user.php b/website/queries/user.php index 114d673..04f379e 100644 --- a/website/queries/user.php +++ b/website/queries/user.php @@ -17,27 +17,53 @@ function getUserID($username) { return $stmt->fetch()["userID"]; } -function selectUser($userID) { +function getUsername($userID) { $stmt = $GLOBALS["db"]->prepare(" SELECT - `username`, - IFNULL( - `profilepicture`, - '../img/notbad.jpg' - ) AS profilepicture, - `bio`, - `role`, - `onlinestatus`, - `loggedin`, - `fname`, - `lname` + `username` FROM `user` WHERE `userID` = :userID "); - $stmt->bindParam(':userID', $userID, PDO::PARAM_INT); + $stmt->bindParam(':userID', $userID, PDO::PARAM_STR); + $stmt->execute(); + return $stmt->fetch()["username"]; +} + +function selectUser($me, $other) { + $stmt = $GLOBALS["db"]->prepare(" + SELECT + `username`, `birthdate`, `location`, `profilepicture`, `bio`, `user`.`creationdate`, `onlinestatus`, `fname`, `lname`, + CASE `status` IS NULL + WHEN TRUE THEN 0 + WHEN FALSE THEN + CASE `status` = 'confirmed' + WHEN TRUE THEN + 1 + WHEN FALSE THEN + CASE `user1ID` = `userID` AND `user2ID` = :me + WHEN TRUE THEN + 2 + WHEN FALSE THEN + 3 + END + END + END AS `friend_status` + FROM + `user` + LEFT JOIN + `friendship` + ON + `user1ID` = `userID` AND `user2ID` = :me OR + `user1ID` = :me AND `user2ID` = `userID` + WHERE + `user`.`userID` = :other + "); + + $stmt->bindParam(':me', $me, PDO::PARAM_INT); + $stmt->bindParam(':other', $other, PDO::PARAM_INT); $stmt->execute(); return $stmt->fetch(); } diff --git a/website/views/profile.php b/website/views/profile.php index 19bd908..83dbca7 100644 --- a/website/views/profile.php +++ b/website/views/profile.php @@ -1,11 +1,24 @@
    "> -
    -

    Als vriend toevoegen

    -
    -

    -
    + +
    + + "; + } else if($user["friend_status"] == 1) { + echo ""; + } else if($user["friend_status"] == 2) { + echo ""; + echo ""; + } else if($user["friend_status"] == 3) { + echo ""; + } + ?> + +

    +

    @@ -14,7 +27,7 @@

    fetch()) { - echo "${friend["username"]}"; + echo "${friend["username"]}"; } -- 2.49.1 From 86b97cc186efe69bcbc4b04b2092ed77b5a11931 Mon Sep 17 00:00:00 2001 From: Marijn Jansen Date: Tue, 24 Jan 2017 14:47:38 +0100 Subject: [PATCH 200/400] Max file size for gifs. --- website/queries/settings.php | 17 +++++++++++++---- website/views/settings-view.php | 9 +++++---- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/website/queries/settings.php b/website/queries/settings.php index 965665a..d3985c7 100644 --- a/website/queries/settings.php +++ b/website/queries/settings.php @@ -186,12 +186,21 @@ function doChangeEmail($email) { function updateAvatar() { $profilePictureDir = "/var/www/html/public/"; - $relativePath = "uploads/profilepictures/" . $_SESSION["userID"] . "_avatar.png"; + $tmpImg = $_FILES["pp"]["tmp_name"]; - checkAvatarSize($_FILES["pp"]["tmp_name"]); - $scaledImg = scaleAvatar($_FILES["pp"]["tmp_name"]); + checkAvatarSize($tmpImg); removeOldAvatar(); - imagepng($scaledImg, $profilePictureDir . $relativePath); + if (getimagesize($tmpImg)["mime"] == "image/gif") { + if ($_FILES["pp"]["size"] > 4000000) { + throw new AngryAlert("Bestand is te groot, maximaal 4MB toegestaan."); + } + $relativePath = "uploads/profilepictures/" . $_SESSION["userID"] . "_avatar.gif"; + move_uploaded_file($tmpImg, $profilePictureDir . $relativePath); + } else { + $relativePath = "uploads/profilepictures/" . $_SESSION["userID"] . "_avatar.png"; + $scaledImg = scaleAvatar($tmpImg); + imagepng($scaledImg, $profilePictureDir . $relativePath); + } setAvatarToDatabase("../" . $relativePath); throw new HappyAlert("Profielfoto veranderd."); } diff --git a/website/views/settings-view.php b/website/views/settings-view.php index fe9c6da..66513fc 100644 --- a/website/views/settings-view.php +++ b/website/views/settings-view.php @@ -6,9 +6,9 @@ $settings = getSettings();

    ". - $alertMessage . - "
    "; + echo "
    + $alertMessage +
    "; } ?>
    @@ -81,7 +81,8 @@ $settings = getSettings();
  • -- 2.49.1 From 4967ab6ea07ed2d20d4bd4909f946ae90ccb9936 Mon Sep 17 00:00:00 2001 From: "K. Nobel" Date: Tue, 24 Jan 2017 15:01:55 +0100 Subject: [PATCH 201/400] Made some small changes for Lars. --- website/queries/user.php | 13 ++++++++++++- website/views/profile.php | 2 +- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/website/queries/user.php b/website/queries/user.php index 15b7fb1..ed431f6 100644 --- a/website/queries/user.php +++ b/website/queries/user.php @@ -35,7 +35,18 @@ function getUsername($userID) { function selectUser($me, $other) { $stmt = $GLOBALS["db"]->prepare(" SELECT - `username`, `birthdate`, `location`, `profilepicture`, `bio`, `user`.`creationdate`, `onlinestatus`, `fname`, `lname`, + `username`, + `birthdate`, + `location`, + IFNULL( + `profilepicture`, + '../img/avatar-standard.png' + ) AS profilepicture, + `bio`, + `user`.`creationdate`, + `onlinestatus`, + `fname`, + `lname`, CASE `status` IS NULL WHEN TRUE THEN 0 WHEN FALSE THEN diff --git a/website/views/profile.php b/website/views/profile.php index 83dbca7..2bc0341 100644 --- a/website/views/profile.php +++ b/website/views/profile.php @@ -27,7 +27,7 @@

    fetch()) { - echo "${friend["username"]}"; + echo "${friend["username"]}"; } -- 2.49.1 From 7a19fea5f9d8ce126d4fa6bb3f995eab036f8625 Mon Sep 17 00:00:00 2001 From: Joey Lai Date: Tue, 24 Jan 2017 15:08:24 +0100 Subject: [PATCH 202/400] Redesigned register functions --- website/public/register.php | 93 +++++++++++--- website/public/styles/index.css | 64 ++++------ website/queries/checkInput.php | 206 ++++++++++++++++++++++++-------- website/views/login_head.php | 1 + website/views/register-view.php | 22 ++-- 5 files changed, 267 insertions(+), 119 deletions(-) diff --git a/website/public/register.php b/website/public/register.php index 8c0f8e4..99af6c0 100644 --- a/website/public/register.php +++ b/website/public/register.php @@ -10,33 +10,90 @@ getMessage(); } - checkInputChoice("username", "username"); - checkInputChoice("password", "longerEight"); - checkInputChoice("confirmpassword", ""); - matchPassword(); - checkInputChoice("location", "lettersAndSpace"); - checkInputChoice("email", "email"); - registerCheck(); + try { + $surname = test_input(($_POST["surname"])); + checkInputChoice($surname, "lettersAndSpaces"); + } + catch(lettersAndSpacesException $e){ + $correct = false; + $surnameErr = $e->getMessage(); + } + + try{ + $bday = test_input(($_POST["bday"])); + checkInputChoice($bday, "bday"); + } catch(bdayException $e){ + $correct = false; + $bdayErr = $e->getMessage(); + } + + try{ + $username = test_input(($_POST["username"])); + checkInputChoice($username, "username"); + } catch(usernameException $e){ + $correct = false; + $usernameErr = $e->getMessage(); + } + + try{ + $password = test_input(($_POST["password"])); + checkInputChoice($password, "longerEight"); + matchPassword(); + } catch(passwordException $e){ + $correct = false; + $passwordErr = $e->getMessage(); + } catch(confirmPasswordException $e){ + $correct = false; + $confirmPasswordErr = $e->getMessage(); + } + + try{ + $location = test_input(($_POST["location"])); + checkInputChoice($location, "lettersAndSpaces"); + } catch(lettersAndSpacesException $e){ + $correct = false; + $locationErr = $e->getMessage(); + } + + try{ + $email = test_input(($_POST["email"])); + checkInputChoice($email, "email"); + } catch(emailException $e){ + $correct = false; + $emailErr = $e->getMessage(); + } + + try{ + $captcha = $_POST['g-recaptcha-response']; + checkCaptcha($captcha); + } catch(captchaException $e){ + $correct = false; + $captchaErr = $e->getMessage(); + } + + try { + getIp(); + registerCheck($correct); + } catch(registerException $e){ + $genericErr = $e->getMessage(); + } } /* This view adds register view */ include("../views/register-view.php"); diff --git a/website/public/styles/index.css b/website/public/styles/index.css index a24bdd0..8482cea 100644 --- a/website/public/styles/index.css +++ b/website/public/styles/index.css @@ -4,17 +4,16 @@ a.button { color: black; cursor: pointer; height: 50%; - margin: 8px 0; - padding: 14px 20px; - width: 25%; + padding: 8px 20px; + width: 50%; font-family: Arial; - font-size: 16px; + font-size: 20px; } /* Body */ body { height: 100%; - background-color: #C8CABD; + background-color: #FBC02D; /*background-image: url(http://play.pokemonshowdown.com/fx/client-bg-shaymin.jpg); background-size: cover; background-attachment: fixed;*/ @@ -24,31 +23,14 @@ body { font-family: Arial, sans-serif; } -/* The Close Button */ -.close { - /* Position it in the top right corner outside of the modal */ - color: white; - font-size: 100px; - font-weight: bold; - position: absolute; - right: 25px; - top: 0; -} - -/* Close button on hover */ -.close:hover, -.close:focus { - color: red; - cursor: pointer; -} /* inlogform */ form { /*background-color: #a87a87;*/ border-radius: 12px; - height: 70%; + height: 75%; margin: auto; - width: 70%; + width: 80%; overflow-y:auto; } @@ -72,24 +54,20 @@ input[type=text], input[type=password], input[type=email], input[type="date"] { border-color: #C8CABD; display: inline-block; height: 60%; + font-size: 16px; padding: 8px 20px; margin: 4px 0; - width: 70%; + width: 55%; } -/* -input[type=text], input[type=password], input[type=email], input[type="date"] { - border: 0px; - border-bottom: 4px solid lightgray; - border-radius: 0px; -}*/ button[type=submit] { background-color: #C8CABD; - color: black ; + color: black; cursor: pointer; font-family: Arial; - font-size: 16px; - width: 50%; + font-size: 22px; + height: 30px; + width: 120px; } .error { @@ -106,12 +84,12 @@ label { display: inline-block; position: relative; background-color: #C8CABD; - height: 30px; - width: 90px; - padding: 3px 3px 3px 0px; + height: 25px; + width: 120px; + padding: 3px 3px 3px 3px; text-align: center; - border-radius: 0px 10px 10px 0px; - font-size: 24px; + border-radius: 0px 5px 5px 0px; + font-size: 22px; } .left-arrow:after { @@ -121,9 +99,9 @@ label { right: 100%; top: 0; bottom: 0; - border-top: 15px solid transparent; + border-top: 12px solid transparent; border-right: 20px solid #C8CABD; - border-bottom: 15px solid transparent; + border-bottom: 12px solid transparent; border-left: 0px solid transparent; } @@ -135,7 +113,7 @@ label { /* padding voor login_containers */ .login_containerlogin { - padding:25px; + padding:16px; text-align: center; } @@ -163,7 +141,7 @@ label { margin: 34px auto; overflow-y: auto; padding: 20px; - width: 50%; + width: 45%; } /*.platform { diff --git a/website/queries/checkInput.php b/website/queries/checkInput.php index f711676..cc32626 100644 --- a/website/queries/checkInput.php +++ b/website/queries/checkInput.php @@ -1,97 +1,138 @@ format($format) == $date; +} + /* checks if username exist and if its longer than 6 characters. */ function username($variable){ - if (strlen($GLOBALS[$variable]) < 6) { - $GLOBALS[$variable . "Err"] = "Gebruikersnaam moet minstens 6 karakters bevatten"; - $correct = false; + if (empty($variable)) { + throw new usernameException("Verplicht!"); + } else if (strlen($variable) < 6) { + throw new usernameException("Moet minstens 6 karakters bevatten"); } else if (getExistingUsername() == 1) { - $GLOBALS[$variable . "Err"] = "Gebruikersnaam bestaat al"; - $correct = false; + throw new usernameException("Gebruikersnaam bestaal al"); } } /* checks if an input is longer that 8 characters. */ function longerEight($variable){ - if (strlen($GLOBALS[$variable]) < 8) { - $GLOBALS[$variable . "Err"] = "Moet minstens 8 karakters bevatten"; - $correct = false; + if (empty($variable)) { + throw new passwordException("Verplicht!"); + } else if (strlen($variable) < 8) { + throw new passwordException("Moet minstens 8 karakters bevatten"); } } /* checks if an input is a valid email. */ function validateEmail($variable){ - if (!filter_var($GLOBALS[$variable], FILTER_VALIDATE_EMAIL)) { - $GLOBALS[$variable . "Err"] = "Geldige email invullen!"; - $correct = false; - + if (empty($variable)) { + throw new emailException("Verplicht!"); + } else if (!filter_var($variable, FILTER_VALIDATE_EMAIL)) { + throw new emailException("Geldige email invullen"); } else if (getExistingEmail() == 1){ - $GLOBALS[$variable . "Err"] = "Email bestaat al"; - $correct = false; - + throw new emailException("Email bestaal al!"); } } /* checks if two passwords matches. */ function matchPassword(){ if ($_POST["password"] != $_POST["confirmpassword"]) { - $GLOBALS["confirmpasswordErr"] = "Wachtwoorden matchen niet"; - $GLOBALS["correct"] = false; - + throw new confirmPasswordException("Wachtwoorden matchen niet!"); } } -// Checks if everything is filled in correctly -function registerCheck(){ - if ($GLOBALS["correct"] == false){ - $GLOBALS["genericErr"] = "Bepaalde velden zijn verkeerd of niet ingevuld!"; +/* Checks if captcha is correctly filled in */ +function checkCaptcha($captcha){ + if(!$captcha){ + throw new captchaException("Captcha needs to be filled in!"); + } else { + $response=json_decode(file_get_contents("https://www.google.com/recaptcha/api/siteverify?secret=6Lc72xIUAAAAAPizuF3nUbklCPljVCVzgYespz8o&response=".$captcha."&remoteip=".$_SERVER['REMOTE_ADDR'])); + if($response->success==false) { + throw new captchaException("You are a spammer!"); + } + } +} +/* Get ip adres */ +function getIp(){ + if (!empty($_SERVER['HTTP_CLIENT_IP'])) { + $GLOBALS["ip"] = $_SERVER['HTTP_CLIENT_IP']; + } elseif (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) { + $GLOBALS["ip"] = $_SERVER['HTTP_X_FORWARDED_FOR']; + } else { + $GLOBALS["ip"] = $_SERVER['REMOTE_ADDR']; + } +} + +/* Checks if everything is filled in correctly */ +function registerCheck($status){ + if ($status == false){ + throw new registerException("Bepaalde velden zijn verkeerd of niet ingevuld"); } else { registerAccount(); header("location: login.php"); - } } @@ -102,4 +143,69 @@ function test_input($data) { $data = htmlspecialchars($data); return $data; } + +class lettersAndSpacesException extends Exception +{ + public function __construct($message = "", $code = 0, Exception $previous = null) + { + parent::__construct($message, $code, $previous); + } +} + + +class bdayException extends Exception +{ + public function __construct($message = "", $code = 0, Exception $previous = null) + { + parent::__construct($message, $code, $previous); + } +} + +class usernameException extends Exception +{ + public function __construct($message = "", $code = 0, Exception $previous = null) + { + parent::__construct($message, $code, $previous); + } +} + +class passwordException extends Exception +{ + public function __construct($message = "", $code = 0, Exception $previous = null) + { + parent::__construct($message, $code, $previous); + } +} + +class confirmPasswordException extends Exception +{ + public function __construct($message = "", $code = 0, Exception $previous = null) + { + parent::__construct($message, $code, $previous); + } +} + +class emailException extends Exception +{ + public function __construct($message = "", $code = 0, Exception $previous = null) + { + parent::__construct($message, $code, $previous); + } +} + +class captchaException extends Exception +{ + public function __construct($message = "", $code = 0, Exception $previous = null) + { + parent::__construct($message, $code, $previous); + } +} + +class registerException extends Exception +{ + public function __construct($message = "", $code = 0, Exception $previous = null) + { + parent::__construct($message, $code, $previous); + } +} ?> diff --git a/website/views/login_head.php b/website/views/login_head.php index 26d439e..e983fab 100644 --- a/website/views/login_head.php +++ b/website/views/login_head.php @@ -9,4 +9,5 @@ href="styles/index.css"> + diff --git a/website/views/register-view.php b/website/views/register-view.php index 7d1843b..4c660c9 100644 --- a/website/views/register-view.php +++ b/website/views/register-view.php @@ -41,11 +41,12 @@

    @@ -117,18 +118,23 @@ *
    • - + + + + +
    -
    -- 2.49.1 From fd055e8355e0ad46e43e120dfb6c49f24b35d49b Mon Sep 17 00:00:00 2001 From: Lars van Hijfte Date: Tue, 24 Jan 2017 15:16:15 +0100 Subject: [PATCH 203/400] Fixed bugs --- website/public/API/loadMessages.php | 1 + website/views/chat-view.php | 1 + 2 files changed, 2 insertions(+) diff --git a/website/public/API/loadMessages.php b/website/public/API/loadMessages.php index a02de26..0fdc740 100644 --- a/website/public/API/loadMessages.php +++ b/website/public/API/loadMessages.php @@ -9,6 +9,7 @@ require_once("../../queries/friendship.php"); if (isset($_POST["lastID"]) && $_POST["lastID"] != "") { echo getNewChatMessages(test_input($_POST["lastID"]), test_input($_POST["destination"])); + setLastVisited(test_input($_POST["destination"])); } else { echo getOldChatMessages(test_input($_POST["destination"])); setLastVisited(test_input($_POST["destination"])); diff --git a/website/views/chat-view.php b/website/views/chat-view.php index 9b40f71..598b3ee 100644 --- a/website/views/chat-view.php +++ b/website/views/chat-view.php @@ -16,6 +16,7 @@ // Set default values of a friend. $username = $friend["username"]; + $name = $friend["name"]; $userID = $friend["userID"]; $pf = "img/avatar-standard.png"; -- 2.49.1 From f9f1e2bf173ee75f6eb9dbb8c94e0bd9ef078cf3 Mon Sep 17 00:00:00 2001 From: "K. Nobel" Date: Tue, 24 Jan 2017 16:40:30 +0100 Subject: [PATCH 204/400] Changed select posts query. --- website/queries/user.php | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/website/queries/user.php b/website/queries/user.php index 18cd3f6..25bbf0e 100644 --- a/website/queries/user.php +++ b/website/queries/user.php @@ -68,18 +68,24 @@ function selectAllUserGroups($userID) { function selectAllUserPosts($userID) { $stmt = $GLOBALS["db"]->prepare(" SELECT - `postID`, - `author`, - `title`, - `content`, - `creationdate` + `postID`, + `author`, + `title`, + CASE LENGTH(`content`) >= 150 + WHEN TRUE THEN + CONCAT(LEFT(`content`, 150), '...') + WHEN FALSE THEN + `content` + END + AS `content`, + `creationdate` FROM - `post` + `post` WHERE - `author` = :userID AND - `groupID` IS NULL + `author` = :userID AND + `groupID` IS NULL ORDER BY - `creationdate` DESC + `creationdate` DESC "); $stmt->bindParam(':userID', $userID, PDO::PARAM_INT); -- 2.49.1 From 70957015ceb57b7d363b9277c17942dee03cd74e Mon Sep 17 00:00:00 2001 From: "K. Nobel" Date: Tue, 24 Jan 2017 16:51:34 +0100 Subject: [PATCH 205/400] Fixed links to friends on profile page. --- website/views/profile.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/views/profile.php b/website/views/profile.php index 19bd908..1080290 100644 --- a/website/views/profile.php +++ b/website/views/profile.php @@ -14,7 +14,7 @@

    fetch()) { - echo "${friend["username"]}"; + echo "${friend["username"]}"; } -- 2.49.1 From b9fc016f7d4545fcc4d7e30ea351e51774f672b8 Mon Sep 17 00:00:00 2001 From: Hendrik Date: Tue, 24 Jan 2017 16:56:04 +0100 Subject: [PATCH 206/400] add post viewing basis, add insert post and comment queries --- website/public/js/masonry.js | 8 +++ website/public/js/profile.js | 0 website/public/profile.php | 4 +- website/public/styles/post-popup.css | 38 +++++++++++ website/queries/post.php | 97 ++++++++++++++++++++++++++++ website/views/post-view.php | 53 +++++++++++++++ website/views/profile.php | 9 +++ 7 files changed, 208 insertions(+), 1 deletion(-) create mode 100644 website/public/js/profile.js create mode 100644 website/public/styles/post-popup.css create mode 100644 website/queries/post.php create mode 100644 website/views/post-view.php diff --git a/website/public/js/masonry.js b/website/public/js/masonry.js index e9419a2..2bddf59 100644 --- a/website/public/js/masonry.js +++ b/website/public/js/masonry.js @@ -73,4 +73,12 @@ function mansonry() { } $("div.posts div.column").width(100/columnCount + "%"); + + $(".post").click(function () { + $(".modal").show(); + }); + + $(".modal-close").click(function () { + $(".modal").hide(); + }); } \ No newline at end of file diff --git a/website/public/js/profile.js b/website/public/js/profile.js new file mode 100644 index 0000000..e69de29 diff --git a/website/public/profile.php b/website/public/profile.php index e4f1452..f7cae2b 100644 --- a/website/public/profile.php +++ b/website/public/profile.php @@ -2,9 +2,10 @@ - + @@ -12,6 +13,7 @@ include("../queries/user.php"); include("../queries/friendship.php"); include("../queries/nicetime.php"); +include("../queries/post.php"); if(empty($_GET["username"])) { $userID = $_SESSION["userID"]; diff --git a/website/public/styles/post-popup.css b/website/public/styles/post-popup.css new file mode 100644 index 0000000..c4a2a4c --- /dev/null +++ b/website/public/styles/post-popup.css @@ -0,0 +1,38 @@ +/* modal based on: http://www.w3schools.com/howto/howto_css_modals.asp */ + +.modal { + /*display: none; !* Hidden by default *!*/ + position: fixed; /* Stay in place */ + z-index: 1; /* Sit on top */ + left: 0; + top: 0; + width: calc(100% - 256px); /* Full width */ + height: calc(100% - 80px); /* Full height */ + overflow: visible; /* Enable scroll if needed */ + background-color: rgb(0,0,0); /* Fallback color */ + background-color: rgba(0,0,0,0.4); /* Black w/ opacity */ +} + +/* Modal Content/Box */ +.modal-content { + background-color: #fefefe; + margin: 15% auto; /* 15% from the top and centered */ + padding: 20px; + border: 1px solid #888; + width: 80%; /* Could be more or less, depending on screen size */ +} + +.modal-close { + color: #aaa; + float: right; + font-size: 28px; + font-weight: bold; + margin: auto; +} + +.modal-close:hover, +.modal-close:focus { + color: black; + text-decoration: none; + cursor: pointer; +} \ No newline at end of file diff --git a/website/queries/post.php b/website/queries/post.php new file mode 100644 index 0000000..0183a5d --- /dev/null +++ b/website/queries/post.php @@ -0,0 +1,97 @@ +prepare(" + SELECT + `user`.`fname`, + `user`.`lname`, + `user`.`username`, + `post`.`groupID`, + `post`.`title`, + `post`.`content`, + `post`.`creationdate` + FROM + `post` + INNER JOIN + `user` + ON + `post`.`author` = `user`. `userID` + WHERE + `post`.`postID` = :postID + "); + + $stmt->bindParam(':postID', $postID); + $stmt->execute(); + return $stmt; +} + +function selectCommentsByPostId($postID) { + $stmt = $GLOBALS["db"]->prepare(" + SELECT + `comment`.`commentID`, + `comment`.`postID`, + `comment`.`author`, + `comment`.`content`, + `comment`.`creationdate`, + `user`.`fname`, + `user`.`lname`, + `user`.`username` + FROM + `comment` + INNER JOIN + `user` + ON + `comment`.`author` = `user`.`userID` + WHERE + `comment`.`postID` = :postID + "); + + $stmt->bindParam(':postID', $postID); + $stmt->execute(); + return $stmt; +} + +function makePost($userID, $groupID, $title, $content) { + $stmt = $GLOBALS["db"]->prepare(" + INSERT INTO + `post` ( + `author`, + `groupID`, + `title`, + `content` + ) + VALUES ( + :userID, + :groupID, + :title, + :content + ) + "); + + $stmt->bindParam(':userID', $userID); + $stmt->bindParam(':groupID', $groupID); + $stmt->bindParam(':title', $title); + $stmt->bindParam(':content', $content); + $stmt->execute(); +} + +function makeComment($postID, $userID, $content) { + $stmt = $_GLOBAL["db"]->prepare(" + INSERT INTO + `comment` ( + `postID`, + `author`, + `content` + ) + VALUES ( + :postID, + :userID, + :content + ) + "); + + $stmt->bindParam(':postID', $postID); + $stmt->bindParam(':userID', $userID); + $stmt->bindParam(':content', $content); + $stmt->execute(); +} \ No newline at end of file diff --git a/website/views/post-view.php b/website/views/post-view.php new file mode 100644 index 0000000..2450468 --- /dev/null +++ b/website/views/post-view.php @@ -0,0 +1,53 @@ +fetch(PDO::FETCH_ASSOC); + $fullname = $post['fname'] . " " . $post['lname'] . " (" . $post['username'] . ")"; +?> + +

    +

    + + gepost door , + + + + +
    + +
    +

    +
    + +
    +
    +
    +
    + + +
    + + fetch(PDO::FETCH_ASSOC)) { + $commentauthor = $comment['fname'] . " " . $comment['lname'] . " (" . $comment['username'] . ")"; + $commentdate = $comment['creationdate']; + $commentnicetime = nicetime($commentdate); + $commentcontent = $comment['content']; + + echo(" +
    +
    + $commentauthor + + $commentnicetime + +
    +
    + $commentcontent +
    +
    + "); + } + ?> +
    diff --git a/website/views/profile.php b/website/views/profile.php index 19bd908..6d69437 100644 --- a/website/views/profile.php +++ b/website/views/profile.php @@ -66,4 +66,13 @@ } ?>
    + +
    +
    +
    + × +
    + +
    +
    \ No newline at end of file -- 2.49.1 From de03d8799a2ce018e3f62ac8da30459ef76787ee Mon Sep 17 00:00:00 2001 From: "K. Nobel" Date: Tue, 24 Jan 2017 16:58:51 +0100 Subject: [PATCH 207/400] Fixed placeholder for new post. --- website/views/profile.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/views/profile.php b/website/views/profile.php index 2bc0341..0b2f4f2 100644 --- a/website/views/profile.php +++ b/website/views/profile.php @@ -60,7 +60,7 @@
    - +
    -- 2.49.1 From 7144d700e4c3d805b4d85f68b7d20e93e68d966b Mon Sep 17 00:00:00 2001 From: "K. Nobel" Date: Tue, 24 Jan 2017 17:02:49 +0100 Subject: [PATCH 208/400] Removed debug echo from profile page. --- website/public/profile.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/website/public/profile.php b/website/public/profile.php index 439f74a..4f9d680 100644 --- a/website/public/profile.php +++ b/website/public/profile.php @@ -20,8 +20,6 @@ if(empty($_GET["username"])) { $userID = getUserID($_GET["username"]); } -echo "User ID: $userID"; - $user = selectUser($_SESSION["userID"], $userID); $profile_friends = selectAllFriends($userID); $profile_groups = selectAllUserGroups($userID); -- 2.49.1 From 7bf8a16cf0c306303db1b1ae3179beb71fe3e39c Mon Sep 17 00:00:00 2001 From: Lars van Hijfte Date: Tue, 24 Jan 2017 17:06:39 +0100 Subject: [PATCH 209/400] Dingen door elkaar --- website/public/{ => API}/edit_friendship.php | 5 ++-- website/public/js/notifications.js | 24 ++++++++++++++--- website/public/styles/menu.css | 28 ++++++++++++++++++++ website/queries/private_message.php | 1 + website/views/chat-view.php | 7 ++++- website/views/loadFriends.php | 3 +++ 6 files changed, 61 insertions(+), 7 deletions(-) rename website/public/{ => API}/edit_friendship.php (91%) create mode 100644 website/views/loadFriends.php diff --git a/website/public/edit_friendship.php b/website/public/API/edit_friendship.php similarity index 91% rename from website/public/edit_friendship.php rename to website/public/API/edit_friendship.php index d88e264..0a08066 100644 --- a/website/public/edit_friendship.php +++ b/website/public/API/edit_friendship.php @@ -1,7 +1,8 @@ \ -
    \ +
  • \ + \ \ \ +
    \ +
    \ + \ + \ + \ + \ + \ +
    \
    • \ "); } @@ -22,10 +38,10 @@ function showChatNotifications(notifications) { $("#unreadChatlist").html(""); for (i in notifications) { $("#unreadChatlist").append(" \ -
  • \ +
  • \ \
    • - "; + "; + } + + $chatID = $_GET["chatID"]; + if (isset($chatID) && $chatID != "") { + echo ""; } ?> diff --git a/website/views/loadFriends.php b/website/views/loadFriends.php new file mode 100644 index 0000000..b4cbaca --- /dev/null +++ b/website/views/loadFriends.php @@ -0,0 +1,3 @@ +fetchAll()); \ No newline at end of file -- 2.49.1 From 12ed710369ce6b0e469eee00a856b19eacd3ee8a Mon Sep 17 00:00:00 2001 From: Lars van Hijfte Date: Tue, 24 Jan 2017 17:10:12 +0100 Subject: [PATCH 210/400] Fixed API --- website/public/profile.php | 1 - website/views/profile.php | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/website/public/profile.php b/website/public/profile.php index 4f9d680..be71023 100644 --- a/website/public/profile.php +++ b/website/public/profile.php @@ -15,7 +15,6 @@ include("../queries/nicetime.php"); if(empty($_GET["username"])) { $userID = $_SESSION["userID"]; - echo "USERNAME NOT GIVEN"; } else { $userID = getUserID($_GET["username"]); } diff --git a/website/views/profile.php b/website/views/profile.php index 0b2f4f2..07ccbee 100644 --- a/website/views/profile.php +++ b/website/views/profile.php @@ -2,7 +2,7 @@
    "> - + Date: Tue, 24 Jan 2017 17:31:39 +0100 Subject: [PATCH 211/400] In notification bar accept or deny --- website/public/API/edit_friendship.php | 2 +- website/public/js/notifications.js | 22 ++++++++++++++-------- website/queries/friendship.php | 15 +++++++++++++++ 3 files changed, 30 insertions(+), 9 deletions(-) diff --git a/website/public/API/edit_friendship.php b/website/public/API/edit_friendship.php index 0a08066..52aacf5 100644 --- a/website/public/API/edit_friendship.php +++ b/website/public/API/edit_friendship.php @@ -28,4 +28,4 @@ if(!empty($_POST["request"]) AND $friendship_status == 0) { $username = getUsername($_POST["userID"]); -header("Location: profile.php?username=$username"); \ No newline at end of file +header("Location: ../profile.php?username=$username"); \ No newline at end of file diff --git a/website/public/js/notifications.js b/website/public/js/notifications.js index aacff71..afcaca0 100644 --- a/website/public/js/notifications.js +++ b/website/public/js/notifications.js @@ -1,9 +1,19 @@ function showFriendNotifications(notifications) { $("#friendrequestslist").html(""); for (i in notifications) { + var outgoing = ""; + if (notifications[i].friend_state == "3") { + outgoing = " \ + \ + "; + } + $("#friendrequestslist").append(" \
  • \ - \ + \ \ - \ \ - \ + \ \
    • \ \ diff --git a/website/queries/friendship.php b/website/queries/friendship.php index d0279c9..cb35640 100644 --- a/website/queries/friendship.php +++ b/website/queries/friendship.php @@ -39,6 +39,21 @@ function selectAllFriendRequests() { SELECT `userID`, `username`, + CASE `status` IS NULL + WHEN TRUE THEN 0 + WHEN FALSE THEN + CASE `status` = 'confirmed' + WHEN TRUE THEN + 1 + WHEN FALSE THEN + CASE `user1ID` = :userID + WHEN TRUE THEN + 2 + WHEN FALSE THEN + 3 + END + END + END AS `friend_state`, LEFT(CONCAT(`user`.`fname`, ' ', `user`.`lname`), 15) as `name`, IFNULL( `profilepicture`, -- 2.49.1 From f7da87596a513cf8ae421e97e2123aa7a771bc88 Mon Sep 17 00:00:00 2001 From: Marijn Jansen Date: Wed, 25 Jan 2017 09:30:05 +0100 Subject: [PATCH 212/400] Added emailconfirm.php --- website/public/emailconfirm.php | 49 +++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 website/public/emailconfirm.php diff --git a/website/public/emailconfirm.php b/website/public/emailconfirm.php new file mode 100644 index 0000000..97eb2f6 --- /dev/null +++ b/website/public/emailconfirm.php @@ -0,0 +1,49 @@ +prepare(" + SELECT + `email`, + `role` + FROM + `user` + WHERE + `userID` = :userID + "); + $checkHash->bindParam(":userID", $_GET["u"]); + $checkHash->execute(); + $result = $checkHash->fetch(); + $email = $result["email"]; + $role = $result["role"]; + if ($role == "unconfirmed") { + doActivate($email); + } else { + echo "Ongeldige link."; + } + +} else { + echo "Ongeldige link."; +} + +function doActivate(string $email) { + if (password_verify($email, $_GET["h"])) { + $confirmUser = $GLOBALS["db"]->prepare(" + UPDATE + `user` + SET + `role` = :role + WHERE + `userID` = :userID + "); + $confirmUser->bindValue(":role", "user"); + $confirmUser->bindParam(":userID", $_GET["u"]); + $confirmUser->execute(); + if ($confirmUser->rowCount()) { + echo "Email bevestigd
    + U wordt automatisch doorgestuurd naar de login pagina over 5 seconden. "; + header("refresh:5;url=login.php"); + } + } else { + echo "Ongeldige link."; + } +} \ No newline at end of file -- 2.49.1 From 28f31d749bf4dc5a920939c55d37a0f9f9a2b2f3 Mon Sep 17 00:00:00 2001 From: Marijn Jansen Date: Wed, 25 Jan 2017 11:16:53 +0100 Subject: [PATCH 213/400] Email confirm (: --- website/queries/emailconfirm.php | 43 ++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 website/queries/emailconfirm.php diff --git a/website/queries/emailconfirm.php b/website/queries/emailconfirm.php new file mode 100644 index 0000000..8b0031c --- /dev/null +++ b/website/queries/emailconfirm.php @@ -0,0 +1,43 @@ +prepare(" + SELECT + `userID` + FROM + `user` + WHERE + `username` = :username + "); + $stmt->bindParam(":username", $username); + $stmt->execute(); + $userID = $stmt->fetch()["username"]; + sendConfirmEmail($userID); +} + +function sendConfirmEmail(int $userID) { + $stmt = $GLOBALS["db"]->prepare(" + SELECT + `email`, + `fname` + FROM + `user` + WHERE + `userID` = :userID + "); + $stmt->bindParam(":userID", $userID); + $user = $stmt->fetch(); + + $email = $user["email"]; + $fname = $user["fname"]; + $hash = password_hash($email, PASSWORD_DEFAULT); + $confirmLink = "https://myhyvesbookplus.nl/emailconfirm.php?u=$userID&h=$hash"; + + $subject = "Bevestig uw emailadres"; + $body = "Hallo $fname,\r\n\r\n + Klik op de onderstaande link om uw emailadres te bevestigen.\r\n\r\n + $confirmLink\r\n\r\n + Groeten MyHyvesbook+"; + $header = "From: MyHyvesbook+ "; + mail($email, $subject, $body, $header); +} \ No newline at end of file -- 2.49.1 From 981e34c95082d1bffe8b4a0ca18f5a19239d5829 Mon Sep 17 00:00:00 2001 From: Joey Lai Date: Wed, 25 Jan 2017 11:19:01 +0100 Subject: [PATCH 214/400] redesigned code --- website/public/js/registerAndLogin.js | 5 +++- website/public/login.php | 23 +++------------ website/public/register.php | 4 +-- website/public/styles/index.css | 2 +- website/queries/checkInput.php | 3 +- website/queries/login.php | 40 ++++++++++++++++++++++++++- website/views/login_head.php | 4 +-- website/views/register-view.php | 2 +- 8 files changed, 55 insertions(+), 28 deletions(-) diff --git a/website/public/js/registerAndLogin.js b/website/public/js/registerAndLogin.js index 0452d15..4e68a07 100644 --- a/website/public/js/registerAndLogin.js +++ b/website/public/js/registerAndLogin.js @@ -4,5 +4,8 @@ function checkLoggedIn() { } else { window.location.href = "profile.php"; } - document.getElementById("demo").innerHTML = x; } + +function bannedAlert(){ + alert("Your account is banned"); +} \ No newline at end of file diff --git a/website/public/login.php b/website/public/login.php index 0d07413..b3a00b0 100644 --- a/website/public/login.php +++ b/website/public/login.php @@ -22,26 +22,11 @@ // Trying to login if ($_SERVER["REQUEST_METHOD"] == "POST") { - // Empty username or password field - if (empty($_POST["uname"]) || empty($_POST["psw"])) { - $loginErr = "Gebruikersnaam of wachtwoord is niet ingevuld"; - - } - else { + try{ $uname = strtolower(test_input($_POST["uname"])); - $psw = test_input($_POST["psw"]); - $hash = getUser()["password"]; - $userid = getUser()["userID"]; - - // If there's an account, go to the profile page - if(password_verify($psw, $hash)) { - $_SESSION["userID"] = $userid; - header("location: profile.php"); - - } else { - $loginErr = "Inloggegevens zijn niet correct"; - } - + validateLogin($_POST["uname"], $_POST["psw"]); + } catch(loginException $e) { + $loginErr = $e->getMessage(); } } diff --git a/website/public/register.php b/website/public/register.php index 99af6c0..84d6873 100644 --- a/website/public/register.php +++ b/website/public/register.php @@ -45,7 +45,7 @@ } try{ - $username = test_input(($_POST["username"])); + $username = str_replace(' ', '', test_input(($_POST["username"]))); checkInputChoice($username, "username"); } catch(usernameException $e){ $correct = false; @@ -53,7 +53,7 @@ } try{ - $password = test_input(($_POST["password"])); + $password = str_replace(' ', '', test_input(($_POST["password"]))); checkInputChoice($password, "longerEight"); matchPassword(); } catch(passwordException $e){ diff --git a/website/public/styles/index.css b/website/public/styles/index.css index 8482cea..fc9d3d6 100644 --- a/website/public/styles/index.css +++ b/website/public/styles/index.css @@ -1,6 +1,6 @@ a.button { background-color: #C8CABD; - border-radius: 10px; + border-radius: 5px; color: black; cursor: pointer; height: 50%; diff --git a/website/queries/checkInput.php b/website/queries/checkInput.php index cc32626..5f72f10 100644 --- a/website/queries/checkInput.php +++ b/website/queries/checkInput.php @@ -38,7 +38,8 @@ function checkName($variable){ if (empty($variable)) { throw new lettersAndSpacesException("Verplicht!"); } else if (!preg_match("/^[a-zA-Z ]*$/", $variable)) { - throw new lettersAndSpacesException("Alleen letters en spaties zijn toegestaan!"); + + throw new lettersAndSpacesException("Alleen letters en spaties zijn toegestaan!"); } } diff --git a/website/queries/login.php b/website/queries/login.php index 180b431..8605e67 100644 --- a/website/queries/login.php +++ b/website/queries/login.php @@ -4,7 +4,8 @@ function getUser() { $stmt = $GLOBALS["db"]->prepare(" SELECT `password`, - `userID` + `userID`, + `role` FROM `user` WHERE @@ -15,3 +16,40 @@ function getUser() { $stmt->execute(); return $stmt->fetch(PDO::FETCH_ASSOC); } + +function validateLogin($username, $password){ + // Empty username or password field + if (empty($username) || empty($password)) { + throw new loginException("Gebruikersnaam of wachtwoord is niet ingevuld"); + } + else { + $psw = test_input($password); + $hash = getUser()["password"]; + $userID = getUser()["userID"]; + $role = getUser()["role"]; + + // If there's an account, go to the profile page + if(password_verify($psw, $hash)) { + if ($role == "banned"){ + echo ""; + } else { + $_SESSION["userID"] = $userID; + header("location: profile.php"); + } + } else { + throw new loginException("Inloggevens zijn niet correct"); + } + + } +} + +class loginException extends Exception +{ + public function __construct($message = "", $code = 0, Exception $previous = null) + { + parent::__construct($message, $code, $previous); + } +} +?> \ No newline at end of file diff --git a/website/views/login_head.php b/website/views/login_head.php index e983fab..e831cd2 100644 --- a/website/views/login_head.php +++ b/website/views/login_head.php @@ -7,7 +7,7 @@ - - + + diff --git a/website/views/register-view.php b/website/views/register-view.php index 4c660c9..f970a6f 100644 --- a/website/views/register-view.php +++ b/website/views/register-view.php @@ -96,7 +96,7 @@ + diff --git a/website/views/login_head.php b/website/views/login_head.php index e831cd2..e319a9d 100644 --- a/website/views/login_head.php +++ b/website/views/login_head.php @@ -7,7 +7,7 @@ - + diff --git a/website/views/register-view.php b/website/views/register-view.php index f970a6f..5f39472 100644 --- a/website/views/register-view.php +++ b/website/views/register-view.php @@ -126,7 +126,7 @@ -- 2.49.1 From 44f86a4fbb614f56b013c964b92662f15f680a5b Mon Sep 17 00:00:00 2001 From: Marijn Jansen Date: Thu, 26 Jan 2017 12:05:28 +0100 Subject: [PATCH 237/400] Email confirm and password change now use messagepage function. --- website/public/emailconfirm.php | 12 ++--- website/public/resetpassword.php | 16 +++--- website/views/messagepage.php | 23 +++++++++ website/views/resetpassword.php | 85 ++++++++++++++------------------ 4 files changed, 77 insertions(+), 59 deletions(-) create mode 100644 website/views/messagepage.php diff --git a/website/public/emailconfirm.php b/website/public/emailconfirm.php index 97eb2f6..2812eaa 100644 --- a/website/public/emailconfirm.php +++ b/website/public/emailconfirm.php @@ -1,5 +1,6 @@ prepare(" SELECT @@ -18,11 +19,11 @@ if (array_key_exists("u", $_GET) and array_key_exists("h", $_GET)) { if ($role == "unconfirmed") { doActivate($email); } else { - echo "Ongeldige link."; + messagePage("Ongeldige link."); } } else { - echo "Ongeldige link."; + messagePage("Ongeldige link."); } function doActivate(string $email) { @@ -39,11 +40,10 @@ function doActivate(string $email) { $confirmUser->bindParam(":userID", $_GET["u"]); $confirmUser->execute(); if ($confirmUser->rowCount()) { - echo "Email bevestigd
    - U wordt automatisch doorgestuurd naar de login pagina over 5 seconden. "; - header("refresh:5;url=login.php"); + messagePage("Email bevestigd
    + Klik hier om terug te gaan naar de login pagina."); } } else { - echo "Ongeldige link."; + messagePage("Ongeldige link."); } } \ No newline at end of file diff --git a/website/public/resetpassword.php b/website/public/resetpassword.php index 54b706b..3ca2698 100644 --- a/website/public/resetpassword.php +++ b/website/public/resetpassword.php @@ -1,26 +1,30 @@ + + + + + +
    + +
    $content
    +
    + + + "); + + echo $webpage; + } \ No newline at end of file diff --git a/website/views/resetpassword.php b/website/views/resetpassword.php index 24d3aaf..a3107f9 100644 --- a/website/views/resetpassword.php +++ b/website/views/resetpassword.php @@ -1,47 +1,38 @@ - - - - - - -
    - - -
    -
    Voer een nieuw wachtwoord in
    - " - > - " - > -
      -
    • - - -
      • -
    • - - -
      • -
    • - - -
      • -
    - -
    - - \ No newline at end of file + +
    Voer een nieuw wachtwoord in
    + + +
      +
    • + + +
      • +
    • + + +
      • +
    • + + +
      • +
    + "; + return $content; +} \ No newline at end of file -- 2.49.1 From 47eed5514a80408a735bafbfbf756166dad27542 Mon Sep 17 00:00:00 2001 From: Marijn Jansen Date: Thu, 26 Jan 2017 12:14:07 +0100 Subject: [PATCH 238/400] Removed .idea folder --- .idea/WebDB.iml | 18 ---------------- .idea/inspectionProfiles/Project_Default.xml | 22 -------------------- .idea/modules.xml | 8 ------- .idea/php.xml | 4 ---- .idea/sqldialects.xml | 6 ------ .idea/vcs.xml | 6 ------ 6 files changed, 64 deletions(-) delete mode 100644 .idea/WebDB.iml delete mode 100644 .idea/inspectionProfiles/Project_Default.xml delete mode 100644 .idea/modules.xml delete mode 100644 .idea/php.xml delete mode 100644 .idea/sqldialects.xml delete mode 100644 .idea/vcs.xml diff --git a/.idea/WebDB.iml b/.idea/WebDB.iml deleted file mode 100644 index b313593..0000000 --- a/.idea/WebDB.iml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml deleted file mode 100644 index f08a78f..0000000 --- a/.idea/inspectionProfiles/Project_Default.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index e1b2ef9..0000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/php.xml b/.idea/php.xml deleted file mode 100644 index 10b171f..0000000 --- a/.idea/php.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/sqldialects.xml b/.idea/sqldialects.xml deleted file mode 100644 index af0e43a..0000000 --- a/.idea/sqldialects.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 94a25f7..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file -- 2.49.1 From 423c2fd7712b0be152c4201e3e2063b9917ac85b Mon Sep 17 00:00:00 2001 From: Marijn Jansen Date: Thu, 26 Jan 2017 12:16:28 +0100 Subject: [PATCH 239/400] Revert "Merge branch 'marijn-settings' into 'master'" This reverts merge request !128 --- .idea/WebDB.iml | 18 ++++++++++++++++ .idea/inspectionProfiles/Project_Default.xml | 22 ++++++++++++++++++++ .idea/modules.xml | 8 +++++++ .idea/php.xml | 4 ++++ .idea/sqldialects.xml | 6 ++++++ .idea/vcs.xml | 6 ++++++ 6 files changed, 64 insertions(+) create mode 100644 .idea/WebDB.iml create mode 100644 .idea/inspectionProfiles/Project_Default.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/php.xml create mode 100644 .idea/sqldialects.xml create mode 100644 .idea/vcs.xml diff --git a/.idea/WebDB.iml b/.idea/WebDB.iml new file mode 100644 index 0000000..b313593 --- /dev/null +++ b/.idea/WebDB.iml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml new file mode 100644 index 0000000..f08a78f --- /dev/null +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -0,0 +1,22 @@ + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..e1b2ef9 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/php.xml b/.idea/php.xml new file mode 100644 index 0000000..10b171f --- /dev/null +++ b/.idea/php.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/.idea/sqldialects.xml b/.idea/sqldialects.xml new file mode 100644 index 0000000..af0e43a --- /dev/null +++ b/.idea/sqldialects.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file -- 2.49.1 From 3ebacd62515c89cf6633c7ad0d41631211d09434 Mon Sep 17 00:00:00 2001 From: "K. Nobel" Date: Thu, 26 Jan 2017 12:20:32 +0100 Subject: [PATCH 240/400] Fixed masonry grid (posts). --- website/public/js/masonry.js | 66 ++++++++++++++---------------------- website/public/profile.php | 16 ++++++++- website/queries/user.php | 4 ++- website/views/profile.php | 50 +++++++++++++-------------- 4 files changed, 69 insertions(+), 67 deletions(-) diff --git a/website/public/js/masonry.js b/website/public/js/masonry.js index e9419a2..b523828 100644 --- a/website/public/js/masonry.js +++ b/website/public/js/masonry.js @@ -1,37 +1,28 @@ margin = 20; -$(window).on("load", function() { - console.log("LOADED"); - container = $("div.posts"); - posts = container.children(); - posts.remove(); - - column = $('
    ').append(posts); - container.append(column); - - mansonry(); - mansonry(); -}); - $(window).resize(function() { clearTimeout(window.resizedFinished); window.resizeFinished = setTimeout(function() { - mansonry(); + masonry(); }, 250); }); -function mansonry() { +var $container = $(".posts"); +function masonry() { + $container.children().remove(); columnCount = Math.floor($(".posts").width() / 250); - console.log("columns: " + columnCount); /* * Initialise columns. */ var columns = new Array(columnCount); + var $columns = new Array(columnCount); for (i = 0; i < columnCount; i++) { - columns[i] = [0, []]; - console.log(columns[i]); + $column = $("
    "); + $column.width(100/columnCount + "%"); + $container.append($column); + columns[i] = [0, $column]; } /* @@ -45,32 +36,27 @@ function mansonry() { column = columns[i]; } } - return column; } /* - * Rearange the objects. + * Get the posts from the server. */ - j = 0; - posts.each(function(i) { - post = posts[i]; - shortestColumn = getShortestColumn(columns); - shortestColumn[0] = shortestColumn[0] + $(post).height() + margin; - shortestColumn[1].push(post); + $.post("API/getPosts.php", { usr : userID }) + .done(function(data) { + posts = JSON.parse(data); - }); - - container.children().remove(); - /* - * Display the objects again in the correct order. - */ - for (i = 0; i < columnCount; i++) { - column = $('
    ').append(columns[i][1]); - console.log(column); - container.append(column); + /* + * Rearange the objects. + */ + jQuery.each(posts, function() { + $post = $("
    "); + $post.append($("

    ").text(this["title"])); + $post.append($("

    ").html(this["content"])); - } - - $("div.posts div.column").width(100/columnCount + "%"); -} \ No newline at end of file + shortestColumn = getShortestColumn(columns); + shortestColumn[1].append($post); + shortestColumn[0] = shortestColumn[0] + $post.height() + margin; + }); + }); +} diff --git a/website/public/profile.php b/website/public/profile.php index 6e188c4..1423483 100644 --- a/website/public/profile.php +++ b/website/public/profile.php @@ -2,7 +2,6 @@ - @@ -45,10 +44,25 @@ include("../views/footer.php"); ?> + diff --git a/website/queries/user.php b/website/queries/user.php index 9904eee..7672746 100644 --- a/website/queries/user.php +++ b/website/queries/user.php @@ -126,7 +126,9 @@ function selectAllUserPosts($userID) { "); $stmt->bindParam(':userID', $userID, PDO::PARAM_INT); - $stmt->execute(); + if(!$stmt->execute()) { + return False; + } return $stmt; } diff --git a/website/views/profile.php b/website/views/profile.php index 3719ff1..6b7b283 100644 --- a/website/views/profile.php +++ b/website/views/profile.php @@ -5,7 +5,7 @@

    - +

    @@ -43,29 +43,29 @@
    - -
    -
    - - - - -
    - fetch()) { - $nicetime = nicetime($post["creationdate"]); - echo " -
    -

    ${post["title"]}

    -

    ${post["content"]}

    -

    ${nicetime} geplaatst.

    -
    - "; - } - ?> + + + + + + + + +fetch()) { +// $nicetime = nicetime($post["creationdate"]); +// echo " +//
    +//

    ${post["title"]}

    +//

    ${post["content"]}

    +//

    ${nicetime} geplaatst.

    +//
    +// "; +// } +// ?>
    \ No newline at end of file -- 2.49.1 From 91aca6baa740f48958435a3f12ee608cbd8d4e14 Mon Sep 17 00:00:00 2001 From: Hendrik Date: Thu, 26 Jan 2017 12:21:01 +0100 Subject: [PATCH 241/400] change comments to use ajax --- website/public/API/postComment.php | 14 ++++++++------ website/public/js/post.js | 18 ++++++++++++++++++ website/public/js/profile.js | 8 -------- website/public/profile.php | 2 +- website/views/post-view.php | 6 +++--- 5 files changed, 30 insertions(+), 18 deletions(-) create mode 100644 website/public/js/post.js diff --git a/website/public/API/postComment.php b/website/public/API/postComment.php index c5b30cc..b840e0b 100644 --- a/website/public/API/postComment.php +++ b/website/public/API/postComment.php @@ -5,12 +5,14 @@ session_start(); require("../../queries/post.php"); require("../../queries/connect.php"); require("../../queries/checkInput.php"); - if (empty($_POST['newcomment-content'])) { + echo 0; } else { - makeComment($_POST['postID'], + if(makeComment($_POST['postID'], $_SESSION['userID'], - test_input($_POST['newcomment-content'])); -} - -header("Location: ../profile.php"); \ No newline at end of file + test_input($_POST['newcomment-content']))) { + echo 1; + } else { + echo 0; + } +} \ No newline at end of file diff --git a/website/public/js/post.js b/website/public/js/post.js new file mode 100644 index 0000000..62ace68 --- /dev/null +++ b/website/public/js/post.js @@ -0,0 +1,18 @@ +function postComment() { + $.post( + "API/postComment.php", + $("#newcommentform").serialize() + ); + + $("#newcomment").val(""); + + //reload post + $.get( + "API/loadPost.php", + $("#newcommentform").serialize() + ).done(function (data) { + $('#modal-response').html(data); + }); +} + + diff --git a/website/public/js/profile.js b/website/public/js/profile.js index 2a47dce..e69de29 100644 --- a/website/public/js/profile.js +++ b/website/public/js/profile.js @@ -1,8 +0,0 @@ -function loadPost(postID) { - $.get( - "API/loadPost.php", - $(postID).serialize() - ).done(function (data) { - $('#modal-response').innerHTML= JSON.parse(data); - }); -} \ No newline at end of file diff --git a/website/public/profile.php b/website/public/profile.php index d2d3c3f..c8f27c4 100644 --- a/website/public/profile.php +++ b/website/public/profile.php @@ -3,7 +3,7 @@ - + + + fetchColumn(); Zoek: > - @@ -79,22 +83,9 @@ $group_count = countSomeGroups($search)->fetchColumn(); @@ -122,42 +113,9 @@ $group_count = countSomeGroups($search)->fetchColumn(); -- 2.49.1 From b66c108f4ec105ed990c804581197b03beb2ac52 Mon Sep 17 00:00:00 2001 From: "K. Nobel" Date: Thu, 26 Jan 2017 14:31:45 +0100 Subject: [PATCH 245/400] Fixed post titles for htmlchars. --- website/public/js/masonry.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/public/js/masonry.js b/website/public/js/masonry.js index 0b31443..6b91e4b 100644 --- a/website/public/js/masonry.js +++ b/website/public/js/masonry.js @@ -100,7 +100,7 @@ function masonry(mode) { */ jQuery.each(posts, function() { $post = $("
    "); - $post.append($("

    ").text(this["title"])); + $post.append($("

    ").html(this["title"])); $post.append($("

    ").html(this["content"])); $post.append($("

    ").text(this["nicetime"])); -- 2.49.1 From 96f70e1a113ee487e65af9e0ab3adebf3d5a29e7 Mon Sep 17 00:00:00 2001 From: Joey Lai Date: Thu, 26 Jan 2017 14:50:41 +0100 Subject: [PATCH 246/400] Fixed date and other extras --- website/public/login.php | 6 +-- website/public/register.php | 17 ++++++-- website/public/styles/index.css | 7 ++- website/queries/checkInput.php | 23 +++++++--- website/queries/login.php | 6 +-- website/queries/register.php | 26 ++++++----- website/views/login-view.php | 77 +++++++++++++++++---------------- website/views/register-view.php | 66 ++++++++++++++++++++++++---- 8 files changed, 156 insertions(+), 72 deletions(-) diff --git a/website/public/login.php b/website/public/login.php index 0515793..d4dd991 100644 --- a/website/public/login.php +++ b/website/public/login.php @@ -20,15 +20,15 @@ } // Define variables and set to empty values - $uname = $psw =""; + $user = $psw =""; $loginErr = $resetErr =""; if ($_SERVER["REQUEST_METHOD"] == "POST") { switch ($_POST["submit"]) { case "login": try { - $uname = ($_POST["uname"]); - validateLogin($_POST["uname"], $_POST["psw"]); + $user = ($_POST["user"]); + validateLogin($_POST["user"], $_POST["psw"]); } catch(loginException $e) { $loginErr = $e->getMessage(); } diff --git a/website/public/register.php b/website/public/register.php index 1ce4817..0077e62 100644 --- a/website/public/register.php +++ b/website/public/register.php @@ -14,9 +14,12 @@ header("location: login.php"); } // define variables and set to empty values - $name = $surname = $bday = $username = $password = $confirmpassword = $location = $housenumber = $email = $captcha = $ip = ""; - $genericErr = $nameErr = $surnameErr = $bdayErr = $usernameErr = $passwordErr = $confirmpasswordErr = $locationErr = $housenumberErr = $emailErr = $captchaErr = ""; + $name = $surname = $bday = $username = $password = $confirmpassword = $location = $housenumber = $email = $confirmEmail = $captcha = $ip = ""; + $genericErr = $nameErr = $surnameErr = $bdayErr = $usernameErr = $passwordErr = $confirmpasswordErr = $locationErr = $housenumberErr = $emailErr = $confirmEmailErr = $captchaErr = ""; $correct = true; + $day_date = "dag"; + $month_date = "maand"; + $year_date = "jaar"; // Trying to register an account if ($_SERVER["REQUEST_METHOD"] == "POST") { @@ -38,7 +41,10 @@ } try{ - $bday = test_input(($_POST["bday"])); + $day_date = test_input(($_POST["day_date"])); + $month_date = test_input(($_POST["month_date"])); + $year_date = test_input(($_POST["year_date"])); + $bday = $year_date . "-" . $month_date . "-" . $day_date; checkInputChoice($bday, "bday"); } catch(bdayException $e){ $correct = false; @@ -76,9 +82,14 @@ try{ $email = test_input(($_POST["email"])); checkInputChoice($email, "email"); + $confirmEmail = test_input(($_POST["confirmEmail"])); + matchEmail(); } catch(emailException $e){ $correct = false; $emailErr = $e->getMessage(); + } catch(confirmEmailException $e){ + $correct = false; + $confirmEmailErr = $e->getMessage(); } try{ diff --git a/website/public/styles/index.css b/website/public/styles/index.css index 97d6f63..9829688 100644 --- a/website/public/styles/index.css +++ b/website/public/styles/index.css @@ -133,6 +133,10 @@ label { width: 45%; } +select{ + width: 18%; +} + ul { font-family: Arial; font-size: 16px; @@ -203,7 +207,6 @@ ul { .modal-body {padding: 2px 16px;} .modal-footer { - padding: 2px 16px; background-color: #FBC02D; color: black; -} \ No newline at end of file +} diff --git a/website/queries/checkInput.php b/website/queries/checkInput.php index 9b91833..fbf64a7 100644 --- a/website/queries/checkInput.php +++ b/website/queries/checkInput.php @@ -38,8 +38,7 @@ function checkName($variable){ if (empty($variable)) { throw new lettersAndSpacesException("Verplicht!"); } else if (!preg_match("/^[a-zA-Z ]*$/", $variable)) { - - throw new lettersAndSpacesException("Alleen letters en spaties zijn toegestaan!"); + throw new lettersAndSpacesException("Alleen letters en spaties zijn toegestaan!"); } } @@ -48,12 +47,12 @@ function validateBday($variable){ if (empty($variable)) { throw new bdayException("Verplicht!"); } else { - if (!(validateDate($variable, "Y/m/d"))) { + if (!(validateDate($variable, "Y-m-d"))) { throw new bdayException("Geen geldige datum"); } else { - $dateNow = date("Y/m/d"); + $dateNow = date("Y-m-d"); if ($dateNow < $variable) { - throw new bdayException("Geen geldige datum"); + throw new bdayException("Geen geldige datum!"); } } } @@ -97,6 +96,12 @@ function validateEmail($variable){ } } +function matchEmail(){ + if (strtolower($_POST["email"]) != strtolower($_POST["confirmEmail"])){ + throw new confirmEmailException("Emails matchen niet!"); + } +} + /* checks if an input is a valid email. */ function resetEmail($variable){ if (empty($variable)) { @@ -206,6 +211,14 @@ class emailException extends Exception } } +class confirmEmailException extends Exception +{ + public function __construct($message = "", $code = 0, Exception $previous = null) + { + parent::__construct($message, $code, $previous); + } +} + class captchaException extends Exception { public function __construct($message = "", $code = 0, Exception $previous = null) diff --git a/website/queries/login.php b/website/queries/login.php index 2af255a..15a5de1 100644 --- a/website/queries/login.php +++ b/website/queries/login.php @@ -9,10 +9,10 @@ function getUser() { FROM `user` WHERE - `username` LIKE :username + `username` LIKE :username OR + `email` LIKE :username "); - $stmt->bindParam(":username", $_POST["uname"]); $stmt->execute(); return $stmt->fetch(PDO::FETCH_ASSOC); } @@ -20,7 +20,7 @@ function getUser() { function validateLogin($username, $password){ // Empty username or password field if (empty($username) || empty($password)) { - throw new loginException("Gebruikersnaam of wachtwoord is niet ingevuld"); + throw new loginException("Inloggegevens zijn niet ingevuld"); } else { $psw = test_input($password); diff --git a/website/queries/register.php b/website/queries/register.php index 738ef43..be9d415 100644 --- a/website/queries/register.php +++ b/website/queries/register.php @@ -10,7 +10,7 @@ function getExistingUsername() { `username` LIKE :username "); - $stmt->bindParam(":username", $_POST["username"]); + $stmt->bindParam(":username", test_input($_POST["username"])); $stmt->execute(); return $stmt->rowCount(); @@ -26,7 +26,7 @@ function getExistingEmail() { `email` LIKE :email "); - $stmt->bindParam(":email", $_POST["email"]); + $stmt->bindParam(":email", test_input($_POST["email"])); $stmt->execute(); return $stmt->rowCount(); @@ -42,7 +42,7 @@ function getResetEmail() { `email` LIKE :email "); - $stmt->bindParam(":email", $_POST["forgotEmail"]); + $stmt->bindParam(":email", test_input($_POST["forgotEmail"])); $stmt->execute(); return $stmt->rowCount(); @@ -70,15 +70,21 @@ function registerAccount() { $hash=password_hash($_POST["password"], PASSWORD_DEFAULT); - $stmt->bindParam(":fname", $_POST["name"]); - $stmt->bindParam(":lname", $_POST["surname"]); - $stmt->bindParam(":bday", $_POST["bday"]); - $stmt->bindParam(":username", $_POST["username"]); - $stmt->bindParam(":password", $hash); - $stmt->bindParam(":location", $_POST["location"]); - $stmt->bindParam(":email", (strtolower($_POST["email"]))); + $stmt->bindParam(":fname", test_input($_POST["name"])); + $stmt->bindParam(":lname", test_input($_POST["surname"])); + $stmt->bindParam(":bday", test_input($_POST["bday"])); + $stmt->bindParam(":username", test_input($_POST["username"])); + $stmt->bindParam(":password", test_input($hash)); + $stmt->bindParam(":location", test_input($_POST["location"])); + $stmt->bindParam(":email", test_input(strtolower($_POST["email"]))); $stmt->execute(); $stmt->rowCount(); } + +function submitselect($date, $value){ + if ($date == $value){ + echo "selected"; + } +} ?> diff --git a/website/views/login-view.php b/website/views/login-view.php index de4c48b..c64590e 100644 --- a/website/views/login-view.php +++ b/website/views/login-view.php @@ -13,11 +13,11 @@

    @@ -47,46 +47,47 @@

    - - -- 2.49.1 From 7073995534742cc2d479f182774d13e2e439b7cf Mon Sep 17 00:00:00 2001 From: Marijn Jansen Date: Thu, 26 Jan 2017 17:03:11 +0100 Subject: [PATCH 252/400] Stop before Genius Bar visit --- website/public/API/postComment.php | 22 ++++++++--- website/public/styles/post-popup.css | 5 +++ website/queries/post.php | 55 +++++++++++++++++++++++++++- website/views/post-view.php | 4 +- 4 files changed, 77 insertions(+), 9 deletions(-) diff --git a/website/public/API/postComment.php b/website/public/API/postComment.php index b840e0b..bbe39b1 100644 --- a/website/public/API/postComment.php +++ b/website/public/API/postComment.php @@ -5,14 +5,24 @@ session_start(); require("../../queries/post.php"); require("../../queries/connect.php"); require("../../queries/checkInput.php"); -if (empty($_POST['newcomment-content'])) { - echo 0; -} else { - if(makeComment($_POST['postID'], - $_SESSION['userID'], - test_input($_POST['newcomment-content']))) { +if ($_POST["button"] == "reaction") { + if (empty($_POST['newcomment-content'])) { + echo 0; + } else { + if (makeComment($_POST['postID'], + $_SESSION['userID'], + test_input($_POST['newcomment-content']))) { + echo 1; + } else { + echo 0; + } + } +} elseif ($_POST["button"] == "nietslecht") { + if (makeNietSlecht($_POST["postID"], $_SESSION["userID"])) { echo 1; } else { echo 0; } +} else { + echo 0; } \ No newline at end of file diff --git a/website/public/styles/post-popup.css b/website/public/styles/post-popup.css index 11fe03b..5522743 100644 --- a/website/public/styles/post-popup.css +++ b/website/public/styles/post-popup.css @@ -69,4 +69,9 @@ .commentcontent { margin: 5px auto; width: 95%; +} + +.nietslecht { + font-family: Impact, sans-serif; + text-shadow: -1.5px 0 1px black, 0 1.5px 1px black, 1px 0 1.5px black, 0 -1.5px 1px black; } \ No newline at end of file diff --git a/website/queries/post.php b/website/queries/post.php index 5940267..59e7a91 100644 --- a/website/queries/post.php +++ b/website/queries/post.php @@ -75,7 +75,7 @@ function makePost($userID, $groupID, $title, $content) { $stmt->execute(); } -function makeComment($postID, $userID, $content) { +function makeComment($postID, $userID, $content) : int { $stmt = $GLOBALS["db"]->prepare(" INSERT INTO `comment` ( @@ -94,4 +94,55 @@ function makeComment($postID, $userID, $content) { $stmt->bindParam(':userID', $userID); $stmt->bindParam(':content', $content); $stmt->execute(); -} \ No newline at end of file + return $stmt->rowCount(); +} + +function makeNietSlecht(int $postID, int $userID) : int { + if (checkNietSlecht($postID, $userID)) { + return deleteNietSlecht(postID, $userID); + } else { + return addNietSlecht($postID, $userID); + } +} + +function checkNietSlecht(int $postID, int $userID) { + $stmt = $GLOBALS["db"]->prepare(" + SELECT + * + FROM + `niet_slecht` + WHERE + `userID` = :userID AND + `postID` = :postID + "); + $stmt->bindParam(":userID", $userID); + $stmt->bindParam(":postID", $postID); + $stmt->execute(); + return $stmt->rowCount(); +} + +function addNietSlecht(int $postID, int $userID) { + $stmt = $GLOBALS["db"]->prepare(" + INSERT INTO + `niet_slecht` (`userID`, `postID`) + VALUES (:userID, :postID) + "); + $stmt->bindParam(":userID", $userID); + $stmt->bindParam(":postID", $postID); + $stmt->execute(); + return $stmt->rowCount(); +} + +function deleteNietSlecht(int $postID, int $userID) { + $stmt = $GLOBALS["db"]->prepare(" + DELETE FROM + `niet_slecht` + WHERE + `userID` = :userID AND + `postID` = :postID + "); + $stmt->bindParam(":userID", $userID); + $stmt->bindParam(":postID", $postID); + $stmt->execute(); + return $stmt->rowCount(); +} diff --git a/website/views/post-view.php b/website/views/post-view.php index 61e0e05..37e64b5 100644 --- a/website/views/post-view.php +++ b/website/views/post-view.php @@ -24,7 +24,9 @@ echo("

    - + + + -- 2.49.1 From 032e25b044c11d0018dfb506de4a9d3d21496f05 Mon Sep 17 00:00:00 2001 From: Lars van Hijfte Date: Thu, 26 Jan 2017 21:50:47 +0100 Subject: [PATCH 253/400] You can now only chat with friends --- website/public/API/sendMessage.php | 1 + website/queries/private_message.php | 2 +- website/views/chat-view.php | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/website/public/API/sendMessage.php b/website/public/API/sendMessage.php index c5d47d1..f84cb11 100644 --- a/website/public/API/sendMessage.php +++ b/website/public/API/sendMessage.php @@ -3,6 +3,7 @@ session_start(); require_once("../../queries/connect.php"); require_once("../../queries/private_message.php"); +require_once("../../queries/friendship.php"); require_once("../../queries/checkInput.php"); if (!empty(test_input($_POST["destination"])) && diff --git a/website/queries/private_message.php b/website/queries/private_message.php index d2b1537..369ee40 100644 --- a/website/queries/private_message.php +++ b/website/queries/private_message.php @@ -58,7 +58,7 @@ function sendMessage($destination, $content) { } function getNewChatMessages($lastID, $destination) { - if (getFriendshipStatus($user2ID) == 1) { + if (getFriendshipStatus($destination) == 1) { $stmt = $GLOBALS["db"]->prepare(" SELECT * diff --git a/website/views/chat-view.php b/website/views/chat-view.php index 0d90149..974b441 100644 --- a/website/views/chat-view.php +++ b/website/views/chat-view.php @@ -74,6 +74,7 @@ name="content" id="newContent" placeholder="Schrijf een bericht..." + autocomplete="off" autofocus required /> -- 2.49.1 From d89e672990325f96c060f3cbb74854eed4519289 Mon Sep 17 00:00:00 2001 From: Lars van Hijfte Date: Thu, 26 Jan 2017 21:54:47 +0100 Subject: [PATCH 254/400] Also fixed unread chat --- website/public/API/sendMessage.php | 1 - website/queries/private_message.php | 6 ++++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/website/public/API/sendMessage.php b/website/public/API/sendMessage.php index f84cb11..c5d47d1 100644 --- a/website/public/API/sendMessage.php +++ b/website/public/API/sendMessage.php @@ -3,7 +3,6 @@ session_start(); require_once("../../queries/connect.php"); require_once("../../queries/private_message.php"); -require_once("../../queries/friendship.php"); require_once("../../queries/checkInput.php"); if (!empty(test_input($_POST["destination"])) && diff --git a/website/queries/private_message.php b/website/queries/private_message.php index 369ee40..4d48d3a 100644 --- a/website/queries/private_message.php +++ b/website/queries/private_message.php @@ -30,6 +30,7 @@ function getOldChatMessages($user2ID) { } function sendMessage($destination, $content) { + require_once("friendship.php"); if (getFriendshipStatus($destination) == 1) { $stmt = $GLOBALS["db"]->prepare(" INSERT INTO @@ -58,6 +59,7 @@ function sendMessage($destination, $content) { } function getNewChatMessages($lastID, $destination) { + require_once("friendship.php"); if (getFriendshipStatus($destination) == 1) { $stmt = $GLOBALS["db"]->prepare(" SELECT @@ -91,13 +93,13 @@ function getNewChatMessages($lastID, $destination) { function selectAllUnreadChat() { $stmt = $GLOBALS["db"]->prepare(" SELECT - LEFT(CONCAT(`user`.`fname`, ' ', `user`.`lname`), 15) as `fullname`, + LEFT(CONCAT(`user`.`fname`, ' ', `user`.`lname`), 15) AS `fullname`, `user`.`userID`, IFNULL( `profilepicture`, '../img/avatar-standard.png' ) AS profilepicture, - LEFT(`private_message`.`content`, 15) as `content` + LEFT(`private_message`.`content`, 15) AS `content` FROM `private_message`, `friendship`, -- 2.49.1 From f1bfc89e6afafc61456c4652fade6f197ebd6a26 Mon Sep 17 00:00:00 2001 From: Lars van Hijfte Date: Thu, 26 Jan 2017 22:33:32 +0100 Subject: [PATCH 255/400] Custom scrollbar --- website/public/styles/main.css | 13 +++++++++++++ website/public/styles/profile.css | 1 + 2 files changed, 14 insertions(+) diff --git a/website/public/styles/main.css b/website/public/styles/main.css index abda8be..0c37afa 100644 --- a/website/public/styles/main.css +++ b/website/public/styles/main.css @@ -275,3 +275,16 @@ div[data-title]:hover:after { display: inline-block; vertical-align: middle; } + +::-webkit-scrollbar { + width: 5px; + height: 5px; +} +::-webkit-scrollbar-track { + background: none; +} +::-webkit-scrollbar-thumb { + -webkit-border-radius: 20px; + border-radius: 20px; + background: #4CAF50; +} \ No newline at end of file diff --git a/website/public/styles/profile.css b/website/public/styles/profile.css index 85b2db5..becbeca 100644 --- a/website/public/styles/profile.css +++ b/website/public/styles/profile.css @@ -30,6 +30,7 @@ div.posts div.post { width: calc(100% - 40px); cursor: pointer; transition-duration: 250ms; + word-wrap: break-word; } div.posts div.post:hover { -- 2.49.1 From cbff973b631126093c0b8dad90dcb3513eca38ba Mon Sep 17 00:00:00 2001 From: Lars van Hijfte Date: Fri, 27 Jan 2017 11:15:33 +0100 Subject: [PATCH 256/400] Save manu state with cookie --- website/public/js/header.js | 11 ++++++++++- website/public/js/main.js | 11 +++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/website/public/js/header.js b/website/public/js/header.js index 9889bdb..bdf5fe3 100644 --- a/website/public/js/header.js +++ b/website/public/js/header.js @@ -1,5 +1,4 @@ $(document).ready(function() { - // Toggle menu $("#own-profile-picture, #open-notifications").click(function() { if ($("#notification-center").css('right') == "-256px") { @@ -8,12 +7,22 @@ $(document).ready(function() { $(".modal").width("calc(100% - 512px)"); $(".content").css("margin-right", "256px"); $("#notification-center").css("right", "0px"); + + // Add cookie so the menu stays open on other pages + document.cookie = "menu=open; path=/"; } else { // Make the menu invisible and move the content to the right. $("#chat-history").width("calc(100% - 331px)"); $(".modal").width("calc(100% - 256px)"); $(".content").css("margin-right", "0px"); $("#notification-center").css("right", "-256px"); + + // Change menu cookie to close + document.cookie = "menu=closed; path=/"; } }); + + if (getCookie("menu") == "open") { + $("#own-profile-picture").click(); + } }); diff --git a/website/public/js/main.js b/website/public/js/main.js index 8a52797..5622827 100644 --- a/website/public/js/main.js +++ b/website/public/js/main.js @@ -1,3 +1,14 @@ +function getCookie(key) { + cookies = document.cookie.split("; "); + for (var i in cookies) { + cookie = cookies[i].split("="); + if (cookie[0] == key) { + return cookie[1]; + } + } + return false; +} + function editFriendship(userID, value) { $.post("API/editFriendship.php", { usr: userID, action: value }) .done(function() { -- 2.49.1 From 3b542e08789c15641248b1e315755e6134f4e38b Mon Sep 17 00:00:00 2001 From: Marijn Jansen Date: Fri, 27 Jan 2017 12:20:50 +0100 Subject: [PATCH 257/400] "Niet slecht."-button! --- website/public/API/postComment.php | 5 +++-- website/public/js/post.js | 10 +++++----- website/public/profile.php | 1 + website/public/styles/post-popup.css | 2 +- website/queries/post.php | 2 +- website/views/post-view.php | 15 ++++++++++++--- 6 files changed, 23 insertions(+), 12 deletions(-) diff --git a/website/public/API/postComment.php b/website/public/API/postComment.php index bbe39b1..30c02eb 100644 --- a/website/public/API/postComment.php +++ b/website/public/API/postComment.php @@ -5,7 +5,8 @@ session_start(); require("../../queries/post.php"); require("../../queries/connect.php"); require("../../queries/checkInput.php"); -if ($_POST["button"] == "reaction") { +print_r($_POST); +if ($_POST['button'] == 'reaction') { if (empty($_POST['newcomment-content'])) { echo 0; } else { @@ -17,7 +18,7 @@ if ($_POST["button"] == "reaction") { echo 0; } } -} elseif ($_POST["button"] == "nietslecht") { +} else if ($_POST['button'] == 'nietslecht') { if (makeNietSlecht($_POST["postID"], $_SESSION["userID"])) { echo 1; } else { diff --git a/website/public/js/post.js b/website/public/js/post.js index 62ace68..1906428 100644 --- a/website/public/js/post.js +++ b/website/public/js/post.js @@ -1,7 +1,9 @@ -function postComment() { +function postComment(buttonValue) { + formData = $("#newcommentform").serializeArray(); + formData.push({name: "button", value: buttonValue}); $.post( "API/postComment.php", - $("#newcommentform").serialize() + formData ); $("#newcomment").val(""); @@ -13,6 +15,4 @@ function postComment() { ).done(function (data) { $('#modal-response').html(data); }); -} - - +} \ No newline at end of file diff --git a/website/public/profile.php b/website/public/profile.php index a79ad4c..95c5b86 100644 --- a/website/public/profile.php +++ b/website/public/profile.php @@ -8,6 +8,7 @@ diff --git a/website/public/styles/post-popup.css b/website/public/styles/post-popup.css index 5522743..c6e96c1 100644 --- a/website/public/styles/post-popup.css +++ b/website/public/styles/post-popup.css @@ -72,6 +72,6 @@ } .nietslecht { - font-family: Impact, sans-serif; + font-family: Impact, Anton, sans-serif; text-shadow: -1.5px 0 1px black, 0 1.5px 1px black, 1px 0 1.5px black, 0 -1.5px 1px black; } \ No newline at end of file diff --git a/website/queries/post.php b/website/queries/post.php index 59e7a91..df1e227 100644 --- a/website/queries/post.php +++ b/website/queries/post.php @@ -99,7 +99,7 @@ function makeComment($postID, $userID, $content) : int { function makeNietSlecht(int $postID, int $userID) : int { if (checkNietSlecht($postID, $userID)) { - return deleteNietSlecht(postID, $userID); + return deleteNietSlecht($postID, $userID); } else { return addNietSlecht($postID, $userID); } diff --git a/website/views/post-view.php b/website/views/post-view.php index 37e64b5..4e0ddb1 100644 --- a/website/views/post-view.php +++ b/website/views/post-view.php @@ -2,6 +2,7 @@ $postID = $_GET['postID']; $post = selectPostById($postID)->fetch(PDO::FETCH_ASSOC); $fullname = $post['fname'] . " " . $post['lname'] . " (" . $post['username'] . ")"; +session_start(); echo("
    @@ -21,12 +22,20 @@ echo("
    -
    +
    - + - +
    -- 2.49.1 From f27b9ec6b41f85f519c50961e53eb516e3ec842a Mon Sep 17 00:00:00 2001 From: Lars van Hijfte Date: Fri, 27 Jan 2017 12:22:26 +0100 Subject: [PATCH 258/400] Chat messages split per day --- website/public/js/chat.js | 18 ++++++++++++++++-- website/public/js/main.js | 3 +++ website/public/js/search.js | 2 -- website/public/styles/chat.css | 21 +++++++++++++++++++++ 4 files changed, 40 insertions(+), 4 deletions(-) diff --git a/website/public/js/chat.js b/website/public/js/chat.js index 06f85df..2b2fe34 100644 --- a/website/public/js/chat.js +++ b/website/public/js/chat.js @@ -1,3 +1,5 @@ +var previousDate = new Date("1970-01-01 00:00:00"); + $(document).ready(function() { loadMessages(); sayEmpty(); @@ -31,13 +33,25 @@ function sendMessage() { } function addMessages(messages) { - for(i in messages) { + for(var i in messages) { + thisDate = new Date(messages[i].creationdate); + thisDate.setHours(0,0,0,0); if (messages[i].destination == $(".destinationID").val()) { type = "chat-message-self"; } else { type = "chat-message-other"; } - + if (thisDate > previousDate) { + console.log(previousDate); + previousDate = thisDate; + $("#chat-history").append('\ +
    \ +
    \ + ' + days[thisDate.getDay()] + " " + thisDate.getDate() + " " + months[thisDate.getMonth()] + " " + thisDate.getFullYear() + '\ +
    \ +
    \ + '); + } $("#chat-history").append('\
    \
    \ diff --git a/website/public/js/main.js b/website/public/js/main.js index 5622827..587f020 100644 --- a/website/public/js/main.js +++ b/website/public/js/main.js @@ -1,3 +1,6 @@ +var days = ["zondag", "maandag", "dinsdag", "woensdag", "donderdag", "vrijdag", "zaterdag"]; +var months = ["januari", "februari", "maart", "april", "mei", "juni", "juli", "augustus", "september", "oktober", "november", "december"] + function getCookie(key) { cookies = document.cookie.split("; "); for (var i in cookies) { diff --git a/website/public/js/search.js b/website/public/js/search.js index b3c322a..c026b64 100644 --- a/website/public/js/search.js +++ b/website/public/js/search.js @@ -8,7 +8,6 @@ function searchUsers(n, m) { filter: $("#search-filter").val() } ).done(function(data) { - console.log(data); if (!showFriends(data, "#search-users-list", 0, "profile.php", "GET")) { $("#search-users-list").text("Niemand gevonden"); } @@ -25,7 +24,6 @@ function searchGroups(n, m) { filter: $("#search-filter").val() } ).done(function(data) { - console.log(data); if (!showGroups(data, "#search-groups-list")) { $("#search-groups-list").text("Geen groepen gevonden"); } diff --git a/website/public/styles/chat.css b/website/public/styles/chat.css index 6822d21..600bb41 100644 --- a/website/public/styles/chat.css +++ b/website/public/styles/chat.css @@ -1,3 +1,8 @@ + +body { + overflow: hidden; +} + /* Overall chat-screen */ .chat { position: fixed; @@ -37,6 +42,22 @@ } /* Chat-message takes the whole width of the chat area */ +.day-message { + width: 100%; + min-height: 40px; + padding: 10px 0; + clear: both; + text-align: center; +} + +.day-message-content { + width: auto; + padding: 10px; + + background-color: #F8F8F8; + color: #666; +} + .chat-message { width: 100%; min-height: 40px; -- 2.49.1 From 609f350cd344812617a94a18847aa2590fd94044 Mon Sep 17 00:00:00 2001 From: Joey Lai Date: Fri, 27 Jan 2017 12:27:40 +0100 Subject: [PATCH 259/400] Made different files for login and register --- website/public/login.php | 102 +-------- website/public/register(stash).php | 115 +++++++++++ website/public/register.php | 187 ++++++++--------- website/public/styles/index.css | 31 +-- website/queries/login.php | 5 +- website/views/bdayInput.php | 37 ++++ website/views/forgotPasswordModal.php | 35 ++++ website/views/login-view.php | 286 ++++---------------------- website/views/register-view.php | 8 - website/views/registerModal.php | 155 ++++++++++++++ 10 files changed, 482 insertions(+), 479 deletions(-) create mode 100644 website/public/register(stash).php create mode 100644 website/views/bdayInput.php create mode 100644 website/views/forgotPasswordModal.php create mode 100644 website/views/registerModal.php diff --git a/website/public/login.php b/website/public/login.php index 81fee57..9fd7fb0 100644 --- a/website/public/login.php +++ b/website/public/login.php @@ -28,7 +28,7 @@ $year_date = "jaar"; // Define variables and set to empty values - $user = $psw =""; + $user = $psw = $remember =""; $loginErr = $resetErr =""; if ($_SERVER["REQUEST_METHOD"] == "POST") { @@ -55,107 +55,9 @@ } break; case "register": - try { - $name = test_input(($_POST["name"])); - checkInputChoice($name, "lettersAndSpaces"); - } catch(lettersAndSpacesException $e){ - $correct = false; - $nameErr = $e->getMessage(); - } - - try { - $surname = test_input(($_POST["surname"])); - checkInputChoice($surname, "lettersAndSpaces"); - } - catch(lettersAndSpacesException $e){ - $correct = false; - $surnameErr = $e->getMessage(); - } - - try{ - $day_date = test_input(($_POST["day_date"])); - $month_date = test_input(($_POST["month_date"])); - $year_date = test_input(($_POST["year_date"])); - $bday = $year_date . "-" . $month_date . "-" . $day_date; - checkInputChoice($bday, "bday"); - } catch(bdayException $e){ - $correct = false; - $bdayErr = $e->getMessage(); - } - - try{ - $username = str_replace(' ', '', test_input(($_POST["username"]))); - checkInputChoice($username, "username"); - } catch(usernameException $e){ - $correct = false; - $usernameErr = $e->getMessage(); - } - - try{ - $password = str_replace(' ', '', test_input(($_POST["password"]))); - checkInputChoice($password, "longerEight"); - matchPassword(); - } catch(passwordException $e){ - $correct = false; - $passwordErr = $e->getMessage(); - } catch(confirmPasswordException $e){ - $correct = false; - $confirmPasswordErr = $e->getMessage(); - } - - try{ - $location = test_input(($_POST["location"])); - checkInputChoice($location, "lettersAndSpaces"); - } catch(lettersAndSpacesException $e){ - $correct = false; - $locationErr = $e->getMessage(); - } - - try{ - $email = test_input(($_POST["email"])); - checkInputChoice($email, "email"); - $confirmEmail = test_input(($_POST["confirmEmail"])); - matchEmail(); - } catch(emailException $e){ - $correct = false; - $emailErr = $e->getMessage(); - } catch(confirmEmailException $e){ - $correct = false; - $confirmEmailErr = $e->getMessage(); - } - - try{ - $captcha = $_POST['g-recaptcha-response']; - checkCaptcha($captcha); - } catch(captchaException $e){ - $correct = false; - $captchaErr = $e->getMessage(); - } - - try { - getIp(); - registerCheck($correct); - sendConfirmEmailUsername($username); - } catch(registerException $e){ - echo ""; - $genericErr = $e->getMessage(); - } + include("register.php"); } } -// // Trying to login -// if ($_SERVER["REQUEST_METHOD"] == "POST") { -// try{ -// $uname = ($_POST["uname"]); -// validateLogin($_POST["uname"], $_POST["psw"]); -// } catch(loginException $e) { -// $loginErr = $e->getMessage(); -// } -// } - /* This view adds login view */ include("../views/login-view.php"); ?> diff --git a/website/public/register(stash).php b/website/public/register(stash).php new file mode 100644 index 0000000..0077e62 --- /dev/null +++ b/website/public/register(stash).php @@ -0,0 +1,115 @@ + + + + +getMessage(); + } + + try { + $surname = test_input(($_POST["surname"])); + checkInputChoice($surname, "lettersAndSpaces"); + } + catch(lettersAndSpacesException $e){ + $correct = false; + $surnameErr = $e->getMessage(); + } + + try{ + $day_date = test_input(($_POST["day_date"])); + $month_date = test_input(($_POST["month_date"])); + $year_date = test_input(($_POST["year_date"])); + $bday = $year_date . "-" . $month_date . "-" . $day_date; + checkInputChoice($bday, "bday"); + } catch(bdayException $e){ + $correct = false; + $bdayErr = $e->getMessage(); + } + + try{ + $username = str_replace(' ', '', test_input(($_POST["username"]))); + checkInputChoice($username, "username"); + } catch(usernameException $e){ + $correct = false; + $usernameErr = $e->getMessage(); + } + + try{ + $password = str_replace(' ', '', test_input(($_POST["password"]))); + checkInputChoice($password, "longerEight"); + matchPassword(); + } catch(passwordException $e){ + $correct = false; + $passwordErr = $e->getMessage(); + } catch(confirmPasswordException $e){ + $correct = false; + $confirmPasswordErr = $e->getMessage(); + } + + try{ + $location = test_input(($_POST["location"])); + checkInputChoice($location, "lettersAndSpaces"); + } catch(lettersAndSpacesException $e){ + $correct = false; + $locationErr = $e->getMessage(); + } + + try{ + $email = test_input(($_POST["email"])); + checkInputChoice($email, "email"); + $confirmEmail = test_input(($_POST["confirmEmail"])); + matchEmail(); + } catch(emailException $e){ + $correct = false; + $emailErr = $e->getMessage(); + } catch(confirmEmailException $e){ + $correct = false; + $confirmEmailErr = $e->getMessage(); + } + + try{ + $captcha = $_POST['g-recaptcha-response']; + checkCaptcha($captcha); + } catch(captchaException $e){ + $correct = false; + $captchaErr = $e->getMessage(); + } + + try { + getIp(); + registerCheck($correct); + sendConfirmEmailUsername($username); + } catch(registerException $e){ + $genericErr = $e->getMessage(); + } + } +/* This view adds register view */ +include("../views/register-view.php"); +?> + + diff --git a/website/public/register.php b/website/public/register.php index 0077e62..ee19930 100644 --- a/website/public/register.php +++ b/website/public/register.php @@ -1,115 +1,90 @@ - - - -getMessage(); +} - // Trying to register an account - if ($_SERVER["REQUEST_METHOD"] == "POST") { - try { - $name = test_input(($_POST["name"])); - checkInputChoice($name, "lettersAndSpaces"); - } catch(lettersAndSpacesException $e){ - $correct = false; - $nameErr = $e->getMessage(); - } +try { + $surname = test_input(($_POST["surname"])); + checkInputChoice($surname, "lettersAndSpaces"); +} +catch(lettersAndSpacesException $e){ + $correct = false; + $surnameErr = $e->getMessage(); +} - try { - $surname = test_input(($_POST["surname"])); - checkInputChoice($surname, "lettersAndSpaces"); - } - catch(lettersAndSpacesException $e){ - $correct = false; - $surnameErr = $e->getMessage(); - } +try{ + $day_date = test_input(($_POST["day_date"])); + $month_date = test_input(($_POST["month_date"])); + $year_date = test_input(($_POST["year_date"])); + $bday = $year_date . "-" . $month_date . "-" . $day_date; + checkInputChoice($bday, "bday"); +} catch(bdayException $e){ + $correct = false; + $bdayErr = $e->getMessage(); +} - try{ - $day_date = test_input(($_POST["day_date"])); - $month_date = test_input(($_POST["month_date"])); - $year_date = test_input(($_POST["year_date"])); - $bday = $year_date . "-" . $month_date . "-" . $day_date; - checkInputChoice($bday, "bday"); - } catch(bdayException $e){ - $correct = false; - $bdayErr = $e->getMessage(); - } +try{ + $username = str_replace(' ', '', test_input(($_POST["username"]))); + checkInputChoice($username, "username"); +} catch(usernameException $e){ + $correct = false; + $usernameErr = $e->getMessage(); +} - try{ - $username = str_replace(' ', '', test_input(($_POST["username"]))); - checkInputChoice($username, "username"); - } catch(usernameException $e){ - $correct = false; - $usernameErr = $e->getMessage(); - } +try{ + $password = str_replace(' ', '', test_input(($_POST["password"]))); + checkInputChoice($password, "longerEight"); + matchPassword(); +} catch(passwordException $e){ + $correct = false; + $passwordErr = $e->getMessage(); +} catch(confirmPasswordException $e){ + $correct = false; + $confirmPasswordErr = $e->getMessage(); +} - try{ - $password = str_replace(' ', '', test_input(($_POST["password"]))); - checkInputChoice($password, "longerEight"); - matchPassword(); - } catch(passwordException $e){ - $correct = false; - $passwordErr = $e->getMessage(); - } catch(confirmPasswordException $e){ - $correct = false; - $confirmPasswordErr = $e->getMessage(); - } +try{ + $location = test_input(($_POST["location"])); + checkInputChoice($location, "lettersAndSpaces"); +} catch(lettersAndSpacesException $e){ + $correct = false; + $locationErr = $e->getMessage(); +} - try{ - $location = test_input(($_POST["location"])); - checkInputChoice($location, "lettersAndSpaces"); - } catch(lettersAndSpacesException $e){ - $correct = false; - $locationErr = $e->getMessage(); - } +try{ + $email = test_input(($_POST["email"])); + checkInputChoice($email, "email"); + $confirmEmail = test_input(($_POST["confirmEmail"])); + matchEmail(); +} catch(emailException $e){ + $correct = false; + $emailErr = $e->getMessage(); +} catch(confirmEmailException $e){ + $correct = false; + $confirmEmailErr = $e->getMessage(); +} - try{ - $email = test_input(($_POST["email"])); - checkInputChoice($email, "email"); - $confirmEmail = test_input(($_POST["confirmEmail"])); - matchEmail(); - } catch(emailException $e){ - $correct = false; - $emailErr = $e->getMessage(); - } catch(confirmEmailException $e){ - $correct = false; - $confirmEmailErr = $e->getMessage(); - } +try{ + $captcha = $_POST['g-recaptcha-response']; + checkCaptcha($captcha); +} catch(captchaException $e){ + $correct = false; + $captchaErr = $e->getMessage(); +} - try{ - $captcha = $_POST['g-recaptcha-response']; - checkCaptcha($captcha); - } catch(captchaException $e){ - $correct = false; - $captchaErr = $e->getMessage(); - } - - try { - getIp(); - registerCheck($correct); - sendConfirmEmailUsername($username); - } catch(registerException $e){ - $genericErr = $e->getMessage(); - } - } -/* This view adds register view */ -include("../views/register-view.php"); -?> - - +try { + getIp(); + registerCheck($correct); + sendConfirmEmailUsername($username); +} catch(registerException $e){ + echo ""; + $genericErr = $e->getMessage(); +} \ No newline at end of file diff --git a/website/public/styles/index.css b/website/public/styles/index.css index 85cc670..f5d40a7 100644 --- a/website/public/styles/index.css +++ b/website/public/styles/index.css @@ -28,10 +28,10 @@ body { form { /*background-color: #a87a87;*/ border-radius: 12px; - height: 80%; + height: 85%; margin: auto; width: 600px; - overflow-y:auto; + overflow-y: auto; overflow-x: hidden; } @@ -46,13 +46,13 @@ h1 { /* registreer titel*/ h2 { - padding: 16px; + padding: 8px; text-align: left; font-size: 2.0em; } h3 { - padding: 16px; + padding: 8px; text-align: center; font-size: 1.5em; } @@ -63,7 +63,7 @@ input[type=text], input[type=password], input[type=email], input[type="date"] { display: inline-block; height: 60%; font-size: 16px; - padding: 8px 20px; + padding: 8px 10px; margin: 4px 0; width: 55%; } @@ -79,7 +79,7 @@ button { cursor: pointer; height: 50%; padding: 8px 20px; - margin: 10px; + margin: 5px; font-family: Arial; font-size: 22px; box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24); @@ -90,6 +90,7 @@ button { font-family: Arial; font-size: 15px; color: red; + text-align: left; } label { @@ -98,19 +99,19 @@ label { /* padding voor registreer container */ .login_containerregister { - padding: 16px; + padding: 8px; text-align: left; } /* padding voor login_containers */ .login_containerlogin { - padding:16px; + padding:8px; text-align: center; } /* padding voor foutmelding login */ .login_containerfault { - padding: 16px; + padding: 4px; text-align: center; color: red; } @@ -129,7 +130,7 @@ label { background-attachment: fixed;*/ box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24); height: 400px; - margin: 34px auto; + margin: 16px auto; overflow-y: auto; padding: 20px; width: 600px; @@ -149,12 +150,12 @@ ul { display: none; /* Hidden by default */ position: fixed; /* Stay in place */ z-index: 1; /* Sit on top */ - padding-top: 100px; /* Location of the box */ + padding-top: 30px; /* Location of the box */ left: 0; top: 0; width: 100%; /* Full width */ height: 100%; /* Full height */ - overflow: auto; /* Enable scroll if needed */ + overflow: hidden; /* Enable scroll if needed */ background-color: rgb(0,0,0); /* Fallback color */ background-color: rgba(0,0,0,0.4); /* Black w/ opacity */ } @@ -166,7 +167,7 @@ ul { margin: auto; padding: 0; border: 1px solid #888; - width: 589px; + width: 600px; box-shadow: 0 4px 8px 0 rgba(0,0,0,0.2),0 6px 20px 0 rgba(0,0,0,0.19); -webkit-animation-name: animatetop; -webkit-animation-duration: 0.4s; @@ -189,7 +190,7 @@ ul { .close { color: white; float: right; - font-size: 28px; + font-size: 36px; font-weight: bold; } @@ -201,7 +202,7 @@ ul { } .modal-header { - padding: 2px 16px; + padding: 4px 16px; background-color: #FBC02D; color: black; } diff --git a/website/queries/login.php b/website/queries/login.php index 6af9e1e..b686659 100644 --- a/website/queries/login.php +++ b/website/queries/login.php @@ -13,7 +13,7 @@ function getUser() { `email` LIKE :username "); - $stmt->bindParam(":username", test_input($_POST["user"])); + $stmt->bindValue(":username", test_input($_POST["user"])); $stmt->execute(); return $stmt->fetch(PDO::FETCH_ASSOC); } @@ -42,6 +42,9 @@ function validateLogin($username, $password){ "; } else { $_SESSION["userID"] = $userID; + if($_POST[rememberMe] == 1){ + ini_set("session.gc_maxlifetime", "10"); + } header("location: profile.php"); } } else { diff --git a/website/views/bdayInput.php b/website/views/bdayInput.php new file mode 100644 index 0000000..f3ddecc --- /dev/null +++ b/website/views/bdayInput.php @@ -0,0 +1,37 @@ + + + diff --git a/website/views/forgotPasswordModal.php b/website/views/forgotPasswordModal.php new file mode 100644 index 0000000..a84ae68 --- /dev/null +++ b/website/views/forgotPasswordModal.php @@ -0,0 +1,35 @@ + + + + + \ No newline at end of file diff --git a/website/views/login-view.php b/website/views/login-view.php index b9052b3..fa7f8fd 100644 --- a/website/views/login-view.php +++ b/website/views/login-view.php @@ -32,6 +32,11 @@ >
    + + @@ -49,269 +54,52 @@ + +// When the user clicks anywhere outside of the modal, close it + window.onclick = function (event) { + if (event.target == modal) { + modal.style.display = "none"; + } + if (event.target == registerModal) { + registerModal.style.display = "none"; + } + } + \ No newline at end of file diff --git a/website/views/register-view.php b/website/views/register-view.php index 9577216..acb5f4b 100644 --- a/website/views/register-view.php +++ b/website/views/register-view.php @@ -41,14 +41,6 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + +
    +
    + + +
    +
    + + +
    \ No newline at end of file -- 2.49.1 From ce6a75163047b4209846129d748f620565a1cbbb Mon Sep 17 00:00:00 2001 From: Marijn Jansen Date: Fri, 27 Jan 2017 12:30:28 +0100 Subject: [PATCH 260/400] Niet slecht inverted --- website/views/post-view.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/website/views/post-view.php b/website/views/post-view.php index 4e0ddb1..e3ceb9b 100644 --- a/website/views/post-view.php +++ b/website/views/post-view.php @@ -30,9 +30,9 @@ echo(" -- 2.49.1 From 5e9629eddd5ccdf983c384602951a25f468b3081 Mon Sep 17 00:00:00 2001 From: Joey Lai Date: Fri, 27 Jan 2017 14:03:11 +0100 Subject: [PATCH 261/400] Fixed bugs --- website/public/js/registerAndLogin.js | 6 +- website/public/register.php | 155 +++++++++++++------------- website/public/styles/index.css | 4 + website/queries/checkInput.php | 4 +- website/queries/login.php | 6 +- website/queries/register.php | 20 ++-- website/views/bdayInput.php | 24 ++-- website/views/forgotPasswordModal.php | 1 + website/views/login-view.php | 15 ++- website/views/registerModal.php | 5 +- 10 files changed, 127 insertions(+), 113 deletions(-) diff --git a/website/public/js/registerAndLogin.js b/website/public/js/registerAndLogin.js index b2fda05..87522cf 100644 --- a/website/public/js/registerAndLogin.js +++ b/website/public/js/registerAndLogin.js @@ -1,5 +1,5 @@ function checkLoggedIn() { - if (confirm("You are already logged in!\nDo you want to logout?\nPress ok to logout.") == true) { + if (confirm("U bent al ingelogd!!\nWilt u uitloggen?\nKlik ok om uit te loggen.") == true) { window.location.href = "logout.php"; } else { window.location.href = "profile.php"; @@ -7,9 +7,9 @@ function checkLoggedIn() { } function bannedAlert(){ - alert("Your account is banned"); + alert("Uw account is geband!"); } function emailNotConfirmed(){ - alert("Your account has not been verified yet!\nAnother email has been sent to you") + alert("Uw account is nog niet bevestigd!\nEr is een nieuwe email gestuurd om uw account te bevestigen"); } diff --git a/website/public/register.php b/website/public/register.php index ee19930..6bebd7e 100644 --- a/website/public/register.php +++ b/website/public/register.php @@ -1,90 +1,91 @@ getMessage(); -} -try { - $surname = test_input(($_POST["surname"])); - checkInputChoice($surname, "lettersAndSpaces"); -} -catch(lettersAndSpacesException $e){ - $correct = false; - $surnameErr = $e->getMessage(); -} + try { + $name = test_input(($_POST["name"])); + checkInputChoice($name, "lettersAndSpaces"); + } catch(lettersAndSpacesException $e){ + $correct = false; + $nameErr = $e->getMessage(); + } -try{ - $day_date = test_input(($_POST["day_date"])); - $month_date = test_input(($_POST["month_date"])); - $year_date = test_input(($_POST["year_date"])); - $bday = $year_date . "-" . $month_date . "-" . $day_date; - checkInputChoice($bday, "bday"); -} catch(bdayException $e){ - $correct = false; - $bdayErr = $e->getMessage(); -} + try { + $surname = test_input(($_POST["surname"])); + checkInputChoice($surname, "lettersAndSpaces"); + } + catch(lettersAndSpacesException $e){ + $correct = false; + $surnameErr = $e->getMessage(); + } -try{ - $username = str_replace(' ', '', test_input(($_POST["username"]))); - checkInputChoice($username, "username"); -} catch(usernameException $e){ - $correct = false; - $usernameErr = $e->getMessage(); -} + try{ + $day_date = test_input(($_POST["day_date"])); + $month_date = test_input(($_POST["month_date"])); + $year_date = test_input(($_POST["year_date"])); + $bday = $year_date . "-" . $month_date . "-" . $day_date; + checkInputChoice($bday, "bday"); + } catch(bdayException $e){ + $correct = false; + $bdayErr = $e->getMessage(); + } -try{ - $password = str_replace(' ', '', test_input(($_POST["password"]))); - checkInputChoice($password, "longerEight"); - matchPassword(); -} catch(passwordException $e){ - $correct = false; - $passwordErr = $e->getMessage(); -} catch(confirmPasswordException $e){ - $correct = false; - $confirmPasswordErr = $e->getMessage(); -} + try{ + $username = str_replace(' ', '', test_input(($_POST["username"]))); + checkInputChoice($username, "username"); + } catch(usernameException $e){ + $correct = false; + $usernameErr = $e->getMessage(); + } -try{ - $location = test_input(($_POST["location"])); - checkInputChoice($location, "lettersAndSpaces"); -} catch(lettersAndSpacesException $e){ - $correct = false; - $locationErr = $e->getMessage(); -} + try{ + $password = str_replace(' ', '', test_input(($_POST["password"]))); + checkInputChoice($password, "longerEight"); + matchPassword(); + } catch(passwordException $e){ + $correct = false; + $passwordErr = $e->getMessage(); + } catch(confirmPasswordException $e){ + $correct = false; + $confirmPasswordErr = $e->getMessage(); + } -try{ - $email = test_input(($_POST["email"])); - checkInputChoice($email, "email"); - $confirmEmail = test_input(($_POST["confirmEmail"])); - matchEmail(); -} catch(emailException $e){ - $correct = false; - $emailErr = $e->getMessage(); -} catch(confirmEmailException $e){ - $correct = false; - $confirmEmailErr = $e->getMessage(); -} + try{ + $location = test_input(($_POST["location"])); + checkInputChoice($location, "lettersAndSpaces"); + } catch(lettersAndSpacesException $e){ + $correct = false; + $locationErr = $e->getMessage(); + } -try{ - $captcha = $_POST['g-recaptcha-response']; - checkCaptcha($captcha); -} catch(captchaException $e){ - $correct = false; - $captchaErr = $e->getMessage(); -} + try{ + $email = test_input(($_POST["email"])); + checkInputChoice($email, "email"); + $confirmEmail = test_input(($_POST["confirmEmail"])); + matchEmail(); + } catch(emailException $e){ + $correct = false; + $emailErr = $e->getMessage(); + } catch(confirmEmailException $e){ + $correct = false; + $confirmEmailErr = $e->getMessage(); + } -try { - getIp(); - registerCheck($correct); - sendConfirmEmailUsername($username); -} catch(registerException $e){ - echo ""; - $genericErr = $e->getMessage(); -} \ No newline at end of file + $genericErr = $e->getMessage(); + } diff --git a/website/public/styles/index.css b/website/public/styles/index.css index f5d40a7..6f7caf0 100644 --- a/website/public/styles/index.css +++ b/website/public/styles/index.css @@ -68,6 +68,10 @@ input[type=text], input[type=password], input[type=email], input[type="date"] { width: 55%; } +.middle{ + text-align: center; +} + .center{ text-align: center; } diff --git a/website/queries/checkInput.php b/website/queries/checkInput.php index fbf64a7..52b830f 100644 --- a/website/queries/checkInput.php +++ b/website/queries/checkInput.php @@ -124,11 +124,11 @@ function matchPassword(){ /* Checks if captcha is correctly filled in */ function checkCaptcha($captcha){ if(!$captcha){ - throw new captchaException("Captcha needs to be filled in!"); + throw new captchaException("Captcha moet ingevuld worde!"); } else { $response=json_decode(file_get_contents("https://www.google.com/recaptcha/api/siteverify?secret=6Lc72xIUAAAAAPizuF3nUbklCPljVCVzgYespz8o&response=".$captcha."&remoteip=".$_SERVER['REMOTE_ADDR'])); if($response->success==false) { - throw new captchaException("You are a spammer!"); + throw new captchaException("Je bent een spammer!"); } } } diff --git a/website/queries/login.php b/website/queries/login.php index b686659..384a3d5 100644 --- a/website/queries/login.php +++ b/website/queries/login.php @@ -42,9 +42,9 @@ function validateLogin($username, $password){ "; } else { $_SESSION["userID"] = $userID; - if($_POST[rememberMe] == 1){ - ini_set("session.gc_maxlifetime", "10"); - } +// if($_POST[rememberMe] == 1){ +// ini_set("session.gc_maxlifetime", "10"); +// } header("location: profile.php"); } } else { diff --git a/website/queries/register.php b/website/queries/register.php index be9d415..bc44acf 100644 --- a/website/queries/register.php +++ b/website/queries/register.php @@ -10,7 +10,7 @@ function getExistingUsername() { `username` LIKE :username "); - $stmt->bindParam(":username", test_input($_POST["username"])); + $stmt->bindValue(":username", test_input($_POST["username"])); $stmt->execute(); return $stmt->rowCount(); @@ -26,7 +26,7 @@ function getExistingEmail() { `email` LIKE :email "); - $stmt->bindParam(":email", test_input($_POST["email"])); + $stmt->bindValue(":email", test_input($_POST["email"])); $stmt->execute(); return $stmt->rowCount(); @@ -42,7 +42,7 @@ function getResetEmail() { `email` LIKE :email "); - $stmt->bindParam(":email", test_input($_POST["forgotEmail"])); + $stmt->bindValue(":email", test_input($_POST["forgotEmail"])); $stmt->execute(); return $stmt->rowCount(); @@ -70,13 +70,13 @@ function registerAccount() { $hash=password_hash($_POST["password"], PASSWORD_DEFAULT); - $stmt->bindParam(":fname", test_input($_POST["name"])); - $stmt->bindParam(":lname", test_input($_POST["surname"])); - $stmt->bindParam(":bday", test_input($_POST["bday"])); - $stmt->bindParam(":username", test_input($_POST["username"])); - $stmt->bindParam(":password", test_input($hash)); - $stmt->bindParam(":location", test_input($_POST["location"])); - $stmt->bindParam(":email", test_input(strtolower($_POST["email"]))); + $stmt->bindValue(":fname", test_input($_POST["name"])); + $stmt->bindValue(":lname", test_input($_POST["surname"])); + $stmt->bindValue(":bday", test_input($_POST["bday"])); + $stmt->bindValue(":username", test_input($_POST["username"])); + $stmt->bindValue(":password", test_input($hash)); + $stmt->bindValue(":location", test_input($_POST["location"])); + $stmt->bindValue(":email", test_input(strtolower($_POST["email"]))); $stmt->execute(); $stmt->rowCount(); diff --git a/website/views/bdayInput.php b/website/views/bdayInput.php index f3ddecc..f4e440f 100644 --- a/website/views/bdayInput.php +++ b/website/views/bdayInput.php @@ -11,18 +11,18 @@ diff --git a/website/views/login-view.php b/website/views/login-view.php index fa7f8fd..8edc777 100644 --- a/website/views/login-view.php +++ b/website/views/login-view.php @@ -15,6 +15,7 @@ - - @@ -49,6 +46,11 @@ Inloggen + + @@ -78,7 +80,10 @@ var registerSpan = document.getElementsByClassName("close")[1]; // When the user clicks the button, open the modal btn.onclick = function () { +// modal.style.display = "block"; modal.style.display = "block"; + window.onload=emailSent(); + } registerBtn.onclick = function () { diff --git a/website/views/registerModal.php b/website/views/registerModal.php index f55c33a..b430ab8 100644 --- a/website/views/registerModal.php +++ b/website/views/registerModal.php @@ -19,6 +19,8 @@ return= $correct method="post"> + + @@ -135,7 +137,8 @@ -- 2.49.1 From e9eeeaf11045b6c98a7f52929c4cb906cf125db9 Mon Sep 17 00:00:00 2001 From: Joey Lai Date: Fri, 27 Jan 2017 14:17:56 +0100 Subject: [PATCH 262/400] fixed idk --- website/queries/requestpassword.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/queries/requestpassword.php b/website/queries/requestpassword.php index c0ff462..bae825a 100644 --- a/website/queries/requestpassword.php +++ b/website/queries/requestpassword.php @@ -50,5 +50,5 @@ function setHashToDatabase(int $userID, string $hash) { $stmt->bindParam(":hash", $hash); $stmt->bindParam(":userID", $userID); $stmt->execute(); - return $stmt->rowCount(); + $stmt->rowCount(); } \ No newline at end of file -- 2.49.1 From 7e2c20e2447a10fd449bc718e4b735bf5b589559 Mon Sep 17 00:00:00 2001 From: Marijn Jansen Date: Fri, 27 Jan 2017 15:40:07 +0100 Subject: [PATCH 263/400] Added showEmail and showBday to the settings page --- website/queries/settings.php | 49 ++++++++++++++++++++++++++++----- website/views/settings-view.php | 26 +++++++++++++++++ 2 files changed, 68 insertions(+), 7 deletions(-) diff --git a/website/queries/settings.php b/website/queries/settings.php index 0bf8791..05e7fbf 100644 --- a/website/queries/settings.php +++ b/website/queries/settings.php @@ -1,6 +1,10 @@ fetch(); } +/** + * Gets the passwordHas form the database + * @return mixed passwordhash + */ function getPasswordHash() { $stmt = $GLOBALS["db"]->prepare(" SELECT @@ -73,6 +91,10 @@ function getPasswordHash() { return $stmt->fetch(); } +/** + * Changes the setting from post. + * @throws HappyAlert + */ function updateSettings() { $stmt = $GLOBALS["db"]->prepare(" UPDATE @@ -82,7 +104,9 @@ function updateSettings() { `lname` = :lname, `location` = :location, `birthdate` = :bday, - `bio` = :bio + `bio` = :bio, + `showEmail` = :showEmail, + `showBday` = :showBday WHERE `userID` = :userID "); @@ -92,15 +116,22 @@ function updateSettings() { $stmt->bindValue(":location", test_input($_POST["location"])); $stmt->bindValue(":bday", test_input($_POST["bday"])); $stmt->bindValue(":bio", test_input($_POST["bio"])); + $stmt->bindValue(":showEmail", test_input($_POST["showEmail"])); + $stmt->bindValue(":showBday", test_input($_POST["showBday"])); + $stmt->bindValue(":userID", $_SESSION["userID"]); $stmt->execute(); throw new HappyAlert("Instellingen zijn opgeslagen."); } +/** + * Change + * @throws AngryAlert + */ function changePassword() { $user = getPasswordHash(); - if (password_verify($_POST["password-old"], $user["password"])) { - if ($_POST["password-new"] == $_POST["password-confirm"] && (strlen($_POST["password-new"]) >= 8)) { + if (password_verify($_POST["password-old"], test_input($user["password"]))) { + if (test_input($_POST["password-new"]) == test_input($_POST["password-confirm"]) && (strlen(test_input($_POST["password-new"])) >= 8)) { doChangePassword(); } else { throw new AngryAlert("Wachtwoorden komen niet overeen."); @@ -110,6 +141,10 @@ function changePassword() { } } +/** + * @throws AngryAlert + * @throws HappyAlert + */ function doChangePassword() { $stmt = $GLOBALS["db"]->prepare(" UPDATE @@ -134,8 +169,8 @@ function doChangePassword() { function changeEmail() { - if ($_POST["email"] == $_POST["email-confirm"]) { - $email = strtolower($_POST["email"]); + if (test_input($_POST["email"]) == test_input($_POST["email-confirm"])) { + $email = strtolower(test_input($_POST["email"])); if (filter_var($email, FILTER_VALIDATE_EMAIL)) { //check if email exists emailIsAvailableInDatabase($email); @@ -193,7 +228,6 @@ function updateAvatar() { $tmpImg = $_FILES["pp"]["tmp_name"]; checkAvatarSize($tmpImg); - removeOldAvatar(); if (getimagesize($tmpImg)["mime"] == "image/gif") { if ($_FILES["pp"]["size"] > 4000000) { throw new AngryAlert("Bestand is te groot, maximaal 4MB toegestaan."); @@ -205,6 +239,7 @@ function updateAvatar() { $scaledImg = scaleAvatar($tmpImg); imagepng($scaledImg, $profilePictureDir . $relativePath); } + removeOldAvatar(); setAvatarToDatabase("../" . $relativePath); throw new HappyAlert("Profielfoto veranderd."); } diff --git a/website/views/settings-view.php b/website/views/settings-view.php index 66513fc..b6a3b4c 100644 --- a/website/views/settings-view.php +++ b/website/views/settings-view.php @@ -51,6 +51,32 @@ $settings = getSettings(); value="" > +
  • + + + > Ja + + > Nee +
    • +
  • + + + > Ja + + > Nee +

  • - - -- 2.49.1 From 9a36dea59219f037eb266412fd090d1b950a1f1b Mon Sep 17 00:00:00 2001 From: Marijn Jansen Date: Mon, 30 Jan 2017 13:22:44 +0100 Subject: [PATCH 276/400] Removed a comma --- website/views/post-view.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/views/post-view.php b/website/views/post-view.php index 81aca46..264d67c 100644 --- a/website/views/post-view.php +++ b/website/views/post-view.php @@ -50,7 +50,7 @@ echo("
    $commentauthor - + $commentnicetime
    -- 2.49.1 From 54ddb784531c5dc8ae57cba6bf8cc6cf2416bc4f Mon Sep 17 00:00:00 2001 From: Lars van Hijfte Date: Mon, 30 Jan 2017 13:59:02 +0100 Subject: [PATCH 277/400] Chat receive messages is now better --- website/public/js/chat.js | 36 +++++++++++++++++++------------ website/public/styles/main.css | 1 - website/public/styles/profile.css | 3 --- website/queries/friendship.php | 6 ++++++ website/views/menu.php | 2 +- 5 files changed, 29 insertions(+), 19 deletions(-) diff --git a/website/public/js/chat.js b/website/public/js/chat.js index 773a819..0f32fa6 100644 --- a/website/public/js/chat.js +++ b/website/public/js/chat.js @@ -1,25 +1,30 @@ var previousDate = new Date("1970-01-01 00:00:00"); +var gettingMessages = false; + $(document).ready(function() { - loadMessages(); + setInterval(loadMessages, 2000); sayEmpty(); $(".chat-field").hide(); }); function loadMessages() { - $.post( - "API/loadMessages.php", - $("#lastIDForm").serialize() - ).done(function(data) { - if (data && data != "[]") { - messages = JSON.parse(data); - addMessages(messages); - $("#lastID").val(messages[messages.length - 1].messageID); - $("#chat-history").scrollTop($("#chat-history")[0].scrollHeight); - } - }); - - setTimeout(loadMessages, 1000); + if (!gettingMessages) { + gettingMessages = true; + $.post( + "API/loadMessages.php", + $("#lastIDForm").serialize() + ).done(function (data) { + if (data && data != "[]") { + messages = JSON.parse(data); + addMessages(messages); + $("#lastID").val(messages[messages.length - 1].messageID); + } + gettingMessages = false; + }); + } else { + setTimeout(loadMessages, 500); + } } @@ -30,6 +35,7 @@ function sendMessage() { ); $("#newContent").val(""); + loadMessages(); } function addMessages(messages) { @@ -59,6 +65,8 @@ function addMessages(messages) {
    \ '); } + + $("#chat-history").scrollTop($("#chat-history")[0].scrollHeight); } function switchUser(userID) { diff --git a/website/public/styles/main.css b/website/public/styles/main.css index be2f4f7..3eb0bb3 100644 --- a/website/public/styles/main.css +++ b/website/public/styles/main.css @@ -97,7 +97,6 @@ p { } .item-box, .item-box-full-width { - margin: 20px 0 0 0; padding: 25px; background-color: #FFFFFF; } diff --git a/website/public/styles/profile.css b/website/public/styles/profile.css index 2fe819a..03ab19f 100644 --- a/website/public/styles/profile.css +++ b/website/public/styles/profile.css @@ -2,7 +2,6 @@ .user-box { text-align: center; - margin-bottom: 50px; } .status-buttons-container { @@ -64,14 +63,12 @@ } div.posts { - padding-top: 20px; width: calc(100% + 20px); display: inline-flex; } div.posts div.post { display: block; - margin: 20px 0 0 0; padding: 10px; width: calc(100% - 40px); cursor: pointer; diff --git a/website/queries/friendship.php b/website/queries/friendship.php index a1a23d8..01e3d8a 100644 --- a/website/queries/friendship.php +++ b/website/queries/friendship.php @@ -29,6 +29,12 @@ function selectLimitedFriends($userID, $limit) { `friendship`.`user1ID` = `user`.`userID`) AND `user`.`role` != 'banned' AND `friendship`.`status` = 'confirmed' + ORDER BY + CASE + WHEN `friendship`.`user2ID` = `user`.`userID` THEN `friendship`.`chatLastVisted1` + WHEN `friendship`.`user1ID` = `user`.`userID` THEN `friendship`.`chatLastVisted2` + END + DESC LIMIT :limitCount "); diff --git a/website/views/menu.php b/website/views/menu.php index 0444384..f3f3cde 100644 --- a/website/views/menu.php +++ b/website/views/menu.php @@ -1,7 +1,7 @@
    • @@ -25,15 +24,14 @@ while ($group = $q->fetch(PDO::FETCH_ASSOC)) { class='checkbox-list' value='$groupID' form='admin-groupbatchform' - onchange='$function'> + onchange='checkCheckAll();'> - + @@ -14,7 +14,6 @@ while($user = $q->fetch(PDO::FETCH_ASSOC)) { $username = $user['username']; $role = $user['role']; $bancomment = $user['bancomment']; - $function = "checkCheckAll(document.getElementById('checkall'))"; echo(" @@ -24,20 +23,29 @@ while($user = $q->fetch(PDO::FETCH_ASSOC)) { class='checkbox-list' value='$userID' form='admin-batchform' - onchange='$function'> + onchange='checkCheckAll();'> - + - + - + @@ -33,9 +33,9 @@ while ($group = $q->fetch(PDO::FETCH_ASSOC)) { diff --git a/website/views/adminpanel-table.php b/website/views/adminpanel-table.php index aa790e6..f7bc966 100644 --- a/website/views/adminpanel-table.php +++ b/website/views/adminpanel-table.php @@ -55,7 +55,8 @@ while($user = $q->fetch(PDO::FETCH_ASSOC)) { OR $user['role'] == 'owner'))) { echo " - "; + + "; if ($userinfo == 'owner') { echo " diff --git a/website/views/adminpanel.php b/website/views/adminpanel.php index a4da648..2c0bec2 100644 --- a/website/views/adminpanel.php +++ b/website/views/adminpanel.php @@ -67,13 +67,13 @@ if (isset($_GET["groupstatus"])) { id="frozen" value="frozen" > -
    +
    > -
    +
    > - +
    @@ -122,6 +122,7 @@ if (isset($_GET["groupstatus"])) { + Maak Owner"; + value=\"owner\">Maak Eigenaar"; } ?> @@ -139,9 +140,9 @@ if (isset($_GET["groupstatus"])) { onsubmit="adminUpdate(this); return false;"> - - - + + +
    -- 2.49.1 From cfa7c870f08417b80d5d7c285207deb0e94db228 Mon Sep 17 00:00:00 2001 From: Hendrik Date: Thu, 2 Feb 2017 15:13:35 +0100 Subject: [PATCH 364/400] fix profile error color --- website/public/styles/profile.css | 4 ++++ website/views/profile.php | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/website/public/styles/profile.css b/website/public/styles/profile.css index dbb3d24..46906d2 100644 --- a/website/public/styles/profile.css +++ b/website/public/styles/profile.css @@ -5,6 +5,10 @@ background-color: firebrick; } +.alerttext { + color: white; +} + .user-box { text-align: center; } diff --git a/website/views/profile.php b/website/views/profile.php index 7348642..4139099 100644 --- a/website/views/profile.php +++ b/website/views/profile.php @@ -1,6 +1,6 @@
    - +
    -- 2.49.1 From 8a3cfebf55bbc8380034c25741f52682beb2b9aa Mon Sep 17 00:00:00 2001 From: "K. Nobel" Date: Thu, 2 Feb 2017 15:34:45 +0100 Subject: [PATCH 365/400] Redirect to 404 from profile and group --- website/public/group.php | 9 ++++++++- website/public/profile.php | 7 ++++++- website/queries/group_page.php | 7 ++++++- website/queries/user.php | 4 +++- 4 files changed, 23 insertions(+), 4 deletions(-) diff --git a/website/public/group.php b/website/public/group.php index bb393e3..84726fa 100644 --- a/website/public/group.php +++ b/website/public/group.php @@ -13,9 +13,16 @@ include_once("../queries/group_page.php"); -$group = selectGroupByName($_GET["groupname"]); +if(!$group = selectGroupByName($_GET["groupname"])) { + header("HTTP/1.0 404 Not Found"); + header("Location: error/404.php"); + die(); +} + + $members = selectGroupMembers($group["groupID"]); + /* * This view adds the main layout over the screen. * Header, menu, footer. diff --git a/website/public/profile.php b/website/public/profile.php index aa4cf7c..126c87f 100644 --- a/website/public/profile.php +++ b/website/public/profile.php @@ -25,7 +25,12 @@ if(empty($_GET["username"])) { $userID = getUserID($_GET["username"]); } -$user = selectUser($_SESSION["userID"], $userID); +if(!$user = selectUser($_SESSION["userID"], $userID)) { + header("HTTP/1.0 404 Not Found"); + header("Location: error/404.php"); + die(); +} + $profile_friends = selectAllFriends($userID); $profile_groups = selectAllUserGroups($userID); $showProfile = $user["showProfile"] || ($user["status"] == 'confirmed') || $_SESSION["userID"] == $userID; diff --git a/website/queries/group_page.php b/website/queries/group_page.php index f2f028f..a6676c4 100644 --- a/website/queries/group_page.php +++ b/website/queries/group_page.php @@ -33,7 +33,12 @@ function selectGroupByName($name) { if (!$stmt->execute()) { return False; } - return $stmt->fetch(); + $row = $stmt->fetch(); + if($row["groupID"] == null) { + return False; + } + + return $row; } function selectGroupRole(int $groupID) { diff --git a/website/queries/user.php b/website/queries/user.php index 972937d..836c956 100644 --- a/website/queries/user.php +++ b/website/queries/user.php @@ -101,7 +101,9 @@ function selectUser($me, $other) { $stmt->bindParam(':me', $me, PDO::PARAM_INT); $stmt->bindParam(':other', $other, PDO::PARAM_INT); - $stmt->execute(); + if(!$stmt->execute() || $stmt->rowCount() == 0) { + return False; + } return $stmt->fetch(); } -- 2.49.1 From 1c53eab2fa77c02aaeb7340a38b053d38c0cf335 Mon Sep 17 00:00:00 2001 From: "K. Nobel" Date: Thu, 2 Feb 2017 15:50:12 +0100 Subject: [PATCH 366/400] Fixed user group list on profile page. --- website/queries/user.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/queries/user.php b/website/queries/user.php index 06487be..422edc4 100644 --- a/website/queries/user.php +++ b/website/queries/user.php @@ -122,7 +122,7 @@ function selectAllUserGroups($userID) { `group_page`.`groupID` = `group_member`.`groupID` WHERE `userID` = :userID AND - `role` = 'member' + `role` IN ('member', 'mod', 'admin') "); $stmt->bindParam(':userID', $userID, PDO::PARAM_INT); -- 2.49.1 From afb45d6709c6ddf640bac34844ac4e3ac8f38055 Mon Sep 17 00:00:00 2001 From: Hendrik Date: Thu, 2 Feb 2017 15:51:27 +0100 Subject: [PATCH 367/400] add closing of modal on escape key and clicking outside --- website/public/js/masonry.js | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/website/public/js/masonry.js b/website/public/js/masonry.js index a628e96..107f710 100644 --- a/website/public/js/masonry.js +++ b/website/public/js/masonry.js @@ -83,6 +83,21 @@ $(window).on("load", function() { loadMorePosts(userID, groupID, postAmount, postLimit); } }; + + $(document).keyup(function(e) { + if (e.keyCode == 27) { + closeModal(); + } + }); + + $('.modal').click(function() { + closeModal(); + }); + + $('.modal-content').click(function(event){ + event.stopPropagation(); + }); + }); function closeModal() { -- 2.49.1 From 380d8fa83a7ea8780f09fd8c1a8df7965b8f45b1 Mon Sep 17 00:00:00 2001 From: Marijn Jansen Date: Thu, 2 Feb 2017 16:01:45 +0100 Subject: [PATCH 368/400] Group Shit --- website/public/createGroup.php | 36 +++++++++++++++ website/public/groupAdmin.php | 46 ++++++++++++++++++++ website/queries/createGroup.php | 37 ++++++++++++++++ website/queries/groupAdmin.php | 61 ++++++++++++++++++++++++++ website/queries/picture.php | 12 ++--- website/views/createGroup.php | 42 ++++++++++++++++++ website/views/groupAdmin.php | 77 +++++++++++++++++++++++++++++++++ website/views/menu.php | 2 +- 8 files changed, 306 insertions(+), 7 deletions(-) create mode 100644 website/public/createGroup.php create mode 100644 website/public/groupAdmin.php create mode 100644 website/queries/createGroup.php create mode 100644 website/queries/groupAdmin.php create mode 100644 website/views/createGroup.php create mode 100644 website/views/groupAdmin.php diff --git a/website/public/createGroup.php b/website/public/createGroup.php new file mode 100644 index 0000000..ffeb6e3 --- /dev/null +++ b/website/public/createGroup.php @@ -0,0 +1,36 @@ + + + + + + + + + + + diff --git a/website/public/groupAdmin.php b/website/public/groupAdmin.php new file mode 100644 index 0000000..13ff7e0 --- /dev/null +++ b/website/public/groupAdmin.php @@ -0,0 +1,46 @@ + + + + + + + + +getClass(); + $alertMessage = $w->getMessage(); + } +} + +/* Add your view files here. */ +include("../views/groupAdmin.php"); + +/* This adds the footer. */ +include("../views/footer.php"); +?> + + diff --git a/website/queries/createGroup.php b/website/queries/createGroup.php new file mode 100644 index 0000000..20ee28b --- /dev/null +++ b/website/queries/createGroup.php @@ -0,0 +1,37 @@ +bindValue(':name', test_input($_POST["groupName"]), PDO::PARAM_STR); + $createGroup->bindValue(':description', test_input($_POST["bio"])); + $createGroup->execute(); + + $getGroupID = prepareQuery(" + SELECT + `groupID` + FROM + `group_page` + WHERE + `name` LIKE :name"); + $getGroupID->bindValue(':name', test_input($_POST["groupName"]), PDO::PARAM_STR); + $getGroupID->execute(); + $groupID = $getGroupID->fetch()["groupID"]; + + $makeUserAdmin = prepareQuery(" + INSERT INTO + `group_member` (userID, groupID, role) + VALUES (:userID, :groupID, 'admin') + "); + $makeUserAdmin->bindValue(":userID", $_SESSION["userID"]); + $makeUserAdmin->bindValue("groupID", $groupID); + $makeUserAdmin->execute(); + + updateAvatar($groupID); +} \ No newline at end of file diff --git a/website/queries/groupAdmin.php b/website/queries/groupAdmin.php new file mode 100644 index 0000000..ae2abd3 --- /dev/null +++ b/website/queries/groupAdmin.php @@ -0,0 +1,61 @@ +bindParam(":groupID", $groupID); + $stmt->execute(); + return $stmt->fetch(); +} + +function updateGroupSettings(int $groupID) +{ + if (!checkGroupAdmin($groupID, $_SESSION["userID"])) { + throw new AngryAlert("Je hebt geen rechten in deze groep"); + } + $stmt = prepareQuery(" + UPDATE + `group_page` + SET + `name` = :name, + `description` = :bio + WHERE + `groupID` = :groupID + "); + $stmt->bindValue(":bio", test_input($_POST["bio"])); + $stmt->bindValue(":name", test_input($_POST["name"])); + $stmt->bindValue(":groupID", test_input($_POST["groupID"])); + $stmt->execute(); + if ($stmt->rowCount()) { + throw new HappyAlert("Groep aangepast!"); + } else { + throw new AngryAlert("Er is iets mis gegaan"); + } +} + +function checkGroupAdmin(int $groupID, int $userID) : bool { + $stmt = prepareQuery(" + SELECT + `role` + FROM + `group_member` + WHERE + `groupID` = :groupID AND + `userID` = :userID + "); + $stmt->bindValue(":userID", $userID); + $stmt->bindValue(":groupID", $groupID); + $stmt->execute(); + if (!$stmt->rowCount()) { + return false; + } + $role = $stmt->fetch()["role"]; + return ($role == "admin"); +} \ No newline at end of file diff --git a/website/queries/picture.php b/website/queries/picture.php index 8e99d9a..ba27f72 100644 --- a/website/queries/picture.php +++ b/website/queries/picture.php @@ -6,7 +6,7 @@ * @throws AngryAlert * @throws HappyAlert */ -function updateAvatar(bool $group = false) { +function updateAvatar(int $group = 0) { $publicDir = "/var/www/html/public/"; $tmpImg = $_FILES["pp"]["tmp_name"]; $avatarDir = $group ? "uploads/groupavatar/" : "uploads/profilepictures/"; @@ -16,17 +16,17 @@ function updateAvatar(bool $group = false) { if ($_FILES["pp"]["size"] > 4000000) { throw new AngryAlert("Bestand is te groot, maximaal 4MB toegestaan."); } - $relativePath = $avatarDir . $_SESSION["userID"] . "_avatar.gif"; - $group ? removeOldGroupAvatar($_POST["groupID"]) : removeOldUserAvatar(); + $relativePath = $group ? $avatarDir . $group . "_avatar.gif" : $avatarDir . $_SESSION["userID"] . "_avatar.gif"; + $group ? removeOldGroupAvatar($group) : removeOldUserAvatar(); move_uploaded_file($tmpImg, $publicDir . $relativePath); } else { - $relativePath = $avatarDir . $_SESSION["userID"] . "_avatar.png"; + $relativePath = $group ? $avatarDir . $group . "_avatar.png": $avatarDir . $_SESSION["userID"] . "_avatar.png"; $scaledImg = scaleAvatar($tmpImg); - $group ? removeOldGroupAvatar($_POST["groupID"]) : removeOldUserAvatar(); + $group ? removeOldGroupAvatar($group) : removeOldUserAvatar(); imagepng($scaledImg, $publicDir . $relativePath); } - $group ? setGroupAvatarToDatabase("../" . $relativePath, $_POST["groupID"]) : setUserAvatarToDatabase("../" . $relativePath); + $group ? setGroupAvatarToDatabase("../" . $relativePath, $group) : setUserAvatarToDatabase("../" . $relativePath); throw new HappyAlert("Profielfoto veranderd."); } diff --git a/website/views/createGroup.php b/website/views/createGroup.php new file mode 100644 index 0000000..736fc45 --- /dev/null +++ b/website/views/createGroup.php @@ -0,0 +1,42 @@ + + +
    +
    +
    +
    Maak een groep!
    +
      +
    • + + +
      • +
    • + + +
      • +
    • + + +
      • +
    • + + +
      • +
    + +
    +
    diff --git a/website/views/groupAdmin.php b/website/views/groupAdmin.php new file mode 100644 index 0000000..66b38f5 --- /dev/null +++ b/website/views/groupAdmin.php @@ -0,0 +1,77 @@ + +
    +
    + +
    + +
    + +
    +
    Groep Instellingen
    + "> +
      +
    • + + " + > +
      • +
    • + + + +
      • +
    • + + +
      • +
    + +
    +
    Verander groepsafbeelding.
    + "> +
      +
    • + + " + class="group-picture" + > +
      • +
    • + + +
      • +
    • + + +
      • +
    + +
    +
    \ No newline at end of file diff --git a/website/views/menu.php b/website/views/menu.php index dab8fce..03e0f56 100644 --- a/website/views/menu.php +++ b/website/views/menu.php @@ -14,7 +14,7 @@
    • - + Maak een groep aan
      • -- 2.49.1 From 9165f8fa1b326928174f5faead81ecbc91558606 Mon Sep 17 00:00:00 2001 From: Marijn Jansen Date: Thu, 2 Feb 2017 16:18:15 +0100 Subject: [PATCH 369/400] Check if file had been uploaded. --- website/queries/picture.php | 3 +++ website/views/groupAdmin.php | 1 + 2 files changed, 4 insertions(+) diff --git a/website/queries/picture.php b/website/queries/picture.php index ba27f72..9c92540 100644 --- a/website/queries/picture.php +++ b/website/queries/picture.php @@ -7,6 +7,9 @@ * @throws HappyAlert */ function updateAvatar(int $group = 0) { + if (!array_key_exists("pp", $_FILES)) { + throw new AngryAlert("Geen afbeelding meegegeven!"); + } $publicDir = "/var/www/html/public/"; $tmpImg = $_FILES["pp"]["tmp_name"]; $avatarDir = $group ? "uploads/groupavatar/" : "uploads/profilepictures/"; diff --git a/website/views/groupAdmin.php b/website/views/groupAdmin.php index 66b38f5..aab4eea 100644 --- a/website/views/groupAdmin.php +++ b/website/views/groupAdmin.php @@ -62,6 +62,7 @@ $groupinfo = getGroupSettings($_GET["groupID"]); name="pp" accept="image/*" size="4000000" + required >
    • -- 2.49.1 From f8c9454b85a2e85961e9421555f8c0d7054f3b3c Mon Sep 17 00:00:00 2001 From: Lars van Hijfte Date: Thu, 2 Feb 2017 17:43:32 +0100 Subject: [PATCH 370/400] empty SessionID sends the user to login page If the session is empty, it now sends you to the login page with a safed url so it can revert you back to the right page after login --- website/public/API/deletePost.php | 8 ++++---- website/public/API/postComment.php | 8 ++++---- website/public/API/postPost.php | 7 ++++--- website/public/API/sendMessage.php | 7 ++++--- website/public/js/chat.js | 2 ++ website/public/js/main.js | 5 ++--- website/public/js/masonry.js | 10 +++++++++- website/public/js/post.js | 4 ++++ website/public/styles/post-popup.css | 2 +- website/views/head.php | 4 ++-- website/views/post-view.php | 17 ++++++++--------- 11 files changed, 44 insertions(+), 30 deletions(-) diff --git a/website/public/API/deletePost.php b/website/public/API/deletePost.php index fffadf5..37f89a1 100644 --- a/website/public/API/deletePost.php +++ b/website/public/API/deletePost.php @@ -3,10 +3,10 @@ session_start(); require_once "../../queries/post.php"; require_once "../../queries/user.php"; - -if (isset($_SESSION["userID"]) and - getRoleByID($_SESSION["userID"]) != 'frozen' and - getRoleByID($_SESSION["userID"]) != 'banned') { +if (!isset($_SESSION["userID"])) { + echo "logged out"; +} else if (getRoleByID($_SESSION["userID"]) != 'frozen' and + getRoleByID($_SESSION["userID"]) != 'banned') { if (empty($_POST["postID"]) or empty($_SESSION["userID"])) { header('HTTP/1.1 500 Non enough arguments'); diff --git a/website/public/API/postComment.php b/website/public/API/postComment.php index 3864cc8..c9f8a53 100644 --- a/website/public/API/postComment.php +++ b/website/public/API/postComment.php @@ -7,10 +7,10 @@ require_once("../../queries/connect.php"); require_once("../../queries/checkInput.php"); require_once("../../queries/user.php"); - -if (isset($_SESSION["userID"]) && - getRoleByID($_SESSION["userID"]) != 'frozen' && - getRoleByID($_SESSION["userID"]) != 'banned') { +if (!isset($_SESSION["userID"])) { + echo "logged out"; +} else if (getRoleByID($_SESSION["userID"]) != 'frozen' && + getRoleByID($_SESSION["userID"]) != 'banned') { if ($_POST['button'] == 'reaction') { if (empty($_POST['newcomment-content'])) { echo 0; diff --git a/website/public/API/postPost.php b/website/public/API/postPost.php index 241bda6..2d703d3 100644 --- a/website/public/API/postPost.php +++ b/website/public/API/postPost.php @@ -8,9 +8,10 @@ require_once("../../queries/connect.php"); require_once("../../queries/checkInput.php"); require_once("../../queries/user.php"); -if (isset($_SESSION["userID"]) && - getRoleByID($_SESSION["userID"]) != 'frozen' && - getRoleByID($_SESSION["userID"]) != 'banned') { +if (!isset($_SESSION["userID"])) { + echo "logged out"; +} else if (getRoleByID($_SESSION["userID"]) != 'frozen' && + getRoleByID($_SESSION["userID"]) != 'banned') { if (empty($_SESSION["userID"])) { header('HTTP/1.1 500 Non enough arguments'); diff --git a/website/public/API/sendMessage.php b/website/public/API/sendMessage.php index c6e3231..a2d411b 100644 --- a/website/public/API/sendMessage.php +++ b/website/public/API/sendMessage.php @@ -7,9 +7,10 @@ require_once("../../queries/checkInput.php"); require_once("../../queries/user.php"); // Check if the user is allowed to send a message. -if (isset($_SESSION["userID"]) && - getRoleByID($_SESSION["userID"]) != 'frozen' && - getRoleByID($_SESSION["userID"]) != 'banned') { +if (!isset($_SESSION["userID"])) { + echo "logged out"; +} else if (getRoleByID($_SESSION["userID"]) != 'frozen' && + getRoleByID($_SESSION["userID"]) != 'banned') { if (!empty(test_input($_POST["destination"])) && !empty(test_input($_POST["content"])) ) { diff --git a/website/public/js/chat.js b/website/public/js/chat.js index a3ff430..f431b91 100644 --- a/website/public/js/chat.js +++ b/website/public/js/chat.js @@ -43,6 +43,8 @@ function sendMessage() { ).done(function(response) { if (response == "frozen") { alert("Je account is bevroren, dus je kan niet chat berichten versturen. Contacteer een admin als je denkt dat dit onjuist is."); + } else if (response == "logged out") { + window.location.href = "login.php?url=" + window.location.pathname; } // Load messages if the message has been send, so it shows in the chat. loadMessages(); diff --git a/website/public/js/main.js b/website/public/js/main.js index 30cd3ed..2ce58e4 100644 --- a/website/public/js/main.js +++ b/website/public/js/main.js @@ -3,8 +3,7 @@ var months = ["januari", "februari", "maart", "april", "mei", "juni", "juli", "a function fancyText(text) { // Add links, images, gifs and (youtube) video's. - var regex = /(https?:\/\/.[^ <>"]*)/ig; - text = text.replace(regex, function(link) { + text = text.replace(/(https?:\/\/.[^ \n<>"]*)/ig, function(link) { // Add images if (link.match(/(https?:\/\/.[^ ]*\.(?:png|jpg|jpeg|gif))/ig)) { return "" + link + ""; @@ -39,7 +38,7 @@ function fancyText(text) { } // This function gets the value of a cookie when given a key. -// If didn´t find any compatible cookie, it returns false. +// If it didn´t find any compatible cookie, it returns false. function getCookie(key) { cookies = document.cookie.split("; "); for (var i in cookies) { diff --git a/website/public/js/masonry.js b/website/public/js/masonry.js index a628e96..d43577b 100644 --- a/website/public/js/masonry.js +++ b/website/public/js/masonry.js @@ -26,7 +26,7 @@ function requestPost(postID) { function postPost() { title = $("input.newpost[name='title']").val(); content = $("textarea.newpost[name='content']").val(); - + console.log(masonryMode); if (masonryMode == 2) { $.post("API/postPost.php", { title: title, content : content, @@ -36,6 +36,10 @@ function postPost() { $('#alertbox').show(); $('#alerttext').html("Geen titel of inhoud; vul a.u.b. in."); window.scrollTo(0,0); + } else if (data == "logged out") { + window.location.href = "login.php?url=" + window.location.pathname; + } else if (data == "frozen") { + alert("Je account is bevroren, dus je kan geen posts plaatsen. Contacteer een admin als je denkt dat dit onjuist is."); } else { $('#alertbox').hide(); masonry(masonryMode); @@ -49,6 +53,10 @@ function postPost() { $('#alertbox').show(); $('#alerttext').html("Geen titel of inhoud; vul a.u.b. in."); window.scrollTo(0,0); + } else if (data == "logged out") { + window.location.href = "login.php?url=" + window.location.pathname; + } else if (data == "frozen") { + alert("Je account is bevroren, dus je kan geen posts plaatsen. Contacteer een admin als je denkt dat dit onjuist is."); } else { $('#alertbox').hide(); masonry(masonryMode); diff --git a/website/public/js/post.js b/website/public/js/post.js index 4009023..4f77d4d 100644 --- a/website/public/js/post.js +++ b/website/public/js/post.js @@ -8,6 +8,8 @@ function postComment(buttonValue) { ).done(function (response) { if (response == "frozen") { alert("Je account is bevroren, dus je kan geen comments plaatsen of \"niet slechten\". Contacteer een admin als je denkt dat dit onjuist is."); + } else if (response == "logged out") { + window.location.href = "login.php?url=" + window.location.pathname; } }); @@ -30,6 +32,8 @@ function deletePost(postID) { ).done(function (response) { if (response == "frozen") { alert("Je account is bevroren, dus je kan geen posts verwijderen. Contacteer een admin als je denkt dat dit onjuist is."); + } else if (response == "logged out") { + window.location.href = "login.php?url=" + window.location.pathname; } }); closeModal(); diff --git a/website/public/styles/post-popup.css b/website/public/styles/post-popup.css index 24badcb..9493b83 100644 --- a/website/public/styles/post-popup.css +++ b/website/public/styles/post-popup.css @@ -91,7 +91,7 @@ .deleteButton { background-color: firebrick; - + float: right; } .deleteButton i { diff --git a/website/views/head.php b/website/views/head.php index f831f5d..52bcab8 100644 --- a/website/views/head.php +++ b/website/views/head.php @@ -26,8 +26,8 @@ require_once ("../queries/user.php"); session_start(); -if(!isset($_SESSION["userID"])){ - header("location:login.php"); +if(!isset($_SESSION["userID"])) { + header("location:login.php?url=" . "$_SERVER[REQUEST_URI]"); } else { updateLastActivity(); } diff --git a/website/views/post-view.php b/website/views/post-view.php index f8fe902..717e6a8 100644 --- a/website/views/post-view.php +++ b/website/views/post-view.php @@ -5,14 +5,6 @@ $fullname = $post['fname'] . " " . $post['lname'] . " (" . $post['username'] . " ?>

      - -
      - gepost door , '> @@ -20,7 +12,14 @@ $fullname = $post['fname'] . " " . $post['lname'] . " (" . $post['username'] . "
      - + +
      +

      -- 2.49.1 From b206d243b905ad614f2542bb582d06fa1369ff58 Mon Sep 17 00:00:00 2001 From: Lars van Hijfte Date: Thu, 2 Feb 2017 18:17:58 +0100 Subject: [PATCH 371/400] Validator fixes Changes chat, profile and settings pages so it is compatible with the validator of w3 --- website/public/styles/main.css | 2 -- website/public/styles/profile.css | 1 - website/views/group.php | 2 +- website/views/header.php | 4 ++-- website/views/profile.php | 26 ++++++++++++-------------- website/views/settings-view.php | 8 ++++---- 6 files changed, 19 insertions(+), 24 deletions(-) diff --git a/website/public/styles/main.css b/website/public/styles/main.css index 650a30f..5bb7b1d 100644 --- a/website/public/styles/main.css +++ b/website/public/styles/main.css @@ -256,8 +256,6 @@ div[data-title]:hover:after { top: 150%; z-index: 200; white-space: nowrap; - -moz-border-radius: 3px; - -webkit-border-radius: 3px; border-radius: 3px; box-shadow: 0 14px 28px rgba(0,0,0,0.25), 0 10px 10px rgba(0,0,0,0.22); background-color: #333; diff --git a/website/public/styles/profile.css b/website/public/styles/profile.css index 27ff7fd..2f857a4 100644 --- a/website/public/styles/profile.css +++ b/website/public/styles/profile.css @@ -71,7 +71,6 @@ .group-picture { border: none; - margin-right: 15px; } diff --git a/website/views/group.php b/website/views/group.php index b27f18c..250fc9f 100644 --- a/website/views/group.php +++ b/website/views/group.php @@ -1,6 +1,6 @@
      - ">
      + <?= $group[" class="group-picture main-picture" src="">
      diff --git a/website/views/header.php b/website/views/header.php index c1379fc..e13eca6 100644 --- a/website/views/header.php +++ b/website/views/header.php @@ -23,9 +23,9 @@ $userinfo = getHeaderInfo();
      Hallo
      - +
      - "/> + <?= $userinfo[" id="own-profile-picture" class="profile-picture" src=""/>
      diff --git a/website/views/profile.php b/website/views/profile.php index 4139099..62157f4 100644 --- a/website/views/profile.php +++ b/website/views/profile.php @@ -4,7 +4,7 @@
      - " src="">
      + <?= $user[" class="profile-picture main-picture " src="">
    • - - - - format("Y"); for ($year = $now; $year >= 1900; $year--): ?> -- 2.49.1 From 1486e712075ee7ebfa9c4ba0dc3dcea10e83fa47 Mon Sep 17 00:00:00 2001 From: Joey Lai Date: Thu, 2 Feb 2017 19:34:58 +0100 Subject: [PATCH 372/400] Added url get --- website/public/js/dobPicker.js | 123 ----------------------- website/public/js/dobPicker.min.js | 1 - website/public/js/loginRegisterModals.js | 68 +++++++++++++ website/public/login.php | 8 +- website/queries/login.php | 21 +++- website/views/homeLoginRegister.php | 19 +++- website/views/login-view.php | 76 +------------- 7 files changed, 110 insertions(+), 206 deletions(-) delete mode 100644 website/public/js/dobPicker.js delete mode 100644 website/public/js/dobPicker.min.js create mode 100644 website/public/js/loginRegisterModals.js diff --git a/website/public/js/dobPicker.js b/website/public/js/dobPicker.js deleted file mode 100644 index 9440153..0000000 --- a/website/public/js/dobPicker.js +++ /dev/null @@ -1,123 +0,0 @@ -/** - * jQuery DOB Picker - * Website: https://github.com/tyea/dobpicker - * Version: 1.0 - * Author: Tom Yeadon - * License: BSD 3-Clause - */ - -jQuery.extend({ - - dobPicker: function(params) { - - // set the defaults - if (typeof(params.dayDefault)==='undefined') params.dayDefault = 'Day'; - if (typeof(params.monthDefault)==='undefined') params.monthDefault = 'Month'; - if (typeof(params.yearDefault)==='undefined') params.yearDefault = 'Year'; - if (typeof(params.minimumAge)==='undefined') params.minimumAge = 12; - if (typeof(params.maximumAge)==='undefined') params.maximumAge = 80; - - // set the default messages - $(params.daySelector).append(''); - $(params.monthSelector).append(''); - $(params.yearSelector).append(''); - - // populate the day select - for (i = 1; i <= 31; i++) { - if (i <= 9) { - var val = '0' + i; - } else { - var val = i; - } - $(params.daySelector).append(''); - } - - // populate the month select - var months = [ - "January", - "February", - "March", - "April", - "May", - "June", - "July", - "August", - "September", - "October", - "November", - "December" - ]; - - for (i = 1; i <= 12; i++) { - if (i <= 9) { - var val = '0' + i; - } else { - var val = i; - } - $(params.monthSelector).append(''); - } - - // populate the year select - var date = new Date(); - var year = date.getFullYear(); - var start = year - params.minimumAge; - var count = start - params.maximumAge; - - for (i = start; i >= count; i--) { - $(params.yearSelector).append(''); - } - - // do the logic for the day select - $(params.daySelector).change(function() { - - $(params.monthSelector)[0].selectedIndex = 0; - $(params.yearSelector)[0].selectedIndex = 0; - $(params.yearSelector + ' option').removeAttr('disabled'); - - if ($(params.daySelector).val() >= 1 && $(params.daySelector).val() <= 29) { - - $(params.monthSelector + ' option').removeAttr('disabled'); - - } else if ($(params.daySelector).val() == 30) { - - $(params.monthSelector + ' option').removeAttr('disabled'); - $(params.monthSelector + ' option[value="02"]').attr('disabled', 'disabled'); - - } else if($(params.daySelector).val() == 31) { - - $(params.monthSelector + ' option').removeAttr('disabled'); - $(params.monthSelector + ' option[value="02"]').attr('disabled', 'disabled'); - $(params.monthSelector + ' option[value="04"]').attr('disabled', 'disabled'); - $(params.monthSelector + ' option[value="06"]').attr('disabled', 'disabled'); - $(params.monthSelector + ' option[value="09"]').attr('disabled', 'disabled'); - $(params.monthSelector + ' option[value="11"]').attr('disabled', 'disabled'); - - } - - }); - - // do the logic for the month select - $(params.monthSelector).change(function() { - - $(params.yearSelector)[0].selectedIndex = 0; - $(params.yearSelector + ' option').removeAttr('disabled'); - - if ($(params.daySelector).val() == 29 && $(params.monthSelector).val() == '02') { - - $(params.yearSelector + ' option').each(function(index) { - if (index !== 0) { - var year = $(this).attr('value'); - var leap = !((year % 4) || (!(year % 100) && (year % 400))); - if (leap === false) { - $(this).attr('disabled', 'disabled'); - } - } - }); - - } - - }); - - } - -}); diff --git a/website/public/js/dobPicker.min.js b/website/public/js/dobPicker.min.js deleted file mode 100644 index b82c3a2..0000000 --- a/website/public/js/dobPicker.min.js +++ /dev/null @@ -1 +0,0 @@ -jQuery.extend({dobPicker:function(a){for("undefined"==typeof a.dayDefault&&(a.dayDefault="Day"),"undefined"==typeof a.monthDefault&&(a.monthDefault="Month"),"undefined"==typeof a.yearDefault&&(a.yearDefault="Year"),"undefined"==typeof a.minimumAge&&(a.minimumAge=12),"undefined"==typeof a.maximumAge&&(a.maximumAge=80),$(a.daySelector).append('"),$(a.monthSelector).append('"),$(a.yearSelector).append('"),i=1;i<=31;i++){if(i<=9)var b="0"+i;else var b=i;$(a.daySelector).append('")}var c=["January","February","March","April","May","June","July","August","September","October","November","December"];for(i=1;i<=12;i++){if(i<=9)var b="0"+i;else var b=i;$(a.monthSelector).append('")}var d=new Date,e=d.getFullYear(),f=e-a.minimumAge,g=f-a.maximumAge;for(i=f;i>=g;i--)$(a.yearSelector).append('");$(a.daySelector).change(function(){$(a.monthSelector)[0].selectedIndex=0,$(a.yearSelector)[0].selectedIndex=0,$(a.yearSelector+" option").removeAttr("disabled"),$(a.daySelector).val()>=1&&$(a.daySelector).val()<=29?$(a.monthSelector+" option").removeAttr("disabled"):30==$(a.daySelector).val()?($(a.monthSelector+" option").removeAttr("disabled"),$(a.monthSelector+' option[value="02"]').attr("disabled","disabled")):31==$(a.daySelector).val()&&($(a.monthSelector+" option").removeAttr("disabled"),$(a.monthSelector+' option[value="02"]').attr("disabled","disabled"),$(a.monthSelector+' option[value="04"]').attr("disabled","disabled"),$(a.monthSelector+' option[value="06"]').attr("disabled","disabled"),$(a.monthSelector+' option[value="09"]').attr("disabled","disabled"),$(a.monthSelector+' option[value="11"]').attr("disabled","disabled"))}),$(a.monthSelector).change(function(){$(a.yearSelector)[0].selectedIndex=0,$(a.yearSelector+" option").removeAttr("disabled"),29==$(a.daySelector).val()&&"02"==$(a.monthSelector).val()&&$(a.yearSelector+" option").each(function(a){if(0!==a){var b=$(this).attr("value"),c=!(b%4||!(b%100)&&b%400);c===!1&&$(this).attr("disabled","disabled")}})})}}); diff --git a/website/public/js/loginRegisterModals.js b/website/public/js/loginRegisterModals.js new file mode 100644 index 0000000..373fb7e --- /dev/null +++ b/website/public/js/loginRegisterModals.js @@ -0,0 +1,68 @@ + +// Get the modal +var modal = document.getElementById('myModal'); +var registerModal = document.getElementById('registerModal'); +var facebookModal = document.getElementById("fbModal"); + +// Get the button that opens the modal +var registerBtn = document.getElementById("registerBtn"); +var btn = document.getElementById("myBtn"); + + +// Get the element that closes the modal +var span = document.getElementsByClassName("close")[0]; +var registerSpan = document.getElementsByClassName("close")[1]; +var facebookCLose = document.getElementsByClassName("close")[2]; + +/** + * When the user clicks the button, open the modal + */ +btn.onclick = function () { + modal.style.display = "block"; + +} +registerBtn.onclick = function () { + registerModal.style.display = "block"; +} + +/** + * WHen the user clicks on (X), close the modal + */ +span.onclick = function () { + modal.style.display = "none"; +} +registerSpan.onclick = function () { + registerModal.style.display = "none"; +} +facebookCLose.onclick = function () { + facebookModal.style.display = "none"; +} + +/** + * When the user clicks anywhere outside of the modal, close it + */ +window.onclick = function (event) { + if (event.target == modal) { + modal.style.display = "none"; + } + if (event.target == registerModal) { + registerModal.style.display = "none"; + } + if (event.target == facebookModal) { + facebookModal.style.display = "none"; + } +} + +/** + * When ESC is pressed, close modal + */ +document.addEventListener('keyup', function(e) { + if (e.keyCode == 27) { + modal.style.display = "none"; + registerModal.style.display = "none"; + + } +}); +/** + * Created by joey on 2-2-17. + */ diff --git a/website/public/login.php b/website/public/login.php index 726d530..57e9af7 100644 --- a/website/public/login.php +++ b/website/public/login.php @@ -13,18 +13,12 @@ ?> - window.onload=checkLoggedIn(); - "; - } include("../views/homeLoginRegister.php"); /* This view adds login view */ include("../views/login-view.php"); ?> +; diff --git a/website/queries/login.php b/website/queries/login.php index 4dad5c5..27c1f3b 100644 --- a/website/queries/login.php +++ b/website/queries/login.php @@ -33,7 +33,7 @@ function getUserID() { return $stmt->fetch(PDO::FETCH_ASSOC); } -function validateLogin($username, $password){ +function validateLogin($username, $password, $url){ // Empty username or password field if (empty($username) || empty($password)) { throw new loginException("Inloggegevens zijn niet ingevuld"); @@ -50,20 +50,35 @@ function validateLogin($username, $password){ echo ""; - } else if ($role == "frozen"){ + + } else if ($role == "frozen") { $_SESSION["userID"] = $userID; + if (!isset($url) or $url = "") { echo ""; + } else { + echo ""; + } + } else if ($role == "unconfirmed"){ sendConfirmEmail(getUser()["userID"]); echo ""; + } else { $_SESSION["userID"] = $userID; - header("location: profile.php"); + if(!isset($url) or $url == "") { + header("location: profile.php"); + } else{ + header("location: $url"); + } + } } else { throw new loginException("Inloggevens zijn niet correct"); diff --git a/website/views/homeLoginRegister.php b/website/views/homeLoginRegister.php index 54c2015..55277e7 100644 --- a/website/views/homeLoginRegister.php +++ b/website/views/homeLoginRegister.php @@ -1,4 +1,12 @@ + window.onload=checkLoggedIn(); + "; +} // Facebook variables $appID = "353857824997532"; @@ -20,13 +28,22 @@ $fbDay_date = $fbMonth_date = $fbYear_date = ""; $user = $psw = $remember =""; $loginErr = $resetErr = $fbRegisterErr =""; +//if ($_SERVER["REQUEST_METHOD"] == "GET") { +// try { +// $user = ($_POST["user"]); +// validateLogin($_POST["user"], $_POST["psw"], "https://$_SERVER[HTTP_HOST]$_SERVER[REQUEST_URI]"); +// } catch(loginException $e) { +// $loginErr = $e->getMessage(); +// } +//} + if ($_SERVER["REQUEST_METHOD"] == "POST") { // Checks for which button is pressed switch ($_POST["submit"]) { case "login": try { $user = ($_POST["user"]); - validateLogin($_POST["user"], $_POST["psw"]); + validateLogin($_POST["user"], $_POST["psw"], $_POST["url"]); } catch(loginException $e) { $loginErr = $e->getMessage(); } diff --git a/website/views/login-view.php b/website/views/login-view.php index 98ce71c..89487de 100644 --- a/website/views/login-view.php +++ b/website/views/login-view.php @@ -16,6 +16,9 @@ return=$correct method="post" name="login"> + "/> '; + echo ''; } -?> - - \ No newline at end of file +?> \ No newline at end of file -- 2.49.1 From 74145d5d1c808b5c37a0646d27804aaa6e9c386c Mon Sep 17 00:00:00 2001 From: Marijn Jansen Date: Thu, 2 Feb 2017 19:43:57 +0100 Subject: [PATCH 373/400] Updated buttons on groups --- website/public/js/groupButtons.js | 36 ++++++++++++++++++---------- website/public/styles/post-popup.css | 1 - website/public/styles/profile.css | 21 +++++++++++++++- website/views/groupAdmin.php | 27 +++++++++++++++++---- 4 files changed, 66 insertions(+), 19 deletions(-) diff --git a/website/public/js/groupButtons.js b/website/public/js/groupButtons.js index e6ada67..549277d 100644 --- a/website/public/js/groupButtons.js +++ b/website/public/js/groupButtons.js @@ -3,31 +3,41 @@ function placeGroupButtons() { .done(function(data) { var $buttonContainer = $("div.group-button-container"); - if(data == 'none') { + if (data == 'none') { $buttonContainer.append( - ""); - } else if(data == 'request') { + } else if (data == 'request') { $buttonContainer.append( - ""); + } else if (data == 'admin') { + $buttonContainer.append( + "" + ); } else { $buttonContainer.append( - ""); } $buttonContainer.children().click(function() { - $.post("API/editMembership.php", { grp: groupID, role: this.value }) - .done(function() { - $buttonContainer.children().remove(); - placeGroupButtons(); - updateMenus(); - }).fail(function() { - }); + if (this.value == 'admin') { + window.location.href='groupAdmin.php?groupID=' + groupID; + } else { + $.post("API/editMembership.php", {grp: groupID, role: this.value}) + .done(function () { + $buttonContainer.children().remove(); + placeGroupButtons(); + updateMenus(); + }).fail(function () { + }); + } }); }); diff --git a/website/public/styles/post-popup.css b/website/public/styles/post-popup.css index 24badcb..541b52c 100644 --- a/website/public/styles/post-popup.css +++ b/website/public/styles/post-popup.css @@ -91,7 +91,6 @@ .deleteButton { background-color: firebrick; - } .deleteButton i { diff --git a/website/public/styles/profile.css b/website/public/styles/profile.css index 27ff7fd..f6e545e 100644 --- a/website/public/styles/profile.css +++ b/website/public/styles/profile.css @@ -31,11 +31,14 @@ display: block; margin: 7px 0; - width: 200px; font-size: 18px; } +.friend-button-container button, .status-buttons-container button, .group-button-fixed { + width: 200px; +} + .group-button-container button { float: right; } @@ -74,6 +77,22 @@ margin-right: 15px; } +.group-button-fancy span { + display: none; +} + +.group-button-fancy:hover { + text-align: right; +} + +.group-button-fancy i { + display: inline-block; +} + +.group-button-fancy:hover span { + display: inline-block; + margin-right: 5px; +} /* Old */ diff --git a/website/views/groupAdmin.php b/website/views/groupAdmin.php index aab4eea..a28553e 100644 --- a/website/views/groupAdmin.php +++ b/website/views/groupAdmin.php @@ -7,10 +7,20 @@ $groupinfo = getGroupSettings($_GET["groupID"]);
      -
      - -
      +
      + +
      +
      + +
      Groep Instellingen
      "> @@ -70,9 +80,18 @@ $groupinfo = getGroupSettings($_GET["groupID"]); + class="fa fa-picture-o" + > Verander profielfoto
    +
    + +
    \ No newline at end of file -- 2.49.1 From 74e91ed7cb18acebaabd5b6356f87aec25830977 Mon Sep 17 00:00:00 2001 From: Marijn Jansen Date: Thu, 2 Feb 2017 21:14:25 +0100 Subject: [PATCH 374/400] Add mods/admin to a group. --- website/public/groupAdmin.php | 27 ++++++++++++++----- website/queries/groupAdmin.php | 48 ++++++++++++++++++++++++++++++++++ website/queries/settings.php | 15 +++++++++++ website/views/groupAdmin.php | 29 ++++++++++++++++++++ 4 files changed, 113 insertions(+), 6 deletions(-) diff --git a/website/public/groupAdmin.php b/website/public/groupAdmin.php index 13ff7e0..6095149 100644 --- a/website/public/groupAdmin.php +++ b/website/public/groupAdmin.php @@ -23,12 +23,27 @@ $alertClass; $alertMessage; if ($_SERVER["REQUEST_METHOD"] == "POST") { try { - if ($_POST["form"] == "group") { - updateGroupSettings($_POST["groupID"]); - } else if ($_POST["form"] == "picture") { - if (checkGroupAdmin($_POST["groupID"], $_SESSION["userID"])) { - updateAvatar($_POST["groupID"]); - } + switch ($_POST["form"]) { + case "group": + updateGroupSettings($_POST["groupID"]); + break; + case "picture": + if (checkGroupAdmin($_POST["groupID"], $_SESSION["userID"])) { + updateAvatar($_POST["groupID"]); + } + break; + case "mod": + if (!array_key_exists("userID", $_POST)) { + throw new AngryAlert("Geen gebruiker geselecteerd."); + } + upgradeUser($_POST["groupID"], $_POST["userID"], "mod"); + break; + case "admin": + if (!array_key_exists("userID", $_POST)) { + throw new AngryAlert("Geen gebruiker geselecteerd."); + } + upgradeUser($_POST["groupID"], $_POST["userID"], "admin"); + break; } } catch (AlertMessage $w) { $alertClass = $w->getClass(); diff --git a/website/queries/groupAdmin.php b/website/queries/groupAdmin.php index ae2abd3..e3580b6 100644 --- a/website/queries/groupAdmin.php +++ b/website/queries/groupAdmin.php @@ -58,4 +58,52 @@ function checkGroupAdmin(int $groupID, int $userID) : bool { } $role = $stmt->fetch()["role"]; return ($role == "admin"); +} + +function getAllGroupMembers(int $groupID) { + $stmt = prepareQuery(" + SELECT + `username`, + `user`.`userID`, + CONCAT(`fname`, ' ', `lname`) AS `fullname`, + `group_member`.`role` + FROM + `group_member` + LEFT JOIN + `user` + ON + `group_member`.`userID` = `user`.`userID` + WHERE + `groupID` = :groupID AND `group_member`.`role` = 'member' + "); + + $stmt->bindParam(':groupID', $groupID); + if (!$stmt->execute()) { + return False; + } + return $stmt->fetchAll(); +} + +function upgradeUser(int $groupID, int $userID, string $role) { + if (!checkGroupAdmin($groupID, $_SESSION["userID"])) { + throw new AngryAlert("Geen toestemming om te wijzigen"); + } + + $stmt = prepareQuery(" + UPDATE + `group_member` + SET + `role` = :role + WHERE + `userID` = :userID AND `groupID` = :groupID + "); + $stmt->bindValue(":groupID", $groupID); + $stmt->bindValue(":userID", $userID); + $stmt->bindValue(":role", $role); + $stmt->execute(); + if ($stmt->rowCount()) { + throw new HappyAlert("Permissie aangepast!"); + } else { + throw new AngryAlert("Er is iets mis gegaan"); + } } \ No newline at end of file diff --git a/website/queries/settings.php b/website/queries/settings.php index 9b17d17..26237ec 100644 --- a/website/queries/settings.php +++ b/website/queries/settings.php @@ -148,6 +148,10 @@ function doChangePassword() { } } +/** + * Changes the users email if it is valid. + * @throws AngryAlert + */ function changeEmail() { if (test_input($_POST["email"]) == test_input($_POST["email-confirm"])) { @@ -164,6 +168,11 @@ function changeEmail() { } } +/** + * Checks if an emailadres is available in the database. + * @param $email + * @throws AngryAlert + */ function emailIsAvailableInDatabase($email) { $stmt = prepareQuery(" SELECT @@ -181,6 +190,12 @@ function emailIsAvailableInDatabase($email) { } } +/** + * Does the actual changing of an email-adress. + * @param $email + * @throws AngryAlert + * @throws HappyAlert + */ function doChangeEmail($email) { $stmt = prepareQuery(" UPDATE diff --git a/website/views/groupAdmin.php b/website/views/groupAdmin.php index a28553e..54fbee8 100644 --- a/website/views/groupAdmin.php +++ b/website/views/groupAdmin.php @@ -85,6 +85,35 @@ $groupinfo = getGroupSettings($_GET["groupID"]); +
    +
    Voeg een admin/mod toe
    +
      + + " type="hidden"> + + + + + +
    +
    • -- 2.49.1 From 7e4107ac8b357bc1335c9657293182a5ce18720c Mon Sep 17 00:00:00 2001 From: Lars van Hijfte Date: Fri, 3 Feb 2017 00:13:23 +0100 Subject: [PATCH 375/400] Added fancy buttons in profile --- website/public/js/friendButtons.js | 28 +++++++++++++++------------- website/public/js/groupButtons.js | 12 ++++++------ website/public/styles/post-popup.css | 12 ------------ website/public/styles/profile.css | 19 ++++++++++++------- website/views/post-view.php | 4 ++-- website/views/profile.php | 14 ++++++++++---- 6 files changed, 45 insertions(+), 44 deletions(-) diff --git a/website/public/js/friendButtons.js b/website/public/js/friendButtons.js index 47c476a..303ccf9 100644 --- a/website/public/js/friendButtons.js +++ b/website/public/js/friendButtons.js @@ -19,24 +19,24 @@ function placeFriendButtons() { case "0": value1 = "request"; class1 = "green"; - text1 = "Bevriend"; - icon1 = "fa-handshake-o"; + text1 = "Word vrienden"; + icon1 = "fa-user-plus"; break; case "1": value1 = userID; class1 = "green"; text1 = "Chat"; - icon1 = "fa-comment-o"; + icon1 = "fa-comment"; value2 = "delete"; class2 = "red"; - text2 = "Verwijder"; - icon2 = "fa-times"; + text2 = "Ontvriend"; + icon2 = "fa-user-times"; break; case "2": value1 = "delete"; class1 = "red"; text1 = "Trek verzoek in"; - icon1 = "fa-cross"; + icon1 = "fa-times"; break; case "3": value1 = "accept"; @@ -51,16 +51,18 @@ function placeFriendButtons() { } $buttonContainer.append( - ""); + "
      "); $buttonContainer.append( - ""); + "
      "); - $buttonContainer.children().click(function() { + $buttonContainer.find("button").click(function() { if (isNaN(this.value)) editFriendship(userID, this.value); else if (this.value != "") diff --git a/website/public/js/groupButtons.js b/website/public/js/groupButtons.js index 549277d..caf3ab8 100644 --- a/website/public/js/groupButtons.js +++ b/website/public/js/groupButtons.js @@ -5,23 +5,23 @@ function placeGroupButtons() { if (data == 'none') { $buttonContainer.append( - ""); } else if (data == 'request') { $buttonContainer.append( - ""); } else if (data == 'admin') { $buttonContainer.append( - "" ); } else { $buttonContainer.append( - ""); } diff --git a/website/public/styles/post-popup.css b/website/public/styles/post-popup.css index 9493b83..e82129b 100644 --- a/website/public/styles/post-popup.css +++ b/website/public/styles/post-popup.css @@ -92,16 +92,4 @@ .deleteButton { background-color: firebrick; float: right; -} - -.deleteButton i { - display: inline-block; -} - -.deleteButton:hover span { - display: inline-block; -} - -.deleteButton span { - display: none; } \ No newline at end of file diff --git a/website/public/styles/profile.css b/website/public/styles/profile.css index 18e105e..8a93d12 100644 --- a/website/public/styles/profile.css +++ b/website/public/styles/profile.css @@ -27,16 +27,21 @@ display: inline-block; } +.friend-button-container div, .status-buttons-container div { + width: 200px; + display: inline-block; +} + .friend-button-container button, .status-buttons-container button, .group-button-container button { display: block; + float: right; margin: 7px 0; font-size: 18px; } - -.friend-button-container button, .status-buttons-container button, .group-button-fixed { - width: 200px; +.status-buttons-container button { + float: left; } .group-button-container button { @@ -76,19 +81,19 @@ border: none; } -.group-button-fancy span { +.fancy-button span { display: none; } -.group-button-fancy:hover { +.fancy-button:hover { text-align: right; } -.group-button-fancy i { +.fancy-button i { display: inline-block; } -.group-button-fancy:hover span { +.fancy-button:hover span { display: inline-block; margin-right: 5px; } diff --git a/website/views/post-view.php b/website/views/post-view.php index 717e6a8..fadc791 100644 --- a/website/views/post-view.php +++ b/website/views/post-view.php @@ -13,11 +13,11 @@ $fullname = $post['fname'] . " " . $post['lname'] . " (" . $post['username'] . "
    -
    diff --git a/website/views/profile.php b/website/views/profile.php index 62157f4..0cb5cc2 100644 --- a/website/views/profile.php +++ b/website/views/profile.php @@ -7,10 +7,16 @@ <?= $user[" class="profile-picture main-picture " src="">
    - - +
    + +
    +
    + +

    :)

    -- 2.49.1 From 6d739a4480019709d6abe9addea37ade0ebbc34d Mon Sep 17 00:00:00 2001 From: Lars van Hijfte Date: Fri, 3 Feb 2017 00:24:38 +0100 Subject: [PATCH 376/400] Chat is now only loading the last 100 messages --- website/queries/private_message.php | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/website/queries/private_message.php b/website/queries/private_message.php index 3b88563..f2df887 100644 --- a/website/queries/private_message.php +++ b/website/queries/private_message.php @@ -6,18 +6,23 @@ function getOldChatMessages($user2ID) { if (getFriendshipStatus($user2ID) == 1) { $stmt = prepareQuery(" SELECT - * + * FROM - `private_message` - WHERE - `origin` = :user1 AND - `destination` = :user2 OR - `origin` = :user2 AND - `destination` = :user1 + (SELECT + * + FROM + `private_message` + WHERE + `origin` = :user1 AND + `destination` = :user2 OR + `origin` = :user2 AND + `destination` = :user1 + ORDER BY + `messageID` DESC + LIMIT + 100) sub ORDER BY - `creationdate` ASC - LIMIT - 100 + `messageID` ASC "); $stmt->bindParam(":user1", $user1ID); @@ -76,7 +81,7 @@ function getNewChatMessages($lastID, $destination) { `destination` = :user1) AND `messageID` > :lastID ORDER BY - `creationdate` ASC + `messageID` ASC "); $stmt->bindParam(':user1', $_SESSION["userID"]); -- 2.49.1 From 1a3efe9669089acffc404151616d26b1d3f9d984 Mon Sep 17 00:00:00 2001 From: Joey Lai Date: Fri, 3 Feb 2017 10:12:37 +0100 Subject: [PATCH 377/400] Fixed W3Validation and url GETs --- website/public/fb-callback.php | 71 -------------- website/public/register(stash).php | 116 ----------------------- website/public/styles/index.css | 6 -- website/queries/checkInput.php | 6 +- website/queries/login.php | 7 +- website/views/facebookRegisterModal.php | 8 +- website/{public => views}/fbRegister.php | 0 website/views/forgotPasswordModal.php | 4 +- website/views/homeLoginRegister.php | 38 ++++---- website/views/login-view.php | 13 ++- website/{public => views}/register.php | 0 website/views/registerModal.php | 13 +-- 12 files changed, 43 insertions(+), 239 deletions(-) delete mode 100644 website/public/fb-callback.php delete mode 100644 website/public/register(stash).php rename website/{public => views}/fbRegister.php (100%) rename website/{public => views}/register.php (100%) diff --git a/website/public/fb-callback.php b/website/public/fb-callback.php deleted file mode 100644 index 0ed0369..0000000 --- a/website/public/fb-callback.php +++ /dev/null @@ -1,71 +0,0 @@ - $appID, // Replace {app-id} with your app id - 'app_secret' => $appSecret, - 'default_graph_version' => 'v2.2', -]); - -$helper = $fb->getRedirectLoginHelper(); - -try { - $accessToken = $helper->getAccessToken(); -} catch(Facebook\Exceptions\FacebookResponseException $e) { - // When Graph returns an error - echo 'Graph returned an error: ' . $e->getMessage(); - exit; -} catch(Facebook\Exceptions\FacebookSDKException $e) { - // When validation fails or other local issues - echo 'Facebook SDK returned an error: ' . $e->getMessage(); - exit; -} - -if (! isset($accessToken)) { - if ($helper->getError()) { - header('HTTP/1.0 401 Unauthorized'); - echo "Error: " . $helper->getError() . "\n"; - echo "Error Code: " . $helper->getErrorCode() . "\n"; - echo "Error Reason: " . $helper->getErrorReason() . "\n"; - echo "Error Description: " . $helper->getErrorDescription() . "\n"; - } else { - header('HTTP/1.0 400 Bad Request'); - echo 'Bad request'; - } - exit; -} - -// Logged in -echo '

    Access Token

    '; -var_dump($accessToken->getValue()); - -// The OAuth 2.0 client handler helps us manage access tokens -$oAuth2Client = $fb->getOAuth2Client(); - -// Get the access token metadata from /debug_token -$tokenMetadata = $oAuth2Client->debugToken($accessToken); -echo '

    Metadata

    '; -var_dump($tokenMetadata); - -// Validation (these will throw FacebookSDKException's when they fail) -$tokenMetadata->validateAppId($appID); // Replace {app-id} with your app id -// If you know the user ID this access token belongs to, you can validate it here -//$tokenMetadata->validateUserId('123'); -$tokenMetadata->validateExpiration(); - -if (! $accessToken->isLongLived()) { - // Exchanges a short-lived access token for a long-lived one - try { - $accessToken = $oAuth2Client->getLongLivedAccessToken($accessToken); - } catch (Facebook\Exceptions\FacebookSDKException $e) { - echo "

    Error getting long-lived access token: " . $helper->getMessage() . "

    \n\n"; - exit; - } - - echo '

    Long-lived

    '; - var_dump($accessToken->getValue()); -} - -$_SESSION['fb_access_token'] = (string) $accessToken; - -// User is logged in with a long-lived access token. -// You can redirect them to a members-only page. -//header('Location: https://example.com/members.php'); \ No newline at end of file diff --git a/website/public/register(stash).php b/website/public/register(stash).php deleted file mode 100644 index 99ebc02..0000000 --- a/website/public/register(stash).php +++ /dev/null @@ -1,116 +0,0 @@ - - - - -getMessage(); - } - - try { - $surname = test_input(($_POST["surname"])); - checkInputChoice($surname, "lettersAndSpaces"); - } - catch(lettersAndSpacesException $e){ - $correct = false; - $surnameErr = $e->getMessage(); - } - - try{ - $day_date = test_input(($_POST["day_date"])); - $month_date = test_input(($_POST["month_date"])); - $year_date = test_input(($_POST["year_date"])); - $bday = $year_date . "-" . $month_date . "-" . $day_date; - checkInputChoice($bday, "bday"); - } catch(bdayException $e){ - $correct = false; - $bdayErr = $e->getMessage(); - } - - try{ - $username = str_replace(' ', '', test_input(($_POST["username"]))); - checkInputChoice($username, "username"); - } catch(usernameException $e){ - $correct = false; - $usernameErr = $e->getMessage(); - } - - try{ - $password = str_replace(' ', '', test_input(($_POST["password"]))); - checkInputChoice($password, "longerEight"); - matchPassword(); - } catch(passwordException $e){ - $correct = false; - $passwordErr = $e->getMessage(); - } catch(confirmPasswordException $e){ - $correct = false; - $confirmPasswordErr = $e->getMessage(); - } - - try{ - $location = test_input(($_POST["location"])); - checkInputChoice($location, "lettersAndSpaces"); - } catch(lettersAndSpacesException $e){ - $correct = false; - $locationErr = $e->getMessage(); - } - - try{ - $email = test_input(($_POST["email"])); - checkInputChoice($email, "email"); - $confirmEmail = test_input(($_POST["confirmEmail"])); - matchEmail(); - } catch(emailException $e){ - $correct = false; - $emailErr = $e->getMessage(); - } catch(confirmEmailException $e){ - $correct = false; - $confirmEmailErr = $e->getMessage(); - } - - try{ - $captcha = $_POST['g-recaptcha-response']; - checkCaptcha($captcha); - } catch(captchaException $e){ - $correct = false; - $captchaErr = $e->getMessage(); - } - - try { - getIp(); - registerCheck($correct); - sendConfirmEmailUsername($username); - } catch(registerException $e){ - $genericErr = $e->getMessage(); - } - } -/* This view adds register view */ -include("../views/register-view.php"); -?> - - diff --git a/website/public/styles/index.css b/website/public/styles/index.css index c7a0aa8..68191ad 100644 --- a/website/public/styles/index.css +++ b/website/public/styles/index.css @@ -198,12 +198,6 @@ ul { animation-duration: 0.4s } -/* Add Animation */ -@-webkit-keyframes animatetop { - from {top:-300px; opacity:0} - to {top:0; opacity:1} -} - @keyframes animatetop { from {top:-300px; opacity:0} to {top:0; opacity:1} diff --git a/website/queries/checkInput.php b/website/queries/checkInput.php index 69274ce..247050b 100644 --- a/website/queries/checkInput.php +++ b/website/queries/checkInput.php @@ -68,7 +68,7 @@ function validateBday($variable){ } } -// Checks for date +/* Checks for date */ function validateDate($date, $format) { $d = DateTime::createFromFormat($format, $date); @@ -124,7 +124,7 @@ function validateEmail($variable){ throw new emailException("Mag maximaal 50 karakters!"); } } -//255 + /* checks if an input is a valid email. */ function validateFBEmail($variable){ if (empty($variable)) { @@ -138,6 +138,7 @@ function validateFBEmail($variable){ } } +/* checks if email is the same */ function matchEmail(){ if (strtolower($_POST["email"]) != strtolower($_POST["confirmEmail"])){ throw new confirmEmailException("Emails matchen niet!"); @@ -153,7 +154,6 @@ function resetEmail($variable){ } } - /* checks if two passwords matches. */ function matchPassword(){ if ($_POST["password"] != $_POST["confirmpassword"]) { diff --git a/website/queries/login.php b/website/queries/login.php index 27c1f3b..3480991 100644 --- a/website/queries/login.php +++ b/website/queries/login.php @@ -1,5 +1,6 @@ @@ -75,8 +77,9 @@ function validateLogin($username, $password, $url){ $_SESSION["userID"] = $userID; if(!isset($url) or $url == "") { header("location: profile.php"); + echo "succes"; } else{ - header("location: $url"); + header("location: ".$url); } } diff --git a/website/views/facebookRegisterModal.php b/website/views/facebookRegisterModal.php index 7271d63..a38a3a3 100644 --- a/website/views/facebookRegisterModal.php +++ b/website/views/facebookRegisterModal.php @@ -1,7 +1,6 @@
    - * +
    - + diff --git a/website/public/fbRegister.php b/website/views/fbRegister.php similarity index 100% rename from website/public/fbRegister.php rename to website/views/fbRegister.php diff --git a/website/views/forgotPasswordModal.php b/website/views/forgotPasswordModal.php index 2ebdbb9..ebb9d64 100644 --- a/website/views/forgotPasswordModal.php +++ b/website/views/forgotPasswordModal.php @@ -4,7 +4,6 @@ diff --git a/website/views/homeLoginRegister.php b/website/views/homeLoginRegister.php index 55277e7..ad7be40 100644 --- a/website/views/homeLoginRegister.php +++ b/website/views/homeLoginRegister.php @@ -11,16 +11,16 @@ if(isset($_SESSION["userID"])){ // Facebook variables $appID = "353857824997532"; $appSecret = "db47e91ffbfd355fdd11b4b65eade851"; -$fbUsername = $fbPassword = $fbConfirmpassword = ""; +$fbUsername = $fbPassword = $fbConfirmpassword = $fbName = $fbSurname = $fbBday = $fbEmail = $fbUserID = ""; $fbUsernameErr = $fbPasswordErr = $fbConfirmpasswordErr = $fbEmailErr = $fbBdayErr = ""; $fbCorrect = true; -$fbName = $fbSurname = $fbBday = $fbEmail = $fbUserID = ""; // Register variables $name = $surname = $bday = $username = $password = $confirmpassword = $location = $housenumber = $email = $confirmEmail = $captcha = $ip = ""; $genericErr = $nameErr = $surnameErr = $bdayErr = $usernameErr = $passwordErr = $confirmpasswordErr = $locationErr = $housenumberErr = $emailErr = $confirmEmailErr = $captchaErr = ""; $correct = true; +// Bday dates $day_date = $month_date = $year_date = ""; $fbDay_date = $fbMonth_date = $fbYear_date = ""; @@ -28,22 +28,14 @@ $fbDay_date = $fbMonth_date = $fbYear_date = ""; $user = $psw = $remember =""; $loginErr = $resetErr = $fbRegisterErr =""; -//if ($_SERVER["REQUEST_METHOD"] == "GET") { -// try { -// $user = ($_POST["user"]); -// validateLogin($_POST["user"], $_POST["psw"], "https://$_SERVER[HTTP_HOST]$_SERVER[REQUEST_URI]"); -// } catch(loginException $e) { -// $loginErr = $e->getMessage(); -// } -//} - if ($_SERVER["REQUEST_METHOD"] == "POST") { + $url = $_POST["url"]; // Checks for which button is pressed switch ($_POST["submit"]) { case "login": try { $user = ($_POST["user"]); - validateLogin($_POST["user"], $_POST["psw"], $_POST["url"]); + validateLogin($_POST["user"], $_POST["psw"], $url); } catch(loginException $e) { $loginErr = $e->getMessage(); } @@ -62,18 +54,22 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") { } break; case "register": - include("register.php"); + include("../views/register.php"); break; case "fbRegister": - include("fbRegister.php"); + include("../views/fbRegister.php"); break; } } + +// Get facebook information with facebook PHP SDK. $fb = new Facebook\Facebook([ 'app_id' => $appID, 'app_secret' => $appSecret, 'default_graph_version' => 'v2.2', ]); + +// Redirect back to login.php after logging/canceling with facebook. $redirect = "https://myhyvesbookplus.nl/login.php"; $helper = $fb->getRedirectLoginHelper(); @@ -88,6 +84,7 @@ try { exit; } +// If theres no facebook account logged in, ask for permission. if(!isset($acces_token)){ $permission=["email", "user_birthday"]; $loginurl=$helper->getLoginUrl($redirect,$permission); @@ -96,13 +93,14 @@ if(!isset($acces_token)){ $response = $fb->get('/me?fields=email,name,birthday'); $usernode = $response->getGraphUser(); + // Get facebook information $nameSplit = explode(" ", $usernode->getName()); $fbName = $nameSplit[0]; $fbSurname = $nameSplit[1]; $fbUserID = $usernode->getID(); $fbEmail = $usernode->getProperty("email"); -// $image = 'https://graph.facebook.com/' . $usernode->getId() . '/picture?width=200'; + // If there is an account, check if the account is banned or frozen. if (fbLogin($fbUserID) == 1) { $fbID = getfbUserID($fbUserID)["userID"]; $fbRole = getfbUserID($fbUserID)["role"]; @@ -110,16 +108,20 @@ if(!isset($acces_token)){ echo ""; + } else if($fbRole == "frozen"){ $_SESSION["userID"] = $fbID; echo ""; + window.onload=frozenAlert(); + window.location.href= 'profile.php'; + "; + } else { $_SESSION["userID"] = $fbID; header("location: profile.php"); + } + // Registration with faceobook if theres no account. } else { echo " diff --git a/website/views/login_head.php b/website/views/login_head.php index 9e580df..e8e3a84 100644 --- a/website/views/login_head.php +++ b/website/views/login_head.php @@ -3,6 +3,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + MyHyvesbook+ Date: Fri, 3 Feb 2017 11:47:16 +0100 Subject: [PATCH 394/400] Added fbModal button --- website/public/js/loginRegisterModals.js | 5 ++++- website/views/facebookRegisterModal.php | 6 ++++++ website/views/homeLoginRegister.php | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/website/public/js/loginRegisterModals.js b/website/public/js/loginRegisterModals.js index 373fb7e..104dd02 100644 --- a/website/public/js/loginRegisterModals.js +++ b/website/public/js/loginRegisterModals.js @@ -7,7 +7,7 @@ var facebookModal = document.getElementById("fbModal"); // Get the button that opens the modal var registerBtn = document.getElementById("registerBtn"); var btn = document.getElementById("myBtn"); - +var fbBtn = document.getElementById("fbBtn"); // Get the element that closes the modal var span = document.getElementsByClassName("close")[0]; @@ -24,6 +24,9 @@ btn.onclick = function () { registerBtn.onclick = function () { registerModal.style.display = "block"; } +fbBtn.onclick = function () { + facebookModal.style.display = "block"; +} /** * WHen the user clicks on (X), close the modal diff --git a/website/views/facebookRegisterModal.php b/website/views/facebookRegisterModal.php index a38a3a3..17ce7ef 100644 --- a/website/views/facebookRegisterModal.php +++ b/website/views/facebookRegisterModal.php @@ -1,3 +1,9 @@ +Facebook registreer'; + +} +?> -- 2.49.1 From fb5f76c4993cab6d41ab7be8c246452a2f49a207 Mon Sep 17 00:00:00 2001 From: Lars van Hijfte Date: Fri, 3 Feb 2017 12:32:57 +0100 Subject: [PATCH 397/400] ? --- website/public/js/profile.js | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 website/public/js/profile.js diff --git a/website/public/js/profile.js b/website/public/js/profile.js deleted file mode 100644 index e69de29..0000000 -- 2.49.1 From 1ac6a7da87e1637e195e596f111df74c8742d8af Mon Sep 17 00:00:00 2001 From: Lars van Hijfte Date: Fri, 3 Feb 2017 12:40:33 +0100 Subject: [PATCH 398/400] Changed admin checkbox buttons --- website/public/styles/adminpanel.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/website/public/styles/adminpanel.css b/website/public/styles/adminpanel.css index 888b4ca..d04d8fa 100644 --- a/website/public/styles/adminpanel.css +++ b/website/public/styles/adminpanel.css @@ -1,9 +1,9 @@ .admin-panel input[type="radio"], input[type="checkbox"] { vertical-align: middle; - height: 28px; - width: 28px; - margin: 2px; + height: 14px; + width: 14px; + margin: 7px; } .table-checkbox { -- 2.49.1 From 4643dfcddb4f8ef314168cb0851c811d559d57bd Mon Sep 17 00:00:00 2001 From: Joey Lai Date: Fri, 3 Feb 2017 12:42:30 +0100 Subject: [PATCH 399/400] Fixed comments and links --- website/queries/register.php | 31 +++++++++++++++++++++++++++++ website/queries/requestpassword.php | 18 +++++++++++++++-- website/views/homeLoginRegister.php | 2 +- 3 files changed, 48 insertions(+), 3 deletions(-) diff --git a/website/queries/register.php b/website/queries/register.php index 3dcbed4..7f91dfa 100644 --- a/website/queries/register.php +++ b/website/queries/register.php @@ -1,5 +1,9 @@ rowCount(); } +/** + * Registers a new account with facebook register + */ function fbRegisterAccount() { $stmt = prepareQuery(" INSERT INTO @@ -158,6 +184,11 @@ function fbRegisterAccount() { return $stmt->execute(); } +/** + * Checks which dates need to be selected when there is an invalid registration. + * @param $date + * @param $value + */ function submitselect($date, $value){ if ($date == $value){ echo "selected"; diff --git a/website/queries/requestpassword.php b/website/queries/requestpassword.php index a54bd7d..daad355 100644 --- a/website/queries/requestpassword.php +++ b/website/queries/requestpassword.php @@ -1,6 +1,10 @@ getRedirectLoginHelper(); try { -- 2.49.1 From 7cc6450e6afde743509fcc83b3e8dadf0415509e Mon Sep 17 00:00:00 2001 From: "K. Nobel" Date: Fri, 3 Feb 2017 13:19:00 +0100 Subject: [PATCH 400/400] Added comments to javascript code. --- website/public/js/friendButtons.js | 8 +++++- website/public/js/groupButtons.js | 5 ++++ website/public/js/masonry.js | 44 +++++++++++++++++++----------- 3 files changed, 40 insertions(+), 17 deletions(-) diff --git a/website/public/js/friendButtons.js b/website/public/js/friendButtons.js index 47c476a..440dfe5 100644 --- a/website/public/js/friendButtons.js +++ b/website/public/js/friendButtons.js @@ -1,6 +1,8 @@ +// Show the right friendship buttonsto the user. function placeFriendButtons() { $.post("API/getFriendshipStatus.php", { usr: userID }) .done(function(data) { + //save the friendship status var friendshipStatus = data; var $buttonContainer = $("div.friend-button-container"); $("#start-profile-chat").hide(); @@ -22,6 +24,7 @@ function placeFriendButtons() { text1 = "Bevriend"; icon1 = "fa-handshake-o"; break; + // Users are friends. case "1": value1 = userID; class1 = "green"; @@ -32,12 +35,14 @@ function placeFriendButtons() { text2 = "Verwijder"; icon2 = "fa-times"; break; + // This user sent request. case "2": value1 = "delete"; class1 = "red"; text1 = "Trek verzoek in"; icon1 = "fa-cross"; break; + // Other user sent request. case "3": value1 = "accept"; class1 = "green"; @@ -50,6 +55,7 @@ function placeFriendButtons() { break; } + // Append buttons to the container. $buttonContainer.append( ""); - + // Gets triggered when a friend button is triggered. $buttonContainer.children().click(function() { if (isNaN(this.value)) editFriendship(userID, this.value); diff --git a/website/public/js/groupButtons.js b/website/public/js/groupButtons.js index e6ada67..ab86e8c 100644 --- a/website/public/js/groupButtons.js +++ b/website/public/js/groupButtons.js @@ -3,16 +3,20 @@ function placeGroupButtons() { .done(function(data) { var $buttonContainer = $("div.group-button-container"); + // Append the right group button to the button container. + // When user is not a member if(data == 'none') { $buttonContainer.append( ""); + // when user sent a request to become a member. } else if(data == 'request') { $buttonContainer.append( ""); + // When user is a member of the group. } else { $buttonContainer.append( ""); } + // Gets triggered when a group button is clicked. $buttonContainer.children().click(function() { $.post("API/editMembership.php", { grp: groupID, role: this.value }) .done(function() { diff --git a/website/public/js/masonry.js b/website/public/js/masonry.js index a628e96..eeb5cf7 100644 --- a/website/public/js/masonry.js +++ b/website/public/js/masonry.js @@ -1,3 +1,4 @@ +// Vertical margin between two posts. margin = 20; // scrolling modal taken from http://stackoverflow.com/questions/10476632/how-to-scroll-the-page-when-a-modal-dialog-is-longer-than-the-screen @@ -11,9 +12,12 @@ function scrollbarMargin(width, overflow) { }); } +// Get post from the server. function requestPost(postID) { + // Make the modal view visible. $(".modal").show(); + // Send get request to the server to load the post. $.get("API/loadPost.php", { postID : postID }).done(function(data) { $('.modal-default').hide(); var scrollBarWidth = window.innerWidth - document.body.offsetWidth; @@ -23,11 +27,14 @@ function requestPost(postID) { }); } +// Create a new post. function postPost() { title = $("input.newpost[name='title']").val(); content = $("textarea.newpost[name='content']").val(); + // Masonrymode 2: when on group page and user is an admin. if (masonryMode == 2) { + // Create the new group post. $.post("API/postPost.php", { title: title, content : content, group : groupID }) @@ -42,6 +49,7 @@ function postPost() { } }); } else { + // Create the new user post. $.post("API/postPost.php", { title: title, content : content }) .done(function(data) { @@ -68,6 +76,7 @@ var postAmount = 0; var noposts = false; $(document).ready(function () { + // Initialise variables for masonry. windowWidth = $(window).width(); columnCount = Math.floor($(".posts").width() / 250); columns = new Array(columnCount); @@ -78,6 +87,7 @@ $(window).on("load", function() { $(".modal-close").click(function (){closeModal()}); // http://stackoverflow.com/questions/9439725/javascript-how-to-detect-if-browser-window-is-scrolled-to-bottom + // Infinite scroll. window.onscroll = function(ev) { if($(window).scrollTop() + $(window).height() == $(document).height() ) { loadMorePosts(userID, groupID, postAmount, postLimit); @@ -85,6 +95,7 @@ $(window).on("load", function() { }; }); +// Hide modal view from the screen. function closeModal() { $(".modal").hide(); scrollbarMargin(0, 'auto'); @@ -92,23 +103,30 @@ function closeModal() { $('.modal-default').show(); } +// Will fire when user resizes the window. $(window).resize(function() { clearTimeout(window.resizedFinished); window.resizeFinished = setTimeout(function() { + // Check if the width of the screen changed. if ($(window).width() != windowWidth) { + // Save width. windowWidth = $(window).width(); - + // Check if there fit more or less columns in the new width. if (columnCount != Math.floor($(".posts").width() / 250)) { columnCount = Math.floor($(".posts").width() / 250); + // Respawn the masonry grid. masonry(masonryMode); } } }, 250); }); +// Select the container for masonry. var $container = $(".posts"); +// Spawn the masonry grid. function masonry(mode) { + // save the masonry mode. masonryMode = mode; $container.children().remove(); @@ -116,10 +134,7 @@ function masonry(mode) { noposts = false; postAmount = 0; - /* - * Initialise columns. - */ - + // Initialise columns. for (i = 0; i < columnCount; i++) { $column = $("
    "); $column.width(100/columnCount + "%"); @@ -127,11 +142,13 @@ function masonry(mode) { columns[i] = [0, $column]; } + // Place the form for new posts. if(mode > 0) { $postInput = $("
    "); $form = $(""); $postInput.append($form); + //Add extra input for group posts. if(mode == 2) { $form.append($("")); } @@ -144,17 +161,11 @@ function masonry(mode) { columns[0][0] = $postInput.height() + margin; } - /* - * Function will find the column with the shortest height. - */ - - - /* - * Get the posts from the server. - */ + // Get the posts from the server. loadMorePosts(userID, groupID, 0, postLimit); } +// Find the column with the shortest hight. function getShortestColumn(columns) { column = columns[0]; @@ -166,17 +177,20 @@ function getShortestColumn(columns) { return column; } +// Load certain range of posts. function loadMorePosts(uID, gID, offset, limit) { if (noposts) { return; } + // Get a list of posts from the server. $.post("API/getPosts.php", { usr : uID, grp : gID, offset : offset, limit : limit}) .done(function(data) { if (!data) { + // No posts were found, show noposts bar to user. $('.noposts').show(); noposts = true; return; @@ -184,9 +198,7 @@ function loadMorePosts(uID, gID, offset, limit) { posts = JSON.parse(data); - /* - * Rearange the objects. - */ + // Rearange the objects. $.each(posts, function() { $post = $("
    "); $post.append($("

    ").html(this["title"])); -- 2.49.1

    - - UserGebruikersnaam StatusCommentActionAantekeningActie
    $name $role $description
    + onsubmit=\"adminUpdate(this); return false;\">
    Gebruikersnaam Status Aantekening
    $username $role $bancomment - + onsubmit=\"adminUpdate(this); return false;\"> + diff --git a/website/views/adminpanel.php b/website/views/adminpanel.php index c48a28d..d2b83d2 100644 --- a/website/views/adminpanel.php +++ b/website/views/adminpanel.php @@ -7,6 +7,7 @@ $perpage = 20; $status = array("user", "frozen", "banned", "unconfirmed", "admin", "owner"); $groupstatus = array("hidden", "public", "membersonly"); $pagetype = "user"; +$userinfo = getRoleByID($_SESSION['userID'])->fetch(PDO::FETCH_ASSOC); if (isset($_GET["search"])) { $search = test_input($_GET["search"]); @@ -123,20 +124,30 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") { -
    + + + Maak Admin + "; + } + ?>
    -
    + + -- 2.49.1 From 422e2d13086ec6d501edf1aa71f8f6107ab53f32 Mon Sep 17 00:00:00 2001 From: Marijn Jansen Date: Mon, 30 Jan 2017 21:48:18 +0100 Subject: [PATCH 291/400] Date picker in bday --- website/queries/settings.php | 14 +++++++-- website/views/settings-view.php | 53 ++++++++++++++++++++++++++------- 2 files changed, 54 insertions(+), 13 deletions(-) diff --git a/website/queries/settings.php b/website/queries/settings.php index f4c5403..6c52fc4 100644 --- a/website/queries/settings.php +++ b/website/queries/settings.php @@ -110,20 +110,30 @@ function updateSettings() { WHERE `userID` = :userID "); + $bday = new DateTime(test_input($_POST["year"] . $_POST["month"] . $_POST["day"])); + checkBday($bday); $stmt->bindValue(":fname", test_input($_POST["fname"])); $stmt->bindValue(":lname", test_input($_POST["lname"])); $stmt->bindValue(":location", test_input($_POST["location"])); - $stmt->bindValue(":bday", test_input($_POST["bday"])); + $stmt->bindValue(":bday", $bday->format("Ymd")); $stmt->bindValue(":bio", test_input($_POST["bio"])); $stmt->bindValue(":showEmail", test_input($_POST["showEmail"])); - $stmt->bindValue(":showBday", test_input($_POST["showBday"])); + $stmt->bindValue(":showBday",test_input($_POST["showBday"])); $stmt->bindValue(":userID", $_SESSION["userID"]); $stmt->execute(); throw new HappyAlert("Instellingen zijn opgeslagen."); } +function checkBday(DateTime $bday) { + $today = new DateTime(); + if ($bday >= $today) { + throw new AngryAlert("Jij bent vast niet in de toekomst geboren toch? ;)"); + } +} + + /** * Change * @throws AngryAlert diff --git a/website/views/settings-view.php b/website/views/settings-view.php index b6a3b4c..1079c91 100644 --- a/website/views/settings-view.php +++ b/website/views/settings-view.php @@ -44,37 +44,68 @@ $settings = getSettings();
  • - " - > + + + +
  • + > Ja + > Nee
  • + > Ja + > Nee
  • @@ -189,4 +220,4 @@ $settings = getSettings();
    • - \ No newline at end of file + -- 2.49.1 From ce53b6e9e4e592b55a4f1918862e01ba50bbc4c5 Mon Sep 17 00:00:00 2001 From: Marijn Jansen Date: Mon, 30 Jan 2017 22:42:47 +0100 Subject: [PATCH 292/400] Checkbox for showBday and showEmail --- website/queries/settings.php | 7 ++-- website/views/settings-view.php | 58 +++++++++++++-------------------- 2 files changed, 26 insertions(+), 39 deletions(-) diff --git a/website/queries/settings.php b/website/queries/settings.php index 6c52fc4..bdc9d38 100644 --- a/website/queries/settings.php +++ b/website/queries/settings.php @@ -110,7 +110,8 @@ function updateSettings() { WHERE `userID` = :userID "); - $bday = new DateTime(test_input($_POST["year"] . $_POST["month"] . $_POST["day"])); + $bday = new DateTime(); + $bday->setDate(test_input($_POST["year"]), test_input($_POST["month"]), test_input($_POST["day"])); checkBday($bday); $stmt->bindValue(":fname", test_input($_POST["fname"])); @@ -118,8 +119,8 @@ function updateSettings() { $stmt->bindValue(":location", test_input($_POST["location"])); $stmt->bindValue(":bday", $bday->format("Ymd")); $stmt->bindValue(":bio", test_input($_POST["bio"])); - $stmt->bindValue(":showEmail", test_input($_POST["showEmail"])); - $stmt->bindValue(":showBday",test_input($_POST["showBday"])); + $stmt->bindValue(":showEmail", (array_key_exists("showEmail", $_POST) ? "1" : "0")); + $stmt->bindValue(":showBday", (array_key_exists("showBday", $_POST) ? "1" : "0")); $stmt->bindValue(":userID", $_SESSION["userID"]); $stmt->execute(); diff --git a/website/views/settings-view.php b/website/views/settings-view.php index 1079c91..6271a45 100644 --- a/website/views/settings-view.php +++ b/website/views/settings-view.php @@ -45,30 +45,30 @@ $settings = getSettings();
  • - + "; - + + + - format("Y"); for ($year = $now; $year >= 1900; $year--): ?> @@ -80,33 +80,19 @@ $settings = getSettings();
  • - - > Ja - - > Nee + >
  • - - > Ja - - > Nee + >
  • @@ -220,4 +206,4 @@ $settings = getSettings(); - + \ No newline at end of file -- 2.49.1 From 8dfa31696c8c53ceac1214c862261bd8ba875d06 Mon Sep 17 00:00:00 2001 From: Marijn Jansen Date: Mon, 30 Jan 2017 22:49:43 +0100 Subject: [PATCH 293/400] autocomplete suggestions at password --- website/views/settings-view.php | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/website/views/settings-view.php b/website/views/settings-view.php index 6271a45..c5c58c2 100644 --- a/website/views/settings-view.php +++ b/website/views/settings-view.php @@ -141,24 +141,30 @@ $settings = getSettings();
    Verander Wachtwoord
    • - +
    • - +
    • - +
    • -- 2.49.1 From 6983aa06a2c97646ff2f5fce9ebe4b03c18c8a33 Mon Sep 17 00:00:00 2001 From: Marijn Jansen Date: Mon, 30 Jan 2017 23:03:50 +0100 Subject: [PATCH 294/400] Finishing touches --- website/views/settings-view.php | 37 +++++++++++++++++---------------- 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/website/views/settings-view.php b/website/views/settings-view.php index c5c58c2..029a32b 100644 --- a/website/views/settings-view.php +++ b/website/views/settings-view.php @@ -21,7 +21,7 @@ $settings = getSettings(); id="fname" placeholder="Voornaam" title="Voornaam" - value="" + value="" >
    • @@ -30,7 +30,7 @@ $settings = getSettings(); name="lname" id="lname" placeholder="Achternaam" - value="" + value="" >
    • @@ -39,18 +39,19 @@ $settings = getSettings(); name="location" id="location" placeholder="Locatie" - value="" + value="" >
    • - + - -
      • @@ -83,7 +84,7 @@ $settings = getSettings(); + >
    • @@ -91,7 +92,7 @@ $settings = getSettings(); + >
    • @@ -100,7 +101,7 @@ $settings = getSettings(); rows="5" title="bio" id="bio" - > + >
    • @@ -116,7 +117,7 @@ $settings = getSettings();
      • - " + " class="profile-picture" >
        • @@ -183,7 +184,7 @@ $settings = getSettings(); " + value="" disabled > -- 2.49.1 From a6b6d6d747ca2a02e53f8bab68dcafda38ea5387 Mon Sep 17 00:00:00 2001 From: Marijn Jansen Date: Tue, 31 Jan 2017 10:23:47 +0100 Subject: [PATCH 295/400] Style changes --- website/views/settings-view.php | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/website/views/settings-view.php b/website/views/settings-view.php index 029a32b..b7f554a 100644 --- a/website/views/settings-view.php +++ b/website/views/settings-view.php @@ -4,13 +4,11 @@ $settings = getSettings();
        - - $alertMessage -
        "; - } - ?> + +
        + +
        +
        Profiel Instellingen
          @@ -43,10 +41,10 @@ $settings = getSettings(); >
        • - + +
        • -- 2.49.1 From 4dc3b4f651d353b266973acebaad5f517cb97826 Mon Sep 17 00:00:00 2001 From: Lars van Hijfte Date: Tue, 31 Jan 2017 10:31:57 +0100 Subject: [PATCH 296/400] Mobile friendly --- website/public/js/admin.js | 1 - website/public/js/friendButtons.js | 3 -- website/public/js/header.js | 46 ++++++++++++++--------- website/public/styles/chat.css | 14 ++++++- website/public/styles/header.css | 9 ++++- website/public/styles/main.css | 10 +++++ website/public/styles/menu.css | 14 +++++++ website/public/styles/mobilefriendly.css | 47 ++++++++++++++++++++++++ website/public/styles/profile.css | 2 +- website/views/head.php | 2 + website/views/menu.php | 2 +- 11 files changed, 125 insertions(+), 25 deletions(-) create mode 100644 website/public/styles/mobilefriendly.css diff --git a/website/public/js/admin.js b/website/public/js/admin.js index 140c99a..36347c2 100644 --- a/website/public/js/admin.js +++ b/website/public/js/admin.js @@ -60,7 +60,6 @@ function adminSearch() { "API/adminSearchUsers.php", $("#admin-searchform").serialize() ).done(function (data) { - console.log(data); $("#usertable").html(data); }) } diff --git a/website/public/js/friendButtons.js b/website/public/js/friendButtons.js index d62e919..47c476a 100644 --- a/website/public/js/friendButtons.js +++ b/website/public/js/friendButtons.js @@ -48,9 +48,6 @@ function placeFriendButtons() { text2 = "Weiger"; icon2 = "fa-times"; break; - default: - console.log(friendshipStatus); - break; } $buttonContainer.append( diff --git a/website/public/js/header.js b/website/public/js/header.js index bdf5fe3..13e3e12 100644 --- a/website/public/js/header.js +++ b/website/public/js/header.js @@ -1,25 +1,37 @@ $(document).ready(function() { // Toggle menu $("#own-profile-picture, #open-notifications").click(function() { - if ($("#notification-center").css('right') == "-256px") { - // Make the menu visible and move the content to the left. - $("#chat-history").width("calc(100% - 587px)"); - $(".modal").width("calc(100% - 512px)"); - $(".content").css("margin-right", "256px"); - $("#notification-center").css("right", "0px"); + if ($("#notification-center").css('display') == "none") { + // Make the menu visible and move the content to the left. + $(".modal").width("calc(100% - 512px)"); + $(".content").css("margin-right", "256px"); + $("#notification-center").css("right", "0px"); + $("#notification-center").css("display", "block"); + $("#contact-menu").css("display", "block"); - // Add cookie so the menu stays open on other pages - document.cookie = "menu=open; path=/"; - } else { - // Make the menu invisible and move the content to the right. - $("#chat-history").width("calc(100% - 331px)"); - $(".modal").width("calc(100% - 256px)"); - $(".content").css("margin-right", "0px"); - $("#notification-center").css("right", "-256px"); + // Add cookie so the menu stays open on other pages + if (window.innerWidth > 1080) { + $("#chat-history").width("calc(100% - 587px)"); + document.cookie = "menu=open; path=/"; + } else { + document.cookie = "menu=closed; path=/"; + } + } else { + $(".modal").width("calc(100% - 256px)"); + $(".content").css("margin-right", "0px"); + $("#notification-center").css("display", "none"); - // Change menu cookie to close - document.cookie = "menu=closed; path=/"; - } + if (window.innerWidth > 1080) { + $("#chat-history").width("calc(100% - 331px)"); + } else { + // Make the menu invisible and move the content to the right. + $("#contact-menu").css("display", "none"); + } + + // Change menu cookie to close + document.cookie = "menu=closed; path=/"; + + } }); if (getCookie("menu") == "open") { diff --git a/website/public/styles/chat.css b/website/public/styles/chat.css index 85eb219..cb0f19f 100644 --- a/website/public/styles/chat.css +++ b/website/public/styles/chat.css @@ -146,8 +146,20 @@ body { text-align: right; } -@media only screen and (max-width: 1200px) { +@media only screen and (max-width: 1080px) { .chat-message-self, .chat-message-other { max-width: 75%; } + .chat { + left: 0; + width: 100%; + } + #chat-recent-panel { + left: 0; + width: 320px; + } + #chat-history { + left: 50%; + width: calc(100% - 390px); + } } \ No newline at end of file diff --git a/website/public/styles/header.css b/website/public/styles/header.css index 70e8c80..61727eb 100644 --- a/website/public/styles/header.css +++ b/website/public/styles/header.css @@ -26,7 +26,8 @@ header { } #header-search { - padding-left: 42px; + margin: 24px 0 24px 32px; + vertical-align: middle; } @@ -49,4 +50,10 @@ header div { #open-notifications { padding: 5px 20px 5px 0px; +} + +@media only screen and (max-width: 1080px) { + #header-logo { + display: none; + } } \ No newline at end of file diff --git a/website/public/styles/main.css b/website/public/styles/main.css index abb1604..baff345 100644 --- a/website/public/styles/main.css +++ b/website/public/styles/main.css @@ -293,4 +293,14 @@ div[data-title]:hover:after { -webkit-border-radius: 20px; border-radius: 20px; background: #4CAF50; +} + +@media only screen and (max-width: 1080px) { + body { + font-size: 28px!important; + } + button { + font-size: 28px; + } + } \ No newline at end of file diff --git a/website/public/styles/menu.css b/website/public/styles/menu.css index 303b9bc..a862d12 100644 --- a/website/public/styles/menu.css +++ b/website/public/styles/menu.css @@ -86,4 +86,18 @@ height: 100%; padding: 0; text-align: left; +} + +@media only screen and (max-width: 1080px) { + #contact-menu, #notification-center { + display: none; + background: rgba(0, 0, 0, 0.4); + width: calc(50% - 20px); + } + .content { + margin-left: 0; + } + #quick-links i { + font-size: 48px!important; + } } \ No newline at end of file diff --git a/website/public/styles/mobilefriendly.css b/website/public/styles/mobilefriendly.css new file mode 100644 index 0000000..86ffab8 --- /dev/null +++ b/website/public/styles/mobilefriendly.css @@ -0,0 +1,47 @@ +/* MAIN */ +body { + font-size: 28px!important; +} +button { + font-size: 28px; +} + +/* HEADER */ +#header-logo { + display: none; +} + +/* PROFILE */ +.post-box { + width: calc(100% - 65px); +} + +/* MENU */ +#contact-menu, #notification-center { + display: none; + background: rgba(0, 0, 0, 0.4); + width: calc(50% - 20px); +} +.content { + margin-left: 0; +} +#quick-links i { + font-size: 48px!important; +} + +/* CHAT */ +.chat-message-self, .chat-message-other { + max-width: 75%; +} +.chat { + left: 0; + width: 100%; +} +#chat-recent-panel { + left: 0; + width: 320px; +} +#chat-history { + left: 50%; + width: calc(100% - 390px); +} \ No newline at end of file diff --git a/website/public/styles/profile.css b/website/public/styles/profile.css index 03ab19f..37aaaa1 100644 --- a/website/public/styles/profile.css +++ b/website/public/styles/profile.css @@ -116,7 +116,7 @@ div.posts .post form textarea.newpost { } /* mobile */ -@media only screen and (max-width: 1000px) { +@media only screen and (max-width: 1080px) { .post-box { width: calc(100% - 65px); } diff --git a/website/views/head.php b/website/views/head.php index eb86d56..6e8ca0a 100644 --- a/website/views/head.php +++ b/website/views/head.php @@ -12,6 +12,8 @@ @import url("styles/header.css"); @import url("styles/menu.css"); @import url("styles/footer.css"); + + @import url("styles/mobilefriendly.css") screen and (orientation: portrait); +
        -- 2.49.1 From f26097f55fab9a19fa2fc59b087aa4c813f84b5f Mon Sep 17 00:00:00 2001 From: Lars van Hijfte Date: Tue, 31 Jan 2017 12:25:28 +0100 Subject: [PATCH 299/400] Fixed online status --- website/public/bits/friend-item.php | 2 +- website/public/group.php | 2 +- website/public/profile.php | 8 ++++---- website/public/styles/main.css | 10 +++++++++- website/public/styles/profile.css | 2 +- website/queries/friendship.php | 11 ++++++----- website/queries/user.php | 13 +++++++++++++ website/views/head.php | 5 ++++- website/views/profile.php | 4 ++-- 9 files changed, 41 insertions(+), 16 deletions(-) diff --git a/website/public/bits/friend-item.php b/website/public/bits/friend-item.php index a69d12a..40bc8a8 100644 --- a/website/public/bits/friend-item.php +++ b/website/public/bits/friend-item.php @@ -33,7 +33,7 @@ foreach($friends as $i => $friend) { } ?>'>
        - PF + PF
        fullname ?>
        = DATE_SUB(NOW(),INTERVAL 15 MINUTE) + WHEN TRUE THEN 'online' + WHEN FALSE THEN 'offline' + END AS `onlinestatus`, `role` FROM `user` @@ -28,11 +32,8 @@ function selectLimitedFriends($userID, $limit) { `friendship`.`user1ID` = `user`.`userID`) AND `user`.`role` != 'banned' AND `friendship`.`status` = 'confirmed' - ORDER BY - CASE - WHEN `friendship`.`user2ID` = `user`.`userID` THEN `friendship`.`chatLastVisted1` - WHEN `friendship`.`user1ID` = `user`.`userID` THEN `friendship`.`chatLastVisted2` - END + ORDER BY + `user`.`lastactivity` DESC LIMIT :limitCount "); diff --git a/website/queries/user.php b/website/queries/user.php index 0900d9f..b1bb93c 100644 --- a/website/queries/user.php +++ b/website/queries/user.php @@ -2,6 +2,19 @@ require_once ("connect.php"); +function updateLastActivity() { + $stmt = prepareQuery(" + UPDATE + `user` + SET + `lastactivity` = NOW() + WHERE + `userID` = :userID + "); + $stmt->bindParam(":userID", $_SESSION["userID"]); + return $stmt->execute(); +} + function getUserID($username) { $stmt = prepareQuery(" SELECT diff --git a/website/views/head.php b/website/views/head.php index 6e8ca0a..284abb4 100644 --- a/website/views/head.php +++ b/website/views/head.php @@ -19,9 +19,12 @@ require_once ("../queries/checkInput.php"); require_once ("../queries/connect.php"); +require_once ("../queries/user.php"); session_start(); if(!isset($_SESSION["userID"])){ header("location:login.php"); -} \ No newline at end of file +} else { + updateLastActivity(); +} diff --git a/website/views/profile.php b/website/views/profile.php index 90a368d..8cf555f 100644 --- a/website/views/profile.php +++ b/website/views/profile.php @@ -1,10 +1,10 @@
        - ">
        + " src="">
        -- 2.49.1 From f67dd019c46c67ca604423d00ac04b7c956a8ac7 Mon Sep 17 00:00:00 2001 From: Lars van Hijfte Date: Tue, 31 Jan 2017 12:47:24 +0100 Subject: [PATCH 300/400] Inputs are now mobile friendly --- website/public/styles/main.css | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/website/public/styles/main.css b/website/public/styles/main.css index 7909687..f2d7535 100644 --- a/website/public/styles/main.css +++ b/website/public/styles/main.css @@ -192,7 +192,7 @@ button.green { } button.gray{ - background-color: inherit; + background-color: #FFF; color: #333; } @@ -307,8 +307,9 @@ div[data-title]:hover:after { body { font-size: 28px!important; } - button { + button, input { font-size: 28px; + height: 42px; } } \ No newline at end of file -- 2.49.1 From c14a2770bd092b41a343a2a99f0606c444c75b3d Mon Sep 17 00:00:00 2001 From: "K. Nobel" Date: Tue, 31 Jan 2017 12:52:50 +0100 Subject: [PATCH 301/400] Fixed posting functions for groups. --- website/public/API/postPost.php | 57 +++++++++++++++++++++++++++------ website/queries/group_page.php | 31 +++++++++++++++++- 2 files changed, 77 insertions(+), 11 deletions(-) diff --git a/website/public/API/postPost.php b/website/public/API/postPost.php index b52e96b..40c18e1 100644 --- a/website/public/API/postPost.php +++ b/website/public/API/postPost.php @@ -2,16 +2,53 @@ session_start(); -require("../../queries/post.php"); -require("../../queries/connect.php"); -require("../../queries/checkInput.php"); +require_once("../../queries/post.php"); +require_once("../../queries/group_page.php"); +require_once("../../queries/connect.php"); +require_once("../../queries/checkInput.php"); -if (empty($_POST['newpost-title'])) { -} else { - makePost($_SESSION['userID'], - null, - test_input($_POST['newpost-title']), - test_input($_POST['newpost-content'])); +if (empty($_POST["title"]) or + empty($_POST["content"]) or + empty($_SESSION["userID"])) { + header('HTTP/1.1 500 Non enough arguments'); } -header("Location: ../profile.php"); \ No newline at end of file +if (empty($_POST["group"])) { + // User Post + makePost( + $_SESSION["userID"], + null, + test_input($_POST["title"]), + test_input($_POST["content"]) + ); +} else { + // Group Post + + // Check if the user is an admin or mod of the group. + if(!in_array(selectGroupRole($_POST["group"]), array('mod', 'admin'))) { + header('HTTP/1.1 500 Non enough rights'); + return; + } + + makePost( + $_SESSION["userID"], + $_POST["group"], + test_input($_POST["title"]), + test_input($_POST["content"]) + ); +} + + + + + + +//if (empty($_POST['newpost-title'])) { +//} else { +// makePost($_SESSION['userID'], +// null, +// test_input($_POST['newpost-title']), +// test_input($_POST['newpost-content'])); +//} +// +//header("Location: ../profile.php"); \ No newline at end of file diff --git a/website/queries/group_page.php b/website/queries/group_page.php index b3e454c..83911f8 100644 --- a/website/queries/group_page.php +++ b/website/queries/group_page.php @@ -11,6 +11,12 @@ function selectGroupByName($name) { `description`, `picture`, `status`, + ( + SELECT `role` + FROM `group_member` + WHERE `group_member`.`groupID` = `group_page`.`groupID` AND + `userID` = :userID + ) AS `role`, COUNT(`group_member`.`groupID`) as `members` FROM `group_page` @@ -22,13 +28,36 @@ function selectGroupByName($name) { name LIKE :name "); - $stmt->bindParam(':name', $name); + $stmt->bindParam(':name', $name, PDO::PARAM_STR); + $stmt->bindParam(':userID', $_SESSION["userID"], PDO::PARAM_INT); if (!$stmt->execute()) { return False; } return $stmt->fetch(); } +function selectGroupRole(int $groupID) { + $stmt = prepareQuery(" + SELECT + `role` + FROM + `group_member` + WHERE + `groupID` = :groupID AND + `userID` = :userID + "); + + $stmt->bindParam(':groupID', $groupID, PDO::PARAM_INT); + $stmt->bindParam(':userID', $_SESSION["userID"], PDO::PARAM_INT); + if(!$stmt->execute()) { + return False; + } + if($stmt->rowCount() == 0) { + return "none"; + } + return $stmt->fetch()["role"]; +} + function selectGroupMembers(int $groupID) { $stmt = prepareQuery(" SELECT -- 2.49.1 From 6b13db9c4fbfeb99ce903b8072c36ad2e60f7cc9 Mon Sep 17 00:00:00 2001 From: "K. Nobel" Date: Tue, 31 Jan 2017 12:53:45 +0100 Subject: [PATCH 302/400] Fixed posting on group pages. --- website/public/API/postPost.php | 2 +- website/public/group.php | 3 +++ website/public/js/masonry.js | 34 +++++++++++++++++++++++++++++---- website/views/group.php | 2 +- 4 files changed, 35 insertions(+), 6 deletions(-) diff --git a/website/public/API/postPost.php b/website/public/API/postPost.php index 40c18e1..7a33857 100644 --- a/website/public/API/postPost.php +++ b/website/public/API/postPost.php @@ -29,7 +29,7 @@ if (empty($_POST["group"])) { header('HTTP/1.1 500 Non enough rights'); return; } - + makePost( $_SESSION["userID"], $_POST["group"], diff --git a/website/public/group.php b/website/public/group.php index 2ef3493..5d9459e 100644 --- a/website/public/group.php +++ b/website/public/group.php @@ -34,6 +34,9 @@ include("../views/group.php"); include("../views/footer.php"); $masonry_mode = 0; +if ($group["role"] == "mod" OR $group["role"] == "admin") { + $masonry_mode = 2; +} ?> diff --git a/website/public/js/masonry.js b/website/public/js/masonry.js index cb82089..d73c33c 100644 --- a/website/public/js/masonry.js +++ b/website/public/js/masonry.js @@ -23,6 +23,28 @@ function requestPost(postID) { }); } +function postPost() { + title = $("input.newpost[name='title']").val(); + content = $("textarea.newpost[name='content']").val(); + + if (masonryMode == 2) { + $.post("API/postPost.php", { title: title, + content : content, + group : groupID }) + .done(function() { + masonry(masonryMode); + }); + } else { + $.post("API/postPost.php", { title: title, + content : content }) + .done(function() { + masonry(masonryMode); + }); + } + + +} + $(window).on("load", function() { $(".modal-close").click(function () { $(".modal").hide(); @@ -64,13 +86,17 @@ function masonry(mode) { columns[i] = [0, $column]; } - if(mode == 1) { + if(mode > 0) { $postInput = $("
        "); - $form = $(""); + $form = $(""); $postInput.append($form); - $form.append($("")); - $form.append($("")); $form.append($("")); columns[0][1].append($postInput); diff --git a/website/views/post-view.php b/website/views/post-view.php index 264d67c..d961334 100644 --- a/website/views/post-view.php +++ b/website/views/post-view.php @@ -24,7 +24,7 @@ echo("
        -
        +
        +
        +
        + + + + + + + + + + + +
        \ No newline at end of file diff --git a/website/views/fbBdayInput.php b/website/views/fbBdayInput.php new file mode 100644 index 0000000..c08b192 --- /dev/null +++ b/website/views/fbBdayInput.php @@ -0,0 +1,40 @@ + + + + + + diff --git a/website/views/login-view.php b/website/views/login-view.php index 0219797..8e82fdf 100644 --- a/website/views/login-view.php +++ b/website/views/login-view.php @@ -20,7 +20,7 @@ name="user" value="" title="Moet een geldige gebruiker zijn" - > + required>
        @@ -31,7 +31,7 @@ placeholder="Voer uw wachtwoord in" name="psw" title="Moet minstens 8 karakters lang zijn" - > + required>
        @@ -47,73 +47,68 @@
        -
        - + + +login with Facebook!
        '; + } +?> \ No newline at end of file diff --git a/website/views/registerModal.php b/website/views/registerModal.php index b430ab8..9ad48dc 100644 --- a/website/views/registerModal.php +++ b/website/views/registerModal.php @@ -32,7 +32,8 @@ name="name" value="" title="Mag alleen letters bevatten" - > + required + autocomplete="given-name"> * @@ -44,7 +45,8 @@ name="surname" value="" title="Mag alleen letters bevatten" - > + required + autocomplete="family-name"> * @@ -65,7 +67,7 @@ name="username" value="" title="Moet minimaal 6 karakters bevatten" - > + required> *
        • Minstens 6 karakters
          • @@ -81,7 +83,7 @@ name="password" value="" id="password" - > + required> *
          • Minstens 8 karakters
            • @@ -96,7 +98,7 @@ value="" id="confirmpassword" title="Herhaal wachtwoord" - > + required> * @@ -109,7 +111,6 @@ value="" pattern="[A-Za-z]{1,}" title="Mag alleen letters bevatten"> - * @@ -120,7 +121,8 @@ name="email" value="" id="email" - title="Voer een geldige email in"> + title="Voer een geldige email in" + required> * @@ -132,10 +134,12 @@ name="confirmEmail" value="" id="email" - title="Herhaal uw email"> + title="Herhaal uw email" + required> * +
            +
    		• $username $role$bancomment +
    $bancomment
    +
    +
    + + + +
    +
    + +
    -- 2.49.1 From c0a64e9ffd4af652b488ac18a39f31831de13523 Mon Sep 17 00:00:00 2001 From: Marijn Jansen Date: Tue, 31 Jan 2017 16:19:15 +0100 Subject: [PATCH 316/400] 1337 bday --- website/views/settings-view.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/website/views/settings-view.php b/website/views/settings-view.php index b7f554a..b03133e 100644 --- a/website/views/settings-view.php +++ b/website/views/settings-view.php @@ -75,6 +75,9 @@ $settings = getSettings(); +
  • -- 2.49.1 From 52a4822477432218965aff2bf0b9b15018f4112e Mon Sep 17 00:00:00 2001 From: Hendrik Date: Tue, 31 Jan 2017 16:20:02 +0100 Subject: [PATCH 317/400] post-merge fix --- website/public/API/adminSearchUsers.php | 2 +- website/views/adminpanel-table.php | 2 +- website/views/adminpanel.php | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/website/public/API/adminSearchUsers.php b/website/public/API/adminSearchUsers.php index 58b170a..5f7944b 100644 --- a/website/public/API/adminSearchUsers.php +++ b/website/public/API/adminSearchUsers.php @@ -33,7 +33,7 @@ if (isset($_POST['groupstatus'])) { $groupstatus = $_POST["groupstatus"]; } -$userinfo = getRoleByID($_SESSION['userID'])->fetch(PDO::FETCH_ASSOC); +$userinfo = getRoleByID($_SESSION['userID']); if ($pagetype == "user") { include ("../../views/adminpanel-table.php"); diff --git a/website/views/adminpanel-table.php b/website/views/adminpanel-table.php index 9e6b9bc..3ae5da4 100644 --- a/website/views/adminpanel-table.php +++ b/website/views/adminpanel-table.php @@ -50,7 +50,7 @@ while($user = $q->fetch(PDO::FETCH_ASSOC)) { - + name="fbUserID" + value=""> + diff --git a/website/views/forgotPasswordModal.php b/website/views/forgotPasswordModal.php index d3f12f9..2ebdbb9 100644 --- a/website/views/forgotPasswordModal.php +++ b/website/views/forgotPasswordModal.php @@ -19,7 +19,8 @@ class="middle" placeholder="Voer uw email in" name="forgotEmail" - title="Voer een email in"> + title="Voer een email in" + required>
    diff --git a/website/views/homeLoginRegister.php b/website/views/homeLoginRegister.php new file mode 100644 index 0000000..8fc0ec0 --- /dev/null +++ b/website/views/homeLoginRegister.php @@ -0,0 +1,121 @@ +getMessage(); + } + break; + case "reset": + try { + resetEmail($_POST["forgotEmail"]); + sendPasswordRecovery($_POST["forgotEmail"]); + } catch (emailException $e){ + $resetErr = $e->getMessage(); + echo ""; + } + break; + case "register": + include("register.php"); + break; + case "fbRegister": + include("fbRegister.php"); + break; + } +} +$fb = new Facebook\Facebook([ + 'app_id' => $appID, + 'app_secret' => $appSecret, + 'default_graph_version' => 'v2.2', +]); +$redirect = "https://myhyvesbookplus.nl/~joey/login.php"; +$helper = $fb->getRedirectLoginHelper(); + +try { + // Returns a `Facebook\FacebookResponse` object + $acces_token = $helper->getAccessToken(); +} catch(Facebook\Exceptions\FacebookResponseException $e) { + echo 'Graph returned an error: ' . $e->getMessage(); + exit; +} catch(Facebook\Exceptions\FacebookSDKException $e) { + echo 'Facebook SDK returned an error: ' . $e->getMessage(); + exit; +} + +if(!isset($acces_token)){ + $permission=["email", "user_birthday"]; + $loginurl=$helper->getLoginUrl($redirect,$permission); +}else { + $fb->setDefaultAccessToken($acces_token); + $response = $fb->get('/me?fields=email,name,birthday'); + $usernode = $response->getGraphUser(); + +// echo $usernode->getName() . "
    "; + echo $usernode->getID() . "
    "; +// echo $usernode->getProperty("email") . "

    "; +// echo "Picture
    "; +// echo "

    "; + + $nameSplit = explode(" ", $usernode->getName()); + $fbName = $nameSplit[0]; + $fbSurname = $nameSplit[1]; + $fbUserID = $usernode->getID(); + $fbEmail = $usernode->getProperty("email"); +// $image = 'https://graph.facebook.com/' . $usernode->getId() . '/picture?width=200'; + + + if (fbLogin($fbUserID) == 1) { + $fbID = getfbUserID($fbUserID)["userID"]; + $fbRole = getfbUserID($fbUserID)["role"]; + if($fbRole == "banned"){ + echo ""; + } else if($fbRole == "frozen"){ + $_SESSION["userID"] = $fbID; + echo ""; + } else { + $_SESSION["userID"] = $fbID; + header("location: profile.php"); + } + } else { + echo ""; + } +} \ No newline at end of file diff --git a/website/views/login-view.php b/website/views/login-view.php index 8e82fdf..f525103 100644 --- a/website/views/login-view.php +++ b/website/views/login-view.php @@ -128,7 +128,6 @@ var facebookCLose = document.getElementsByClassName("close")[2]; if (e.keyCode == 27) { modal.style.display = "none"; registerModal.style.display = "none"; - facebookModal.style.display = "none"; } }); -- 2.49.1 From 69b0b24176b5cc058a5e5b6fb920b645b5da697e Mon Sep 17 00:00:00 2001 From: "K. Nobel" Date: Wed, 1 Feb 2017 12:26:05 +0100 Subject: [PATCH 327/400] Fixed group add/leave buttons --- website/public/group.php | 3 +++ website/public/js/groupButtons.js | 33 +++++++++++++++++++++++++++++++ website/public/styles/main.css | 1 + website/public/styles/profile.css | 16 ++++++++++++++- website/views/group.php | 7 +++---- 5 files changed, 55 insertions(+), 5 deletions(-) create mode 100644 website/public/js/groupButtons.js diff --git a/website/public/group.php b/website/public/group.php index 5d9459e..eb860e3 100644 --- a/website/public/group.php +++ b/website/public/group.php @@ -40,12 +40,15 @@ if ($group["role"] == "mod" OR $group["role"] == "admin") { ?> + diff --git a/website/public/js/groupButtons.js b/website/public/js/groupButtons.js new file mode 100644 index 0000000..0f1b6bf --- /dev/null +++ b/website/public/js/groupButtons.js @@ -0,0 +1,33 @@ +function placeGroupButtons() { + $.post("API/getGrouprole.php", { grp: groupID }) + .done(function(data) { + var $buttonContainer = $("div.group-button-container"); + + if(data == 'none') { + $buttonContainer.append( + ""); + } else if(data == 'request') { + $buttonContainer.append( + ""); + } else { + $buttonContainer.append( + ""); + } + + $buttonContainer.children().click(function() { + $.post("API/editMembership.php", { grp: groupID, role: this.value }) + .done(function() { + $buttonContainer.children().remove(); + placeGroupButtons(); + }).fail(function() { + }); + }); + + }); +} \ No newline at end of file diff --git a/website/public/styles/main.css b/website/public/styles/main.css index baff345..5714217 100644 --- a/website/public/styles/main.css +++ b/website/public/styles/main.css @@ -94,6 +94,7 @@ p { .group-picture { border-radius: 5px; + border: none; } .item-box, .item-box-full-width { diff --git a/website/public/styles/profile.css b/website/public/styles/profile.css index 37aaaa1..4df42ce 100644 --- a/website/public/styles/profile.css +++ b/website/public/styles/profile.css @@ -18,7 +18,7 @@ display: inline-block; } -.friend-button-container button, .status-buttons-container button { +.friend-button-container button, .status-buttons-container button, .group-button-container button { display: block; margin: 7px 0; @@ -27,6 +27,10 @@ font-size: 18px; } +.group-button-container button { + float: right; +} + .empty-button { background: none; cursor: auto; @@ -51,8 +55,18 @@ width: 150px; height: 150px; margin-bottom: -45px; + + object-fit: cover; + vertical-align: middle; } +.group-picture { + border: none; + margin-bottom: 0; + margin-right: 15px; +} + + /* Old */ .profile-box h1.profile-username { diff --git a/website/views/group.php b/website/views/group.php index f2f797d..c12b552 100644 --- a/website/views/group.php +++ b/website/views/group.php @@ -1,11 +1,10 @@
    - -
    -

    Groep verlaten

    -
    + +

    +
    -- 2.49.1 From dc69fb493c0454e395a8f043d8278747fe6ceec1 Mon Sep 17 00:00:00 2001 From: Lars van Hijfte Date: Wed, 1 Feb 2017 12:34:27 +0100 Subject: [PATCH 328/400] BUG FIX: Added session start, so posts load again --- website/public/API/getPosts.php | 2 ++ website/public/API/loadPost.php | 2 ++ 2 files changed, 4 insertions(+) diff --git a/website/public/API/getPosts.php b/website/public/API/getPosts.php index da82f14..3f07c7d 100644 --- a/website/public/API/getPosts.php +++ b/website/public/API/getPosts.php @@ -4,6 +4,8 @@ if(empty($_POST["usr"]) and empty($_POST["grp"])) { header('HTTP/1.1 500 Non enough arguments'); } +session_start(); + require_once ("../../queries/post.php"); require_once ("../../queries/nicetime.php"); require_once("../../queries/user.php"); diff --git a/website/public/API/loadPost.php b/website/public/API/loadPost.php index 257a282..13a2f54 100644 --- a/website/public/API/loadPost.php +++ b/website/public/API/loadPost.php @@ -1,5 +1,7 @@ Date: Wed, 1 Feb 2017 12:45:26 +0100 Subject: [PATCH 329/400] Fixed redirect link and removes test echo's --- website/queries/login.php | 6 +++--- website/queries/register.php | 6 +++--- website/views/facebookRegisterModal.php | 4 ---- website/views/homeLoginRegister.php | 9 +-------- 4 files changed, 7 insertions(+), 18 deletions(-) diff --git a/website/queries/login.php b/website/queries/login.php index f3c5d9a..4dad5c5 100644 --- a/website/queries/login.php +++ b/website/queries/login.php @@ -19,7 +19,7 @@ function getUser() { } function getUserID() { - $stmt = $GLOBALS["db"]->prepare(" + $stmt = prepareQuery(" SELECT `userID` FROM @@ -73,7 +73,7 @@ function validateLogin($username, $password){ } function fbLogin($fbID) { - $stmt = $GLOBALS["db"]->prepare(" + $stmt = prepareQuery(" SELECT `email`, `userID`, @@ -91,7 +91,7 @@ function fbLogin($fbID) { } function getfbUserID($fbID) { - $stmt = $GLOBALS["db"]->prepare(" + $stmt = prepareQuery(" SELECT `userID`, `role` diff --git a/website/queries/register.php b/website/queries/register.php index 6ed4d50..3dcbed4 100644 --- a/website/queries/register.php +++ b/website/queries/register.php @@ -17,7 +17,7 @@ function getExistingUsername() { } function getExistingFBUsername() { - $stmt = $GLOBALS["db"]->prepare(" + $stmt = prepareQuery(" SELECT `username` FROM @@ -49,7 +49,7 @@ function getExistingEmail() { } function getExistingFBEmail() { - $stmt = $GLOBALS["db"]->prepare(" + $stmt = prepareQuery(" SELECT `email`, `userID` @@ -120,7 +120,7 @@ function registerAccount() { } function fbRegisterAccount() { - $stmt = $GLOBALS["db"]->prepare(" + $stmt = prepareQuery(" INSERT INTO `user`(fname, lname, diff --git a/website/views/facebookRegisterModal.php b/website/views/facebookRegisterModal.php index d36b08e..7db44b0 100644 --- a/website/views/facebookRegisterModal.php +++ b/website/views/facebookRegisterModal.php @@ -81,18 +81,14 @@ - - - -
    \ No newline at end of file diff --git a/website/views/homeLoginRegister.php b/website/views/homeLoginRegister.php index 8fc0ec0..beffff8 100644 --- a/website/views/homeLoginRegister.php +++ b/website/views/homeLoginRegister.php @@ -58,7 +58,7 @@ $fb = new Facebook\Facebook([ 'app_secret' => $appSecret, 'default_graph_version' => 'v2.2', ]); -$redirect = "https://myhyvesbookplus.nl/~joey/login.php"; +$redirect = "https://myhyvesbookplus.nl/login.php"; $helper = $fb->getRedirectLoginHelper(); try { @@ -80,12 +80,6 @@ if(!isset($acces_token)){ $response = $fb->get('/me?fields=email,name,birthday'); $usernode = $response->getGraphUser(); -// echo $usernode->getName() . "
    "; - echo $usernode->getID() . "
    "; -// echo $usernode->getProperty("email") . "

    "; -// echo "Picture
    "; -// echo "

    "; - $nameSplit = explode(" ", $usernode->getName()); $fbName = $nameSplit[0]; $fbSurname = $nameSplit[1]; @@ -93,7 +87,6 @@ if(!isset($acces_token)){ $fbEmail = $usernode->getProperty("email"); // $image = 'https://graph.facebook.com/' . $usernode->getId() . '/picture?width=200'; - if (fbLogin($fbUserID) == 1) { $fbID = getfbUserID($fbUserID)["userID"]; $fbRole = getfbUserID($fbUserID)["role"]; -- 2.49.1 From 2b984805877c7519fac54db8e645aabb16e4cc19 Mon Sep 17 00:00:00 2001 From: Lars van Hijfte Date: Wed, 1 Feb 2017 13:07:06 +0100 Subject: [PATCH 330/400] BUG FIX: Menu now saves the cookie again --- website/public/js/admin.js | 3 -- website/public/js/chat.js | 1 - website/public/js/groupButtons.js | 1 + website/public/js/header.js | 68 ++++++++++++++++++------------- website/public/js/main.js | 1 + website/public/js/menu.js | 21 +++++++--- 6 files changed, 57 insertions(+), 38 deletions(-) diff --git a/website/public/js/admin.js b/website/public/js/admin.js index 2b78e0b..e0dc9f7 100644 --- a/website/public/js/admin.js +++ b/website/public/js/admin.js @@ -17,12 +17,10 @@ $(window).on("load", function () { because serialize doesn't take submit values. */ $('#admin-batchform > button').click(function () { $('#batchinput').prop('value', $(this).prop('value')); - console.log($('#batchinput').prop('value')); }); $('#admin-groupbatchform > button').click(function () { $('#groupbatchinput').prop('value', $(this).prop('value')); - console.log($('#batchinput').prop('value')); }); }); @@ -67,7 +65,6 @@ function searchFromOne() { } function adminSearch() { - console.log($("#admin-searchform").serialize()); $.post( "API/adminSearchUsers.php", $("#admin-searchform").serialize() diff --git a/website/public/js/chat.js b/website/public/js/chat.js index e332324..6a027c8 100644 --- a/website/public/js/chat.js +++ b/website/public/js/chat.js @@ -49,7 +49,6 @@ function addMessages(messages) { // Initialize message variables var thisDate = new Date(messages[i].creationdate.replace(/ /,"T")); var thisTime = thisDate.getHours() + ":" + thisDate.getMinutes(); - console.log(thisDate); var type; thisDate.setHours(0,0,0,0); diff --git a/website/public/js/groupButtons.js b/website/public/js/groupButtons.js index 0f1b6bf..e6ada67 100644 --- a/website/public/js/groupButtons.js +++ b/website/public/js/groupButtons.js @@ -25,6 +25,7 @@ function placeGroupButtons() { .done(function() { $buttonContainer.children().remove(); placeGroupButtons(); + updateMenus(); }).fail(function() { }); }); diff --git a/website/public/js/header.js b/website/public/js/header.js index 13e3e12..4feea40 100644 --- a/website/public/js/header.js +++ b/website/public/js/header.js @@ -1,40 +1,52 @@ $(document).ready(function() { // Toggle menu $("#own-profile-picture, #open-notifications").click(function() { - if ($("#notification-center").css('display') == "none") { - // Make the menu visible and move the content to the left. - $(".modal").width("calc(100% - 512px)"); - $(".content").css("margin-right", "256px"); - $("#notification-center").css("right", "0px"); - $("#notification-center").css("display", "block"); - $("#contact-menu").css("display", "block"); + if ($("#notification-center").css('display') == "none") { + // Make the menu visible and move the content to the left. + $(".modal").width("calc(100% - 512px)"); + $(".content").css("margin-right", "256px"); + $("#notification-center").css("right", "0px"); + $("#notification-center").css("display", "block"); + $("#contact-menu").css("display", "block"); - // Add cookie so the menu stays open on other pages - if (window.innerWidth > 1080) { - $("#chat-history").width("calc(100% - 587px)"); - document.cookie = "menu=open; path=/"; - } else { - document.cookie = "menu=closed; path=/"; - } + // Add cookie so the menu stays open on other pages + if (window.innerWidth > 1080) { + $("#chat-history").width("calc(100% - 587px)"); + document.cookie = "menu=open; path=/"; } else { - $(".modal").width("calc(100% - 256px)"); - $(".content").css("margin-right", "0px"); - $("#notification-center").css("display", "none"); - - if (window.innerWidth > 1080) { - $("#chat-history").width("calc(100% - 331px)"); - } else { - // Make the menu invisible and move the content to the right. - $("#contact-menu").css("display", "none"); - } - - // Change menu cookie to close document.cookie = "menu=closed; path=/"; - } + } else { + $(".modal").width("calc(100% - 256px)"); + $(".content").css("margin-right", "0px"); + $("#notification-center").css("display", "none"); + + if (window.innerWidth > 1080) { + $("#chat-history").width("calc(100% - 331px)"); + } else { + // Make the menu invisible and move the content to the right. + $("#contact-menu").css("display", "none"); + } + + // Change menu cookie to close + document.cookie = "menu=closed; path=/"; + } }); if (getCookie("menu") == "open") { - $("#own-profile-picture").click(); + // Make the menu visible and move the content to the left. + $(".modal").width("calc(100% - 512px)"); + $(".content").css("margin-right", "256px"); + $("#notification-center").css("right", "0px"); + $("#notification-center").css("display", "block"); + $("#contact-menu").css("display", "block"); + + // Add cookie so the menu stays open on other pages + if (window.innerWidth > 1080) { + $("#chat-history").width("calc(100% - 587px)"); + document.cookie = "menu=open; path=/"; + } else { + document.cookie = "menu=closed; path=/"; + } } }); diff --git a/website/public/js/main.js b/website/public/js/main.js index 2983fdb..a5f17de 100644 --- a/website/public/js/main.js +++ b/website/public/js/main.js @@ -53,6 +53,7 @@ function editFriendship(userID, value) { $.post("API/editFriendship.php", { usr: userID, action: value }) .done(function() { placeFriendButtons(); + updateMenus(); }); } diff --git a/website/public/js/menu.js b/website/public/js/menu.js index d15d678..5ca9c97 100644 --- a/website/public/js/menu.js +++ b/website/public/js/menu.js @@ -2,23 +2,28 @@ var menuFriendsData; var menuGroupsData; var notificationMessagesData; var notificationRequestsData; +var updatingMenus = 0; - +// On document load, load menus and loops loading menus every 10 seconds. $(document).ready(function() { + updatingMenus = 4; loadMenuFriends(5); loadNotificationFriends(); loadUnreadMessages(); loadMenuGroups(); - setInterval(updateMenus, 3000); + setInterval(updateMenus, 10000); }); // Update the menu and notification items. function updateMenus() { - loadMenuFriends(5); - loadNotificationFriends(); - loadUnreadMessages(); - loadMenuGroups(); + if (updatingMenus <= 0) { + updatingMenus = 4; + loadMenuFriends(5); + loadNotificationFriends(); + loadUnreadMessages(); + loadMenuGroups(); + } } @@ -38,6 +43,7 @@ function loadMenuFriends(limit) { $("#friends-menu-section").hide(); } } + updatingMenus --; }); } @@ -57,6 +63,7 @@ function loadMenuGroups() { $("#groups-menu-section").hide(); } } + updatingMenus --; }); } @@ -73,6 +80,7 @@ function loadNotificationFriends() { $("#friend-request-section").hide(); } } + updatingMenus --; }); } @@ -89,5 +97,6 @@ function loadUnreadMessages() { $("#unread-messages-section").hide(); } } + updatingMenus --; }); } \ No newline at end of file -- 2.49.1 From 9b89058484246925d399075fda21d1a9acbbd22d Mon Sep 17 00:00:00 2001 From: Hendrik Date: Wed, 1 Feb 2017 14:05:04 +0100 Subject: [PATCH 331/400] add infinite scroll on profile --- website/public/API/getPosts.php | 28 ++++--- website/public/js/masonry.js | 117 ++++++++++++++++++++---------- website/public/styles/profile.css | 5 ++ website/queries/post.php | 51 +++++++++++++ website/views/profile.php | 4 + 5 files changed, 156 insertions(+), 49 deletions(-) diff --git a/website/public/API/getPosts.php b/website/public/API/getPosts.php index 620a707..850c5ea 100644 --- a/website/public/API/getPosts.php +++ b/website/public/API/getPosts.php @@ -1,26 +1,30 @@ fetchAll(PDO::FETCH_ASSOC); + + for($i = 0; $i < sizeof($results); $i++) { + $results[$i]["nicetime"] = nicetime($results[$i]["creationdate"]); + } + + echo json_encode($results); } -$results = $posts->fetchAll(PDO::FETCH_ASSOC); - -for($i = 0; $i < sizeof($results); $i++) { - $results[$i]["nicetime"] = nicetime($results[$i]["creationdate"]); -} - -echo json_encode($results); \ No newline at end of file diff --git a/website/public/js/masonry.js b/website/public/js/masonry.js index 53018d3..4c40aad 100644 --- a/website/public/js/masonry.js +++ b/website/public/js/masonry.js @@ -45,6 +45,21 @@ function postPost() { } +var masonryMode = 0; +var windowWidth; +var columnCount; +var columns; +var postLimit; +var postAmount = 0; +var noposts = false; + +$(document).ready(function () { + windowWidth = $(window).width(); + columnCount = Math.floor($(".posts").width() / 250); + columns = new Array(columnCount); + postLimit = columnCount * 7; +}); + $(window).on("load", function() { $(".modal-close").click(function () { $(".modal").hide(); @@ -52,21 +67,28 @@ $(window).on("load", function() { $('#modal-response').hide(); $('.modal-default').show(); }); + + // http://stackoverflow.com/questions/9439725/javascript-how-to-detect-if-browser-window-is-scrolled-to-bottom + // $(window).on("scroll", function () { + // if ((window.innerHeight + window.pageYOffset) >= document.body.offsetHeight) { + // loadMorePosts(userID, groupID, postAmount, postLimit); + // } + // }); + window.onscroll = function(ev) { + if($(window).scrollTop() + $(window).height() == $(document).height() ) { + loadMorePosts(userID, groupID, postAmount, postLimit); + } + }; }); -var masonryMode = 0; -var windowWidth = $(window).width(); -var oldColumnCount = Math.floor($(".posts").width() / 250); - - $(window).resize(function() { clearTimeout(window.resizedFinished); window.resizeFinished = setTimeout(function() { if ($(window).width() != windowWidth) { windowWidth = $(window).width(); - if (oldColumnCount != Math.floor($(".posts").width() / 250)) { - oldColumnCount = Math.floor($(".posts").width() / 250); + if (columnCount != Math.floor($(".posts").width() / 250)) { + columnCount = Math.floor($(".posts").width() / 250); masonry(masonryMode); } } @@ -78,12 +100,10 @@ var $container = $(".posts"); function masonry(mode) { masonryMode = mode; $container.children().remove(); - columnCount = Math.floor($(".posts").width() / 250); /* * Initialise columns. */ - var columns = new Array(columnCount); for (i = 0; i < columnCount; i++) { $column = $("
    "); @@ -112,38 +132,61 @@ function masonry(mode) { /* * Function will find the column with the shortest height. */ - function getShortestColumn(columns) { - column = columns[0]; - for (i = 1; i < columnCount; i++) { - if (column[0] > columns[i][0]) { - column = columns[i]; - } - } - return column; - } /* * Get the posts from the server. */ - $.post("API/getPosts.php", { usr : userID, grp : groupID }) - .done(function(data) { - posts = JSON.parse(data); - - /* - * Rearange the objects. - */ - $.each(posts, function() { - $post = $("
    "); - $post.append($("

    ").html(this["title"])); - $post.append($("

    ").html(fancyText(this["content"]))); - $post.append($("

    ").text(this["nicetime"])); - $post.append($("

    ").text("comments: " + this["comments"] + ", niet slechts: " + this["niet_slechts"])); - - shortestColumn = getShortestColumn(columns); - shortestColumn[1].append($post); - shortestColumn[0] = shortestColumn[0] + $post.height() + margin; - }); - }); + loadMorePosts(userID, groupID, 0, postLimit); } +function getShortestColumn(columns) { + column = columns[0]; + + for (i = 1; i < columnCount; i++) { + if (column[0] > columns[i][0]) { + column = columns[i]; + } + } + return column; +} + +function loadMorePosts(uID, gID, offset, limit) { + if (noposts) { + return; + } + + console.log(uID, gID, offset, limit); + + + $.post("API/getPosts.php", { usr : uID, + grp : gID, + offset : offset, + limit : limit}) + .done(function(data) { + if (!data) { + $('.noposts').show(); + noposts = true; + return; + } + + posts = JSON.parse(data); + + /* + * Rearange the objects. + */ + $.each(posts, function() { + $post = $("

    "); + $post.append($("

    ").html(this["title"])); + $post.append($("

    ").html(fancyText(this["content"]))); + $post.append($("

    ").text(this["nicetime"])); + $post.append($("

    ").text("comments: " + this["comments"] + ", niet slechts: " + this["niet_slechts"])); + + shortestColumn = getShortestColumn(columns); + shortestColumn[1].append($post); + shortestColumn[0] = shortestColumn[0] + $post.height() + margin; + }); + }); + + postAmount += limit; +} \ No newline at end of file diff --git a/website/public/styles/profile.css b/website/public/styles/profile.css index 421e781..fd6f6fc 100644 --- a/website/public/styles/profile.css +++ b/website/public/styles/profile.css @@ -109,6 +109,11 @@ div.posts .post form textarea.newpost { font-size: 0.8em; } +.noposts { + display: none; + text-align: center; +} + @media only screen and (max-width: 1500px) { .post-box { width: calc(50% - 68px); diff --git a/website/queries/post.php b/website/queries/post.php index a175cda..db81892 100644 --- a/website/queries/post.php +++ b/website/queries/post.php @@ -46,6 +46,57 @@ function selectAllPosts($userID, $groupID) { } +function selectSomePosts($userID, $groupID, $offset, $limit) { + $stmt = prepareQuery(" + SELECT + `post`.`postID`, + `post`.`author`, + `title`, + CASE LENGTH(`post`.`content`) >= 150 AND `post`.`content` NOT LIKE 'bindParam(':userID', $userID, PDO::PARAM_INT); + $stmt->bindParam(':groupID', $groupID , PDO::PARAM_INT); + $stmt->bindParam(':offset', intval($offset), PDO::PARAM_INT); + $stmt->bindParam(':limit', intval($limit), PDO::PARAM_INT); + if(!$stmt->execute()) { + return False; + } + if($stmt->rowCount() == 0) { + return False; + } + return $stmt; + +} + function selectPostById($postID) { $stmt = prepareQuery(" SELECT diff --git a/website/views/profile.php b/website/views/profile.php index c72c01b..2bb117f 100644 --- a/website/views/profile.php +++ b/website/views/profile.php @@ -71,6 +71,10 @@

    +
    +

    Geen posts meer!

    +
    +
    -- 2.49.1 From f10d9c14a19c4ca8089f1ab8002fe3e4851e2803 Mon Sep 17 00:00:00 2001 From: Marijn Jansen Date: Wed, 1 Feb 2017 14:12:13 +0100 Subject: [PATCH 332/400] Niet slecht small img --- website/public/img/nietslecht_small.png | Bin 0 -> 25774 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 website/public/img/nietslecht_small.png diff --git a/website/public/img/nietslecht_small.png b/website/public/img/nietslecht_small.png new file mode 100644 index 0000000000000000000000000000000000000000..bb44b909fced1419aad9d13ceccba39a379ab05b GIT binary patch literal 25774 zcmeHw2{@H&+x8MEk|LSOl+2cyWtoL!$~;eNEi9Qbha@spl!TPAk|ZKiDpRH=b4Zd* zNfA<}!gsCOd)3}=`~7|Y`yJnZ{Kvtu<=)S_r{}z{;k?efZO0nuX>O-vrbHkR+Ye}| z8^TX4;d?7N{OL8EWDGwjytFKQ5QuHN2;U@#OKFSip0loTn^fhd^39p~%75$Nvb;e!fP;QBr<3fhFnqFfx`yZ9bf;8Gzh$YHK)z@g^p zjpL9Kkru{?Nyu`@$ccza$;paK3UP=d#iT`%a-w3A!bmX`QVxX_cd>#nac*$Hns>h7v#i#|f|);-X%D-frLD4T}-Qx#8S#9=<*>PVBb}!OR82p%pF{}00mpZpm1-KKsVH5x!esd?iZd_BF5Jw4qNf0(PmpJ&LSrbaMN z84f;O2MpeWaIpMn(Z3J+X*xgW!>K#?;uHyE!Kj7B<&4FVC>%712`rqvejm4mxJiXl=d=>HT4$e4HFArz5=+B2g z7a|yqt}g0;hmWrVyxswIMR*{B$750AI7ewooP(6GgoFf6SW?^xBP@%PLJB(}#gJI6 zgtQ|@Lj1cW{dM@iO#SCRVd@`&8taLH>3^Og79%Moi4l_pLq%eR#l&PBU?Hryu$+@L z1}Wp{=pZSF`*WdRCi|C#^u6(rM;zRK=|gxIEG&k>I!Q{4Ny`a4!b=HDVkM-Yg%uOV zI$|B9FpgMhoEYZMC4Mu_zbvJNC)mN!za1Fi6pe64{`&N%9ej`YUJl+qI6^#A;QBM5 z5mN+oC4Qm5$3>I_hL9^1F@z|A!=gq1^7QAn{yq%tkFTJe+Y@ zMbSUs?av4Qi)V-N^zg@d|92b-+|>bCB@SY~leeckhl7`w8y@38a7s~s59}Ybj2O!} zd_6gS3AjJr{FgcY7vB|&^Tz*oEcKUN5@F)_|LmRrW8Yj~&fD#-aYhJ~aqlMM#|g=fnts1PD9om*n&(RatLH{oC-rc;g?l13CH5_5P8qV4NHs zCFCS=!s606@gHnOPD(;tSXNpRiFJ~ZmBL8?NByzYUncwATAu$YVfnGjZ>IUV+Mnm} z3*5gP9-2_kpn&l}_Wd5z6oDB3%d=l*`~I0Zfw{Q(eP<>z;z;-s6(jul$IxFt{`*ji ze?RoskN-aO=SUL|yssi~&+nW0+v8tG5sI!Km4guo4LC(1fNMP{5&LYwMTBBKjSaZggA%dN23$la*3;O4Ydt6t`)t5P zgkn974Y<~W60y$)Ttq0=)7XG(Jtz_TY`{f?Vm*xwxYmObvCjrvL@3tN*nn$2C=vT? zz(s^&J&g^x)`JqU&jwsXDAv>1fNMP{5&LYwMTBBKjSaZggA%dN23$la*3;O4Ydt6t z`)t5Pgkn974Y<~W60y$)Ttq0=)7XG(Jtz_TY`{f?Vm*xwxYmObvCjrvL@3tN*nn$2 zC=vT?z(s^&J&g^x)`JqU&jwsXDAv>1fNMP{5&LYwMTBBKjSaZggA%dN23$la*3;O4 zYdt6t`)t5Pgkn97e+w7o&tD*b^MKzP5CFd(AeOp29DcO`2S&?K7l8=ci$H`$AP`Gy z@N)uz@IxXH@9hx?)I|h>!SlRbqXq)OU41}Z#W?WgMc`{Yk16k&H*i0Ai^ znD2|fsb$q@QR>;)^U|{alWV@C39Db(g_|a&mSyI0w!4!-HQS)p9*GDuw6sLsDJt^vHZ|?(FDona@UFDhv>NPs@xmow zyfyvJ=g*(_*GKO-dr1t_#LJt=f9^4MZPOK!aJ}5C+1Yjc+}s%I%(l$EJGVwHlra?= z=DAEvOdMoa2$Jk>Yx7J@Ozg@w!eot3OBp{eOcQpF zI==c%Ur$eOdU1JqHKoOAJm2`{npKzqA6>hPEMnbu5TW(5H z(vsdKN&M6~PBm&nz6)zCPNH!dYF1X4TPuCWxz4i6(S8vK%cjXQb`6~9%pskfoo&8m zn8%*3w>D_Yi9(@n+_>Qtf94GOkhL{>*yIbz$JbR~Gf$m5<>2%7nT4Z=N5-lWMNE7= z^_`NE<_z>v@q5+PuZK+no;`W`RAI*+#SqI<8Vl^cX2^f((j^09V=|GH)7P%?Jn!ySpr9OiQy0-}V{OfR zUH7v8)v~hPJhXY91K}C6j+K>_Z3CXK8J1-A@}kTA4+~B!2BU zf?r4|WZwI#VYXqO)@cUO_)5PIJ#OwKVlZXMY$F4sQYiXNT-?`?ep&xXM$-bz$mQjr z;j&)4;|if4dJ0wrlC+l|9G1p3omuVR6i=N@jZo*}M59B}%WD~>-55oz?}qhPcyc3= zMRv7_u!X_ndt^Lbh2`e%o3(UudV4uV#AdnS*)yu3prEPphFr}WcZ-4DsrIzz&4Hy?uM&`{(>;Nl3|! zpNxGHX=9OcHD0^5GuzF6|=*&X|0Sl9mUmd|)=-Rsx3 zyVk_doH_GK`D%wUSHeBk6{q=A>R0qMt*lrI?P?S!URMQ&RxOEDS66FkYd?IHz-`Ag z*W1)Yo{*5hk+^oxn1X_0Iwd(dh>8)3ASWkJj}IjswI~^W-<_WyG^ci}pnzuAt_axN z18>F0&-09Cd#pV1!?w>9g6D6E@bjx2IdUX-BxjiuV#THtwR`vNbJp<;eRPIN!rt9| zmvKA|ue3?mbhAL9zSmY<(rG`Nz^0bSknm;Fj12);BgYtGN?a z)aSOiv^4a2q6>i#Ns*rfTut4it!A#Re$ah)a{0RKDXamvf~eu4#rXe*IbzT$rDK8ep4fJT2OqTzu!w!^YDLu|?|o z`?C$Q3JSIhBvE3;nc$6%wJ5@2o{Wefy=yIEX=UXHKMt&qtkkV(a-;zP3m%!=JGY)oPL6v1+!%|+W>r_S)5el%=g@+|LNs-gW`ShDDB(mE z9uZMin8HU#iB?dk8}sH&(taEn8437a>mir9s~Lu7v%KCl0co^F^mC)Jz?Cak-b_sm z6pS22v-?lIjC}FJTvA$EabfYo1-dl(0P4B7EfE>E3n36{R(5aRyx9ehKcStoDWWbc zHkM*?YD&!aoq;S0Mf*lC1I;8RCU)-W*o8ZH#LqXKeQ&0$ah84Hqg>)+vWU7sPGv&q z2n!4IV7r`|x#Rfp<1>K|JdRiAsIAMhdS0Ox*ucBt*q)FJ=zMf4gOnDL_{6pbmJxn%+=M3ip%e~@7}%Z`$3+X9lfZ7 zL?{cotvL;x@A%FW_)~$nOU!g=l-_ypFVk8S9)(&T3zJ! z_V%tFpQ{_6J7i|2`HnYLC#t+$dN_@A3pEE14_ViB-Fkhc6?JJOl0%G<>a#pYQ&SUg zuN${+k-^3-3&_*;Zo?so+`e_oce2$vFgO@9`J#A$vP&mZku5GR?xHx3QdLzIdGymL zwX&(1+0`32wu1G6#}C-$Lh~O92B4(UG%zRN*Yko1-BGEd$q_7F?obZGM8c0bwrlzJ#1DmmR;hV`EvIO}B z1?wS342_PS?9MkMB%Fb-3)6$mj}!MLBqc>Yd!_@sy;@#Q4+cw3O}+TJOMmv|;oE*6 zlzGA=uAGNh*9*?u9 zxvB>6xgI{ucG%T58F*<+fR9g!?Hw$Io10r!aVZdLaP&SrYJQ^qpjk$Mp&_lcwRI8h zDLp`m0m}`Xu39K^s3(UtIFyw3pxJjgI5+?Se&Z!uR9+r+;si-&XD5Lvfp?G(ZB>!Z=K9;1&Ez}ah)g{@wu53*f4%iCMz)WQsJ zHu;0b3KJA4W^r|W5Yc_A-o z?}dn@mnKVcLOG0Jwri^^4M!kTF0Ou^E_Q0UTu7E3eUkpy@Lmh1e2bKw57{<+VDpg%38aNuQ2mPx*;LvNvtd9mYWl`$naICjO5nDFpTE+wzbFVom;*|G)6 zNcE~Jn1Ng4Ol|n)ZAJEVn{F5j@X?(TY4I(y+@7SJQ(j(f%EZh(U(K0i)*~>S-tdR)9}Ou zMV_(t=#%^0?(Xge`Q75MqYF>R+RucNHavZrZ=pte)qrm**~Qe9KAv6S)WwU8;DoAq z##|`WrNHAow=4opEfYXU5Z_3ALo%V*c$!mNXTl` zeI11en$wNjAyBlNjxc-gAbA}6`Q4!sUIy?$RaqZMYCQ2)z=1-S#u#3_d|6$(&Cb9e z42oBO8X%!AtO`MN5F$Pp9=dH^Nefk1v=+~M(`)8-cA5FPxxMjouROy7gMv(fAKKk4 zER0G`Wg>|&;8WMt-A-efD&b5GHFwV=jKc10gP4H9V+@y4S!ifZ04IuQ8y^Ass2*$S z> z0%$oo2?+`CS9i0MgLY7#@1&z619Hr7bUjR+%VG7~62bOoyUpzUK1dM4!u$8{$I1Ef zZ{AeS?Rpxi%4un78PkzzN*}djPv~BL{=9~s9{PfU0_H|?>S$7MjPN6z^rwM7eP!FJ zdqG-K^1{|eb93|BhK6gJho;)w4btR%uB+{7&Q(3&3dvD$=T?J5hg4w8CpE6twYKUR znwa<<;!3EkuP5Df0zpT)d7pm9^T0X8s^bOV+Y5q>kfp(%B4c9@$nzdlQ6Zrhwmb=W z7c6_-Lf(%h!3AWeahIZl^-9kCjm-H;?==hLUAUaAZ@bALRj3l zi&rOW6+)nwpI>9}bk!D-lx;pfK8WLDG&PV&fhdIwTpT%@ke(j*?OVujg|VsW zFhnC4SJ&{03K?Luw!u?U56{z5MqY%IgNoSR*?CK<4mnU~bl?mENXtkGZgIcBah( z_XCc+Yv(+}B14^TTA*rTvRg+-$H2xW4gv?4u<&-+W>INr1H^3t)vb6PwC!+jVPtwb z8&KkG13skBTb(q8V0y?iA39x^<=walVd({M*27;C6yA^SWMeDfl;+^%ba;@P>wNzH zeR*KdYNJZ*=)kapDI(c9Ih!H4Pd)r}tUz7}3iiW2LI`DdcVUmg>NuchG3s0wQ&Wdp zWCnSzbRf=Mych#~1?qFM#C`f6<94Ox<=+$On}{9u7);mDS4iudNJ*!wR+m3;zw^Df z{P@FNhx({h3(iYULXap63kxfThlgpy!^3%@iWzF&bG+gF-h;JR@nT@w{{Gdf+3$=* ztAKbxk+ul4#`Nmw>QZ>!I}fNj4mZTI*@E;HSy(9Y&KD&hAb{Ge&Xo{WKO_lWceAXo zrBqYfCh;B=ohM65N}lxf9sK}m#RYI{bzm`0Z5i9y&-T_GR`7dIcRn%kE7iG?=Chbr zcaKKuQ6 z|C!lYPSZJ!_?)}o=X6kpqUO@hVQ9DrQzJfDxBxt!p?8$1GXTDHWRKy-x zkmf_H|x6-l3ssq1&xHLCD`=*X` zN3l5?-=3vXzUf337@xI-q@<9yuWtjCW^1F~mDNz51s8tl8hAYW@&5F1^q$an=VC*E z1VVvR9Q4KY!i5WX&Ey@a0QXifZ=gy?ggS znRU5w9VUZ-HoSuoS!=dy_s4>3xw#nN!fdsR)5q6NgZbAF45Y^_x;C`8?-Wm^0tt>l zNsEicsJ3s<&duEtsY+l_XUK3V{&fGXoNryp)j{2LLYVI3$Tt?@87$+bWL{O z^vRkvm3kHkY#qv7pn9M*?mG?z10Nrs^3kJ5w~%J%dVlB<4j;I&^by27PA;xZupr@O zlSS>QA+DNRS^_1wQdG1PNHSC)pkXpM>Rga~(ce#yvSEYZRZ!8gL5u+%@ST6yqcLw- zh#tOs=B4lT=Z2xHT%jgzfA#7XfBZ8S7niWhmsud<6!}hcGOW76F+$efbyBw2{7l7Q zC<`cLTX*be-j^BDnb!^FRyU{dU}xv11g(>A-#S5X3kQ+Cvy(QFS2w(-Mk$_EE`0xK z`XR^?P}661O~4VJJaIzh69j?msZfh!~Lh2F9(qudiRLjv)Ql9KYx(9j8` zwQsvLG&E!+v#LA8zS&4@0?T!|k_A>16%}QI$KzXs=uay^83XL3R83bSAm{q^D1)M! zZ=bfA3(zi5|ft3 zO162k!`PFgyMeP@);2a`A&WC2ZM#l4g1+Abae*NEkdcwqg3=9jvq7HmjoY_1p%j$% zcohT1v3>VV6Xx{ZkM|Go(59uQ)3C5u!6uHW*xA+eQYG5TN9m_9p!xOJVq0I=fcR@n z9&uz0^rgMFZ7nVP)z!&B(Hv}ToqlpFJ|+gzvwQTzj>W}5Lg@w+?V==}7H$UM{Gzup zh|~gayQ&elDZ2jXTjxFU{#4*aFDiYU?^AFkX@lZR>g?F84$`+pg3ND zrL>Gp1tBH01}9hcvz<>jEf+E}>SEB$P!9(h$dshr0yLg!VRY&Mki+6*U;Wciew3V? zoLea=A6^u*sUQLKjf#%mQtsX#r4m8z&|mIuUu=H&=p3)dtGgr+P#&zUehvIkP!W{Y z21p2jQ-KIH)1|L;qJ9X((vk7Z{^71Tz@}&6AiK(eLPPM2kxZlgwOIHmFLV?gYG&~%x7EP_9 zuRk4$aRO>Z*z2j?f?jWGN!Xp=n{WC3kgN5_f0Jp3vY`}Za< zVmv+1Rs}B%gJMgl27v`X*Q483 zGpO8OTj&;;atjMjEkY=j=zsaLw6j(1aM*>UB$`977-%5Q!xahCqYc_Q=R0hY2QP|Y z-i(YyaBIdB^rwqT$3t_gj+E80hFJPfzUYtyS476DU-_c!c$4UaS~B-)o@L(;f~!n?eEgXH zTa%21JzuwDdt&u<)3r~G_0UyV0$0`v$isDRR6OXE8(b_kjk zszZeZLbuoK@P1i2xw_t71`x|dji;MOW|7XVtONmdab{?_qoczL2%-Gc<4_BI+h{1b z!49&svJh|IzOA}WRyBj#m-raC-J_P4y{JlsZBXEb16@1EChvduDOMcN|MFz+xFLkR zVi3f*_GP4|#tt4|V*{!K5N%G=621p{mCE7cp@zqN2C^ z;C^~(2qFw5V#~gaWvZRq`G69`oj*u~9P{o#9l;mI%l=3 z<+4mB-RZ{VmsA~}DL5__fX1A4NJ2(~QbQ(s*WoK|5Bwl2ot}tOM>w&F^4idqJSM z4U(l#j$z(4yr5y0i8AnZvP~!QlsRN8a8Hvf^{r&m_iL}LtP}^%Iuh=@S8O%Xp^SzC z{g!Rjy{?e^I=mlBtJAe}96`V$fF=kxlJ{d`Vq`0=J#ykGMeazK6Ap(tE~=rSAq;BN z=kVcUh*NA%R%UhT`uh5AFH0#1@e5?tY^Aex2@@i*MP>Y khOR7s8LL`4w&sbr;pw2*z;T1{e Date: Wed, 1 Feb 2017 14:13:22 +0100 Subject: [PATCH 333/400] Backend for delete post --- website/public/API/deletePost.php | 20 ++++++++++++ website/public/js/post.js | 14 ++++++++ website/queries/post.php | 53 +++++++++++++++++++++++++++++++ website/views/post-view.php | 4 ++- 4 files changed, 90 insertions(+), 1 deletion(-) create mode 100644 website/public/API/deletePost.php diff --git a/website/public/API/deletePost.php b/website/public/API/deletePost.php new file mode 100644 index 0000000..fffadf5 --- /dev/null +++ b/website/public/API/deletePost.php @@ -0,0 +1,20 @@ +execute(); return $stmt->rowCount(); } + +function deletePost(int $postID, int $userID) { + if (checkPermissionOnPost($postID, $userID)) { + $stmt = prepareQuery(" + DELETE FROM + `post` + WHERE + `postID` = :postID + "); + $stmt->bindParam(":postID", $postID); + $stmt->execute(); + } +} + +function checkPermissionOnPost(int $postID, int $userID) : bool { + $getGroupID = prepareQuery(" + SELECT + `author`, + `groupID` + FROM + `post` + WHERE + `postID` = :postID + "); + $getGroupID->bindParam(":postID", $postID); + $getGroupID->execute(); + $postinfo = $getGroupID->fetch(); + + if ($postinfo["groupID"] == null) { + // User post + return ($userID == $postinfo["author"]); + } else { + // Group post + $roleInGroup = getRoleInGroup($userID, $postinfo["groupID"]); + return ($roleInGroup == "mod" or $roleInGroup == "admin"); + } +} + +function getRoleInGroup(int $userID, int $groupID) { + $stmt = prepareQuery(" + SELECT + `role` + FROM + `group_member` + WHERE + `userID` = :userID AND + `groupID` = :groupID + "); + $stmt->bindParam(":userID", $userID); + $stmt->bindParam(":groupID", $groupID); + $stmt->execute(); + return $stmt->fetch()["role"]; +} diff --git a/website/views/post-view.php b/website/views/post-view.php index 11a985a..0844224 100644 --- a/website/views/post-view.php +++ b/website/views/post-view.php @@ -6,7 +6,9 @@ session_start(); ?>

    -
    verwijder post
    +
    + +
    gepost door , '> -- 2.49.1 From b7a6fae4d901f4ff6ae6c9519447b2e98d2c8407 Mon Sep 17 00:00:00 2001 From: Lars van Hijfte Date: Wed, 1 Feb 2017 14:14:49 +0100 Subject: [PATCH 334/400] BUG FIX: Menu loading Menu's now load slower but update when needed. Also frozen users now catch the forbidden error --- website/public/js/header.js | 7 ++-- website/public/js/main.js | 12 +------ website/public/js/menu.js | 68 +++++++++++++++++++++++++------------ 3 files changed, 52 insertions(+), 35 deletions(-) diff --git a/website/public/js/header.js b/website/public/js/header.js index 4feea40..e4408cc 100644 --- a/website/public/js/header.js +++ b/website/public/js/header.js @@ -11,7 +11,8 @@ $(document).ready(function() { // Add cookie so the menu stays open on other pages if (window.innerWidth > 1080) { - $("#chat-history").width("calc(100% - 587px)"); + $("#chat-history").css("margin-right", "266px"); + $("#chat-history").css("width", "calc(100% - 512px - 75px)"); document.cookie = "menu=open; path=/"; } else { document.cookie = "menu=closed; path=/"; @@ -22,7 +23,8 @@ $(document).ready(function() { $("#notification-center").css("display", "none"); if (window.innerWidth > 1080) { - $("#chat-history").width("calc(100% - 331px)"); + $("#chat-history").css("margin-right", "10px"); + $("#chat-history").css("width", "calc(100% - 256px - 85px)"); } else { // Make the menu invisible and move the content to the right. $("#contact-menu").css("display", "none"); @@ -43,6 +45,7 @@ $(document).ready(function() { // Add cookie so the menu stays open on other pages if (window.innerWidth > 1080) { + $("#chat-history").css("margin-right", "266px"); $("#chat-history").width("calc(100% - 587px)"); document.cookie = "menu=open; path=/"; } else { diff --git a/website/public/js/main.js b/website/public/js/main.js index a5f17de..7741406 100644 --- a/website/public/js/main.js +++ b/website/public/js/main.js @@ -94,14 +94,4 @@ function showGroups(groups, list) { } else { return false; } -} - -$(document).ready(function() { - $("body").delegate("textarea[maxlength]", "keydown", function() { - if ($(this).val().length / .9 >= $(this).attr("maxlength")) { - $(this).next().text($(this).val().length + "/" + $(this).attr("maxlength")); - } else { - $(this).next().text(""); - } - }); -}); \ No newline at end of file +} \ No newline at end of file diff --git a/website/public/js/menu.js b/website/public/js/menu.js index 5ca9c97..c575ecd 100644 --- a/website/public/js/menu.js +++ b/website/public/js/menu.js @@ -6,11 +6,7 @@ var updatingMenus = 0; // On document load, load menus and loops loading menus every 10 seconds. $(document).ready(function() { - updatingMenus = 4; - loadMenuFriends(5); - loadNotificationFriends(); - loadUnreadMessages(); - loadMenuGroups(); + updateMenus(); setInterval(updateMenus, 10000); }); @@ -18,7 +14,6 @@ $(document).ready(function() { // Update the menu and notification items. function updateMenus() { if (updatingMenus <= 0) { - updatingMenus = 4; loadMenuFriends(5); loadNotificationFriends(); loadUnreadMessages(); @@ -27,76 +22,105 @@ function updateMenus() { } -// Get, every 3 seconds, the friends and insert them in the menu. +// Get the friends and insert them in the menu. function loadMenuFriends(limit) { + updatingMenus ++; $.post( "API/loadFriends.php", { limit: 5 } ).done(function(data) { + if (data == "" || data == "[]") { + $("#friends-menu-section").hide(); + } else { + $("#friends-menu-section").show(); + } if (menuFriendsData != data) { menuFriendsData = data; - if (showFriends(data, "#menu-friends-list", 5, "profile.php", "GET", limit)) { - $("#friends-menu-section").show(); - } else { + if (!showFriends(data, "#menu-friends-list", 5, "profile.php", "GET", limit)) { $("#friends-menu-section").hide(); } } + }).fail(function() { + $("#friends-menu-section").hide(); + }).always(function() { updatingMenus --; }); } -// Get, every 3 seconds, the groups and insert them in the menu. +// Get the groups and insert them in the menu. function loadMenuGroups() { + updatingMenus ++; $.post( "API/loadGroups.php", { limit: 5 } ).done(function(data) { + + if (data == "" || data == "[]") { + $("#groups-menu-section").hide(); + } else { + $("#groups-menu-section").show(); + } if (menuGroupsData != data) { menuGroupsData = data; - if (showGroups(data, "#menu-groups-list")) { - $("#groups-menu-section").show(); - } else { + if (!showGroups(data, "#menu-groups-list")) { $("#groups-menu-section").hide(); } } + }).fail(function() { + $("#groups-menu-section").hide(); + }).always(function() { updatingMenus --; }); } -// Get, every 3 seconds, the friends requests and insert them in the notification center. +// Get the friends requests and insert them in the notification center. function loadNotificationFriends() { + updatingMenus ++; $.post( "API/loadFriendRequest.php" ).done(function(data) { + if (data == "" || data == "[]") { + $("#friend-request-section").hide(); + } else { + $("#friend-request-section").show(); + } if (notificationRequestsData != data) { notificationRequestsData = data; - if (showFriendsPlus(data, "#friend-requests-list", 5, "profile.php", "GET")) { - $("#friend-request-section").show(); - } else { + if (!showFriendsPlus(data, "#friend-requests-list", 5, "profile.php", "GET")) { $("#friend-request-section").hide(); } } + }).fail(function() { + $("#friend-request-section").hide(); + }).always(function() { updatingMenus --; }); } -// Get, every 3 seconds, the unread messages and insert them in the notification center. +// Get the unread messages and insert them in the notification center. function loadUnreadMessages() { + updatingMenus ++; $.post( "API/loadChatNotifications.php" ).done(function(data) { + if (data == "" || data == "[]") { + $("#unread-messages-section").hide(); + } else { + $("#unread-messages-section").show(); + } if (notificationMessagesData != data) { notificationMessagesData = data; - if (showFriendsPlus(data, "#unread-chat-list", 5, "chat.php", "GET")) { - $("#unread-messages-section").show(); - } else { + if (!showFriendsPlus(data, "#unread-chat-list", 5, "chat.php", "GET")) { $("#unread-messages-section").hide(); } } + }).fail(function() { + $("#unread-messages-section").hide(); + }).always(function() { updatingMenus --; }); } \ No newline at end of file -- 2.49.1 From cfe2928f7b277b5224700fac2086903c6f4556c6 Mon Sep 17 00:00:00 2001 From: "K. Nobel" Date: Wed, 1 Feb 2017 14:28:03 +0100 Subject: [PATCH 335/400] Fixed member list --- website/public/group.php | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/website/public/group.php b/website/public/group.php index 72da9c8..bb393e3 100644 --- a/website/public/group.php +++ b/website/public/group.php @@ -14,12 +14,7 @@ include_once("../queries/group_page.php"); $group = selectGroupByName($_GET["groupname"]); -$members = selectGroupMembers(2); - -?> - - - Date: Wed, 1 Feb 2017 14:31:18 +0100 Subject: [PATCH 336/400] Added noposts div to group. --- website/views/group.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/website/views/group.php b/website/views/group.php index c12b552..aaec353 100644 --- a/website/views/group.php +++ b/website/views/group.php @@ -22,6 +22,10 @@
    +
    +

    Geen posts meer!

    +
    +
    -- 2.49.1 From dbfe10f84b52dbdd5b1b68789c2ce96282c973af Mon Sep 17 00:00:00 2001 From: Marijn Jansen Date: Wed, 1 Feb 2017 14:34:02 +0100 Subject: [PATCH 337/400] Delete Posts! --- website/public/js/masonry.js | 14 ++++++++------ website/public/js/post.js | 3 +++ website/public/styles/post-popup.css | 17 +++++++++++++++++ website/views/post-view.php | 11 ++++++++--- 4 files changed, 36 insertions(+), 9 deletions(-) diff --git a/website/public/js/masonry.js b/website/public/js/masonry.js index b4370b7..cfccdfa 100644 --- a/website/public/js/masonry.js +++ b/website/public/js/masonry.js @@ -46,14 +46,16 @@ function postPost() { } $(window).on("load", function() { - $(".modal-close").click(function () { - $(".modal").hide(); - scrollbarMargin(0, 'auto'); - $('#modal-response').hide(); - $('.modal-default').show(); - }); + $(".modal-close").click(function (){closeModal()}); }); +function closeModal() { + $(".modal").hide(); + scrollbarMargin(0, 'auto'); + $('#modal-response').hide(); + $('.modal-default').show(); +} + var masonryMode = 0; var windowWidth = $(window).width(); diff --git a/website/public/js/post.js b/website/public/js/post.js index 03c8b1e..f176950 100644 --- a/website/public/js/post.js +++ b/website/public/js/post.js @@ -1,3 +1,4 @@ + function postComment(buttonValue) { formData = $("#newcommentform").serializeArray(); formData.push({name: "button", value: buttonValue}); @@ -31,6 +32,8 @@ function deletePost(postID) { alert("Je account is bevroren, dus je kan geen posts verwijderen. Contacteer een admin als je denkt dat dit onjuist is."); } }); + closeModal(); + masonry(masonryMode); } \ No newline at end of file diff --git a/website/public/styles/post-popup.css b/website/public/styles/post-popup.css index 7bbeb48..4b913ed 100644 --- a/website/public/styles/post-popup.css +++ b/website/public/styles/post-popup.css @@ -83,4 +83,21 @@ vertical-align: middle; height: 24px; width: 24px; +} + +.deleteButton { + background-color: firebrick; + +} + +.deleteButton i { + display: inline-block; +} + +.deleteButton:hover span { + display: inline-block; +} + +.deleteButton span { + display: none; } \ No newline at end of file diff --git a/website/views/post-view.php b/website/views/post-view.php index 0844224..2ee2b66 100644 --- a/website/views/post-view.php +++ b/website/views/post-view.php @@ -6,9 +6,14 @@ session_start(); ?>

    -
    - -
    + +
    + gepost door , '> -- 2.49.1 From b4975386523727cc148ea3c64ec920a8ac4096cb Mon Sep 17 00:00:00 2001 From: Marijn Jansen Date: Wed, 1 Feb 2017 14:45:58 +0100 Subject: [PATCH 338/400] Double session_start fixed :D --- website/views/post-view.php | 1 - 1 file changed, 1 deletion(-) diff --git a/website/views/post-view.php b/website/views/post-view.php index 2ee2b66..da1c86f 100644 --- a/website/views/post-view.php +++ b/website/views/post-view.php @@ -2,7 +2,6 @@ $postID = $_GET['postID']; $post = selectPostById($postID)->fetch(PDO::FETCH_ASSOC); $fullname = $post['fname'] . " " . $post['lname'] . " (" . $post['username'] . ")"; -session_start(); ?>

    -- 2.49.1 From 0546b8689df056533e0c8623155139e62ea6a662 Mon Sep 17 00:00:00 2001 From: Lars van Hijfte Date: Wed, 1 Feb 2017 14:51:27 +0100 Subject: [PATCH 339/400] BUG FIX: name size --- website/public/styles/main.css | 14 -------------- website/public/styles/profile.css | 3 +-- website/queries/friendship.php | 17 +++++++++-------- website/queries/private_message.php | 2 +- website/queries/user.php | 4 ++-- website/views/group.php | 19 ++++++++++++------- website/views/settings-view.php | 11 +++++++++-- 7 files changed, 34 insertions(+), 36 deletions(-) diff --git a/website/public/styles/main.css b/website/public/styles/main.css index 94fdea9..226a96d 100644 --- a/website/public/styles/main.css +++ b/website/public/styles/main.css @@ -102,7 +102,6 @@ p { .group-picture { border-radius: 5px; - border: none; } .item-box, .item-box-full-width { @@ -291,19 +290,6 @@ div[data-title]:hover:after { vertical-align: middle; } -::-webkit-scrollbar { - width: 5px; - height: 5px; -} -::-webkit-scrollbar-track { - background: none; -} -::-webkit-scrollbar-thumb { - -webkit-border-radius: 20px; - border-radius: 20px; - background: #4CAF50; -} - @media only screen and (max-width: 1080px) { body { font-size: 28px!important; diff --git a/website/public/styles/profile.css b/website/public/styles/profile.css index 1bacafa..0d792ac 100644 --- a/website/public/styles/profile.css +++ b/website/public/styles/profile.css @@ -11,7 +11,7 @@ display: inline-block; } -.friend-button-container { +.friend-button-container, .group-button-container { position: relative; float: right; width: 200px; @@ -62,7 +62,6 @@ .group-picture { border: none; - margin-bottom: 0; margin-right: 15px; } diff --git a/website/queries/friendship.php b/website/queries/friendship.php index a16d859..7355af2 100644 --- a/website/queries/friendship.php +++ b/website/queries/friendship.php @@ -10,8 +10,8 @@ function selectLimitedFriends($userID, $limit) { $stmt = prepareQuery(" SELECT `userID`, - `username`, - LEFT(CONCAT(`user`.`fname`, ' ', `user`.`lname`), 15) as `fullname`, + LEFT(`username`, 17) as `username`, + LEFT(CONCAT(`user`.`fname`, ' ', `user`.`lname`), 12) as `fullname`, IFNULL( `profilepicture`, '../img/avatar-standard.png' @@ -50,8 +50,8 @@ function selectAllFriends($userID) { $stmt = prepareQuery(" SELECT `userID`, - `username`, - LEFT(CONCAT(`user`.`fname`, ' ', `user`.`lname`), 15) as `fullname`, + LEFT(`username`, 17) as `username`, + LEFT(CONCAT(`user`.`fname`, ' ', `user`.`lname`), 12) as `fullname`, IFNULL( `profilepicture`, '../img/avatar-standard.png' @@ -85,8 +85,8 @@ function selectAllFriendRequests() { $stmt = prepareQuery(" SELECT `userID`, - `username`, - LEFT(CONCAT(`user`.`fname`, ' ', `user`.`lname`), 15) as `fullname`, + LEFT(`username`, 17) as `username`, + LEFT(CONCAT(`user`.`fname`, ' ', `user`.`lname`), 12) as `fullname`, IFNULL( `profilepicture`, '../img/avatar-standard.png' @@ -235,8 +235,9 @@ function searchSomeFriends($n, $m, $search) { $stmt = prepareQuery(" SELECT `userID`, - `username`, - LEFT(CONCAT(`user`.`fname`, ' ', `user`.`lname`), 15) as `fullname`, + + LEFT(`username`, 17) as `username`, + LEFT(CONCAT(`user`.`fname`, ' ', `user`.`lname`), 12) as `fullname`, IFNULL( `profilepicture`, '../img/avatar-standard.png' diff --git a/website/queries/private_message.php b/website/queries/private_message.php index 4ac04a7..3b88563 100644 --- a/website/queries/private_message.php +++ b/website/queries/private_message.php @@ -95,7 +95,7 @@ function getNewChatMessages($lastID, $destination) { function selectAllUnreadChat() { $stmt = prepareQuery(" SELECT - LEFT(CONCAT(`user`.`fname`, ' ', `user`.`lname`), 15) AS `fullname`, + LEFT(CONCAT(`user`.`fname`, ' ', `user`.`lname`), 12) as `fullname`, `user`.`userID`, IFNULL( `profilepicture`, diff --git a/website/queries/user.php b/website/queries/user.php index 33a85a1..101c70c 100644 --- a/website/queries/user.php +++ b/website/queries/user.php @@ -345,12 +345,12 @@ function searchSomeUsers($n, $m, $search) { $stmt = prepareQuery(" SELECT `userID`, - `username`, + LEFT(`username`, 17) as `username`, IFNULL( `profilepicture`, '../img/avatar-standard.png' ) AS profilepicture, - LEFT(CONCAT(`user`.`fname`, ' ', `user`.`lname`), 15) as `fullname`, + LEFT(CONCAT(`user`.`fname`, ' ', `user`.`lname`), 12) as `fullname`, CASE `lastactivity` >= DATE_SUB(NOW(),INTERVAL 15 MINUTE) WHEN TRUE THEN 'online' WHEN FALSE THEN 'offline' diff --git a/website/views/group.php b/website/views/group.php index c12b552..d192123 100644 --- a/website/views/group.php +++ b/website/views/group.php @@ -1,12 +1,17 @@
    -
    - -
    -

    -

    - +
    + ">
    +
    +
    + +
    +
    +
    +

    + +
    +
    -

    Leden ()

    diff --git a/website/views/settings-view.php b/website/views/settings-view.php index e3cfd36..4a54ec5 100644 --- a/website/views/settings-view.php +++ b/website/views/settings-view.php @@ -17,6 +17,7 @@ $settings = getSettings(); " @@ -27,6 +28,7 @@ $settings = getSettings(); " > @@ -36,6 +38,7 @@ $settings = getSettings(); " > @@ -186,6 +189,7 @@ $settings = getSettings(); " disabled > @@ -194,6 +198,7 @@ $settings = getSettings(); @@ -203,14 +208,16 @@ $settings = getSettings();

  • + value="email"> + Verander Email +
    • -- 2.49.1 From d027333bd7dfa3170505566a0f93c6b5ef55d6d9 Mon Sep 17 00:00:00 2001 From: Hendrik Date: Thu, 2 Feb 2017 01:06:31 +0100 Subject: [PATCH 340/400] fix filter and pagenumber interaction in search --- website/public/API/searchPageNumber.php | 14 ++++++++--- website/queries/friendship.php | 31 +++++++++++++++++++++++++ website/queries/group_member.php | 23 ++++++++++++++++++ website/views/search-view.php | 7 +++++- 4 files changed, 71 insertions(+), 4 deletions(-) diff --git a/website/public/API/searchPageNumber.php b/website/public/API/searchPageNumber.php index 4a76516..9a12d79 100644 --- a/website/public/API/searchPageNumber.php +++ b/website/public/API/searchPageNumber.php @@ -6,6 +6,8 @@ require_once ("../../queries/connect.php"); require_once ("../../queries/checkInput.php"); require_once ("../../queries/user.php"); require_once ("../../queries/group_page.php"); +require_once ("../../queries/friendship.php"); +require_once ("../../queries/group_member.php"); $user_perpage = $group_perpage = 20; @@ -25,14 +27,20 @@ if (isset($_POST['search'])) { $search = test_input($_POST['search']); } -$user_count = countSomeUsers($search)->fetchColumn(); -$group_count = countSomeGroups($search)->fetchColumn(); - $filter = "all"; if (isset($_POST['filter'])) { $filter = test_input($_POST['filter']); } +if ($filter == "all") { + $user_count = countSomeUsers($search)->fetchColumn(); + $group_count = countSomeGroups($search)->fetchColumn(); +} else { + $user_count = countSomeFriends($search); + $group_count = countSomeOwnGroups($search); +} + + $option = "user"; if (isset($_POST['option'])) { $option = test_input($_POST['option']); diff --git a/website/queries/friendship.php b/website/queries/friendship.php index 450fd20..49d8047 100644 --- a/website/queries/friendship.php +++ b/website/queries/friendship.php @@ -274,4 +274,35 @@ function searchSomeFriends($n, $m, $search) { $stmt->bindParam(':m', $m, PDO::PARAM_INT); $stmt->execute(); return json_encode($stmt->fetchAll()); +} + +function countSomeFriends($search) { + $stmt = prepareQuery(" + SELECT + COUNT(*) + FROM + `user` + INNER JOIN + `friendship` + WHERE + ((`friendship`.`user1ID` = :userID AND + `friendship`.`user2ID` = `user`.`userID` OR + `friendship`.`user2ID` = :userID AND + `friendship`.`user1ID` = `user`.`userID`) AND + `user`.`role` != 'banned' AND + `friendship`.`status` = 'confirmed') AND + (`username` LIKE :keyword OR + `fname` LIKE :keyword OR + `lname` LIKE :keyword) + ORDER BY + `fname`, + `lname`, + `username` + "); + + $search = "%$search%"; + $stmt->bindParam(':keyword', $search); + $stmt->bindParam(':userID', $_SESSION["userID"], PDO::PARAM_INT); + $stmt->execute(); + return $stmt->fetchColumn(); } \ No newline at end of file diff --git a/website/queries/group_member.php b/website/queries/group_member.php index cea4dde..8b6bf75 100644 --- a/website/queries/group_member.php +++ b/website/queries/group_member.php @@ -54,3 +54,26 @@ function searchSomeOwnGroups($n, $m, $search) { return json_encode($stmt->fetchAll()); } + +function countSomeOwnGroups($search) { + $stmt = prepareQuery(" + SELECT + COUNT(*) + FROM + `group_page` + INNER JOIN + `group_member` + WHERE + `group_member`.`userID` = :userID AND + `group_member`.`groupID` = `group_page`.`groupID` AND + `group_page`.`status` != 'hidden' AND + `name` LIKE :keyword + "); + + $search = "%$search%"; + $stmt->bindParam(':keyword', $search); + $stmt->bindParam(':userID', $_SESSION["userID"], PDO::PARAM_INT); + $stmt->execute(); + + return $stmt->fetchColumn(); +} \ No newline at end of file diff --git a/website/views/search-view.php b/website/views/search-view.php index e42f985..f00fd3c 100644 --- a/website/views/search-view.php +++ b/website/views/search-view.php @@ -48,7 +48,12 @@ $group_n = ($group_currentpage - 1) * $group_perpage; - -- 2.49.1 From e299ef59e8e5e46d87fde39c1b152b34aa92807a Mon Sep 17 00:00:00 2001 From: Marijn Jansen Date: Thu, 2 Feb 2017 10:28:12 +0100 Subject: [PATCH 341/400] Added show profile into settings --- website/public/js/post.js | 2 -- website/queries/settings.php | 7 +++++-- website/views/settings-view.php | 8 ++++++++ 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/website/public/js/post.js b/website/public/js/post.js index f176950..4009023 100644 --- a/website/public/js/post.js +++ b/website/public/js/post.js @@ -34,6 +34,4 @@ function deletePost(postID) { }); closeModal(); masonry(masonryMode); - - } \ No newline at end of file diff --git a/website/queries/settings.php b/website/queries/settings.php index 03f794f..dfd65a0 100644 --- a/website/queries/settings.php +++ b/website/queries/settings.php @@ -18,7 +18,8 @@ function getSettings() { `bio`, `profilepicture`, `showBday`, - `showEmail` + `showEmail`, + `showProfile` FROM `user` WHERE @@ -64,7 +65,8 @@ function updateSettings() { `birthdate` = :bday, `bio` = :bio, `showEmail` = :showEmail, - `showBday` = :showBday + `showBday` = :showBday, + `showProfile` = :showProfile WHERE `userID` = :userID "); @@ -79,6 +81,7 @@ function updateSettings() { $stmt->bindValue(":bio", test_input($_POST["bio"])); $stmt->bindValue(":showEmail", (array_key_exists("showEmail", $_POST) ? "1" : "0")); $stmt->bindValue(":showBday", (array_key_exists("showBday", $_POST) ? "1" : "0")); + $stmt->bindValue(":showProfile", (array_key_exists("showProfile", $_POST) ? "1" : "0")); $stmt->bindValue(":userID", $_SESSION["userID"]); $stmt->execute(); diff --git a/website/views/settings-view.php b/website/views/settings-view.php index e3cfd36..f72e243 100644 --- a/website/views/settings-view.php +++ b/website/views/settings-view.php @@ -96,6 +96,14 @@ $settings = getSettings(); > +
  • + + + > +
  • ")); - $form.append($("")); + $form.append($("")); columns[0][1].append($postInput); columns[0][0] = $postInput.height() + margin; diff --git a/website/public/styles/profile.css b/website/public/styles/profile.css index 1bacafa..2370da8 100644 --- a/website/public/styles/profile.css +++ b/website/public/styles/profile.css @@ -108,7 +108,7 @@ div.posts .post form input, div.posts .post form textarea { width: calc(100% - 15px); } -div.posts .post form input[type="submit"] { +div.posts .post form input[type="submit"], .post button{ width: 100%; } diff --git a/website/views/post-view.php b/website/views/post-view.php index da1c86f..f8fe902 100644 --- a/website/views/post-view.php +++ b/website/views/post-view.php @@ -30,7 +30,7 @@ $fullname = $post['fname'] . " " . $post['lname'] . " (" . $post['username'] . "

    - + "; + ""; } // Add ogg video's else if (link.match(/(https?:\/\/.[^ ]*\.(?:ogg))/ig)) { return ""; + ""; } // Add youtube video's else if (link.match(/(https?:\/\/.(www.)?youtube|youtu.be)*watch/ig)) { diff --git a/website/public/styles/main.css b/website/public/styles/main.css index 226a96d..650a30f 100644 --- a/website/public/styles/main.css +++ b/website/public/styles/main.css @@ -116,7 +116,7 @@ p { @media only screen and (max-width: 1400px) { .item-box { - width: calc(100% - 50px); + width: calc(100% - 50px)!important; } } diff --git a/website/public/styles/settings.css b/website/public/styles/settings.css index 933e7fd..6a2c2f2 100644 --- a/website/public/styles/settings.css +++ b/website/public/styles/settings.css @@ -32,6 +32,11 @@ text-align: right; } +.settings-password, .settings-email { + width: calc(50% - 60px); + display: inline-flex; +} + .settings-password label, .settings-email label { text-align: left; } diff --git a/website/views/head.php b/website/views/head.php index 284abb4..c4d13a5 100644 --- a/website/views/head.php +++ b/website/views/head.php @@ -1,4 +1,8 @@ - + + + + + MyHyvesbook+ -- 2.49.1 From 327a6a8f5cb5f8ca04508548dd3f6d3062e5264d Mon Sep 17 00:00:00 2001 From: Lars van Hijfte Date: Thu, 2 Feb 2017 12:52:03 +0100 Subject: [PATCH 346/400] BUG FIX: username doesn't cut off in link --- website/public/bits/friend-item.php | 2 +- website/queries/friendship.php | 13 ++++++++----- website/queries/user.php | 3 ++- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/website/public/bits/friend-item.php b/website/public/bits/friend-item.php index 181f9b6..6a0c868 100644 --- a/website/public/bits/friend-item.php +++ b/website/public/bits/friend-item.php @@ -41,7 +41,7 @@ foreach($friends as $i => $friend) { fullname ?>
    username)) { - echo $friend->username; + echo $friend->usernameshort; } else if (isset($friend->content)) { echo $friend->content; } diff --git a/website/queries/friendship.php b/website/queries/friendship.php index e1a8c53..6ea6313 100644 --- a/website/queries/friendship.php +++ b/website/queries/friendship.php @@ -10,7 +10,8 @@ function selectLimitedFriends($userID, $limit) { $stmt = prepareQuery(" SELECT `userID`, - LEFT(`username`, 12) as `username`, + LEFT(`username`, 12) as `usernameshort`, + `username`, LEFT(CONCAT(`user`.`fname`, ' ', `user`.`lname`), 12) as `fullname`, IFNULL( `profilepicture`, @@ -50,7 +51,8 @@ function selectAllFriends($userID) { $stmt = prepareQuery(" SELECT `userID`, - LEFT(`username`, 12) as `username`, + LEFT(`username`, 12) as `usernameshort`, + `username`, LEFT(CONCAT(`user`.`fname`, ' ', `user`.`lname`), 12) as `fullname`, IFNULL( `profilepicture`, @@ -85,7 +87,8 @@ function selectAllFriendRequests() { $stmt = prepareQuery(" SELECT `userID`, - LEFT(`username`, 12) as `username`, + LEFT(`username`, 12) as `usernameshort`, + `username`, LEFT(CONCAT(`user`.`fname`, ' ', `user`.`lname`), 12) as `fullname`, IFNULL( `profilepicture`, @@ -235,8 +238,8 @@ function searchSomeFriends($n, $m, $search) { $stmt = prepareQuery(" SELECT `userID`, - - LEFT(`username`, 12) as `username`, + LEFT(`username`, 12) as `usernameshort`, + `username`, LEFT(CONCAT(`user`.`fname`, ' ', `user`.`lname`), 12) as `fullname`, IFNULL( `profilepicture`, diff --git a/website/queries/user.php b/website/queries/user.php index 72205ba..1e54763 100644 --- a/website/queries/user.php +++ b/website/queries/user.php @@ -349,7 +349,8 @@ function searchSomeUsers($n, $m, $search) { $stmt = prepareQuery(" SELECT `userID`, - LEFT(`username`, 12) as `username`, + LEFT(`username`, 12) as `usernameshort`, + `username`, IFNULL( `profilepicture`, '../img/avatar-standard.png' -- 2.49.1 From 86b02973e4887022619cff121379f9fd5da50998 Mon Sep 17 00:00:00 2001 From: "K. Nobel" Date: Thu, 2 Feb 2017 13:02:00 +0100 Subject: [PATCH 347/400] Fixed visibility on profiles --- website/public/profile.php | 6 ++++++ website/queries/user.php | 4 ++++ website/views/profile.php | 7 +++++-- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/website/public/profile.php b/website/public/profile.php index 05c661d..d9a317c 100644 --- a/website/public/profile.php +++ b/website/public/profile.php @@ -21,13 +21,19 @@ include_once("../queries/calcAge.php"); if(empty($_GET["username"])) { $userID = $_SESSION["userID"]; + $showProfile = True; } else { $userID = getUserID($_GET["username"]); + $showProfile = False; } $user = selectUser($_SESSION["userID"], $userID); $profile_friends = selectAllFriends($userID); $profile_groups = selectAllUserGroups($userID); +$showProfile = $showProfile || $user["showProfile"] || ($user["status"] == 'confirmed'); +echo " friendship status: " . $user["status"]; +echo " showprofile: $showProfile"; +echo " userID: " . $user["userID"]; if ($userID == $_SESSION["userID"]) { diff --git a/website/queries/user.php b/website/queries/user.php index 33a85a1..74b0aa1 100644 --- a/website/queries/user.php +++ b/website/queries/user.php @@ -65,6 +65,10 @@ function selectUser($me, $other) { `role`, `fname`, `lname`, + `showBday`, + `showEmail`, + `showProfile`, + `status`, CASE `status` IS NULL WHEN TRUE THEN 0 WHEN FALSE THEN diff --git a/website/views/profile.php b/website/views/profile.php index 2bb117f..1e88af8 100644 --- a/website/views/profile.php +++ b/website/views/profile.php @@ -15,16 +15,18 @@

    - " . $user["bio"] . "

    "; } ?>
    - 50) { + 50 and $showProfile) { echo "

    Bio:

    " . $user["bio"] . "

    "; } ?> +

    Informatie

    @@ -85,4 +87,5 @@

    + \ No newline at end of file -- 2.49.1 From 9d675dd897b01d2a5e4e13a124ab9944b2b63a46 Mon Sep 17 00:00:00 2001 From: "K. Nobel" Date: Thu, 2 Feb 2017 13:11:05 +0100 Subject: [PATCH 348/400] Fixed default image for group members. --- website/queries/group_page.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/website/queries/group_page.php b/website/queries/group_page.php index 511ff4d..b66ca54 100644 --- a/website/queries/group_page.php +++ b/website/queries/group_page.php @@ -81,7 +81,10 @@ function selectGroupMembers(int $groupID) { `username`, `fname`, `lname`, - `profilepicture` + IFNULL( + `profilepicture`, + '../img/avatar-standard.png' + ) AS profilepicture FROM `group_member` LEFT JOIN -- 2.49.1 From 044ed6a9d34345e54778ef1795611a51402521c1 Mon Sep 17 00:00:00 2001 From: Joey Lai Date: Thu, 2 Feb 2017 13:19:39 +0100 Subject: [PATCH 349/400] Added noscript --- website/public/styles/index.css | 8 +++++++- website/queries/checkInput.php | 2 +- website/views/facebookRegisterModal.php | 3 +-- website/views/login-view.php | 7 +++++++ 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/website/public/styles/index.css b/website/public/styles/index.css index 196485e..c7a0aa8 100644 --- a/website/public/styles/index.css +++ b/website/public/styles/index.css @@ -133,6 +133,12 @@ label { color: red; } +.login_containerNoscript { + padding: 4px; + text-align: center; + color: red; +} + @keyframes animatezoom { from {transform: scale(0)} to {transform: scale(1)} @@ -150,7 +156,7 @@ label { margin: 16px auto; overflow-y: auto; padding: 20px; - width: 600px; + width: 650px; } select{ diff --git a/website/queries/checkInput.php b/website/queries/checkInput.php index 8722418..69274ce 100644 --- a/website/queries/checkInput.php +++ b/website/queries/checkInput.php @@ -132,7 +132,7 @@ function validateFBEmail($variable){ } else if (!filter_var($variable, FILTER_VALIDATE_EMAIL)) { throw new emailException("Geldige email invullen"); } else if (getExistingFBEmail() == 1){ - throw new emailException("Email bestaal al!"); + throw new emailException("Uw email wordt al gebruikt voor een ander account!"); } else if (strlen($variable) > 255) { throw new emailException("Mag maximaal 50 karakters!"); } diff --git a/website/views/facebookRegisterModal.php b/website/views/facebookRegisterModal.php index 7db44b0..7271d63 100644 --- a/website/views/facebookRegisterModal.php +++ b/website/views/facebookRegisterModal.php @@ -55,7 +55,6 @@ * - + *
    - diff --git a/website/views/login-view.php b/website/views/login-view.php index 4f85b0a..98ce71c 100644 --- a/website/views/login-view.php +++ b/website/views/login-view.php @@ -1,3 +1,9 @@ +
    -- 2.49.1 From 417124a1fed22f85cd86615e83df488455baeb30 Mon Sep 17 00:00:00 2001 From: Lars van Hijfte Date: Thu, 2 Feb 2017 14:13:20 +0100 Subject: [PATCH 354/400] BUG FIX: added 0 in chat time if needed --- website/public/js/chat.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/website/public/js/chat.js b/website/public/js/chat.js index 1141334..a3ff430 100644 --- a/website/public/js/chat.js +++ b/website/public/js/chat.js @@ -59,7 +59,7 @@ function addMessages(messages) { for(var i in messages) { // Initialize message variables. var thisDate = new Date(messages[i].creationdate.replace(/ /,"T")); - var thisTime = thisDate.getHours() + ":" + thisDate.getMinutes(); + var thisTime = thisDate.getHours() + ":" + ('0' + thisDate.getMinutes()).slice(-2); var type; thisDate.setHours(0,0,0,0); @@ -81,6 +81,8 @@ function addMessages(messages) {
    '; } previousDate = thisDate; + previousTime = thisTime; + previousType = type; messagesText += '
    '; // If it is not the first message, and has a different date/time/type then the previous message, } else if (type != previousType || thisTime != previousTime || thisDate.getTime() > previousDate.getTime()) { -- 2.49.1 From 4a7a91ecd964f1cb0827765078314d04ac6534dc Mon Sep 17 00:00:00 2001 From: "K. Nobel" Date: Thu, 2 Feb 2017 14:20:17 +0100 Subject: [PATCH 355/400] Fixed bug (not showing profile when on own profile) --- website/public/profile.php | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/website/public/profile.php b/website/public/profile.php index d9a317c..aa4cf7c 100644 --- a/website/public/profile.php +++ b/website/public/profile.php @@ -21,19 +21,14 @@ include_once("../queries/calcAge.php"); if(empty($_GET["username"])) { $userID = $_SESSION["userID"]; - $showProfile = True; } else { $userID = getUserID($_GET["username"]); - $showProfile = False; } $user = selectUser($_SESSION["userID"], $userID); $profile_friends = selectAllFriends($userID); $profile_groups = selectAllUserGroups($userID); -$showProfile = $showProfile || $user["showProfile"] || ($user["status"] == 'confirmed'); -echo " friendship status: " . $user["status"]; -echo " showprofile: $showProfile"; -echo " userID: " . $user["userID"]; +$showProfile = $user["showProfile"] || ($user["status"] == 'confirmed') || $_SESSION["userID"] == $userID; if ($userID == $_SESSION["userID"]) { -- 2.49.1 From 188741ddf5ded574767a0115f06af8bd2a97487b Mon Sep 17 00:00:00 2001 From: Lars van Hijfte Date: Thu, 2 Feb 2017 14:22:13 +0100 Subject: [PATCH 356/400] BUG FIX: link in fancy text now opens in new tab --- website/public/js/main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/public/js/main.js b/website/public/js/main.js index b6ab703..30cd3ed 100644 --- a/website/public/js/main.js +++ b/website/public/js/main.js @@ -31,7 +31,7 @@ function fancyText(text) { } // Add links else { - return "" + link + ""; + return "" + link + ""; } }); -- 2.49.1 From 1672ce6086deed96f1325a3044e9fe9c632adaf6 Mon Sep 17 00:00:00 2001 From: Lars van Hijfte Date: Thu, 2 Feb 2017 14:23:36 +0100 Subject: [PATCH 357/400] Changed offline status to 5 minutes after inactive --- website/queries/friendship.php | 8 ++++---- website/queries/user.php | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/website/queries/friendship.php b/website/queries/friendship.php index 7edada9..3dcd53b 100644 --- a/website/queries/friendship.php +++ b/website/queries/friendship.php @@ -17,7 +17,7 @@ function selectLimitedFriends($userID, $limit) { `profilepicture`, '../img/avatar-standard.png' ) AS profilepicture, - CASE `lastactivity` >= DATE_SUB(NOW(),INTERVAL 15 MINUTE) + CASE `lastactivity` >= DATE_SUB(NOW(),INTERVAL 5 MINUTE) WHEN TRUE THEN 'online' WHEN FALSE THEN 'offline' END AS `onlinestatus`, @@ -58,7 +58,7 @@ function selectAllFriends($userID) { `profilepicture`, '../img/avatar-standard.png' ) AS profilepicture, - CASE `lastactivity` >= DATE_SUB(NOW(),INTERVAL 15 MINUTE) + CASE `lastactivity` >= DATE_SUB(NOW(),INTERVAL 5 MINUTE) WHEN TRUE THEN 'online' WHEN FALSE THEN 'offline' END AS `onlinestatus`, @@ -94,7 +94,7 @@ function selectAllFriendRequests() { `profilepicture`, '../img/avatar-standard.png' ) AS profilepicture, - CASE `lastactivity` >= DATE_SUB(NOW(),INTERVAL 15 MINUTE) + CASE `lastactivity` >= DATE_SUB(NOW(),INTERVAL 5 MINUTE) WHEN TRUE THEN 'online' WHEN FALSE THEN 'offline' END AS `onlinestatus`, @@ -245,7 +245,7 @@ function searchSomeFriends($n, $m, $search) { `profilepicture`, '../img/avatar-standard.png' ) AS profilepicture, - CASE `lastactivity` >= DATE_SUB(NOW(),INTERVAL 15 MINUTE) + CASE `lastactivity` >= DATE_SUB(NOW(),INTERVAL 5 MINUTE) WHEN TRUE THEN 'online' WHEN FALSE THEN 'offline' END AS `onlinestatus`, diff --git a/website/queries/user.php b/website/queries/user.php index e8bda13..7b8ef3f 100644 --- a/website/queries/user.php +++ b/website/queries/user.php @@ -62,7 +62,7 @@ function selectUser($me, $other) { ) AS profilepicture, `bio`, `user`.`creationdate`, - CASE `lastactivity` >= DATE_SUB(NOW(),INTERVAL 15 MINUTE) + CASE `lastactivity` >= DATE_SUB(NOW(),INTERVAL 5 MINUTE) WHEN TRUE THEN 'online' WHEN FALSE THEN 'offline' END AS `onlinestatus`, @@ -131,7 +131,7 @@ function select20UsersFromN($n) { `username`, `role`, `bancomment`, - CASE `lastactivity` >= DATE_SUB(NOW(),INTERVAL 15 MINUTE) + CASE `lastactivity` >= DATE_SUB(NOW(),INTERVAL 5 MINUTE) WHEN TRUE THEN 'online' WHEN FALSE THEN 'offline' END AS `onlinestatus` @@ -156,7 +156,7 @@ function search20UsersFromN($n, $keyword) { `username`, `role`, `bancomment`, - CASE `lastactivity` >= DATE_SUB(NOW(),INTERVAL 15 MINUTE) + CASE `lastactivity` >= DATE_SUB(NOW(),INTERVAL 5 MINUTE) WHEN TRUE THEN 'online' WHEN FALSE THEN 'offline' END AS `onlinestatus` @@ -184,7 +184,7 @@ function search20UsersFromNByStatus($n, $keyword, $status) { `username`, `role`, `bancomment`, - CASE `lastactivity` >= DATE_SUB(NOW(),INTERVAL 15 MINUTE) + CASE `lastactivity` >= DATE_SUB(NOW(),INTERVAL 5 MINUTE) WHEN TRUE THEN 'online' WHEN FALSE THEN 'offline' END AS `onlinestatus` @@ -218,7 +218,7 @@ function searchSomeUsersByStatus($n, $m, $search, $status) { `username`, `role`, `bancomment`, - CASE `lastactivity` >= DATE_SUB(NOW(),INTERVAL 15 MINUTE) + CASE `lastactivity` >= DATE_SUB(NOW(),INTERVAL 5 MINUTE) WHEN TRUE THEN 'online' WHEN FALSE THEN 'offline' END AS `onlinestatus` @@ -362,7 +362,7 @@ function searchSomeUsers($n, $m, $search) { '../img/avatar-standard.png' ) AS profilepicture, LEFT(CONCAT(`user`.`fname`, ' ', `user`.`lname`), 12) as `fullname`, - CASE `lastactivity` >= DATE_SUB(NOW(),INTERVAL 15 MINUTE) + CASE `lastactivity` >= DATE_SUB(NOW(),INTERVAL 5 MINUTE) WHEN TRUE THEN 'online' WHEN FALSE THEN 'offline' END AS `onlinestatus` -- 2.49.1 From 6fc2f715176a34529d129a0f1a79d4d57f9ae659 Mon Sep 17 00:00:00 2001 From: Lars van Hijfte Date: Thu, 2 Feb 2017 14:27:23 +0100 Subject: [PATCH 358/400] Added meta data in the login page --- website/views/login_head.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/website/views/login_head.php b/website/views/login_head.php index e319a9d..bb7d7cf 100644 --- a/website/views/login_head.php +++ b/website/views/login_head.php @@ -1,5 +1,8 @@ - + + + + MyHyvesbook+ Date: Thu, 2 Feb 2017 14:50:51 +0100 Subject: [PATCH 359/400] Added "add group" under group menu --- website/views/menu.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/website/views/menu.php b/website/views/menu.php index dab8fce..1c1cf01 100644 --- a/website/views/menu.php +++ b/website/views/menu.php @@ -12,6 +12,8 @@ + +
    • -- 2.49.1 From 33399639b1278e893460322514be2083f9af91d9 Mon Sep 17 00:00:00 2001 From: Lars van Hijfte Date: Thu, 2 Feb 2017 14:51:37 +0100 Subject: [PATCH 360/400] Added support for iframe "niet slecht" --- website/public/bits/niet-slecht.php | 8 ++++++++ website/public/bits/niet_slecht.php | 7 ------- 2 files changed, 8 insertions(+), 7 deletions(-) create mode 100644 website/public/bits/niet-slecht.php delete mode 100644 website/public/bits/niet_slecht.php diff --git a/website/public/bits/niet-slecht.php b/website/public/bits/niet-slecht.php new file mode 100644 index 0000000..432fe41 --- /dev/null +++ b/website/public/bits/niet-slecht.php @@ -0,0 +1,8 @@ + +\"Niet slecht\" ons op MyHyvesbook+ diff --git a/website/public/bits/niet_slecht.php b/website/public/bits/niet_slecht.php deleted file mode 100644 index 05b981a..0000000 --- a/website/public/bits/niet_slecht.php +++ /dev/null @@ -1,7 +0,0 @@ - Date: Thu, 2 Feb 2017 14:57:50 +0100 Subject: [PATCH 361/400] Added uderline in link posts --- website/public/styles/post-popup.css | 4 ++++ website/public/styles/profile.css | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/website/public/styles/post-popup.css b/website/public/styles/post-popup.css index 3f37ffd..24badcb 100644 --- a/website/public/styles/post-popup.css +++ b/website/public/styles/post-popup.css @@ -48,6 +48,10 @@ width: 90%; } +.post-content a { + text-decoration: underline; +} + .commentfield { margin-bottom: 20px; } diff --git a/website/public/styles/profile.css b/website/public/styles/profile.css index dbb3d24..a69414c 100644 --- a/website/public/styles/profile.css +++ b/website/public/styles/profile.css @@ -94,6 +94,10 @@ div.posts div.post { word-wrap: break-word; } +div.posts div.post a { + text-decoration: underline; +} + div.posts div.post:hover { box-shadow: 0 10px 20px rgba(0,0,0,0.19), 0 6px 6px rgba(0,0,0,0.23); } -- 2.49.1 From 9426f4d6acfaa759254944587197e0e4e04bc5b1 Mon Sep 17 00:00:00 2001 From: Hendrik Date: Thu, 2 Feb 2017 15:00:01 +0100 Subject: [PATCH 362/400] add name field check in settings --- website/public/settings.php | 2 +- website/queries/settings.php | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/website/public/settings.php b/website/public/settings.php index e40f042..9247d26 100644 --- a/website/public/settings.php +++ b/website/public/settings.php @@ -18,7 +18,7 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") { try { switch ($_POST["form"]) { case "profile": - updateSettings(); + checkUpdateSettings(); break; case "password": changePassword(); diff --git a/website/queries/settings.php b/website/queries/settings.php index dfd65a0..9b17d17 100644 --- a/website/queries/settings.php +++ b/website/queries/settings.php @@ -50,6 +50,15 @@ function getPasswordHash() { return $stmt->fetch(); } +function checkUpdateSettings() { + if (empty(test_input($_POST['fname'])) || empty(test_input($_POST['lname']))) { + throw new AngryAlert("Geen voornaam of achternaam."); + return; + } + + updateSettings(); +} + /** * Changes the setting from post. * @throws HappyAlert -- 2.49.1 From e60578dc43ed51810e6c54bc0e8105d14a53db38 Mon Sep 17 00:00:00 2001 From: Hendrik Date: Thu, 2 Feb 2017 15:11:41 +0100 Subject: [PATCH 363/400] add unvalidated option and fixed text --- website/views/adminpanel-grouptable.php | 10 +++++----- website/views/adminpanel-table.php | 3 ++- website/views/adminpanel.php | 15 ++++++++------- 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/website/views/adminpanel-grouptable.php b/website/views/adminpanel-grouptable.php index 9d2c8e8..2449b3d 100644 --- a/website/views/adminpanel-grouptable.php +++ b/website/views/adminpanel-grouptable.php @@ -1,8 +1,8 @@
    • GebruikersnaamGroepsnaam StatusAantekeningBeschrijving Actie