393 Commits

Author SHA1 Message Date
Lars van Hijfte
490d39ba47 Merge branch 'joey-testing' into 'master'
Added fbModal button

See merge request !208
2017-02-03 21:20:25 +01:00
Lars van Hijfte
1193078e8f Merge branch 'kevin-prototype' into 'master'
Added comments to javascript code

See merge request !211
2017-02-03 21:19:50 +01:00
K. Nobel
bcb01e3296 Merge branch 'master' into kevin-prototype 2017-02-03 13:22:59 +01:00
K. Nobel
7cc6450e6a Added comments to javascript code. 2017-02-03 13:19:00 +01:00
Joey Lai
4643dfcddb Fixed comments and links 2017-02-03 12:42:30 +01:00
Lars van Hijfte
833bfd3292 Merge branch 'lars' into 'master'
Lars

See merge request !209
2017-02-03 12:42:15 +01:00
Lars van Hijfte
1ac6a7da87 Changed admin checkbox buttons 2017-02-03 12:40:33 +01:00
Lars van Hijfte
52ce787241 Merge remote-tracking branch 'origin/hendrik-testing' into lars 2017-02-03 12:34:19 +01:00
Lars van Hijfte
fb5f76c499 ? 2017-02-03 12:32:57 +01:00
Hendrik
f3aebddfea commentses 2017-02-03 12:21:37 +01:00
Lars van Hijfte
3aae884bb5 Added comments 2017-02-03 12:12:16 +01:00
Hendrik
b07d0712aa Merge branch 'marijn-groups' into hendrik-testing 2017-02-03 12:08:42 +01:00
Joey Lai
05d6bf8aa6 Added fbModal button 2017-02-03 11:47:16 +01:00
Marijn Jansen
1e60941a3f Merge branch 'marijn-favicon' into 'master'
Favicon

See merge request !207
2017-02-03 11:42:40 +01:00
Marijn Jansen
e3f4fa0b3c Favicon 2017-02-03 11:42:16 +01:00
Lars van Hijfte
1fd984cc02 Merge branch 'marijn-groups' into lars 2017-02-03 11:31:58 +01:00
Marijn Jansen
6d5de98c1d comments 2017-02-03 11:31:18 +01:00
Lars van Hijfte
16f83d93ce Merge branch 'lars' into 'master'
Lars

See merge request !206
2017-02-03 11:21:12 +01:00
Lars van Hijfte
306fd3090f Merge branch 'hendrik-testing' into 'master'
removed session id lol

See merge request !205
2017-02-03 11:20:24 +01:00
Hendrik
771567660c removed session id lol 2017-02-03 11:19:06 +01:00
Lars van Hijfte
4eae09dfc7 Merge branch 'master' into lars 2017-02-03 11:19:02 +01:00
Lars van Hijfte
53e1d7fef3 Fixed admin layout 2017-02-03 11:18:32 +01:00
Lars van Hijfte
c29be662bc Session logout now works 2017-02-03 11:18:17 +01:00
Lars van Hijfte
000d1f4072 Merge branch 'joey-testing' into 'master'
fixed login

See merge request !202
2017-02-03 11:16:48 +01:00
Lars van Hijfte
d260bf04bc Merge branch 'hendrik-testing' into 'master'
Hendrik testing

See merge request !204
2017-02-03 11:16:36 +01:00
Hendrik
a0ef234b79 Merge branch 'master' into hendrik-testing 2017-02-03 11:15:01 +01:00
Hendrik
da061de226 validated adminpanel, added shown friends limit in profile. 2017-02-03 11:14:03 +01:00
Marijn Jansen
f18088d8d2 Merge branch 'marijn-groups' into 'master'
Comments

See merge request !203
2017-02-03 11:13:46 +01:00
Marijn Jansen
ac2ce3d07b Merge branch 'master' into marijn-groups 2017-02-03 11:13:20 +01:00
Joey Lai
ba6f86e70e fixed login 2017-02-03 11:12:30 +01:00
Marijn Jansen
c69b5d8ed3 Comments 2017-02-03 11:12:02 +01:00
Marijn Jansen
5de3a84683 Merge branch 'marijn-groups' into 'master'
Marijn groups

See merge request !201
2017-02-03 10:59:35 +01:00
Marijn Jansen
b8d6136a9d Added deadmin! 2017-02-03 10:59:10 +01:00
Lars van Hijfte
1862369013 Merge branch 'joey-testing' into 'master'
Joey testing

See merge request !200
2017-02-03 10:54:47 +01:00
Joey Lai
8d70804155 Merge branch 'joey-testing' of ssh://gitlab-fnwi.uva.nl:1337/11166932/WebDB into joey-testing 2017-02-03 10:52:35 +01:00
Joey Lai
0ac12f5110 Merge branch 'master' into joey-testing 2017-02-03 10:48:14 +01:00
Lars van Hijfte
5e8fa6791f Merge branch 'joey-testing' into 'master'
Fixed url

See merge request !198
2017-02-03 10:45:33 +01:00
Marijn Jansen
28e9269b52 Delete groups 2017-02-03 10:44:50 +01:00
Hendrik
bb352c7a7a merge 2017-02-03 10:41:29 +01:00
Lars van Hijfte
fe190975d5 Merge branch 'master' into 'joey-testing'
# Conflicts:
#   website/views/homeLoginRegister.php
2017-02-03 10:41:05 +01:00
Hendrik
0f202088a1 Merge branch 'master' into hendrik-testing 2017-02-03 10:40:44 +01:00
Lars van Hijfte
87b0ab5892 Merge branch 'lars' into 'master'
Lars

See merge request !199
2017-02-03 10:40:16 +01:00
Joey Lai
c8dbdfe70e Fixed url 2017-02-03 10:34:44 +01:00
Lars van Hijfte
8949d14a5e Merge branch 'revert-50e94fb8' into 'master'
Revert "Merge branch 'joey-testing' into 'master'"

See merge request !197
2017-02-03 10:34:39 +01:00
Lars van Hijfte
ecd24ef442 Revert "Merge branch 'joey-testing' into 'master'"
This reverts merge request !196
2017-02-03 10:34:07 +01:00
Lars van Hijfte
50e94fb8ed Merge branch 'joey-testing' into 'master'
Fixed url

See merge request !196
2017-02-03 10:33:47 +01:00
Hendrik
fde736b8c5 misc 2017-02-03 10:33:44 +01:00
Joey Lai
127162b938 Fixed url 2017-02-03 10:32:54 +01:00
Lars van Hijfte
02349dbe28 Changed description 2017-02-03 10:30:44 +01:00
Lars van Hijfte
da01729b61 Merge branch 'master' into lars 2017-02-03 10:15:10 +01:00
Lars van Hijfte
820ffb4a62 Merge branch 'joey-testing' into 'master'
Fixed W3Validation and url GETs

See merge request !195
2017-02-03 10:13:43 +01:00
Joey Lai
1a3efe9669 Fixed W3Validation and url GETs 2017-02-03 10:12:37 +01:00
Lars van Hijfte
6d739a4480 Chat is now only loading the last 100 messages 2017-02-03 00:24:38 +01:00
Lars van Hijfte
ab21226925 Merge branch 'master' into lars 2017-02-03 00:14:03 +01:00
Lars van Hijfte
7e4107ac8b Added fancy buttons in profile 2017-02-03 00:13:23 +01:00
Marijn Jansen
de96ae8263 Merge branch 'marijn-groups' into 'master'
Add mods/admin to a group.

See merge request !194
2017-02-02 21:14:59 +01:00
Marijn Jansen
74e91ed7cb Add mods/admin to a group. 2017-02-02 21:14:25 +01:00
Lars van Hijfte
e9468b0ec8 Merge branch 'master' into lars 2017-02-02 21:04:32 +01:00
Lars van Hijfte
839fb247b4 Merge branch 'joey-testing' into 'master'
Added url get

See merge request !193
2017-02-02 21:03:03 +01:00
Marijn Jansen
bf298f4b43 Merge branch 'marijn-groups' into 'master'
Marijn groups

See merge request !192
2017-02-02 19:44:28 +01:00
Marijn Jansen
74145d5d1c Updated buttons on groups 2017-02-02 19:43:57 +01:00
Joey Lai
1486e71207 Added url get 2017-02-02 19:34:58 +01:00
Lars van Hijfte
b206d243b9 Validator fixes
Changes chat, profile and settings pages so it is compatible with the validator of w3
2017-02-02 18:17:58 +01:00
Lars van Hijfte
4f731e12fe Merge branch 'master' into lars 2017-02-02 17:45:10 +01:00
Lars van Hijfte
f8c9454b85 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
2017-02-02 17:43:32 +01:00
Lars van Hijfte
93b908fb13 Merge branch 'kevin-prototype' into 'master'
Redirect to 404 from profile and group

See merge request !190
2017-02-02 16:47:06 +01:00
Marijn Jansen
6fd5401c86 Merge branch 'marijn-groups' into 'master'
Marijn groups

See merge request !191
2017-02-02 16:19:03 +01:00
Marijn Jansen
9165f8fa1b Check if file had been uploaded. 2017-02-02 16:18:15 +01:00
Marijn Jansen
380d8fa83a Group Shit 2017-02-02 16:01:45 +01:00
Hendrik
afb45d6709 add closing of modal on escape key and clicking outside 2017-02-02 15:51:27 +01:00
K. Nobel
1c53eab2fa Fixed user group list on profile page. 2017-02-02 15:50:12 +01:00
K. Nobel
28254d98e4 Merge branch 'master' into kevin-prototype 2017-02-02 15:38:39 +01:00
K. Nobel
8a3cfebf55 Redirect to 404 from profile and group 2017-02-02 15:34:45 +01:00
Lars van Hijfte
b1941f0191 Merge branch 'hendrik-testing' into 'master'
add name field check in settings

See merge request !188
2017-02-02 15:27:39 +01:00
Lars van Hijfte
a27a4881c3 Merge branch 'lars' into 'master'
Lars

See merge request !189
2017-02-02 15:27:27 +01:00
Hendrik
cfa7c870f0 fix profile error color 2017-02-02 15:13:35 +01:00
Hendrik
e60578dc43 add unvalidated option and fixed text 2017-02-02 15:11:41 +01:00
Hendrik
9426f4d6ac add name field check in settings 2017-02-02 15:00:01 +01:00
Lars van Hijfte
7f48cae019 Added uderline in link posts 2017-02-02 14:57:50 +01:00
Lars van Hijfte
33399639b1 Added support for iframe "niet slecht" 2017-02-02 14:51:37 +01:00
Lars van Hijfte
52e40242e6 Added "add group" under group menu 2017-02-02 14:50:51 +01:00
Lars van Hijfte
8a6acbc52a Merge branch 'lars' into 'master'
Lars

See merge request !187
2017-02-02 14:27:49 +01:00
Lars van Hijfte
6fc2f71517 Added meta data in the login page 2017-02-02 14:27:23 +01:00
Lars van Hijfte
1672ce6086 Changed offline status to 5 minutes after inactive 2017-02-02 14:23:36 +01:00
Lars van Hijfte
188741ddf5 BUG FIX: link in fancy text now opens in new tab 2017-02-02 14:22:13 +01:00
K. Nobel
4a7a91ecd9 Fixed bug (not showing profile when on own profile) 2017-02-02 14:20:17 +01:00
Lars van Hijfte
1c1283243c Merge branch 'lars' into 'master'
Lars

See merge request !186
2017-02-02 14:16:56 +01:00
Lars van Hijfte
417124a1fe BUG FIX: added 0 in chat time if needed 2017-02-02 14:13:20 +01:00
Lars van Hijfte
d24ed89096 BUG FIX: mobile support fix 2017-02-02 14:04:59 +01:00
Lars van Hijfte
a92b0fe892 Merge branch 'hendrik-post' into 'master'
Hendrik post

See merge request !185
2017-02-02 13:58:17 +01:00
Lars van Hijfte
5c1b2d1b21 Merge branch 'kevin-prototype' into 'master'
FIXED VISIBILITY ON PROFILE

See merge request !183
2017-02-02 13:57:44 +01:00
Lars van Hijfte
3abaeba52c Merge branch 'joey-testing' into 'master'
Joey testing

See merge request !182
2017-02-02 13:57:25 +01:00
Hendrik
93e63111de cleaned fix 2017-02-02 13:54:52 +01:00
Hendrik
feba1d9786 fix reload after posting post 2017-02-02 13:47:41 +01:00
Hendrik
6ed19d9060 Merge branch 'master' into hendrik-post 2017-02-02 13:43:31 +01:00
Hendrik
d4d16661df added alert box when emptpy posting 2017-02-02 13:42:59 +01:00
Joey Lai
044ed6a9d3 Added noscript 2017-02-02 13:19:39 +01:00
K. Nobel
328ce69144 Merge branch 'master' into kevin-prototype 2017-02-02 13:15:29 +01:00
K. Nobel
9d675dd897 Fixed default image for group members. 2017-02-02 13:11:05 +01:00
K. Nobel
86b02973e4 Fixed visibility on profiles 2017-02-02 13:02:00 +01:00
Lars van Hijfte
ab5f243281 Merge branch 'lars' into 'master'
BUG FIX: username doesn't cut off in link

See merge request !181
2017-02-02 12:53:13 +01:00
Lars van Hijfte
327a6a8f5c BUG FIX: username doesn't cut off in link 2017-02-02 12:52:03 +01:00
Lars van Hijfte
d03d58ce37 Merge branch 'hendrik-search' into 'master'
Hendrik search

See merge request !177
2017-02-02 12:47:05 +01:00
Lars van Hijfte
487e0a0523 Merge branch 'lars' into 'master'
Lars

See merge request !180
2017-02-02 12:46:42 +01:00
Lars van Hijfte
1dfc14e6f0 Added meta data 2017-02-02 12:44:03 +01:00
Marijn Jansen
cc9866d3dd Merge branch 'marijn-settings' into 'master'
More Awesome Fonts :D

See merge request !179
2017-02-02 10:54:10 +01:00
Marijn Jansen
04df02862f More Awesome Fonts :D 2017-02-02 10:52:42 +01:00
Joey Lai
67eb7b991e Merge branch 'master' into joey-testing 2017-02-02 10:44:18 +01:00
Joey Lai
90ac38acdd Fixed restrictions with registering 2017-02-02 10:43:34 +01:00
Lars van Hijfte
60b55b3f04 Added comments
Also hiding the mail/age if said so by the user
2017-02-02 10:29:49 +01:00
Marijn Jansen
70b7e12559 Merge branch 'marijn-settings' into 'master'
Added show profile into settings

See merge request !178
2017-02-02 10:28:54 +01:00
Marijn Jansen
e299ef59e8 Added show profile into settings 2017-02-02 10:28:12 +01:00
Hendrik
d9c68d5f5f Merge branch 'master' into hendrik-search 2017-02-02 10:27:21 +01:00
Hendrik
d027333bd7 fix filter and pagenumber interaction in search 2017-02-02 01:06:31 +01:00
Lars van Hijfte
12d5e00731 Merge branch 'hendrik-testing' into 'master'
Hendrik testing

See merge request !173
2017-02-01 14:52:03 +01:00
Lars van Hijfte
0546b8689d BUG FIX: name size 2017-02-01 14:51:27 +01:00
Marijn Jansen
eb8eb5bf03 Merge branch 'marijn-postdelete' into 'master'
Double session_start fixed :D

See merge request !176
2017-02-01 14:46:31 +01:00
Marijn Jansen
b497538652 Double session_start fixed :D 2017-02-01 14:45:58 +01:00
Marijn Jansen
6ad1c0edf5 Merge branch 'marijn-postdelete' into 'master'
Marijn postdelete

See merge request !174
2017-02-01 14:42:02 +01:00
Marijn Jansen
96f421d088 Merge branch 'master' into 'marijn-postdelete'
# Conflicts:
#   website/public/js/masonry.js
2017-02-01 14:41:45 +01:00
Lars van Hijfte
7955509cb2 Merge branch 'lars' into 'master'
Lars

See merge request !175
2017-02-01 14:35:01 +01:00
Marijn Jansen
dbfe10f84b Delete Posts! 2017-02-01 14:34:02 +01:00
K. Nobel
6c43cae1cb Added noposts div to group. 2017-02-01 14:31:18 +01:00
K. Nobel
3af38cd088 Merge branch 'master' into kevin-prototype 2017-02-01 14:28:39 +01:00
K. Nobel
cfe2928f7b Fixed member list 2017-02-01 14:28:03 +01:00
Hendrik
022893aca2 Merge branch 'master' into hendrik-testing 2017-02-01 14:24:27 +01:00
Lars van Hijfte
89cff4da8c Merge branch 'master' into lars 2017-02-01 14:20:03 +01:00
Lars van Hijfte
fb6b392a42 Merge branch 'hendrik-post' into 'master'
Hendrik post

See merge request !172
2017-02-01 14:19:54 +01:00
Marijn Jansen
fc07027405 Merge branch 'master' into marijn-postdelete 2017-02-01 14:16:52 +01:00
Lars van Hijfte
b7a6fae4d9 BUG FIX: Menu loading
Menu's now load slower but update when needed.
Also frozen users now catch the forbidden error
2017-02-01 14:14:49 +01:00
Hendrik
7f31575bfc Merge branch 'master' into hendrik-post 2017-02-01 14:13:55 +01:00
Marijn Jansen
d87d0b7295 Backend for delete post 2017-02-01 14:13:22 +01:00
Marijn Jansen
7566a756f6 Merge branch 'marijn-postdelete' into 'master'
Marijn postdelete

See merge request !171
2017-02-01 14:13:04 +01:00
Marijn Jansen
f10d9c14a1 Niet slecht small img 2017-02-01 14:12:13 +01:00
Hendrik
9b89058484 add infinite scroll on profile 2017-02-01 14:05:04 +01:00
Lars van Hijfte
61fa0c3781 Merge branch 'lars' into 'master'
BUG FIX: Menu now saves the cookie again

See merge request !170
2017-02-01 13:10:29 +01:00
Lars van Hijfte
2b98480587 BUG FIX: Menu now saves the cookie again 2017-02-01 13:07:06 +01:00
Marijn Jansen
a643ee19b9 Merge branch 'master' into marijn-postdelete 2017-02-01 12:56:09 +01:00
Lars van Hijfte
fcfa6ed9ba Merge branch 'joey-testing' into 'master'
Joey testing

See merge request !169
2017-02-01 12:51:12 +01:00
Joey Lai
700e27e5e3 Fixed redirect link and removes test echo's 2017-02-01 12:45:26 +01:00
Lars van Hijfte
bccb813e92 Merge branch 'lars' into 'master'
BUG FIX: Added session start, so posts load again

See merge request !168
2017-02-01 12:36:16 +01:00
Lars van Hijfte
dc69fb493c BUG FIX: Added session start, so posts load again 2017-02-01 12:34:27 +01:00
Lars van Hijfte
8e81cec843 Merge branch 'lars' into 'master'
Lars

See merge request !165
2017-02-01 12:30:08 +01:00
Lars van Hijfte
fcd58857c0 Merge branch 'safari-chat' into 'master'
Fixed chat in safari

See merge request !166
2017-02-01 12:29:52 +01:00
Lars van Hijfte
152d72d3d8 Merge branch 'joey-testing' into 'master'
Joey testing

See merge request !164
2017-02-01 12:29:29 +01:00
Lars van Hijfte
a9c27583e4 Merge branch 'kevin-prototype' into 'master'
GROUP BUTTONS AND GROUP STYLE

See merge request !167
2017-02-01 12:29:08 +01:00
K. Nobel
3ca7536cc2 Merge branch 'master' into kevin-prototype 2017-02-01 12:27:07 +01:00
K. Nobel
69b0b24176 Fixed group add/leave buttons 2017-02-01 12:26:05 +01:00
Joey Lai
2b893fc283 Facebook ID instead of Facebook email 2017-02-01 12:25:13 +01:00
Marijn Jansen
04365c4f05 Fixed chat in safari 2017-02-01 12:24:59 +01:00
Lars van Hijfte
7fdf9ad329 switch laptop (: 2017-02-01 12:20:40 +01:00
K. Nobel
58bb89f9b4 Added queries and functions for adding group members. 2017-02-01 12:19:59 +01:00
Hendrik
77448d98ba masonry only reloads when columncount changes 2017-02-01 11:49:57 +01:00
Hendrik
6a9e36cea2 Merge branch 'master' into hendrik-post 2017-02-01 11:49:41 +01:00
Lars van Hijfte
6aee603a64 Added online status everywhere needed 2017-02-01 11:44:21 +01:00
Lars van Hijfte
e414a1633e API filter per user level 2017-02-01 11:38:43 +01:00
Hendrik
3c79d86abd add admin search by role 2017-02-01 11:33:34 +01:00
Lars van Hijfte
028c2373c1 Merge branch 'hendrik-testing' into 'master'
fixsquared

See merge request !163
2017-01-31 16:23:41 +01:00
Hendrik
fb9d070d6a fixsquared 2017-01-31 16:23:13 +01:00
Lars van Hijfte
e3ad9c4590 Merge branch 'hendrik-testing' into 'master'
Hendrik testing

See merge request !162
2017-01-31 16:20:36 +01:00
Marijn Jansen
3397253010 Merge branch 'marijn-settings' into 'master'
1337 bday

See merge request !161
2017-01-31 16:20:08 +01:00
Hendrik
52a4822477 post-merge fix 2017-01-31 16:20:02 +01:00
Marijn Jansen
c0a64e9ffd 1337 bday 2017-01-31 16:19:15 +01:00
Hendrik
64a3b13adf Merge branch 'master' into hendrik-testing 2017-01-31 16:17:42 +01:00
Hendrik
b16dc1d4b7 add bancomment change 2017-01-31 16:15:48 +01:00
Joey Lai
8e98001217 Facebook login implemented 2017-01-31 16:12:22 +01:00
Lars van Hijfte
83f75e0282 Merge branch 'lars' into 'master'
Age instead of birthday

See merge request !160
2017-01-31 16:11:47 +01:00
Lars van Hijfte
b41a365b60 Age instead of birthday 2017-01-31 16:11:20 +01:00
Lars van Hijfte
6a7bb4670b Merge branch 'lars' into 'master'
Lars

See merge request !159
2017-01-31 16:03:05 +01:00
Lars van Hijfte
7236a8ba35 Merge branch 'hendrik-search' into 'master'
Hendrik search

See merge request !158
2017-01-31 16:02:29 +01:00
Lars van Hijfte
4d40bb6042 checkbox width fix 2017-01-31 15:46:53 +01:00
Lars van Hijfte
d6c2fab617 Post is now mobile friendly 2017-01-31 15:32:19 +01:00
Hendrik
93200d27c2 Merge branch 'master' into hendrik-search 2017-01-31 15:32:09 +01:00
Hendrik
78e96d5a74 add pageselector on search 2017-01-31 15:30:48 +01:00
Lars van Hijfte
646e6dde48 Added max value in text area 2017-01-31 15:16:40 +01:00
Lars van Hijfte
44408ee429 Frozen user cant comment or niet slecht on postst 2017-01-31 14:34:51 +01:00
Lars van Hijfte
9ca212570d Merge branch 'master' into lars 2017-01-31 14:27:50 +01:00
Lars van Hijfte
164eb2dde6 Frozen users cant chat with other people 2017-01-31 14:26:34 +01:00
Lars van Hijfte
2dd7dd8140 Reload comments bug fix 2017-01-31 13:56:34 +01:00
Lars van Hijfte
794b5ab294 Added fancy text to posts and comments 2017-01-31 13:54:31 +01:00
Marijn Jansen
2a37b9c64d Merge branch 'kevin-prototype' into 'master'
Fixed posts on group pages.

See merge request !156
2017-01-31 13:54:30 +01:00
Marijn Jansen
dfdf72daf4 Merge branch 'marijn-postPicture' into 'master'
Fixed and spilt Avatar upload and Alerts

See merge request !157
2017-01-31 13:38:30 +01:00
Marijn Jansen
1c9c88e030 Fixed and spilt Avatar upload and Alerts 2017-01-31 13:36:32 +01:00
Hendrik
eb12b6ba7d fixed pageselector in admin 2017-01-31 13:11:23 +01:00
K. Nobel
6b13db9c4f Fixed posting on group pages. 2017-01-31 12:53:45 +01:00
K. Nobel
c14a2770bd Fixed posting functions for groups. 2017-01-31 12:52:50 +01:00
Lars van Hijfte
e85a685b0f Merge branch 'master' into lars 2017-01-31 12:47:51 +01:00
Lars van Hijfte
f67dd019c4 Inputs are now mobile friendly 2017-01-31 12:47:24 +01:00
Lars van Hijfte
f26097f55f Fixed online status 2017-01-31 12:25:28 +01:00
K. Nobel
2e71942fdf Merge branch 'master' into kevin-prototype 2017-01-31 12:06:58 +01:00
Hendrik
582d347bcb Merge branch 'master' into hendrik-testing 2017-01-31 12:05:05 +01:00
Lars van Hijfte
03481f5888 Merge branch 'lars' into 'master'
Rip website?

See merge request !155
2017-01-31 11:51:52 +01:00
Lars van Hijfte
d5d9d5857a Rip website? 2017-01-31 11:50:05 +01:00
K. Nobel
dee483e946 Masonry will now only refresh when the width of the screen changes. 2017-01-31 10:54:15 +01:00
Lars van Hijfte
c7d47cf446 Merge branch 'lars' into 'master'
Lars

See merge request !154
2017-01-31 10:33:20 +01:00
Lars van Hijfte
4dc3b4f651 Mobile friendly 2017-01-31 10:31:57 +01:00
Marijn Jansen
3579fe0cd5 Merge branch 'marijn-settings' into 'master'
Marijn settings

See merge request !153
2017-01-31 10:24:34 +01:00
Marijn Jansen
a6b6d6d747 Style changes 2017-01-31 10:23:47 +01:00
Marijn Jansen
6983aa06a2 Finishing touches 2017-01-30 23:03:50 +01:00
Marijn Jansen
8dfa31696c autocomplete suggestions at password 2017-01-30 22:49:43 +01:00
Marijn Jansen
ce53b6e9e4 Checkbox for showBday and showEmail 2017-01-30 22:42:47 +01:00
Marijn Jansen
bc7cbb0fb7 Merge branch 'marijn-settings' of ssh://gitlab-fnwi.uva.nl:1337/11166932/WebDB into marijn-settings 2017-01-30 21:49:17 +01:00
Marijn Jansen
422e2d1308 Date picker in bday 2017-01-30 21:48:18 +01:00
K. Nobel
6e6bbf8d92 Merge branch 'master' into kevin-prototype 2017-01-30 20:19:24 +01:00
Hendrik
a0e77491a2 Merge branch 'master' into hendrik-testing 2017-01-30 16:34:40 +01:00
Hendrik
e464f5bca2 cleaned admin.js, add admin/owner check (frontend), fix submit ajax 2017-01-30 16:32:57 +01:00
K. Nobel
3140242b4f Removed old query for posts. 2017-01-30 16:24:07 +01:00
Lars van Hijfte
0b6ca72dfc Fixed chat date not showing 2017-01-30 16:00:16 +01:00
Lars van Hijfte
6831994ede Merge branch 'lars' into 'master'
Lars

See merge request !152
2017-01-30 15:41:32 +01:00
Marijn Jansen
bb56679885 Merge branch 'kevin-prototype' into 'master'
POSTS ON GROUP PAGES

See merge request !151
2017-01-30 15:41:05 +01:00
Lars van Hijfte
b0a8ceafc3 Added youtube links 2017-01-30 15:40:31 +01:00
K. Nobel
54b56da445 Merge branch 'master' into kevin-prototype 2017-01-30 15:37:57 +01:00
K. Nobel
183a98a339 Fixed link to groups on profile page. 2017-01-30 15:34:32 +01:00
K. Nobel
941296802f Added posts to group page. 2017-01-30 15:30:08 +01:00
K. Nobel
aa12e29948 Fixed posts on profile page. 2017-01-30 15:29:42 +01:00
K. Nobel
1acad8e765 modified masonry and posts, masonry is now reusable on group pages. 2017-01-30 15:28:54 +01:00
Lars van Hijfte
44ff3a4cab added time to chat messages 2017-01-30 15:08:07 +01:00
Marijn Jansen
dd017d8885 Merge branch 'marijn-404' into 'master'
Redirect to index

See merge request !150
2017-01-30 14:35:51 +01:00
Marijn Jansen
282875c6a2 Redirect to index 2017-01-30 14:35:25 +01:00
Marijn Jansen
c840b28495 Merge branch 'marijn-404' into 'master'
Resize

See merge request !149
2017-01-30 14:34:08 +01:00
Marijn Jansen
f1b5a7fe95 Resize 2017-01-30 14:33:38 +01:00
Marijn Jansen
e8c76bef5b Merge branch 'marijn-nietslecht' into 'master'
Marijn nietslecht

See merge request !147
2017-01-30 14:31:17 +01:00
Marijn Jansen
25957c6c78 Merge branch 'marijn-404' into 'master'
404 page

See merge request !148
2017-01-30 14:31:03 +01:00
Marijn Jansen
20b951cad2 404 page 2017-01-30 14:30:36 +01:00
Lars van Hijfte
792f346b12 Added admin-panel button 2017-01-30 14:16:11 +01:00
Lars van Hijfte
54ddb78453 Chat receive messages is now better 2017-01-30 13:59:02 +01:00
Marijn Jansen
9a36dea592 Removed a comma 2017-01-30 13:22:44 +01:00
Marijn Jansen
578ad34020 Picture at nietslecht-button 2017-01-30 13:21:12 +01:00
K. Nobel
f3df682af5 Merge branch 'master' into kevin-prototype 2017-01-30 13:20:53 +01:00
Lars van Hijfte
c8450f3cb3 Changed profile buttons 2017-01-30 12:44:15 +01:00
Marijn Jansen
b30ef0d0cf Merge branch 'marijn-dbConnect' into 'master'
New database connect style

See merge request !146
2017-01-30 12:10:37 +01:00
Lars van Hijfte
877637fcc9 Added video and links in the chat 2017-01-29 18:29:27 +01:00
Lars van Hijfte
89c8c35b4a Changed profile look a bit more 2017-01-29 17:24:39 +01:00
Marijn Jansen
c1a7ccc076 Found some extra statemensts 2017-01-29 14:08:45 +01:00
Marijn Jansen
b24fed57d9 Changed db connect and database query structure so PhpStorm can detect it. 2017-01-29 14:01:25 +01:00
Marijn Jansen
da30b9101c Added age calculation 2017-01-29 13:09:22 +01:00
Lars van Hijfte
dd2113b234 Merge branch 'hendrik-testing' into 'master'
Hendrik testing

See merge request !145
2017-01-27 16:16:07 +01:00
Hendrik
3f960cc091 Merge branch 'master' into hendrik-testing 2017-01-27 16:15:42 +01:00
Joey Lai
08f668859c begin with facebook login 2017-01-27 16:15:23 +01:00
Hendrik
b12eaced4a improve adminpanel w/ ajax, enum fixes, misc fixes 2017-01-27 16:14:54 +01:00
Lars van Hijfte
16b1f93968 Merge branch 'kevin-prototype' into 'master'
Kevin prototype

See merge request !143
2017-01-27 16:13:32 +01:00
K. Nobel
753c596056 Merge branch 'master' into kevin-prototype 2017-01-27 16:09:11 +01:00
K. Nobel
8da1469ca9 Started with group page. 2017-01-27 16:05:45 +01:00
Lars van Hijfte
f7f442ce75 Merge branch 'lars' into 'master'
Lars

See merge request !142
2017-01-27 16:05:11 +01:00
Lars van Hijfte
c8c81ae730 Merge branch 'master' into lars 2017-01-27 16:03:54 +01:00
Lars van Hijfte
a57465189a Chat post images 2017-01-27 16:03:33 +01:00
Marijn Jansen
dc51ac5964 Even more sexy turnary statements! 2017-01-27 15:41:59 +01:00
Marijn Jansen
be9fa6d2c1 Merge branch 'marijn-settings' into 'master'
Added showEmail and showBday to the settings page

See merge request !141
2017-01-27 15:41:02 +01:00
Marijn Jansen
7e2c20e244 Added showEmail and showBday to the settings page 2017-01-27 15:40:07 +01:00
Marijn Jansen
dd6b41783a Merge branch 'joey-testing' into 'master'
fixed idk

See merge request !140
2017-01-27 14:18:27 +01:00
Joey Lai
e9eeeaf110 fixed idk 2017-01-27 14:17:56 +01:00
Marijn Jansen
2651e0fb2b Merge branch 'joey-testing' into 'master'
Made different files for login and register

See merge request !138
2017-01-27 14:04:39 +01:00
Joey Lai
5e9629eddd Fixed bugs 2017-01-27 14:03:11 +01:00
Marijn Jansen
d356468554 Merge branch 'marijn-nietslecht' into 'master'
Niet slecht inverted

See merge request !139
2017-01-27 12:30:56 +01:00
Marijn Jansen
ce6a751630 Niet slecht inverted 2017-01-27 12:30:28 +01:00
Joey Lai
609f350cd3 Made different files for login and register 2017-01-27 12:27:40 +01:00
Lars van Hijfte
07c3b07eb3 Merge branch 'lars' into 'master'
Lars

See merge request !137
2017-01-27 12:23:04 +01:00
Lars van Hijfte
f27b9ec6b4 Chat messages split per day 2017-01-27 12:22:26 +01:00
Marijn Jansen
bf1df4d2d4 Merge branch 'marijn-nietslecht' into 'master'
Marijn nietslecht

See merge request !136
2017-01-27 12:22:14 +01:00
Marijn Jansen
3b542e0878 "Niet slecht."-button! 2017-01-27 12:20:50 +01:00
Marijn Jansen
82c2eaccb3 Merge branch 'master' into marijn-nietslecht 2017-01-27 11:23:42 +01:00
Lars van Hijfte
cbff973b63 Save manu state with cookie 2017-01-27 11:15:33 +01:00
Hendrik
c2d8521cdd Merge branch 'master' into hendrik-testing 2017-01-27 10:48:18 +01:00
Lars van Hijfte
23904caf69 Merge branch 'lars' into 'master'
Lars

See merge request !135
2017-01-26 22:37:19 +01:00
Lars van Hijfte
f1bfc89e6a Custom scrollbar 2017-01-26 22:33:32 +01:00
Lars van Hijfte
f32e0ca382 Merge branch 'master' into lars 2017-01-26 21:57:13 +01:00
Lars van Hijfte
d89e672990 Also fixed unread chat 2017-01-26 21:54:47 +01:00
Lars van Hijfte
032e25b044 You can now only chat with friends 2017-01-26 21:50:47 +01:00
Marijn Jansen
7073995534 Stop before Genius Bar visit 2017-01-26 17:03:11 +01:00
Lars van Hijfte
637a26ba33 Merge branch 'joey-testing' into 'master'
Modal for register

See merge request !134
2017-01-26 16:18:35 +01:00
Joey Lai
dbdb12cca0 Modal for register 2017-01-26 16:17:58 +01:00
Lars van Hijfte
70b7734e8b Merge branch 'lars' into 'master'
Added direct button on the profile to chat with someone

See merge request !133
2017-01-26 16:14:09 +01:00
Lars van Hijfte
c1fc022658 Merge branch 'joey-testing' into 'master'
Fixed date and other extras

See merge request !132
2017-01-26 16:13:43 +01:00
Lars van Hijfte
5c1208460f Added direct button on the profile to chat with someone 2017-01-26 16:12:50 +01:00
K. Nobel
59fc65e27a Made small changes to posts, added amount of comments and niet slechts 2017-01-26 16:09:18 +01:00
Hendrik
0c324b9095 Merge branch 'master' into hendrik-testing 2017-01-26 15:33:08 +01:00
Hendrik
ee204d78a7 minor fixes 2017-01-26 15:32:38 +01:00
Marijn Jansen
cdfbcc0168 Merge branch 'master' into marijn-nietslecht 2017-01-26 15:24:55 +01:00
Marijn Jansen
bf87d20985 Queries for niet slecht 2017-01-26 15:14:51 +01:00
Joey Lai
96f70e1a11 Fixed date and other extras 2017-01-26 14:50:41 +01:00
K. Nobel
e75df42bd8 Merge branch 'master' into kevin-prototype 2017-01-26 14:32:00 +01:00
K. Nobel
b66c108f4e Fixed post titles for htmlchars. 2017-01-26 14:31:45 +01:00
Lars van Hijfte
f4b2fee290 Merge branch 'lars' into 'master'
Lars

See merge request !131
2017-01-26 14:14:40 +01:00
Lars van Hijfte
a60a9b6594 Merge branch 'master' into lars 2017-01-26 14:12:27 +01:00
Lars van Hijfte
feb64002f5 Live search 2017-01-26 14:12:04 +01:00
Lars van Hijfte
33a640329b Filter on search page
It also works with jquery now
2017-01-26 13:53:59 +01:00
Lars van Hijfte
59b0b00304 Merge branch 'hendrik-post' into 'master'
Hendrik post

See merge request !130
2017-01-26 13:47:40 +01:00
Hendrik
51cc736aca Merge branch 'master' into hendrik-post 2017-01-26 13:46:24 +01:00
Hendrik
1a53d01747 add authentication 2017-01-26 13:29:56 +01:00
Lars van Hijfte
e24960c319 Merge branch 'kevin-prototype' into 'master'
Kevin prototype

See merge request !129
2017-01-26 13:29:42 +01:00
K. Nobel
cf964ec8d6 Merge branch 'master' into kevin-prototype 2017-01-26 13:24:16 +01:00
Hendrik
b89a575039 Merge branch 'master' into hendrik-testing 2017-01-26 13:02:35 +01:00
Hendrik
91aca6baa7 change comments to use ajax 2017-01-26 12:21:01 +01:00
K. Nobel
3ebacd6251 Fixed masonry grid (posts). 2017-01-26 12:20:32 +01:00
Marijn Jansen
423c2fd771 Revert "Merge branch 'marijn-settings' into 'master'"
This reverts merge request !128
2017-01-26 12:16:28 +01:00
Marijn Jansen
58e5f200fa Merge branch 'marijn-settings' into 'master'
Removed .idea folder

See merge request !128
2017-01-26 12:14:52 +01:00
Marijn Jansen
47eed5514a Removed .idea folder 2017-01-26 12:14:07 +01:00
Marijn Jansen
78e85c2939 Merge branch 'marijn-messagePage' into 'master'
Email confirm and password change now use messagepage function.

See merge request !127
2017-01-26 12:06:38 +01:00
Marijn Jansen
44f86a4fbb Email confirm and password change now use messagepage function. 2017-01-26 12:05:28 +01:00
Lars van Hijfte
7b7f0b2c64 Added menu button 2017-01-26 11:48:06 +01:00
Hendrik
328f0665f3 add basic post functionality 2017-01-26 11:35:18 +01:00
Lars van Hijfte
8fb8df075f Added comments 2017-01-26 11:31:15 +01:00
Lars van Hijfte
6a882bf78d Merge branch 'lars' into 'master'
Chat messages and groups are now live.

See merge request !126
2017-01-26 10:27:45 +01:00
Lars van Hijfte
95ee91748f Chat messages and groups are now live. 2017-01-26 10:26:40 +01:00
Lars van Hijfte
30d403ae7b Merge branch 'lars' into 'master'
Lars

See merge request !125
2017-01-25 16:21:56 +01:00
Marijn Jansen
2242feda21 Merge branch 'marijn-settings' into 'master'
Password change

See merge request !124
2017-01-25 16:21:44 +01:00
Lars van Hijfte
2ece9e1c63 Merge branch 'master' into lars 2017-01-25 16:21:34 +01:00
Marijn Jansen
4ebdd378a6 Password change 2017-01-25 16:21:17 +01:00
Lars van Hijfte
09dac78eb4 Merge branch 'joey-testing' into 'master'
Joey testing

See merge request !123
2017-01-25 16:21:02 +01:00
Lars van Hijfte
e1ca3c52ed Merge branch 'hendrik-post' into 'master'
Hendrik post

See merge request !122
2017-01-25 16:20:48 +01:00
Lars van Hijfte
f7bf80d789 Merge branch 'kevin-prototype' into 'master'
Kevin prototype

See merge request !120
2017-01-25 16:20:30 +01:00
Joey Lai
4c5ea08614 Fixed reset password 2017-01-25 16:19:34 +01:00
Lars van Hijfte
9046b397a1 Merge branch 'master' into lars 2017-01-25 16:19:07 +01:00
Lars van Hijfte
91fae80326 Friends and friendrequest are fully ajax. Also added friend-item 2017-01-25 16:17:46 +01:00
Hendrik
f06de1e88d Merge branch 'master' into hendrik-post 2017-01-25 15:59:40 +01:00
Hendrik
b161596d67 polished post viewing 2017-01-25 15:59:03 +01:00
Joey Lai
ded314f4d6 Merged marijn 2017-01-25 15:53:44 +01:00
Joey Lai
0b035c0583 Merge branch 'marijn-settings' into joey-testing 2017-01-25 15:48:37 +01:00
Joey Lai
cc08ebec3c Modal added for resetting password 2017-01-25 15:47:31 +01:00
Marijn Jansen
1b2a1a5180 Almost request password 2017-01-25 15:46:20 +01:00
K. Nobel
977757b2d3 Made small improvements to friendship buttons and corresponding API files. 2017-01-25 15:42:28 +01:00
K. Nobel
6a43402c66 Added comment in getFriendshipStatus for Lars. 2017-01-25 15:14:00 +01:00
K. Nobel
95570c49d4 Merge branch 'master' into kevin-prototype 2017-01-25 15:08:34 +01:00
K. Nobel
9ff256429d Changed friendship buttons. We now use AJAX, changed button style and added FA icons. 2017-01-25 15:06:37 +01:00
Marijn Jansen
c23b8bd8e5 Merge branch 'joey-testing' into 'master'
Joey testing

See merge request !119
2017-01-25 13:44:11 +01:00
Joey Lai
e840def733 FIxed confirmation login 2017-01-25 13:43:08 +01:00
Hendrik
db333b6e98 add unpolished post viewing 2017-01-25 13:28:47 +01:00
Joey Lai
30d1ef40f4 fixed js for login 2017-01-25 12:55:29 +01:00
Marijn Jansen
13c575179d Merge branch 'joey-testing' into 'master'
Added confirmation login email

See merge request !118
2017-01-25 12:49:45 +01:00
Joey Lai
aa48092d27 Added confirmation login email 2017-01-25 12:48:30 +01:00
Marijn Jansen
7f755bfd2c Merge branch 'marijn-settings' into 'master'
Cleanup at logout.php

See merge request !117
2017-01-25 12:30:20 +01:00
Marijn Jansen
727d418c8d Merge branch 'marijn-settings' into 'master'
Email confirm on settings page and emailconfirm fix (:

See merge request !116
2017-01-25 12:06:50 +01:00
Marijn Jansen
185874d23f Cleanup at logout.php 2017-01-25 12:06:13 +01:00
Marijn Jansen
827be40646 Email confirm on settings page and emailconfirm fix (: 2017-01-25 12:02:31 +01:00
Marijn Jansen
93ddefa42f Merge branch 'joey-testing' into 'master'
redesigned code

See merge request !115
2017-01-25 11:20:15 +01:00
Marijn Jansen
d19639d1c3 Merge branch 'marijn-settings' into 'master'
Spelling mistake

See merge request !114
2017-01-25 11:20:01 +01:00
Marijn Jansen
d2c7f0787b Spelling mistake 2017-01-25 11:19:41 +01:00
K. Nobel
1402a3ea07 Fixed query for image tags 2017-01-25 11:19:24 +01:00
Joey Lai
981e34c950 redesigned code 2017-01-25 11:19:01 +01:00
Marijn Jansen
022620a375 Merge branch 'marijn-emailconfirm' into 'master'
Email confirm (:

See merge request !113
2017-01-25 11:17:31 +01:00
Marijn Jansen
28f31d749b Email confirm (: 2017-01-25 11:16:53 +01:00
Marijn Jansen
17600adbf1 Merge branch 'marijn-emailconfirm' into 'master'
Added emailconfirm.php

See merge request !112
2017-01-25 09:33:36 +01:00
Marijn Jansen
f7da87596a Added emailconfirm.php 2017-01-25 09:30:05 +01:00
Lars van Hijfte
7efd062f98 Merge branch 'lars' into 'master'
Lars

See merge request !111
2017-01-24 17:32:43 +01:00
Lars van Hijfte
fddbd0ca87 Merge branch 'master' into lars 2017-01-24 17:32:13 +01:00
Lars van Hijfte
37d83169c6 In notification bar accept or deny 2017-01-24 17:31:39 +01:00
Lars van Hijfte
d19038cb1c Merge branch 'lars' into 'master'
Lars

See merge request !110
2017-01-24 17:11:09 +01:00
Lars van Hijfte
12ed710369 Fixed API 2017-01-24 17:10:12 +01:00
Lars van Hijfte
3de4e1387f Merge branch 'master' into lars 2017-01-24 17:07:07 +01:00
Lars van Hijfte
7bf8a16cf0 Dingen door elkaar 2017-01-24 17:06:39 +01:00
Lars van Hijfte
cbfce6f698 Merge branch 'kevin-prototype' into 'master'
Kevin prototype

See merge request !109
2017-01-24 17:05:51 +01:00
K. Nobel
7144d700e4 Removed debug echo from profile page. 2017-01-24 17:02:49 +01:00
K. Nobel
ec56dbe578 Merge branch 'master' into kevin-prototype 2017-01-24 17:00:10 +01:00
K. Nobel
b8f662f825 Merge branch 'master' of ssh://gitlab-fnwi.uva.nl:1337/11166932/WebDB 2017-01-24 16:59:14 +01:00
K. Nobel
de03d8799a Fixed placeholder for new post. 2017-01-24 16:58:51 +01:00
Hendrik
b9fc016f7d add post viewing basis, add insert post and comment queries 2017-01-24 16:56:04 +01:00
K. Nobel
70957015ce Fixed links to friends on profile page. 2017-01-24 16:51:34 +01:00
K. Nobel
f9f1e2bf17 Changed select posts query. 2017-01-24 16:40:30 +01:00
Lars van Hijfte
4b6fe1d202 Merge branch 'lars' into 'master'
Fixed bugs

See merge request !108
2017-01-24 15:17:19 +01:00
Lars van Hijfte
fd055e8355 Fixed bugs 2017-01-24 15:16:15 +01:00
Lars van Hijfte
0b705df09a Merge branch 'joey-testing' into 'master'
Redesigned register functions

See merge request !107
2017-01-24 15:12:01 +01:00
Lars van Hijfte
c48227e258 Merge branch 'kevin-prototype' into 'master'
Kevin prototype

See merge request !106
2017-01-24 15:11:29 +01:00
Joey Lai
7a19fea5f9 Redesigned register functions 2017-01-24 15:08:24 +01:00
K. Nobel
887c773463 Merge branch 'master' into kevin-prototype 2017-01-24 15:03:24 +01:00
K. Nobel
4967ab6ea0 Made some small changes for Lars. 2017-01-24 15:01:55 +01:00
Marijn Jansen
6314494177 Merge branch 'marijn-settings' into 'master'
Max file size for gifs.

See merge request !105
2017-01-24 14:49:02 +01:00
Marijn Jansen
86b97cc186 Max file size for gifs. 2017-01-24 14:47:38 +01:00
K. Nobel
4b3d7967fb Merge branch 'master' into kevin-prototype 2017-01-24 14:47:05 +01:00
K. Nobel
d44ddf2793 Added functionality for add friend buttons. 2017-01-24 14:36:27 +01:00
Lars van Hijfte
9e89307bf9 Merge branch 'lars-chat' into 'master'
Fixed name length

See merge request !104
2017-01-24 14:33:11 +01:00
Lars van Hijfte
dc11830c80 Fixed name length 2017-01-24 14:32:43 +01:00
Lars van Hijfte
8403ff0a17 Merge branch 'lars-chat' into 'master'
Lars chat

See merge request !103
2017-01-24 14:30:09 +01:00
Lars van Hijfte
dbb23922d8 Merge branch 'master' into lars-chat 2017-01-24 14:26:48 +01:00
Lars van Hijfte
a88483ae47 FINALLY FIXED THE UNREAD CHAT MESSAGES! 2017-01-24 14:26:15 +01:00
Marijn Jansen
ee6b55bd91 Merge branch 'marijn-settings' into 'master'
Marijn settings

See merge request !102
2017-01-24 14:02:34 +01:00
Marijn Jansen
08c3d73377 Merge branch 'master' into 'marijn-settings'
# Conflicts:
#   website/views/menu.php
2017-01-24 14:02:19 +01:00
Marijn Jansen
c1359920e0 New Standard avatar 2017-01-24 14:00:55 +01:00
Marijn Jansen
4579b98eb8 Checks and resize on profile pictures :) 2017-01-24 13:54:08 +01:00
Marijn Jansen
62a2b32c95 Changed Alerts to Exceptions. 2017-01-24 12:12:48 +01:00
Hendrik
f6051ee14f Merge branch 'master' into hendrik-search 2017-01-24 11:05:58 +01:00
Lars van Hijfte
96003b1bdc Merge branch 'hendrik-search' into 'master'
Hendrik search

See merge request !100
2017-01-24 10:21:17 +01:00
Lars van Hijfte
c4a0367fef Merge branch 'lars-chat' into 'master'
Lars chat

See merge request !101
2017-01-24 10:19:52 +01:00
Lars van Hijfte
c4e4508b53 Changed admin layout and fixed for enums 2017-01-24 10:19:13 +01:00
Lars van Hijfte
d7e84ee138 Merge branch 'lars-algemeen' into lars-chat 2017-01-23 17:22:38 +01:00
Lars van Hijfte
7eec0cfa2a Begin chat change 2017-01-23 17:22:22 +01:00
Lars van Hijfte
348b66c08c Merge branch 'master' into lars-chat 2017-01-23 17:08:43 +01:00
Lars van Hijfte
37aa073fc1 End of day commit 2017-01-23 16:45:16 +01:00
Hendrik
119c82e110 minor color and text fixes 2017-01-23 16:27:54 +01:00
Lars van Hijfte
b6d166bdea Merge branch 'lars-algemeen' into 'master'
Lars algemeen

See merge request !98
2017-01-23 16:27:45 +01:00
Hendrik
648c2d26e4 Merge branch 'master' into hendrik-testing 2017-01-23 16:06:19 +01:00
Hendrik
2ff23ae668 Merge branch 'master' into hendrik-search 2017-01-23 16:06:03 +01:00
Hendrik
ac83bb750b fix status for enums, fix pages 2017-01-23 16:05:22 +01:00
Hendrik
e6f5044a9a add page functionality 2017-01-23 16:04:59 +01:00
218 changed files with 17998 additions and 1745 deletions

View File

@@ -1,7 +1,7 @@
Options +FollowSymLinks Options +FollowSymLinks
RewriteEngine On RewriteEngine On
ErrorDocument 404 /error404.jpg ErrorDocument 404 /error/404.php
RewriteCond %{SCRIPT_FILENAME} !-d RewriteCond %{SCRIPT_FILENAME} !-d
RewriteCond %{SCRIPT_FILENAME} !-f RewriteCond %{SCRIPT_FILENAME} !-f

View File

@@ -0,0 +1,31 @@
<?php
session_start();
require_once ("../../queries/connect.php");
require_once ("../../queries/checkInput.php");
require_once ("../../queries/group_page.php");
require_once ("../../queries/user.php");
if (isset($_SESSION["userID"]) &&
(getRoleByID($_SESSION["userID"]) == 'admin' ||
getRoleByID($_SESSION["userID"]) == 'owner')) {
$userinfo = getRoleByID($_SESSION['userID']);
if (isset($_POST["actions"]) && isset($_POST["userID"])) {
changeUserStatusByID($_POST["userID"], $_POST["actions"]);
} else if (isset($_POST["actions"]) && isset($_POST["groupID"])) {
changeGroupStatusByID($_POST["groupID"], $_POST["actions"]);
} else if (isset($_POST["batchactions"]) && isset($_POST["checkbox-user"])) {
if ($userinfo == 'owner') {
changeMultipleUserStatusByID($_POST["checkbox-user"], $_POST["batchactions"]);
} else {
changeMultipleUserStatusByIDAdmin($_POST["checkbox-user"], $_POST["batchactions"]);
}
} else if (isset($_POST["groupbatchactions"]) && isset($_POST["checkbox-group"])) {
changeMultipleGroupStatusByID($_POST["checkbox-group"], $_POST["groupbatchactions"]);
} else if (isset($_POST['bancommentuserID']) && isset($_POST['bancommenttext'])) {
editBanCommentByID($_POST['bancommentuserID'], $_POST['bancommenttext']);
}
} else {
header('HTTP/1.0 403 Forbidden');
}

View File

@@ -0,0 +1,44 @@
<?php
session_start();
require_once ("../../queries/connect.php");
require_once ("../../queries/checkInput.php");
require_once ("../../queries/user.php");
require_once ("../../queries/group_page.php");
if (isset($_SESSION["userID"]) &&
(getRoleByID($_SESSION["userID"]) == 'admin' ||
getRoleByID($_SESSION["userID"]) == 'owner')) {
$search = "";
if (isset($_POST["search"])) {
$search = test_input($_POST["search"]);
}
$pagetype = "user";
if (isset($_POST['pagetype'])) {
$pagetype = test_input($_POST['pagetype']);
}
$status = array();
if (isset($_POST['status'])) {
$status = $_POST["status"];
}
$groupstatus = array();
if (isset($_POST['groupstatus'])) {
$groupstatus = $_POST["groupstatus"];
}
$entries = 20;
$currentpage = 1;
if (isset($_POST['currentpage'])) {
$currentpage = (int) test_input($_POST["currentpage"]);
}
$offset = (int) $currentpage * $entries - $entries;
include ("../../views/adminpanel-page.php");
} else {
header('HTTP/1.0 403 Forbidden');
}

View File

@@ -0,0 +1,50 @@
<?php
session_start();
require_once ("../../queries/connect.php");
require_once ("../../queries/checkInput.php");
require_once ("../../queries/user.php");
require_once ("../../queries/group_page.php");
if (isset($_SESSION["userID"]) &&
(getRoleByID($_SESSION["userID"]) == 'admin' ||
getRoleByID($_SESSION["userID"]) == 'owner')) {
$offset = 0;
$entries = 20;
if (isset($_POST["currentpage"])) {
$offset = (int)test_input($_POST["currentpage"]) * $entries - $entries;
}
$search = "";
if (isset($_POST["search"])) {
$search = test_input($_POST["search"]);
}
$pagetype = "user";
if (isset($_POST['pagetype'])) {
$pagetype = test_input($_POST['pagetype']);
}
$status = array();
if (isset($_POST['status'])) {
$status = $_POST["status"];
}
$groupstatus = array();
if (isset($_POST['groupstatus'])) {
$groupstatus = $_POST["groupstatus"];
}
$userinfo = getRoleByID($_SESSION['userID']);
if ($pagetype == "user") {
include("../../views/adminpanel-table.php");
} else if ($pagetype == "group") {
include("../../views/adminpanel-grouptable.php");
} else {
echo "Search failed!";
}
} else {
header('HTTP/1.0 403 Forbidden');
}

View File

@@ -0,0 +1,20 @@
<?php
session_start();
require_once "../../queries/post.php";
require_once "../../queries/user.php";
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');
}
deletePost($_POST["postID"], $_SESSION["userID"]);
return;
} else {
echo "frozen";
}

View File

@@ -0,0 +1,34 @@
<?php
session_start();
require_once ("../../queries/friendship.php");
require_once("../../queries/user.php");
if (isset($_SESSION["userID"]) &&
getRoleByID($_SESSION["userID"]) != 'frozen' &&
getRoleByID($_SESSION["userID"]) != 'banned') {
if (empty($_POST["usr"]) OR empty($_POST["action"]) OR !in_array($_POST["action"], array("request", "accept", "delete"))) {
header('HTTP/1.1 500 Non enough arguments');
}
$friendship_status = getFriendshipStatus($_POST["usr"]);
if ($_POST["action"] == "request" AND $friendship_status == 0) {
if (!requestFriendship($_POST["usr"])) {
header('HTTP/1.1 500 Query (request) failed');
}
} else if ($_POST["action"] == "delete" AND in_array($friendship_status, array(1, 2, 3))) {
if (!removeFriendship($_POST["usr"])) {
header('HTTP/1.1 500 Query (delete) failed');
}
} else if ($_POST["action"] == "accept" AND $friendship_status == 3) {
if (!acceptFriendship($_POST["usr"])) {
header('HTTP/1.1 500 Query (accept) failed');
}
} else {
header('HTTP/1.1 500 Not the right friendship status');
}
} else {
header('HTTP/1.0 403 Forbidden');
}

View File

@@ -0,0 +1,40 @@
<?php
session_start();
if(empty($_POST["grp"]) or empty($_POST["role"])) {
header('HTTP/1.1 500 Non enough arguments');
}
if(in_array($_POST["role"], array('request', 'member', 'banned', 'mod', 'admin'))) {
header('HTTP/1.1 500 Wrong argument given for role');
}
require_once ("../../queries/group_member.php");
require_once ("../../queries/group_page.php");
require_once ("../../queries/group_member.php");
$currentRole = selectGroupRole($_POST["grp"]);
$groupStatus = selectGroupStatus($_POST["grp"]);
echo "role: $currentRole status: $groupStatus ";
if($_POST["role"] == 'request' and $currentRole == 'none') {
if($groupStatus = 'public') {
// Add member to public group
addMember($_POST["grp"], $_SESSION["userID"], 'member');
echo "ADDED";
} else if($groupStatus = 'membersonly') {
// Send request to members only group
addMember($_POST["grp"], $_SESSION["userID"], 'request');
} else {
// Can't invite yourself to hidden groups
header('HTTP/1.1 500 This group is hidden');
}
header('HTTP/1.1 200');
} else if($_POST["role"] == 'none' and $currentRole != 'none') {
// Remove yourself from a group
deleteMember($_POST["grp"], $_SESSION["userID"]);
} else {
echo "failure";
header('HTTP/1.1 500 Wrong argument given for role');
}

View File

@@ -0,0 +1,30 @@
<?php
# -2: Query failed.
# -1: user1 and 2 are the same user
# 0 : no record found
# 1 : confirmed
# 2 : user1 sent request (you)
# 3 : user2 sent request (other)
session_start();
require_once ("../../queries/friendship.php");
require_once("../../queries/user.php");
if (isset($_SESSION["userID"]) &&
getRoleByID($_SESSION["userID"]) != 'banned') {
if (empty($_POST["usr"])) {
header('HTTP/1.1 500 Non enough arguments');
}
$friendship_status = getFriendshipStatus($_POST["usr"]);
if ($friendship_status == -2) {
header('HTTP/1.1 500 Query failed');
}
echo $friendship_status;
} else {
header('HTTP/1.0 403 Forbidden');
}

View File

@@ -0,0 +1,12 @@
<?php
session_start();
if(empty($_POST["grp"])) {
header('HTTP/1.1 500 Non enough arguments');
}
require_once("../../queries/group_page.php");
echo selectGroupRole($_POST["grp"]);

View File

@@ -0,0 +1,37 @@
<?php
if(!isset($_POST["offset"]) or !isset($_POST["limit"])) {
header('HTTP/1.1 500 Not enough arguments');
}
if(!isset($_POST["usr"]) and !isset($_POST["grp"])) {
header('HTTP/1.1 500 Not enough arguments');
}
session_start();
require_once ("../../queries/post.php");
require_once ("../../queries/nicetime.php");
require_once("../../queries/user.php");
if (isset($_SESSION["userID"]) &&
getRoleByID($_SESSION["userID"]) != 'banned') {
if(empty($_POST["usr"])) {
$posts = selectSomePosts(0, $_POST["grp"], $_POST["offset"], $_POST["limit"]);
} else {
$posts = selectSomePosts($_POST["usr"], 0, $_POST["offset"], $_POST["limit"]);
}
if(!$posts) {
echo false;
} else {
$results = $posts->fetchAll(PDO::FETCH_ASSOC);
for($i = 0; $i < sizeof($results); $i++) {
$results[$i]["nicetime"] = nicetime($results[$i]["creationdate"]);
}
echo json_encode($results);
}
} else {
header('HTTP/1.0 403 Forbidden');
}

View File

@@ -3,6 +3,13 @@
session_start(); session_start();
require_once ("../../queries/connect.php"); require_once ("../../queries/connect.php");
require_once ("../../queries/friendship.php"); require_once ("../../queries/private_message.php");
require_once("../../queries/user.php");
// Check if the user is allowed to load them.
if (isset($_SESSION["userID"]) &&
getRoleByID($_SESSION["userID"]) != 'banned') {
echo selectAllUnreadChat(); echo selectAllUnreadChat();
} else {
header('HTTP/1.0 403 Forbidden');
}

View File

@@ -0,0 +1,16 @@
<?php
session_start();
require_once ("../../queries/connect.php");
require_once ("../../queries/friendship.php");
require_once ("../../queries/user.php");
// Check if the user is allowed to load them.
if (isset($_SESSION["userID"]) &&
getRoleByID($_SESSION["userID"]) != 'frozen' &&
getRoleByID($_SESSION["userID"]) != 'banned') {
echo selectAllFriendRequests();
} else {
header('HTTP/1.0 403 Forbidden');
}

View File

@@ -1,8 +0,0 @@
<?php
session_start();
require_once ("../../queries/connect.php");
require_once ("../../queries/friendship.php");
echo selectAllFriendRequests();

View File

@@ -0,0 +1,28 @@
<?php
session_start();
require_once ("../../queries/connect.php");
require_once ("../../queries/checkInput.php");
require_once ("../../queries/friendship.php");
require_once("../../queries/user.php");
// Check if the user is allowed to load them.
if (isset($_SESSION["userID"]) &&
getRoleByID($_SESSION["userID"]) != 'banned') {
if (isset($_SESSION["userID"])) {
// Echo the limited or unlimited users.
if (isset($_POST["limit"])) {
echo selectLimitedFriends($_SESSION["userID"], (int)test_input($_POST["limit"]));
} else if (isset($_GET["limit"])) {
echo selectLimitedFriends($_SESSION["userID"], (int)test_input($_GET["limit"]));
} else {
echo selectFriends($_SESSION["userID"]);
}
} else {
echo "[]";
}
} else {
header('HTTP/1.0 403 Forbidden');
}

View File

@@ -0,0 +1,22 @@
<?php
session_start();
require_once ("../../queries/connect.php");
require_once ("../../queries/checkInput.php");
require_once ("../../queries/group_member.php");
require_once("../../queries/user.php");
// Check if the user is allowed to load them.
if (isset($_SESSION["userID"]) &&
getRoleByID($_SESSION["userID"]) != 'banned') {
// Echo the limited or unlimited groups.
if (isset($_POST["limit"])) {
echo selectLimitedGroupsFromUser($_SESSION["userID"], (int)test_input($_POST["limit"]));
} else {
echo selectAllGroupsFromUser($_SESSION["userID"]);
}
} else {
header('HTTP/1.0 403 Forbidden');
}

View File

@@ -5,9 +5,20 @@ session_start();
require_once("../../queries/connect.php"); require_once("../../queries/connect.php");
require_once("../../queries/private_message.php"); require_once("../../queries/private_message.php");
require_once("../../queries/checkInput.php"); require_once("../../queries/checkInput.php");
require_once("../../queries/friendship.php");
require_once("../../queries/user.php");
// Check if the user is allowed to get the messages.
if (isset($_SESSION["userID"]) &&
getRoleByID($_SESSION["userID"]) != 'banned') {
// Check if the users wants new messages or old ones, and give the right one back.
if (isset($_POST["lastID"]) && $_POST["lastID"] != "") { if (isset($_POST["lastID"]) && $_POST["lastID"] != "") {
setLastVisited(test_input($_POST["destination"]));
echo getNewChatMessages(test_input($_POST["lastID"]), test_input($_POST["destination"])); echo getNewChatMessages(test_input($_POST["lastID"]), test_input($_POST["destination"]));
} else { } else {
setLastVisited(test_input($_POST["destination"]));
echo getOldChatMessages(test_input($_POST["destination"])); echo getOldChatMessages(test_input($_POST["destination"]));
} }
} else {
header('HTTP/1.0 403 Forbidden');
}

View File

@@ -0,0 +1,21 @@
<?php
session_start();
require_once("../../queries/connect.php");
require_once("../../queries/post.php");
require_once("../../queries/checkInput.php");
require_once("../../queries/nicetime.php");
require_once("../../queries/user.php");
if (isset($_SESSION["userID"]) &&
getRoleByID($_SESSION["userID"]) != 'banned') {
if (isset($_GET['postID'])) {
include("../../views/post-view.php");
} else {
echo "Kan de post niet laden";
}
} else {
header('HTTP/1.0 403 Forbidden');
}

View File

@@ -0,0 +1,37 @@
<?php
session_start();
require_once("../../queries/post.php");
require_once("../../queries/connect.php");
require_once("../../queries/checkInput.php");
require_once("../../queries/user.php");
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;
} else {
if (makeComment($_POST['postID'],
$_SESSION['userID'],
test_input($_POST['newcomment-content']))) {
echo 1;
} else {
echo 0;
}
}
} else if ($_POST['button'] == 'nietslecht') {
if (makeNietSlecht($_POST["postID"], $_SESSION["userID"])) {
echo 1;
} else {
echo 0;
}
} else {
echo 0;
}
} else {
echo "frozen";
}

View File

@@ -0,0 +1,52 @@
<?php
session_start();
require_once("../../queries/post.php");
require_once("../../queries/group_page.php");
require_once("../../queries/connect.php");
require_once("../../queries/checkInput.php");
require_once("../../queries/user.php");
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');
}
if (empty(test_input($_POST["title"])) or
empty(test_input($_POST["content"]))
) {
echo "empty";
} else {
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"])
);
}
}
} else {
echo "frozen";
}

View File

@@ -0,0 +1,35 @@
<?php
session_start();
require_once ("../../queries/connect.php");
require_once ("../../queries/checkInput.php");
require_once ("../../queries/group_member.php");
require_once ("../../queries/group_page.php");
require_once ("../../queries/user.php");
if (isset($_SESSION["userID"]) &&
getRoleByID($_SESSION["userID"]) != 'banned') {
$n = 0;
if (isset($_POST["n"])) {
$n = (int)test_input($_POST["n"]);
}
$m = 20;
if (isset($_POST["m"])) {
$m = (int)test_input($_POST["m"]);
}
$search = "";
if (isset($_POST["search"])) {
$search = test_input($_POST["search"]);
}
if (isset($_POST["filter"]) && $_POST["filter"] == "personal") {
echo searchSomeOwnGroups($n, $m, $search);
} else {
echo searchSomeGroups($n, $m, $search);
}
} else {
header('HTTP/1.0 403 Forbidden');
}

View File

@@ -0,0 +1,53 @@
<?php
session_start();
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");
if (isset($_SESSION["userID"]) &&
getRoleByID($_SESSION["userID"]) != 'banned') {$user_perpage = $group_perpage = 20;
$user_currentpage = $group_currentpage = 1;
if (isset($_POST['user-pageselect'])) {
$user_currentpage = test_input($_POST['user-pageselect']);
}
if (isset($_POST['group-pageselect'])) {
$group_currentpage = test_input($_POST['group-pageselect']);
}
$user_n = $user_currentpage * $user_perpage - $user_perpage;
$group_n = $group_currentpage * $group_perpage - $group_perpage;
$search = "";
if (isset($_POST['search'])) {
$search = test_input($_POST['search']);
}
$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']);
}
include ("../../views/searchPageNumber.php");
} else {
header('HTTP/1.0 403 Forbidden');
}

View File

@@ -0,0 +1,35 @@
<?php
session_start();
require_once ("../../queries/connect.php");
require_once ("../../queries/checkInput.php");
require_once ("../../queries/friendship.php");
require_once ("../../queries/user.php");
if (isset($_SESSION["userID"]) &&
getRoleByID($_SESSION["userID"]) != 'banned') {
$n = 0;
$m = 20;
$page = 1;
if (isset($_POST["user-pageselect"])) {
$page = (int)test_input($_POST['user-pageselect']);
}
$n = ($page - 1) * $m;
$search = "";
if (isset($_POST["search"])) {
$search = test_input($_POST["search"]);
}
if (isset($_POST["filter"]) && $_POST["filter"] == "personal") {
echo searchSomeFriends($n, $m, $search);
} else {
echo searchSomeUsers($n, $m, $search);
}
} else {
header('HTTP/1.0 403 Forbidden');
}

View File

@@ -4,9 +4,18 @@ session_start();
require_once("../../queries/connect.php"); require_once("../../queries/connect.php");
require_once("../../queries/private_message.php"); require_once("../../queries/private_message.php");
require_once("../../queries/checkInput.php"); require_once("../../queries/checkInput.php");
require_once("../../queries/user.php");
// Check if the user is allowed to send a message.
if (!isset($_SESSION["userID"])) {
echo "logged out";
} else if (getRoleByID($_SESSION["userID"]) != 'frozen' &&
getRoleByID($_SESSION["userID"]) != 'banned') {
if (!empty(test_input($_POST["destination"])) && if (!empty(test_input($_POST["destination"])) &&
!empty(test_input($_POST["content"]))) { !empty(test_input($_POST["content"]))
) {
// Send the message.
// Returns false when it didn't succeed sending the message.
if (sendMessage(test_input($_POST["destination"]), test_input($_POST["content"]))) { if (sendMessage(test_input($_POST["destination"]), test_input($_POST["content"]))) {
echo 1; echo 1;
} else { } else {
@@ -15,3 +24,6 @@ if (!empty(test_input($_POST["destination"])) &&
} else { } else {
echo 0; echo 0;
} }
} else {
echo "frozen";
}

View File

@@ -1,10 +1,14 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<?php include("../views/head.php"); ?> <?php
require_once ("../queries/user.php");
require_once ("../queries/group_page.php");
require_once ("../views/head.php"); ?>
<style> <style>
@import url("styles/adminpanel.css"); @import url("styles/adminpanel.css");
</style> </style>
<script src="js/admin.js" charset="utf-8"></script>
</head> </head>
<body> <body>
<?php <?php
@@ -12,6 +16,15 @@
* This view adds the main layout over the screen. * This view adds the main layout over the screen.
* Header and menu. * Header and menu.
*/ */
include_once ("../queries/user.php");
// auth
$role = getRoleByID($_SESSION['userID']);
if ($role != 'admin' AND $role != 'owner') {
header("location:profile.php");
}
include("../views/main.php"); include("../views/main.php");
/* Add your view files here. */ /* Add your view files here. */

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.2 KiB

View File

@@ -0,0 +1,94 @@
<?php
session_start();
include_once ("../../queries/friendship.php");
// Initialize variables to given or default values.
if (isset($_POST["action"])) {
$action = $_POST["action"];
} else {
$action = "profile.php";
}
if (isset($_POST["actionType"])) {
$actionType = $_POST["actionType"];
} else {
$actionType = "GET";
}
$friends = json_decode($_POST["friends"]);
// Foreach friend, return them as list item.
foreach($friends as $i => $friend) {
$friendshipStatus = getFriendshipStatus($friend->userID);
?>
<li class='friend-item'>
<form action='<?= $action ?>' method='<?= $actionType ?>'>
<button type='submit'
name='username'
value='<?php
if (isset($friend->username)) {
echo $friend->username;
} else if (isset($friend->content)) {
echo $friend->userID;
}
?>'>
<div class='friend'>
<img alt='PF' class='profile-picture <?= $friend->onlinestatus ?>' src='<?= $friend->profilepicture ?>'/>
<div class='friend-name'>
<?= $friend->fullname ?><br/>
<span style='color: #666'><?php
if (isset($friend->username)) {
echo $friend->usernameshort;
} else if (isset($friend->content)) {
echo $friend->content;
}
?></span>
</div>
</div>
</button>
</form>
<?php
// Add friendship options if possible.
if ($friendshipStatus > 1) {
if ($friendshipStatus == 2) {
$denyName = "Annuleer";
} else {
$denyName = "Weiger";
}
?>
<div class='notification-options'>
<?php
if ($friendshipStatus == 3) {
?>
<button name='accept'
onclick="editFriendship('<?= $friend->userID ?>', 'accept')"
class='accept-notification'
value='1'>
<i class='fa fa-check'></i>Accepteer
</button>
<?php
}
?>
<input type='hidden' name='userID' value='' />
<button name='delete'
onclick="editFriendship('<?= $friend->userID ?>', 'delete')"
class='deny-notification'
value='1'>
<i class='fa fa-times'></i> <?= $denyName ?>
</button>
</div>
<?php
}
?>
</li>
<?php
}
?>

View File

@@ -0,0 +1,25 @@
<?php
session_start();
include_once ("../../queries/group_member.php");
$groups = json_decode($_POST["groups"]);
// Add each group as list item.
foreach($groups as $i => $group) {
?>
<li class='group-item'>
<form action='group.php' method='get'>
<button type='submit'
name='groupname'
value='<?= $group->name ?>'>
<div class='group'>
<img alt='PF' class='group-picture' src='<?= $group->picture ?>'/>
<?= $group->name ?>
</div>
</button>
</form>
</li>
<?php
}

View File

@@ -0,0 +1,8 @@
<?php
if (isset($_GET["groupname"])) {
$url = "https://myhyvesbookplus.nl/~lars/group.php?groupname=" . $_GET["groupname"];
} else {
$url = "https://myhyvesbookplus.nl/";
}
?>
<a href="<?= $url ?>" target='_blank'><img style="width: 100%; height: auto;" src="../external/nietslecht_button.png" alt='\"Niet slecht\" ons op MyHyvesbook+' /></a>

View File

@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<browserconfig>
<msapplication>
<tile>
<square70x70logo src="tiny.png"/>
<square150x150logo src="square.jpg"/>
<wide310x150logo src="wide.jpg"/>
<square310x310logo src="large.jpg"/>
<TileColor>#000000</TileColor>
</tile>
</msapplication>
</browserconfig>

View File

@@ -0,0 +1,36 @@
<?php
require_once "../queries/createGroup.php";
require_once "../queries/connect.php";
require_once "../queries/alerts.php"?>
<!DOCTYPE html>
<html>
<head>
<?php include("../views/head.php"); ?>
<style>
@import url("styles/settings.css");
</style>
</head>
<body>
<?php
/*
* This view adds the main layout over the screen.
* Header and menu.
*/
include("../views/main.php");
if ($_SERVER["REQUEST_METHOD"] == "POST") {
try {
createGroup();
} catch (AlertMessage $e) {
}
$groupname = $_POST["groupName"];
header("location: group.php?groupname=$groupname");
}
/* Add your view files here. */
include("../views/createGroup.php");
/* This adds the footer. */
include("../views/footer.php");
?>
</body>
</html>

View File

@@ -0,0 +1,49 @@
<?php
include_once("../queries/connect.php");
include_once("../views/messagepage.php");
if (array_key_exists("u", $_GET) and array_key_exists("h", $_GET)) {
$checkHash = prepareQuery("
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 {
messagePage("Ongeldige link.");
}
} else {
messagePage("Ongeldige link.");
}
function doActivate(string $email) {
if (password_verify($email, $_GET["h"])) {
$confirmUser = prepareQuery("
UPDATE
`user`
SET
`role` = :role
WHERE
`userID` = :userID
");
$confirmUser->bindValue(":role", "user");
$confirmUser->bindParam(":userID", $_GET["u"]);
$confirmUser->execute();
if ($confirmUser->rowCount()) {
messagePage("Email bevestigd <br />
<a href='index.php'>Klik hier om terug te gaan naar de login pagina.</a>");
}
} else {
messagePage("Ongeldige link.");
}
}

View File

@@ -0,0 +1,9 @@
<?php
require_once "../../views/messagepage.php";
messagePage("
<div class='error-page'>
<h1>404</h1>
<h4>Verkeerde link...</h4><br />
<img height='25%' width='25%' src='../img/zelda.png'>
</div>");

Binary file not shown.

After

Width:  |  Height:  |  Size: 492 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 782 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.5 KiB

BIN
website/public/favicon.ico Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 97 KiB

View File

@@ -4,10 +4,25 @@
<?php include("../views/head.php"); ?> <?php include("../views/head.php"); ?>
<style> <style>
@import url("styles/profile.css"); @import url("styles/profile.css");
@import url("styles/post-popup.css");
@import url('https://fonts.googleapis.com/css?family=Anton');
</style> </style>
</head> </head>
<body> <body>
<?php <?php
include_once("../queries/group_page.php");
if(isset($_SESSION["userID"]) and !$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. * This view adds the main layout over the screen.
* Header, menu, footer. * Header, menu, footer.
@@ -19,6 +34,26 @@ include("../views/group.php");
/* This adds the footer. */ /* This adds the footer. */
include("../views/footer.php"); include("../views/footer.php");
$masonry_mode = 0;
if ($group["role"] == "mod" OR $group["role"] == "admin") {
$masonry_mode = 2;
}
?> ?>
<script src="js/masonry.js"></script>
<script src="js/groupButtons.js"></script>
<script src="js/post.js"></script>
<script>
$(document).ready(function() {
userID = 0;
groupID = <?= $group["groupID"] ?>;
placeGroupButtons();
masonry(<?= $masonry_mode ?>);
});
</script>
</body> </body>
</html> </html>

View File

@@ -0,0 +1,72 @@
<?php
require_once "../queries/picture.php";
require_once "../queries/groupAdmin.php";
require_once "../queries/alerts.php";
?>
<!DOCTYPE html>
<html>
<head>
<?php include("../views/head.php"); ?>
<style>
/*Insert own stylesheet here ;)*/
@import url("styles/settings.css");
</style>
</head>
<body>
<?php
/*
* This view adds the main layout over the screen.
* Header and menu.
*/
include("../views/main.php");
$alertClass;
$alertMessage;
// Select which button has been pressed.
if ($_SERVER["REQUEST_METHOD"] == "POST") {
try {
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;
case "deadmin":
if (!array_key_exists("userID", $_POST)) {
throw new AngryAlert("Geen gebruiker geselecteerd.");
}
upgradeUser($_POST["groupID"], $_POST["userID"], "member");
break;
case "delete":
deleteGroup();
break;
}
} catch (AlertMessage $w) {
$alertClass = $w->getClass();
$alertMessage = $w->getMessage();
}
}
/* Add your view files here. */
include("../views/groupAdmin.php");
/* This adds the footer. */
include("../views/footer.php");
?>
</body>
</html>

Binary file not shown.

After

Width:  |  Height:  |  Size: 98 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 25 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 24 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 147 KiB

View File

@@ -1,5 +1,9 @@
<html> <?php
<head>
<meta http-equiv="refresh" content="0; url=login.php" /> session_start();
</head>
</html> if (isset($_SESSION["userID"])) {
header("Location: profile.php");
} else {
header("Location: login.php");
}

View File

@@ -1,44 +1,116 @@
window.onload = function() { $(window).on("load", function () {
changeFilter(); changeFilter();
}; searchFromOne();
function checkAll(allbox) { $(".admin-searchinput").keyup(function(){
var checkboxes = document.getElementsByClassName('checkbox-list'); searchFromOne();
});
// all inputs and labels directly under admin filter and groupfilter
$("#admin-filter, #admin-groupfilter > input, label").change(function(){
searchFromOne();
});
$("#pagetype").change(function(){
searchFromOne();
});
for (var i = 0; i < checkboxes.length; i++) { /* Update hidden input to be equal to submit pressed,
if (checkboxes[i].type == 'checkbox') { because serialize doesn't take submit values. */
checkboxes[i].checked = allbox.checked; $('#admin-batchform > button').click(function () {
} $('#batchinput').prop('value', $(this).prop('value'));
} });
$('#admin-groupbatchform > button').click(function () {
$('#groupbatchinput').prop('value', $(this).prop('value'));
});
});
// Toggles all checkboxes based on one.
function checkAll() {
$('.checkbox-list').each(function () {
$(this).prop('checked', $('#checkall').prop('checked'));
});
} }
function checkCheckAll(allbox) { // Simple function that checks if checkall should stay checked.
var checkboxes = document.getElementsByClassName('checkbox-list'); function checkCheckAll() {
var checked = true; var checked = true;
for (var i = 0; i < checkboxes.length; i++) { $('.checkbox-list').each(function () {
if (checkboxes[i].type == 'checkbox') { if ($(this).prop('checked') == false) {
if (checkboxes[i].checked == false) {
checked = false; checked = false;
break; return;
} }
} });
}
allbox.checked = checked; $('#checkall').prop('checked', checked);
} }
// Toggle of filter options.
function changeFilter() { function changeFilter() {
if (document.getElementById('group').checked) { if ($('#pagetype').find(":selected").val() == "group") {
document.getElementById('admin-filter').style.display = 'none'; document.getElementById('admin-filter').style.display = 'none';
document.getElementById('admin-groupfilter').style.display = 'inline-block'; document.getElementById('admin-groupfilter').style.display = 'inline-block';
document.getElementById('admin-batchactions').style.display = 'none'; document.getElementById('admin-batchform').style.display = 'none';
document.getElementById('admin-groupbatchactions').style.display = 'inline-block'; document.getElementById('admin-groupbatchform').style.display = 'inline-block';
} else { } else {
document.getElementById('admin-filter').style.display = 'inline-block'; document.getElementById('admin-filter').style.display = 'inline-block';
document.getElementById('admin-groupfilter').style.display = 'none'; document.getElementById('admin-groupfilter').style.display = 'none';
document.getElementById('admin-batchactions').style.display = 'inline-block'; document.getElementById('admin-batchform').style.display = 'inline-block';
document.getElementById('admin-groupbatchactions').style.display = 'none'; document.getElementById('admin-groupbatchform').style.display = 'none';
} }
} }
// Sets the search page to one, relevant when changing filter or search.
function searchFromOne() {
$('#currentpage').prop('value', 1);
adminSearch();
}
// AJAX live search.
function adminSearch() {
$.post(
"API/adminSearchUsers.php",
$("#admin-searchform").serialize()
).done(function (data) {
$("#usertable").html(data);
updatePageN();
})
}
// AJAX live update.
function adminUpdate(form) {
$.post(
"API/adminChangeUser.php",
$(form).serialize()
).done(function () {
adminSearch();
})
}
// AJAX pagenumber functionality.
function updatePageN() {
$.post(
"API/adminPageNumber.php",
$("#admin-searchform").serialize()
).done(function (data) {
$("#admin-pageinfo").html(data);
})
}
// Intended for the edit button to show a form.
function toggleBancomment(button) {
$(button).siblings("div").toggle();
$(button).toggle();
}
// AJAX value editing.
function editComment(form) {
$.post(
"API/adminChangeUser.php",
$(form).serialize()
).done(function (data) {
adminSearch();
});
}

View File

@@ -1,62 +1,144 @@
var previousDate = new Date("1970-01-01 00:00:00");
var previousTime = "00:00";
var gettingMessages = false;
var previousType = "robot";
$(document).ready(function() { $(document).ready(function() {
loadMessages(); setInterval(loadMessages, 1000);
sayEmpty(); sayEmpty();
$(".chat-field").hide(); $(".chat-field").hide();
}); });
// This function loads the new messages and runs the addMessages function to show them.
function loadMessages() { function loadMessages() {
// If the function is not running elsewhere, run it here.
if (!gettingMessages) {
gettingMessages = true;
// Get the messages.
$.post( $.post(
"API/loadMessages.php", "API/loadMessages.php",
$("#lastIDForm").serialize() $("#lastIDForm").serialize()
).done(function (data) { ).done(function (data) {
// Post the messages in the chat.
if (data && data != "[]") { if (data && data != "[]") {
messages = JSON.parse(data); messages = JSON.parse(data);
addMessages(messages); addMessages(messages);
$("#lastID").val(messages[messages.length - 1].messageID); $("#lastID").val(messages[messages.length - 1].messageID);
$("#chat-history").scrollTop($("#chat-history")[0].scrollHeight);
} }
loadUnreadMessages();
gettingMessages = false;
}); });
} else {
setTimeout(loadMessages, 1000); setTimeout(loadMessages, 500);
}
} }
// Send a message to a friend of the user.
function sendMessage() { function sendMessage() {
$.post( $.post(
"API/sendMessage.php", "API/sendMessage.php",
$("#sendMessageForm").serialize() $("#sendMessageForm").serialize()
); ).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();
});
$("#newContent").val(""); $("#newContent").val("");
$("#newContent").focus();
} }
// Add messages to the chat.
function addMessages(messages) { function addMessages(messages) {
for(i in messages) { var messagesText = "";
// Loop over all the messages.
for(var i in messages) {
// Initialize message variables.
var thisDate = new Date(messages[i].creationdate.replace(/ /,"T"));
var thisTime = thisDate.getHours() + ":" + ('0' + thisDate.getMinutes()).slice(-2);
var type;
thisDate.setHours(0,0,0,0);
// See where the message has been send from, so it shows on the right side.
if (messages[i].destination == $(".destinationID").val()) { if (messages[i].destination == $(".destinationID").val()) {
type = "chat-message-self"; type = "chat-message-self";
} else { } else {
type = "chat-message-other"; type = "chat-message-other";
} }
$("#chat-history").append('\ // If it is the first message, open the message box and maybe add a year.
<div class="chat-message"> \ if (i == 0) {
<div class="' + type + '">\ if (thisDate.getTime() > previousDate.getTime()) {
' + messages[i].content + '\ messagesText += '\
<div class="day-message"> \
<div class="day-message-content">\
' + days[thisDate.getDay()] + " " + thisDate.getDate() + " " + months[thisDate.getMonth()] + " " + thisDate.getFullYear() + '\
</div> \ </div> \
</div>\ </div>';
');
} }
previousDate = thisDate;
previousTime = thisTime;
previousType = type;
messagesText += '<div class="chat-message"><div class="' + type + '">';
// 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()) {
// Close the previous message.
messagesText += '<div class="chat-time">\
' + thisTime + '\
</div></div></div>';
previousTime = thisTime;
previousType = type;
// If the date is different, add a new date.
if (thisDate > previousDate) {
previousDate = thisDate;
messagesText += '\
<div class="day-message"> \
<div class="day-message-content">\
' + days[thisDate.getDay()] + " " + thisDate.getDate() + " " + months[thisDate.getMonth()] + " " + thisDate.getFullYear() + '\
</div> \
</div>';
} }
// Open the new message.
messagesText += '<div class="chat-message"><div class="' + type + '">';
}
// Add the content of the message in the new box.
messagesText += fancyText(messages[i].content) + "<br />";
}
// Close the last message
messagesText += '<div class="chat-time">\
' + thisTime + '\
</div></div></div>';
// Add all the new created messaged to the chat.
$("#chat-history").append(messagesText);
// Scroll down, so the user can see the new messages.
$("#chat-history").scrollTop($("#chat-history")[0].scrollHeight - $('#chat-history')[0].clientHeight);
}
// Switch to a different user.
function switchUser(userID) { function switchUser(userID) {
previousDate = new Date("1970-01-01 00:00:00");
$(".chat-field").show(); $(".chat-field").show();
$(".destinationID").val(userID); $(".destinationID").val(userID);
$("#chat-history").html(""); $("#chat-history").html("");
$("#lastID").val(""); $("#lastID").val("");
$(".chat-left .friend-item").removeClass("active-friend-chat"); $("#chat-recent-panel .friend-item").removeClass("active-friend-chat");
$(".chat-left #friend-item-" + userID).addClass("active-friend-chat"); $("#friend-item-" + userID).addClass("active-friend-chat");
} }
// Insert a message in the chat, this is used when it is empty.
function sayEmpty() { function sayEmpty() {
$("#chat-history").html("Begin nu met chatten!"); $("#chat-history").html("Probeer ook eens foto's en video's te sturen");
} }

View File

@@ -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('<option value="">' + params.dayDefault + '</option>');
$(params.monthSelector).append('<option value="">' + params.monthDefault + '</option>');
$(params.yearSelector).append('<option value="">' + params.yearDefault + '</option>');
// populate the day select
for (i = 1; i <= 31; i++) {
if (i <= 9) {
var val = '0' + i;
} else {
var val = i;
}
$(params.daySelector).append('<option value="' + val + '">' + i + '</option>');
}
// 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('<option value="' + val + '">' + months[i - 1] + '</option>');
}
// 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('<option value="' + i + '">' + i + '</option>');
}
// 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');
}
}
});
}
});
}
});

View File

@@ -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('<option value="">'+a.dayDefault+"</option>"),$(a.monthSelector).append('<option value="">'+a.monthDefault+"</option>"),$(a.yearSelector).append('<option value="">'+a.yearDefault+"</option>"),i=1;i<=31;i++){if(i<=9)var b="0"+i;else var b=i;$(a.daySelector).append('<option value="'+b+'">'+i+"</option>")}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('<option value="'+b+'">'+c[i-1]+"</option>")}var d=new Date,e=d.getFullYear(),f=e-a.minimumAge,g=f-a.maximumAge;for(i=f;i>=g;i--)$(a.yearSelector).append('<option value="'+i+'">'+i+"</option>");$(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")}})})}});

View File

@@ -0,0 +1,78 @@
// 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();
$buttonContainer.html("");
var value1 = "";
var class1 = "empty-button";
var icon1 = "";
var text1 = "";
var value2 = "";
var class2 = "empty-button";
var icon2 = "";
var text2 = "";
switch (friendshipStatus) {
case "0":
value1 = "request";
class1 = "green";
text1 = "Word vrienden";
icon1 = "fa-user-plus";
break;
// Users are friends.
case "1":
value1 = userID;
class1 = "green";
text1 = "Chat";
icon1 = "fa-comment";
value2 = "delete";
class2 = "red";
text2 = "Ontvriend";
icon2 = "fa-user-times";
break;
// This user sent request.
case "2":
value1 = "delete";
class1 = "red";
text1 = "Trek verzoek in";
icon1 = "fa-times";
break;
// Other user sent request.
case "3":
value1 = "accept";
class1 = "green";
text1 = "Accepteer";
icon1 = "fa-check";
value2 = "delete";
class2 = "red";
text2 = "Weiger";
icon2 = "fa-times";
break;
}
// Append buttons to the container.
$buttonContainer.append(
"<div><button class='"+ class1 +" fancy-button friend-button' value='"+ value1 +"'>" +
"<span>"+ text1 +"</span>" +
"<i class='fa fa-fw "+ icon1 +"'></i> " +
"</button></div>");
$buttonContainer.append(
"<div><button class='"+ class2 +" fancy-button friend-button' value='"+ value2 +"'>" +
"<span>"+ text2 +"</span>" +
"<i class='fa fa-fw "+ icon2 +"'></i> " +
"</button></div>");
// Gets triggered when a friend button is triggered.
$buttonContainer.find("button").click(function() {
if (isNaN(this.value))
editFriendship(userID, this.value);
else if (this.value != "")
window.location.href = "chat.php?username=" + this.value;
});
});
}

View File

@@ -0,0 +1,51 @@
function placeGroupButtons() {
$.post("API/getGrouprole.php", { grp: groupID })
.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(
"<button class='green group-button fancy-button' value='request'>" +
"<span>Treed toe</span><i class='fa fa-plus'></i>" +
"</button>");
// when user sent a request to become a member.
} else if(data == 'request') {
$buttonContainer.append(
"<button class='red group-button fancy-button' value='none'>" +
"<span>Trek verzoek in</span><i class='fa fa-times'></i>" +
"</button>");
// When user is a member of the group.
} else if (data == 'admin') {
$buttonContainer.append(
"<button class='group-button fancy-button' value='admin'>" +
"<span>Instellingen</span><i class='fa fa-cogs'></i>" +
"</button>"
);
} else {
$buttonContainer.append(
"<button class='red group-button fancy-button' value='none'>" +
"<span>Verlaat groep</span><i class='fa fa-sign-out'></i>" +
"</button>");
}
// Gets triggered when a group button is clicked.
$buttonContainer.children().click(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 () {
});
}
});
});
}

View File

@@ -1,35 +1,55 @@
$(document).ready(function() { $(document).ready(function() {
// Hide notification center. // Toggle menu
$("#profile-menu-popup").hide(); $("#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");
// $("#own-profile-picture").click(function() { // Add cookie so the menu stays open on other pages
// $("#profile-menu-popup").toggle(); if (window.innerWidth > 1080) {
// $("#profile-hello-popup").toggle(); $("#chat-history").css("margin-right", "266px");
// }); $("#chat-history").css("width", "calc(100% - 512px - 75px)");
document.cookie = "menu=open; path=/";
$("#own-profile-picture").click(function() {
if($("#notification-center").css('right') == "-256px") {
$(".content").animate({
marginRight: "256px"
}, 500);
$(".chat-right").animate({
width: "calc(100% - 512px - 40px)"
}, 500);
$("#notification-center").animate({
right: "0px"
}, 500);
} else { } else {
$(".chat-right").animate({ document.cookie = "menu=closed; path=/";
width: "calc(100% - 256px - 40px)" }
}, 500); } else {
$(".content").animate({ $(".modal").width("calc(100% - 256px)");
marginRight: "0px" $(".content").css("margin-right", "0px");
}, 500); $("#notification-center").css("display", "none");
$("#notification-center").animate({
right: "-256px" if (window.innerWidth > 1080) {
}, 500); $("#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");
}
// Change menu cookie to close
document.cookie = "menu=closed; path=/";
} }
}); });
$("#own-profile-picture").click(); if (getCookie("menu") == "open") {
// 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").css("margin-right", "266px");
$("#chat-history").width("calc(100% - 587px)");
document.cookie = "menu=open; path=/";
} else {
document.cookie = "menu=closed; path=/";
}
}
}); });

View File

@@ -0,0 +1,71 @@
// 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");
var fbBtn = document.getElementById("fbBtn");
// Get the <span> 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";
}
fbBtn.onclick = function () {
facebookModal.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.
*/

104
website/public/js/main.js Normal file
View File

@@ -0,0 +1,104 @@
var days = ["zondag", "maandag", "dinsdag", "woensdag", "donderdag", "vrijdag", "zaterdag"];
var months = ["januari", "februari", "maart", "april", "mei", "juni", "juli", "augustus", "september", "oktober", "november", "december"]
function fancyText(text) {
// Add links, images, gifs and (youtube) video's.
text = text.replace(/(https?:\/\/.[^ \n<>"]*)/ig, function(link) {
// Add images
if (link.match(/(https?:\/\/.[^ ]*\.(?:png|jpg|jpeg|gif))/ig)) {
return "<img alt='" + link + "' src='" + link + "' />";
}
// Add mp4 video's
else if (link.match(/(https?:\/\/.[^ ]*\.(?:mp4))/ig)) {
return "<video width='100%'>" +
"<source src='"+ link +"' type='video/mp4'>" +
"<b>Je browser ondersteund geen video</b>" +
"</video><button class='gray' onclick='$(this).prev().get(0).play();'><i class='fa fa-play'></i></button>";
}
// Add ogg video's
else if (link.match(/(https?:\/\/.[^ ]*\.(?:ogg))/ig)) {
return "<video width='100%'>" +
"<source src='"+ link +"' type='video/ogg'>" +
"<b>Je browser ondersteund geen video</b>" +
"</video><button class='gray' onclick='$(this).prev().get(0).play();'><i class='fa fa-play'></i></button>";
}
// Add youtube video's
else if (link.match(/(https?:\/\/.(www.)?youtube|youtu.be)*watch/ig)) {
return '<iframe width="100%"' +
' src="https://www.youtube.com/embed/' + link.substr(link.length - 11) +
'" frameborder="0" allowfullscreen></iframe>';
}
// Add links
else {
return "<a href='" + link + "' target='_blank'>" + link + "</a>";
}
});
return text;
}
// This function gets the value of a cookie when given a key.
// If it didn´t find any compatible cookie, it returns false.
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;
}
// Edit the friendship status of two users.
function editFriendship(userID, value) {
$.post("API/editFriendship.php", { usr: userID, action: value })
.done(function() {
placeFriendButtons();
updateMenus();
});
}
// Show the given friends in the given list.
// The friends are giving in JSON, and the list is giving with a hashtag.
function showFriends(friends, list) {
if(friends && friends != "[]") {
$(list).load("bits/friend-item.php", {
"friends": friends
});
return true;
} else {
return false;
}
}
// Show the given friends in the given list.
// This function supports more options given as parameters. This adds extra functionality.
function showFriendsPlus(friends, list, limit, action, actionType) {
if(friends && friends != "[]") {
$(list).load("bits/friend-item.php", {
"friends": friends,
"limit": limit,
"action": action,
"actionType": actionType
});
return true;
} else {
return false;
}
}
// Show the given groups in the given list.
function showGroups(groups, list) {
if(groups && groups != "[]") {
$(list).load("bits/group-item.php", {
"groups": groups
});
return true;
} else {
return false;
}
}

View File

@@ -1,42 +1,194 @@
// Vertical margin between two posts.
margin = 20; margin = 20;
$(window).on("load", function() { // scrolling modal taken from http://stackoverflow.com/questions/10476632/how-to-scroll-the-page-when-a-modal-dialog-is-longer-than-the-screen
console.log("LOADED"); function scrollbarMargin(width, overflow) {
container = $("div.posts"); $('body').css({
posts = container.children(); marginRight: width,
posts.remove(); overflow: overflow
});
$('.profile-menu').css({
marginRight: width
});
}
column = $('<div class="column"></div>').append(posts); // Get post from the server.
container.append(column); function requestPost(postID) {
// Make the modal view visible.
$(".modal").show();
mansonry(); // Send get request to the server to load the post.
mansonry(); $.get("API/loadPost.php", { postID : postID }).done(function(data) {
$('.modal-default').hide();
var scrollBarWidth = window.innerWidth - document.body.offsetWidth;
scrollbarMargin(scrollBarWidth, 'hidden');
$('#modal-response').show();
$('#modal-response').html(fancyText(data));
});
}
// 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 })
.done(function(data) {
if (data == "empty") {
$('#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);
}
});
} else {
// Create the new user post.
$.post("API/postPost.php", { title: title,
content : content })
.done(function(data) {
if (data == "empty") {
$('#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);
}
});
}
}
var masonryMode = 0;
var windowWidth;
var columnCount;
var columns;
var postLimit;
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);
postLimit = columnCount * 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);
}
};
$(document).keyup(function(e) {
if (e.keyCode == 27) {
closeModal();
}
});
$('.modal').click(function() {
closeModal();
});
$('.modal-content').click(function(event){
event.stopPropagation();
});
});
// Hide modal view from the screen.
function closeModal() {
$(".modal").hide();
scrollbarMargin(0, 'auto');
$('#modal-response').hide();
$('.modal-default').show();
}
// Will fire when user resizes the window.
$(window).resize(function() { $(window).resize(function() {
clearTimeout(window.resizedFinished); clearTimeout(window.resizedFinished);
window.resizeFinished = setTimeout(function() { window.resizeFinished = setTimeout(function() {
mansonry(); // 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); }, 250);
}); });
function mansonry() { // Select the container for masonry.
var $container = $(".posts");
columnCount = Math.floor($(".posts").width() / 250); // Spawn the masonry grid.
console.log("columns: " + columnCount); function masonry(mode) {
// save the masonry mode.
masonryMode = mode;
$container.children().remove();
/* // reinit posts
* Initialise columns. noposts = false;
*/ postAmount = 0;
var columns = new Array(columnCount);
// Initialise columns.
for (i = 0; i < columnCount; i++) { for (i = 0; i < columnCount; i++) {
columns[i] = [0, []]; $column = $("<div class=\"column\">");
console.log(columns[i]); $column.width(100/columnCount + "%");
$container.append($column);
columns[i] = [0, $column];
} }
/* // Place the form for new posts.
* Function will find the column with the shortest height. if(mode > 0) {
*/ $postInput = $("<div class=\"post platform\">");
$form = $("<form class=\"newpost\" action=\"API/postPost.php\" method=\"post\" onsubmit=\"postPost(); return false;\">");
$postInput.append($form);
//Add extra input for group posts.
if(mode == 2) {
$form.append($("<input class=\"newpost\" type=\"hidden\" name=\"group\" value=\"" + groupID + "\">"));
}
$form.append($("<input class=\"newpost\" name=\"title\" placeholder=\"Titel\" type=\"text\">"));
$form.append($("<textarea class=\"newpost\" name=\"content\" placeholder=\"Schrijf een berichtje...\" maxlength='1000'></textarea><span></span>"));
$form.append($("<button type=\"submit\"><i class='fa fa-sticky-note-o'></i> Plaats!</button>"));
columns[0][1].append($postInput);
columns[0][0] = $postInput.height() + margin;
}
// Get the posts from the server.
loadMorePosts(userID, groupID, 0, postLimit);
}
// Find the column with the shortest hight.
function getShortestColumn(columns) { function getShortestColumn(columns) {
column = columns[0]; column = columns[0];
@@ -45,32 +197,43 @@ function mansonry() {
column = columns[i]; column = columns[i];
} }
} }
return column; return column;
} }
/* // Load certain range of posts.
* Rearange the objects. function loadMorePosts(uID, gID, offset, limit) {
*/ if (noposts) {
j = 0; return;
posts.each(function(i) { }
post = posts[i];
shortestColumn = getShortestColumn(columns);
shortestColumn[0] = shortestColumn[0] + $(post).height() + margin;
shortestColumn[1].push(post);
// 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;
}
posts = JSON.parse(data);
// Rearange the objects.
$.each(posts, function() {
$post = $("<div class=\"post platform\" onclick=\"requestPost(\'"+this['postID']+"\')\">");
$post.append($("<h2>").html(this["title"]));
$post.append($("<p>").html(fancyText(this["content"])));
$post.append($("<p class=\"subscript\">").text(this["nicetime"]));
$post.append($("<p class=\"subscript\">").text("comments: " + this["comments"] + ", niet slechts: " + this["niet_slechts"]));
shortestColumn = getShortestColumn(columns);
shortestColumn[1].append($post);
shortestColumn[0] = shortestColumn[0] + $post.height() + margin;
});
}); });
container.children().remove(); postAmount += limit;
/*
* Display the objects again in the correct order.
*/
for (i = 0; i < columnCount; i++) {
column = $('<div class="column"></div>').append(columns[i][1]);
console.log(column);
container.append(column);
}
$("div.posts div.column").width(100/columnCount + "%");
} }

View File

@@ -1,39 +1,126 @@
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() { $(document).ready(function() {
$(".extra-menu-items").hide(); updateMenus();
$("#menu-back").hide(); setInterval(updateMenus, 10000);
// Show more friends
$("#more-friends-click").click(function() {
// Show only friends
$("#groups-menu-section").slideUp();
$("#friends-menu-section li").show();
// Change buttons
$("#more-friends-click").hide();
$("#menu-back").show();
}); });
// Show more groups
$("#more-groups-click").click(function() {
// Show only groups
$("#friends-menu-section").slideUp();
$("#groups-menu-section li").show();
// Change buttons // Update the menu and notification items.
$("#more-groups-click").hide(); function updateMenus() {
$("#menu-back").show(); if (updatingMenus <= 0) {
}); loadMenuFriends(5);
loadNotificationFriends();
loadUnreadMessages();
loadMenuGroups();
}
}
// Go back
$("#menu-back").click(function() {
// Show overview of friends and groups
$("#friends-menu-section").slideDown();
$("#groups-menu-section").slideDown();
$(".extra-menu-items").hide();
// Change buttons // Get the friends and insert them in the menu.
$("#menu-back").hide(); function loadMenuFriends(limit) {
$("#more-groups-click").show(); updatingMenus ++;
$("#more-friends-click").show(); $.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").hide();
}
}
}).fail(function() {
$("#friends-menu-section").hide();
}).always(function() {
updatingMenus --;
}); });
}
// 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").hide();
}
}
}).fail(function() {
$("#groups-menu-section").hide();
}).always(function() {
updatingMenus --;
}); });
}
// 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").hide();
}
}
}).fail(function() {
$("#friend-request-section").hide();
}).always(function() {
updatingMenus --;
});
}
// 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").hide();
}
}
}).fail(function() {
$("#unread-messages-section").hide();
}).always(function() {
updatingMenus --;
});
}

View File

@@ -1,44 +0,0 @@
function showNotifications(notifications, id) {
$("#" + id).html("");
for (i in notifications) {
$("#" + id).append(" \
<li class='friend-item $extraItem'> \
<form action='profile.php' method='get'> \
<button type='submit' \
name='username' \
value='"+ notifications[i].username +"'> \
<div class='friend'> \
<img alt='PF' class='profile-picture' src='"+ notifications[i].profilepicture +"'/> \
"+ notifications[i].username +" \
</div> \
</button> \
</form> \
</li> \
");
}
}
function loadNotifications() {
$.post(
"API/loadFriendRequestNotifications.php"
).done(function(data) {
if (data && data != "[]") {
showNotifications(JSON.parse(data), "friendrequestslist");
}
});
$.post(
"API/loadChatNotifications.php"
).done(function(data) {
if (data && data != "[]") {
showNotifications(JSON.parse(data), "unreadChatlist");
}
});
setTimeout(loadNotifications, 10000);
}
$(document).ready(function() {
loadNotifications();
});

41
website/public/js/post.js Normal file
View File

@@ -0,0 +1,41 @@
function postComment(buttonValue) {
formData = $("#newcommentform").serializeArray();
formData.push({name: "button", value: buttonValue});
$.post(
"API/postComment.php",
formData
).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;
}
});
$("#newcomment").val("");
//reload post
$.get(
"API/loadPost.php",
$("#newcommentform").serialize()
).done(function (data) {
$('#modal-response').html(fancyText(data));
});
}
function deletePost(postID) {
var formData = [{name: "postID", value: postID}];
$.post(
"API/deletePost.php",
formData
).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();
masonry(masonryMode);
}

View File

@@ -1,8 +1,23 @@
function checkLoggedIn() { 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"; window.location.href = "logout.php";
} else { } else {
window.location.href = "profile.php"; window.location.href = "profile.php";
} }
document.getElementById("demo").innerHTML = x; }
function emailAlert(){
alert("Bevestigingsemail is gestuurd!\n");
}
function bannedAlert(){
alert("Uw account is geband!");
}
function frozenAlert(){
alert("Uw account is bevroren!\n");
}
function emailNotConfirmed(){
alert("Uw account is nog niet bevestigd!\nEr is een nieuwe email gestuurd om uw account te bevestigen");
} }

View File

@@ -0,0 +1,44 @@
$(window).on('load', function () {
pageNumber();
});
// Search for the users and put them in the user list.
function searchUsers() {
$.post(
"API/searchUsers.php",
$('#search-form').serialize()
).done(function(data) {
if (!showFriends(data, "#search-users-list", 0, "profile.php", "GET")) {
$("#search-users-list").text("Niemand gevonden");
}
});
}
// Search for the groups and put them in the group list.
function searchGroups() {
$.post(
"API/searchGroups.php",
$('#search-form').serialize()
).done(function(data) {
if (!showGroups(data, "#search-groups-list")) {
$("#search-groups-list").text("Geen groepen gevonden");
}
});
}
// Get the page numbers and return them in the select.
function pageNumber() {
var input = input2 = $('#search-form').serialize();
$.post(
"API/searchPageNumber.php",
input + "&option=user"
).done(function (data) {
$('#user-pageselect').html(data);
});
$.post(
"API/searchPageNumber.php",
input2 + "&option=group"
).done(function (data) {
$('#group-pageselect').html(data);
});
}

BIN
website/public/large.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 20 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

View File

@@ -5,48 +5,20 @@
require_once("../queries/connect.php"); require_once("../queries/connect.php");
include_once("../queries/login.php"); include_once("../queries/login.php");
include_once("../queries/checkInput.php"); include_once("../queries/checkInput.php");
include_once("../queries/emailconfirm.php");
include_once("../queries/requestpassword.php");
include_once("../queries/register.php");
require_once("../queries/Facebook/autoload.php");
?> ?>
<body> <body>
<?php <?php
session_start();
if(isset($_SESSION["userID"])){ include("../views/homeLoginRegister.php");
echo "<script>
window.onload=checkLoggedIn();
</script>";
}
// Define variables and set to empty values
$uname = $psw ="";
$loginErr ="";
// 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 {
$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";
}
}
}
/* This view adds login view */ /* This view adds login view */
include("../views/login-view.php"); include("../views/login-view.php");
?> ?>
<script src="js/loginRegisterModals.js"></script>;
</body> </body>
</html> </html>

View File

@@ -1,15 +1,4 @@
<!DOCTYPE html>
<html>
<?php
include("../views/login_head.php");
require_once("../queries/connect.php");
include_once("../queries/login.php");
?>
<body>
<?php <?php
session_start(); session_start();
unset($_SESSION["userID"]); session_destroy();
header("Location: login.php"); header("Location: login.php");
?>
</body>
</html>

44
website/public/manifest.json Executable file
View File

@@ -0,0 +1,44 @@
{
"name": "Web Application Manifest Sample",
"icons": [
{
"src": "launcher-icon-0-75x.png",
"sizes": "36x36",
"type": "image/png",
"density": "0.75"
},
{
"src": "launcher-icon-1x.png",
"sizes": "48x48",
"type": "image/png",
"density": "1.0"
},
{
"src": "launcher-icon-1-5x.png",
"sizes": "72x72",
"type": "image/png",
"density": "1.5"
},
{
"src": "launcher-icon-2x.png",
"sizes": "96x96",
"type": "image/png",
"density": "2.0"
},
{
"src": "launcher-icon-3x.png",
"sizes": "144x144",
"type": "image/png",
"density": "3.0"
},
{
"src": "launcher-icon-4x.png",
"sizes": "192x192",
"type": "image/png",
"density": "4.0"
}
],
"start_url": "index.html",
"display": "standalone",
"orientation": "portrait"
}

View File

@@ -2,16 +2,22 @@
<html> <html>
<head> <head>
<?php include("../views/head.php"); ?> <?php include("../views/head.php"); ?>
<script src="/js/masonry.js"></script>
<script src="js/masonry.js"></script>
<script src="js/post.js"></script>
<style> <style>
@import url("styles/profile.css"); @import url("styles/profile.css");
@import url("styles/post-popup.css");
@import url('https://fonts.googleapis.com/css?family=Anton');
</style> </style>
</head> </head>
<body> <body>
<?php <?php
include("../queries/user.php"); include_once("../queries/user.php");
include("../queries/friendship.php"); include_once("../queries/friendship.php");
include("../queries/nicetime.php"); include_once("../queries/nicetime.php");
include_once("../queries/post.php");
include_once("../queries/calcAge.php");
if(empty($_GET["username"])) { if(empty($_GET["username"])) {
$userID = $_SESSION["userID"]; $userID = $_SESSION["userID"];
@@ -19,10 +25,25 @@ if(empty($_GET["username"])) {
$userID = getUserID($_GET["username"]); $userID = getUserID($_GET["username"]);
} }
$user = selectUser($userID);
if (isset($_SESSION["userID"]) and !$user = selectUser($_SESSION["userID"], $userID)) {
header("HTTP/1.0 404 Not Found");
header("Location: error/404.php");
die();
}
$profile_friends = selectAllFriends($userID); $profile_friends = selectAllFriends($userID);
$profile_groups = selectAllUserGroups($userID); $profile_groups = selectAllUserGroups($userID);
$posts = selectAllUserPosts($userID); $showProfile = $user["showProfile"] || ($user["status"] == 'confirmed') || $_SESSION["userID"] == $userID;
if ($userID == $_SESSION["userID"]) {
$friendship_status = -1;
$masonry_mode = 1;
} else {
$friendship_status = $user["friend_status"];
$masonry_mode = 0;
}
/* /*
* This view adds the main layout over the screen. * This view adds the main layout over the screen.
@@ -36,5 +57,17 @@ include("../views/profile.php");
/* This adds the footer. */ /* This adds the footer. */
include("../views/footer.php"); include("../views/footer.php");
?> ?>
<script src="js/friendButtons.js"></script>
<script src="js/masonry.js"></script>
<script>
$(document).ready(function() {
userID = <?= $userID ?>;
groupID = 0;
placeFriendButtons();
masonry(<?= $masonry_mode ?>);
});
</script>
</body> </body>
</html> </html>

View File

@@ -1,45 +0,0 @@
<!DOCTYPE html>
<html>
<?php
include("../views/login_head.php");
require_once("../queries/connect.php");
include_once("../queries/register.php");
include_once("../queries/checkInput.php");
?>
<body>
<?php
session_start();
if(isset($_SESSION["userID"])){
header("location: profile.php");
}
// define variables and set to empty values
$name = $surname = $bday = $username = $password = $confirmpassword = $location = $housenumber = $email = "";
$genericErr = $nameErr = $surnameErr = $bdayErr = $usernameErr = $passwordErr = $confirmpasswordErr = $locationErr = $housenumberErr = $emailErr = "";
$correct = true;
// Trying to register an account
if ($_SERVER["REQUEST_METHOD"] == "POST") {
checkInputChoice("name", "lettersAndSpace");
checkInputChoice("surname", "lettersAndSpace");
if (empty($_POST["bday"])) {
$bdayErr = "Geboortedatum is verplicht!";
$correct = false;
} else {
$bday = test_input($_POST["bday"]);
}
checkInputChoice("username", "username");
checkInputChoice("password", "longerEight");
checkInputChoice("confirmpassword", "");
matchPassword();
checkInputChoice("location", "lettersAndSpace");
checkInputChoice("email", "email");
registerCheck();
}
/* This view adds register view */
include("../views/register-view.php");
?>
</body>
</html>

View File

@@ -0,0 +1,57 @@
<?php
include_once("../queries/connect.php");
include_once("../views/messagepage.php");
include_once("../views/resetpassword.php");
if ($_SERVER["REQUEST_METHOD"] == "GET") {
if (array_key_exists("u", $_GET) and array_key_exists("h", $_GET)) {
if (verifyLink($_GET["u"], $_GET["h"])) {
messagePage(passwordResetFields());
} else {
messagePage("Wachtwoorden komen niet overeen.");
}
} else {
messagePage("Ongeldige links");
}
} elseif ($_SERVER["REQUEST_METHOD"] == "POST") {
if (verifyLink($_POST["u"], $_POST["h"])) {
if ($_POST["password"] == $_POST["password-confirm"]) {
changePassword();
messagePage("Wachtwoord gewijzigd");
} else {
messagePage("Ongeldige link");
}
}
} else {
messagePage("Ongeldige link");
}
function changePassword() {
$stmt = prepareQuery("
UPDATE
`user`
SET
`password` = :password
WHERE
`userID` = :userID
");
$stmt->bindValue(":password", password_hash($_POST["password"], PASSWORD_DEFAULT));
$stmt->bindParam(":userID", $_POST["u"]);
$stmt->execute();
}
function verifyLink(int $userID, string $hash) {
$stmt = prepareQuery("
SELECT
`password`
FROM
`user`
WHERE
`userID` = :userID
");
$stmt->bindParam(":userID", $userID);
$stmt->execute();
$password = $stmt->fetch()["password"];
return password_verify($password, $hash);
}

View File

@@ -9,6 +9,8 @@
<style> <style>
@import url("styles/search.css"); @import url("styles/search.css");
</style> </style>
<script src="js/search.js"></script>
</head> </head>
<body> <body>
<?php <?php

View File

@@ -12,24 +12,30 @@
</head> </head>
<body> <body>
<?php <?php
$notImplemented = new settingsMessage("angry", "Deze functie werkt nog niet :("); $alertClass;
$alertMessage;
// Select which button has been pressed.
if ($_SERVER["REQUEST_METHOD"] == "POST") { if ($_SERVER["REQUEST_METHOD"] == "POST") {
try {
switch ($_POST["form"]) { switch ($_POST["form"]) {
case "profile": case "profile":
$result = updateSettings(); checkUpdateSettings();
break; break;
case "password": case "password":
$result = changePassword(); changePassword();
break; break;
case "email": case "email":
$result = changeEmail(); changeEmail();
break; break;
case "picture": case "picture":
updateProfilePicture(); updateAvatar();
$result = new settingsMessage("happy", "Deze melding doet nog niks nuttigs.");
break; break;
} }
} catch (AlertMessage $w) {
$alertClass = $w->getClass();
$alertMessage = $w->getMessage();
}
} }
include("../views/main.php"); include("../views/main.php");

BIN
website/public/square.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.7 KiB

View File

@@ -0,0 +1,3 @@
#quick-links i {
font-size: 32px;
}

View File

@@ -1,91 +1,68 @@
.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"] { .admin-panel input[type="radio"], input[type="checkbox"] {
height: auto; vertical-align: middle;
height: 14px;
width: 14px;
margin: 7px;
} }
.admin-batchactions, .admin-groupbatchactions { .table-checkbox {
display: inline-block; width: 28px;
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);
} }
.admin-searchform { .admin-searchform {
display: inline-block; display: inline-block;
width: 100%;
} }
.admin-searchbar { .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; margin-bottom: 20px;
} }
.usertitle { .admin-pageui {
width: 150px; display: inline-block;
width: 100%;
}
.admin-pageselector {
display: inline-block;
}
.admin-users {
margin-top: 50px;
} }
.usertable { .usertable {
width: 100%; width: 100%;
} }
.usertable .table-checkbox {width: 20px} .table-checkbox {width: 20px}
.usertable .table-username {width: 150px} .table-username {width: 150px}
.usertable .table-status {width: 100px} .table-status {width: 100px}
.usertable .table-action {width: 200px} .table-action {width: 200px}
.usertable th, td { .usertable th, td {
border-bottom: 1px solid #ddd; border-bottom: 1px solid #ddd;
padding: 3px; padding: 3px;
word-wrap: break-word;
} }
.usertable tr { .usertable th, tr {
text-align: left; text-align: left;
} }
.usertable tr:hover { .usertable tr:hover {
background-color: #f5f5f5; background-color: #f5f5f5;
} }
.bancomment {
width: 80%;
}
.bancommentedit {
display: none;
}
.bancommentform input[type="text"] {
width: 80%;
}

View File

@@ -1,39 +1,76 @@
body {
overflow: hidden;
}
/* Overall chat-screen */ /* Overall chat-screen */
.chat { .chat {
position: fixed; position: fixed;
top: 80px; top: 80px;
left: 256px; left: 256px;
padding: 15px 0;
width: calc(100% - 256px); width: calc(100% - 256px);
height: calc(100% - 120px); height: calc(100% - 120px);
display: inline-flex;
padding: 20px 0;
display: inline-block;
} }
.chat-left { #chat-recent-panel {
width: 256px; width: 256px;
height: calc(100% - 100px); height: calc(100% - 100px);
margin: 0 10px;
overflow-y: auto;
}
.chat-right { display: inline-block;
width: calc(100% - 256px - 40px); float: left;
height: calc(100% - 80px);
margin-right: 10px; overflow-y: auto;
} }
/* Chat history. */ /* Chat history. */
.chat-history { #chat-history {
overflow-y: auto; overflow-y: auto;
height: 100%; overflow-x: hidden;
width: calc(100% - 256px - 85px);
height: calc(100% - 80px);
margin-right: 10px;
padding: 10px; padding: 10px;
display: inline-block;
float: right;
word-wrap: break-word;
} }
/* Chat-message takes the whole width of the chat area */ /* 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 { .chat-message {
width: 100%; width: 100%;
min-height: 40px; min-height: 40px;
padding-top: 10px; padding: 10px 0;
clear: both;
}
.chat-message::after {
content: '';
display: table;
clear: both; clear: both;
} }
@@ -46,20 +83,21 @@
.chat-message-self { .chat-message-self {
float: right; float: right;
margin-right: 10px; margin-right: 10px;
background-color: darkgreen; background-color: #FBC02D;
color: white; color: #333;
} }
.chat-message-other { .chat-message-other {
float: left; float: left;
margin-left: 10px; margin-left: 10px;
background-color: aquamarine; background-color: #4CAF50;
color: white;
} }
/* Chat reply field */ /* Chat reply field */
.chat-field { .chat-field {
width: 100%; width: calc(100% - 10px);
display: table; display: table;
} }
@@ -77,7 +115,6 @@
width: 100%; width: 100%;
border: none; border: none;
border-radius: 10px 0 0 10px; 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"] { .chat-field input[type="submit"] {
@@ -87,10 +124,45 @@
color: white; color: white;
padding: 5px 10px; padding: 5px 10px;
border-radius: 0 10px 10px 0; 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 { .active-friend-chat {
background: aquamarine; background: #4CAF50;
color: #333; color: white;
}
.chat-message img {
max-width: 100%;
}
.chat-message a {
text-decoration: underline;
}
.chat-time {
color: #666666;
font-size: 12px;
margin-bottom: -3px;
}
.chat-message-other .chat-time {
text-align: right;
}
@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);
}
} }

View File

@@ -7,7 +7,9 @@ header {
height: 80px; height: 80px;
width: 100%; width: 100%;
color: white; color: #FFF;
font-weight: bold;
letter-spacing: 1px;
background-color: #FBC02D; background-color: #FBC02D;
box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24); box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24);
} }
@@ -24,7 +26,8 @@ header {
} }
#header-search { #header-search {
padding-left: 42px; margin: 24px 0 24px 32px;
vertical-align: middle;
} }
@@ -41,6 +44,16 @@ header div {
width: 64px; width: 64px;
} }
#own-profile-picture { #own-profile-picture, #open-notifications {
cursor: pointer; cursor: pointer;
} }
#open-notifications {
padding: 20px 20px 20px 0px;
}
@media only screen and (max-width: 1080px) {
#header-logo {
display: none;
}
}

View File

@@ -1,20 +1,32 @@
a.button { a.button {
background-color: #C8CABD; background-color: #C8CABD;
border-radius: 10px; border-radius: 5px;
color: black; color: black;
cursor: pointer; cursor: pointer;
height: 50%; padding: 8px 20px;
margin: 8px 0;
padding: 14px 20px;
width: 25%;
font-family: Arial; font-family: Arial;
font-size: 16px; font-size: 22px;
box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24);
}
a.fbButton {
background-color: #3B5998;
border-radius: 5px;
color: black;
cursor: pointer;
padding: 8px 20px;
font-family: Arial;
font-size: 22px;
color: white;
box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24);
} }
/* Body */ /* Body */
body { body {
height: 100%; height: 100%;
background-color: #C8CABD; background-color: #FBC02D;
/*background-image: url(http://play.pokemonshowdown.com/fx/client-bg-shaymin.jpg); /*background-image: url(http://play.pokemonshowdown.com/fx/client-bg-shaymin.jpg);
background-size: cover; background-size: cover;
background-attachment: fixed;*/ background-attachment: fixed;*/
@@ -24,34 +36,20 @@ body {
font-family: Arial, sans-serif; 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 */ /* inlogform */
form { form {
/*background-color: #a87a87;*/ /*background-color: #a87a87;*/
border-radius: 12px; border-radius: 12px;
height: 70%; height: 80%;
margin: auto; margin: auto;
width: 70%; width: 600px;
overflow-y: auto; overflow-y: auto;
overflow-x: hidden;
} }
/* inlog titel */ /* inlog titel */
h1 { h1 {
padding: 8px; padding: 8px;
@@ -61,87 +59,82 @@ h1 {
/* registreer titel*/ /* registreer titel*/
h2 { h2 {
padding: 16px; padding: 8px;
text-align: left; text-align: left;
font-size: 2.0em; font-size: 2.0em;
} }
h3 {
padding: 8px;
text-align: center;
font-size: 1.5em;
}
input[type=text], input[type=password], input[type=email], input[type="date"] { input[type=text], input[type=password], input[type=email], input[type="date"] {
box-sizing: border-box; box-sizing: border-box;
border-color: #C8CABD; border-color: #C8CABD;
display: inline-block; display: inline-block;
height: 60%; height: 60%;
padding: 8px 20px; font-size: 16px;
padding: 8px 10px;
margin: 4px 0; 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] { .middle{
text-align: center;
}
.center{
text-align: center;
}
button {
background-color: #C8CABD; background-color: #C8CABD;
border-radius: 5px;
color: black; color: black;
cursor: pointer; cursor: pointer;
height: 50%;
padding: 8px 20px;
margin: 5px;
font-family: Arial; font-family: Arial;
font-size: 16px; font-size: 22px;
width: 50%; box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24);
} }
.error { .error {
font-family: Arial; font-family: Arial;
font-size: 15px; font-size: 15px;
color: red; color: red;
text-align: left;
} }
label { label {
display: block; display: block;
} }
.left-arrow {
display: inline-block;
position: relative;
background-color: #C8CABD;
height: 30px;
width: 90px;
padding: 3px 3px 3px 0px;
text-align: center;
border-radius: 0px 10px 10px 0px;
font-size: 24px;
}
.left-arrow:after {
content: '';
display: block;
position: absolute;
right: 100%;
top: 0;
bottom: 0;
border-top: 15px solid transparent;
border-right: 20px solid #C8CABD;
border-bottom: 15px solid transparent;
border-left: 0px solid transparent;
}
/* padding voor registreer container */ /* padding voor registreer container */
.login_containerregister { .login_containerregister {
padding: 16px; padding: 8px;
text-align: left; text-align: left;
} }
/* padding voor login_containers */ /* padding voor login_containers */
.login_containerlogin { .login_containerlogin {
padding:25px; padding:8px;
text-align: center; text-align: center;
} }
/* padding voor foutmelding login */ /* padding voor foutmelding login */
.login_containerfault { .login_containerfault {
padding: 16px; padding: 4px;
text-align: center;
color: red;
}
.login_containerNoscript {
padding: 4px;
text-align: center; text-align: center;
color: red; color: red;
} }
@@ -159,24 +152,84 @@ label {
background-repeat: repeat-x; background-repeat: repeat-x;
background-attachment: fixed;*/ background-attachment: fixed;*/
box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24); box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24);
height: 500px; height: 400px;
margin: 34px auto; margin: 16px auto;
overflow-y: auto; overflow-y: auto;
padding: 20px; padding: 20px;
width: 50%; width: 650px;
} }
/*.platform { select{
width: 40%; width: 18%;
margin: 34px auto;
}*/
@-webkit-keyframes animatezoom {
from {-webkit-transform: scale(0)}
to {-webkit-transform: scale(1)}
} }
ul { ul {
font-family: Arial; font-family: Arial;
font-size: 16px; font-size: 16px;
} }
/* The Modal (background) */
.modal {
display: none; /* Hidden by default */
position: fixed; /* Stay in place */
z-index: 1; /* Sit on top */
padding-top: 75px; /* Location of the box */
left: 0;
top: 0;
width: 100%; /* Full width */
height: 100%; /* Full height */
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 */
}
/* Modal Content */
.modal-content {
position: relative;
background-color: #FFFFFF;
margin: auto;
padding: 0;
border: 1px solid #888;
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;
animation-name: animatetop;
animation-duration: 0.4s
}
@keyframes animatetop {
from {top:-300px; opacity:0}
to {top:0; opacity:1}
}
/* The Close Button */
.close {
color: white;
float: right;
font-size: 36px;
font-weight: bold;
}
.close:hover,
.close:focus {
color: #000;
text-decoration: none;
cursor: pointer;
}
.modal-header {
padding: 4px 16px;
background-color: #FBC02D;
color: black;
}
.modal-body {
padding: 2px 16px;
}
.modal-footer {
padding: 2px 8px;
background-color: #FBC02D;
color: black;
}

View File

@@ -92,23 +92,31 @@ p {
border-radius: 50%; border-radius: 50%;
} }
.online {
border: #4CAF50 solid 3px;
}
.offline {
border: #666666 solid 3px;
}
.group-picture { .group-picture {
border-radius: 5px; border-radius: 5px;
} }
.item-box, .item-box-full-width { .item-box, .item-box-full-width {
margin: 20px 0 0 0;
padding: 25px; padding: 25px;
background-color: #FFFFFF; background-color: #FFFFFF;
} }
.item-box { .item-box {
width: calc(50% - 60px); width: calc(33% - 50px);
display: inline-table;
} }
@media only screen and (max-width: 900px) { @media only screen and (max-width: 1400px) {
.item-box { .item-box {
width: calc(100% - 50px); width: calc(100% - 50px)!important;
} }
} }
@@ -175,6 +183,19 @@ textarea:focus, input:focus, select:focus {
} }
/* All buttons */ /* All buttons */
button.red {
background-color: firebrick;
}
button.green {
background-color: forestgreen;
}
button.gray{
background-color: #FFF;
color: #333;
}
button, button,
input[type="submit"], input[type="submit"],
input[type="reset"] { input[type="reset"] {
@@ -215,6 +236,7 @@ td {
/* Custom title box, appears instantaneously */ /* Custom title box, appears instantaneously */
a[data-title]:hover, a[data-title]:hover,
i[data-title]:hover,
img[data-title]:hover, img[data-title]:hover,
span[data-title]:hover, span[data-title]:hover,
div[data-title]:hover { div[data-title]:hover {
@@ -222,6 +244,7 @@ div[data-title]:hover {
} }
a[data-title]:hover:after, a[data-title]:hover:after,
i[data-title]:hover:after,
img[data-title]:hover:after, img[data-title]:hover:after,
span[data-title]:hover:after, span[data-title]:hover:after,
div[data-title]:hover:after { div[data-title]:hover:after {
@@ -233,8 +256,6 @@ div[data-title]:hover:after {
top: 150%; top: 150%;
z-index: 200; z-index: 200;
white-space: nowrap; white-space: nowrap;
-moz-border-radius: 3px;
-webkit-border-radius: 3px;
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); box-shadow: 0 14px 28px rgba(0,0,0,0.25), 0 10px 10px rgba(0,0,0,0.22);
background-color: #333; background-color: #333;
@@ -242,3 +263,45 @@ div[data-title]:hover:after {
line-height: normal; line-height: normal;
font-family: Arial, sans-serif; font-family: Arial, sans-serif;
} }
.friend-item, .group-item {
cursor: pointer;
transition-duration: 250ms;
}
.friend-item button, .group-item button {
background: none;
color: inherit;
width: 100%;
height: 100%;
padding: 0;
text-align: left;
}
.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;
}
@media only screen and (max-width: 1080px) {
body {
font-size: 28px!important;
}
button, input, select {
font-size: 28px;
height: 42px;
}
textarea {
font-size: 28px;
}
input[type="checkbox"], input[type="radio"] {
width: 28px;
height: 28px;
}
}

View File

@@ -5,7 +5,7 @@
left: 0; left: 0;
top: 80px; top: 80px;
height: calc(100% - 80px); height: calc(100% - 120px);
width: 236px; width: 236px;
padding: 20px 10px; padding: 20px 10px;
@@ -34,25 +34,6 @@
cursor: pointer; 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;
width: 100%;
height: 100%;
padding: 0;
text-align: left;
}
#notification-center { #notification-center {
left: auto; left: auto;
width: 236px; width: 236px;
@@ -74,3 +55,49 @@
#quick-links i:hover { #quick-links i:hover {
color: #FBC02D; color: #FBC02D;
} }
.notification-options {
width: 100%;
display: none;
}
.notification-options button {
display: inline-block;
padding: 5px 20px;
width: auto;
}
.accept-notification:hover {
color: #4CAF50;
}
.deny-notification:hover {
color: firebrick;
}
.friend-item:hover .notification-options {
display: inline-block;
}
.menu button {
background: none;
color: inherit;
width: 100%;
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;
}
}

View File

@@ -0,0 +1,28 @@
body {
background-color: #FBC02D;
}
.password-change {
height: 100%;
margin: auto;
}
.top-logo {
text-align: center;
}
.item-box {
margin: 30px auto auto;
display: block;
}
.top-logo img {
width: 50%;
}
.error-page {
text-align: center;
}
.error-page img {
vertical-align: middle;
}

View File

@@ -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);
}

View File

@@ -0,0 +1,95 @@
/* modal based on: http://www.w3schools.com/howto/howto_css_modals.asp */
.modal {
display: none;
position: fixed;
top: 80px;
left: 256px;
width: calc(100% - 256px); /* Full width */
height: calc(100% - 80px); /* Full height */
background-color: rgb(0,0,0); /* Fallback color */
background-color: rgba(0,0,0,0.4); /* Black w/ opacity */
overflow-y: auto;
}
/* Modal Content/Box */
.modal-content {
margin: 50px auto;
width: 70%; /* Could be more or less, depending on screen size */
overflow-y: auto;
}
.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;
}
.modal-content img {
max-height: 100%;
max-width: 100%;
}
.post-header h4 {
font-size: 20pt;
}
.post-content {
margin: 30px auto;
width: 90%;
}
.post-content a {
text-decoration: underline;
}
.commentfield {
margin-bottom: 20px;
}
.commentfield textarea {
width: 100%;
}
.comment {
padding-top: 10px;
padding-bottom: 10px;
border-top: 1px solid #4CAF50;
}
.commentinfo {
font-size: 10pt;
}
.commentcontent {
margin: 5px auto;
width: 95%;
}
.nietslecht-text {
font-family: Impact, Anton, sans-serif;
text-shadow: -1px 0 1px black, 0 1px 1px black, 1px 0 1px black, 0 -1px 1px black;
}
.nietslecht {
}
.nietslecht img {
vertical-align: middle;
height: 24px;
width: 24px;
}
.deleteButton {
background-color: firebrick;
float: right;
}

View File

@@ -1,15 +1,105 @@
.profile-box { /* New */
min-height: 150px;
padding: 25px; .alertbox {
background-color: #FFFFFF; display: none;
background-color: firebrick;
} }
.profile-box .profile-picture, .profile-box .group-picture { .alerttext {
color: white;
}
.user-box {
text-align: center;
}
.status-buttons-container {
position: relative;
float: left;
width: 200px;
display: inline-block;
}
.friend-button-container, .group-button-container {
position: relative;
float: right;
width: 200px;
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;
}
.status-buttons-container button {
float: left;
}
.group-button-container button {
float: right;
}
.empty-button {
background: none;
cursor: auto;
}
.empty-button:active {
box-shadow: none;
}
.profile-info {
display: inline-block;
min-width: 250px;
width: auto;
padding-top: 30px;
}
.main-picture {
position: relative;
border-width: 5px;
display: inline-block;
width: 150px; width: 150px;
height: 150px; height: 150px;
margin: 0 20px 20px 0; margin-bottom: -45px;
object-fit: cover;
vertical-align: middle;
} }
.group-picture {
border: none;
}
.fancy-button span {
display: none;
}
.fancy-button:hover {
text-align: right;
}
.fancy-button i {
display: inline-block;
}
.fancy-button:hover span {
display: inline-block;
margin-right: 5px;
}
/* Old */
.profile-box h1.profile-username { .profile-box h1.profile-username {
padding-top: 50px; padding-top: 50px;
} }
@@ -18,18 +108,21 @@
} }
div.posts { div.posts {
padding-top: 20px;
width: calc(100% + 20px); width: calc(100% + 20px);
display: inline-flex; display: inline-flex;
} }
div.posts div.post { div.posts div.post {
display: block; display: block;
margin: 20px 0 0 0;
padding: 10px; padding: 10px;
width: calc(100% - 40px); width: calc(100% - 40px);
cursor: pointer; cursor: pointer;
transition-duration: 250ms; transition-duration: 250ms;
word-wrap: break-word;
}
div.posts div.post a {
text-decoration: underline;
} }
div.posts div.post:hover { div.posts div.post:hover {
@@ -50,7 +143,7 @@ div.posts .post form input, div.posts .post form textarea {
width: calc(100% - 15px); width: calc(100% - 15px);
} }
div.posts .post form input[type="submit"] { div.posts .post form input[type="submit"], .post button{
width: 100%; width: 100%;
} }
@@ -59,6 +152,17 @@ div.posts .post form textarea.newpost {
height: 100px; height: 100px;
} }
.post .post-date {
float: right;
color: #aaaaaa;
font-size: 0.8em;
}
.noposts {
display: none;
text-align: center;
}
@media only screen and (max-width: 1500px) { @media only screen and (max-width: 1500px) {
.post-box { .post-box {
width: calc(50% - 68px); width: calc(50% - 68px);
@@ -66,28 +170,12 @@ div.posts .post form textarea.newpost {
} }
/* mobile */ /* mobile */
@media only screen and (max-width: 1000px) { @media only screen and (max-width: 1080px) {
.post-box { .post-box {
width: calc(100% - 65px); width: calc(100% - 65px);
} }
.modal {
left: 0!important;
width: 100%!important;
} }
.post .post-date {
float: right;
color: #aaaaaa;
font-size: 0.8em;
}
.profile-button {
float: right;
padding: 10px;
border-radius: 5px;
background-color: #4CAF50;
color: #FFFFFF;
transition-duration: 250ms;
cursor: pointer;
}
.profile-button:hover {
box-shadow: 0 10px 20px rgba(0,0,0,0.19), 0 6px 6px rgba(0,0,0,0.23);
} }

View File

@@ -15,3 +15,15 @@
display: inline-block; display: inline-block;
vertical-align: top; vertical-align: top;
} }
.user-pageselect, .searchleft h4, .group-pageselect, .searchright h4 {
display: inline-block;
}
.user-pageselect, .group-pageselect {
float: right;
}
li.search-item:hover{
background-color: #FBC02D;
}

View File

@@ -32,6 +32,11 @@
text-align: right; text-align: right;
} }
.settings-password, .settings-email {
width: calc(50% - 60px);
display: inline-flex;
}
.settings-password label, .settings-email label { .settings-password label, .settings-email label {
text-align: left; text-align: left;
} }

BIN
website/public/tiny.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

BIN
website/public/wide.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

View File

@@ -0,0 +1,160 @@
<?php
/**
* Copyright 2014 Facebook, Inc.
*
* You are hereby granted a non-exclusive, worldwide, royalty-free license to
* use, copy, modify, and distribute this software in source code or binary
* form for use in connection with the web services and APIs provided by
* Facebook.
*
* As with any software that integrates with the Facebook platform, your use
* of this software is subject to the Facebook Developer Principles and
* Policies [http://developers.facebook.com/policy/]. This copyright notice
* shall be included in all copies or substantial portions of the software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
* DEALINGS IN THE SOFTWARE.
*
*/
namespace Facebook\Authentication;
/**
* Class AccessToken
*
* @package Facebook
*/
class AccessToken
{
/**
* The access token value.
*
* @var string
*/
protected $value = '';
/**
* Date when token expires.
*
* @var \DateTime|null
*/
protected $expiresAt;
/**
* Create a new access token entity.
*
* @param string $accessToken
* @param int $expiresAt
*/
public function __construct($accessToken, $expiresAt = 0)
{
$this->value = $accessToken;
if ($expiresAt) {
$this->setExpiresAtFromTimeStamp($expiresAt);
}
}
/**
* Generate an app secret proof to sign a request to Graph.
*
* @param string $appSecret The app secret.
*
* @return string
*/
public function getAppSecretProof($appSecret)
{
return hash_hmac('sha256', $this->value, $appSecret);
}
/**
* Getter for expiresAt.
*
* @return \DateTime|null
*/
public function getExpiresAt()
{
return $this->expiresAt;
}
/**
* Determines whether or not this is an app access token.
*
* @return bool
*/
public function isAppAccessToken()
{
return strpos($this->value, '|') !== false;
}
/**
* Determines whether or not this is a long-lived token.
*
* @return bool
*/
public function isLongLived()
{
if ($this->expiresAt) {
return $this->expiresAt->getTimestamp() > time() + (60 * 60 * 2);
}
if ($this->isAppAccessToken()) {
return true;
}
return false;
}
/**
* Checks the expiration of the access token.
*
* @return boolean|null
*/
public function isExpired()
{
if ($this->getExpiresAt() instanceof \DateTime) {
return $this->getExpiresAt()->getTimestamp() < time();
}
if ($this->isAppAccessToken()) {
return false;
}
return null;
}
/**
* Returns the access token as a string.
*
* @return string
*/
public function getValue()
{
return $this->value;
}
/**
* Returns the access token as a string.
*
* @return string
*/
public function __toString()
{
return $this->getValue();
}
/**
* Setter for expires_at.
*
* @param int $timeStamp
*/
protected function setExpiresAtFromTimeStamp($timeStamp)
{
$dt = new \DateTime();
$dt->setTimestamp($timeStamp);
$this->expiresAt = $dt;
}
}

Some files were not shown because too many files have changed in this diff Show More