@@ -148,6 +148,12 @@ discard block |
||
148 | 148 | return $statement->fetchAll(PDO::FETCH_CLASS, $returnClass); |
149 | 149 | } |
150 | 150 | |
151 | + /** |
|
152 | + * @param string $returnClass |
|
153 | + * @param string $table |
|
154 | + * @param string[] $columns |
|
155 | + * @param string[] $where |
|
156 | + */ |
|
151 | 157 | public function selectSingle($returnClass, $table, $columns, $where = null) |
152 | 158 | { |
153 | 159 | $statement = $this->selectStatement($table, $columns, $where); |
@@ -215,6 +221,8 @@ discard block |
||
215 | 221 | |
216 | 222 | /** |
217 | 223 | * Use with caution: it is often better to archive items to prevent creating null references. |
224 | + * @param string $table |
|
225 | + * @param string[] $where |
|
218 | 226 | */ |
219 | 227 | public function delete($table, $where) |
220 | 228 | { |
@@ -253,6 +261,9 @@ discard block |
||
253 | 261 | return $table; |
254 | 262 | } |
255 | 263 | |
264 | + /** |
|
265 | + * @param string $table |
|
266 | + */ |
|
256 | 267 | private function tableExists($table) |
257 | 268 | { |
258 | 269 | // todo: implement table check |
@@ -272,8 +272,8 @@ |
||
272 | 272 | public function count($table, $column, $where = null) |
273 | 273 | { |
274 | 274 | $columns = [ |
275 | - 'COUNT('.$column.') AS count', |
|
276 | - ]; |
|
275 | + 'COUNT('.$column.') AS count', |
|
276 | + ]; |
|
277 | 277 | $statement = $this->selectStatement($table, $columns, $where); |
278 | 278 | |
279 | 279 | return $statement->fetchObject()->count; |
@@ -180,10 +180,10 @@ discard block |
||
180 | 180 | if ($first) { |
181 | 181 | $first = false; |
182 | 182 | $fields .= $item['field']; |
183 | - $valuesPlaceholder .= ':'.$item['field']; |
|
183 | + $valuesPlaceholder .= ':' . $item['field']; |
|
184 | 184 | } else { |
185 | - $fields .= ', '.$item['field']; |
|
186 | - $valuesPlaceholder .= ', :'.$item['field']; |
|
185 | + $fields .= ', ' . $item['field']; |
|
186 | + $valuesPlaceholder .= ', :' . $item['field']; |
|
187 | 187 | } |
188 | 188 | |
189 | 189 | if ($item['type'] == 's' || $item['type'] == 'string') { |
@@ -201,9 +201,9 @@ discard block |
||
201 | 201 | } |
202 | 202 | } |
203 | 203 | |
204 | - $statement = $this->db_connection->prepare('INSERT INTO '.$table.' ('.$fields.') VALUES ('.$valuesPlaceholder.')'); |
|
204 | + $statement = $this->db_connection->prepare('INSERT INTO ' . $table . ' (' . $fields . ') VALUES (' . $valuesPlaceholder . ')'); |
|
205 | 205 | foreach ($data as $item) { |
206 | - $statement->bindParam(':'.$item['field'], $item['value']); |
|
206 | + $statement->bindParam(':' . $item['field'], $item['value']); |
|
207 | 207 | } |
208 | 208 | |
209 | 209 | if ($statement->execute()) { |
@@ -248,7 +248,7 @@ discard block |
||
248 | 248 | |
249 | 249 | private function addPrefix($table) |
250 | 250 | { |
251 | - $table = $this->db_prefix.$table; |
|
251 | + $table = $this->db_prefix . $table; |
|
252 | 252 | |
253 | 253 | return $table; |
254 | 254 | } |
@@ -272,7 +272,7 @@ discard block |
||
272 | 272 | public function count($table, $column, $where = null) |
273 | 273 | { |
274 | 274 | $columns = [ |
275 | - 'COUNT('.$column.') AS count', |
|
275 | + 'COUNT(' . $column . ') AS count', |
|
276 | 276 | ]; |
277 | 277 | $statement = $this->selectStatement($table, $columns, $where); |
278 | 278 |
@@ -47,7 +47,7 @@ discard block |
||
47 | 47 | $swapId = filter_var($swapId, FILTER_SANITIZE_NUMBER_INT); |
48 | 48 | |
49 | 49 | switch ($action) { |
50 | - case 'swap': |
|
50 | + case 'swap': |
|
51 | 51 | if ($_SERVER['REQUEST_METHOD'] == 'POST') { |
52 | 52 | $eventPersonId = $_POST['eventPerson']; |
53 | 53 | $newUserRoleId = $_POST['newUserRole']; |
@@ -61,48 +61,48 @@ discard block |
||
61 | 61 | $err = 'Swap details incorrect, please try again.'; |
62 | 62 | } |
63 | 63 | break; |
64 | - case 'accept': |
|
64 | + case 'accept': |
|
65 | 65 | if (canAcceptSwap($swapId) || $verify == verificationCodeForSwap($swapId)) { |
66 | 66 | switch (acceptSwap($swapId)) { |
67 | 67 | case '1': |
68 | 68 | $message = 'Swap Successful'; |
69 | - break; |
|
69 | + break; |
|
70 | 70 | case '2': |
71 | 71 | $message = 'Swap already accepted.'; |
72 | - break; |
|
72 | + break; |
|
73 | 73 | case '3': |
74 | 74 | $message = 'Swap already declined.'; |
75 | - break; |
|
75 | + break; |
|
76 | 76 | case '4': |
77 | 77 | $message = 'Swap already reverted.'; |
78 | - break; |
|
78 | + break; |
|
79 | 79 | default: |
80 | 80 | $err = 'Technical issue - please inform system administrator'; |
81 | - break; |
|
82 | - } |
|
81 | + break; |
|
82 | + } |
|
83 | 83 | } else { |
84 | 84 | $err = 'Swap Already Actioned or Verification Code Invalid'; |
85 | 85 | } |
86 | 86 | break; |
87 | - case 'decline': |
|
87 | + case 'decline': |
|
88 | 88 | if (canDeclineSwap($swapId) || $verify == verificationCodeForSwap($swapId)) { |
89 | 89 | switch (declineSwap($swapId)) { |
90 | 90 | case '1': |
91 | 91 | $message = 'Swap declined'; |
92 | - break; |
|
92 | + break; |
|
93 | 93 | case '2': |
94 | 94 | $message = 'Swap already declined.'; |
95 | - break; |
|
95 | + break; |
|
96 | 96 | default: |
97 | 97 | $err = 'Technical issue - please inform system administrator'; |
98 | - break; |
|
98 | + break; |
|
99 | 99 | } |
100 | 100 | } else { |
101 | 101 | $err = 'Swap Already Actioned or Verification Code Invalid'; |
102 | 102 | } |
103 | 103 | break; |
104 | 104 | |
105 | - default: |
|
105 | + default: |
|
106 | 106 | // code... |
107 | 107 | break; |
108 | 108 | } |
@@ -163,7 +163,7 @@ discard block |
||
163 | 163 | <section class="content"> |
164 | 164 | |
165 | 165 | <?php |
166 | - if (isset($message)): ?> |
|
166 | + if (isset($message)): ?> |
|
167 | 167 | |
168 | 168 | <p><?php echo $message ?></p> |
169 | 169 | |
@@ -224,19 +224,19 @@ discard block |
||
224 | 224 | <label for="newUserRole">Swap To:</label> |
225 | 225 | <select name="newUserRole" class="form-control"> |
226 | 226 | <?php |
227 | - if (roleCanSwapToOtherRoleInGroup($role->roleId)) { |
|
228 | - $whereAnd = 'r.groupId = '.groupIdWithRole($role->roleId).' AND r.allowRoleSwaps IS NOT FALSE'; |
|
229 | - } else { |
|
230 | - $whereAnd = 'r.id = '.$role->roleId; |
|
231 | - } |
|
232 | - $sql = 'SELECT ur.id, u.firstName, u.lastName, r.name FROM cr_users u INNER JOIN cr_userRoles ur ON ur.userId = u.id INNER JOIN cr_roles r ON r.id = ur.roleId WHERE u.id <> '.$role->userId.' AND '.$whereAnd.' ORDER BY lastName, firstName, r.name'; |
|
233 | - $result = mysqli_query(db(), $sql) or die(mysqli_error(db())); |
|
234 | - |
|
235 | - while ($row = mysqli_fetch_array($result, MYSQLI_ASSOC)) { |
|
236 | - ?> |
|
227 | + if (roleCanSwapToOtherRoleInGroup($role->roleId)) { |
|
228 | + $whereAnd = 'r.groupId = '.groupIdWithRole($role->roleId).' AND r.allowRoleSwaps IS NOT FALSE'; |
|
229 | + } else { |
|
230 | + $whereAnd = 'r.id = '.$role->roleId; |
|
231 | + } |
|
232 | + $sql = 'SELECT ur.id, u.firstName, u.lastName, r.name FROM cr_users u INNER JOIN cr_userRoles ur ON ur.userId = u.id INNER JOIN cr_roles r ON r.id = ur.roleId WHERE u.id <> '.$role->userId.' AND '.$whereAnd.' ORDER BY lastName, firstName, r.name'; |
|
233 | + $result = mysqli_query(db(), $sql) or die(mysqli_error(db())); |
|
234 | + |
|
235 | + while ($row = mysqli_fetch_array($result, MYSQLI_ASSOC)) { |
|
236 | + ?> |
|
237 | 237 | <option value='<?php echo $row['id']; ?>'><?php echo $row['firstName'].' '.$row['lastName'].' ('.$row['name'].')'; ?></option> |
238 | 238 | <?php |
239 | - } ?> |
|
239 | + } ?> |
|
240 | 240 | </select> |
241 | 241 | </div> |
242 | 242 | </div> |
@@ -110,7 +110,7 @@ discard block |
||
110 | 110 | if (!empty($eventId)) { |
111 | 111 | // ensure user is logged in before allowing creation of swap |
112 | 112 | if (!(isset($_SESSION['is_logged_in']) || $_SESSION['db_is_logged_in'] == true)) { |
113 | - $_SESSION['redirectUrl'] = siteSettings()->getSiteUrl().'/swap.php?event='.$eventId; |
|
113 | + $_SESSION['redirectUrl'] = siteSettings()->getSiteUrl() . '/swap.php?event=' . $eventId; |
|
114 | 114 | header('Location: login.php'); |
115 | 115 | } |
116 | 116 | $createSwap = true; |
@@ -186,11 +186,11 @@ discard block |
||
186 | 186 | <p> |
187 | 187 | <strong> |
188 | 188 | <s class="text-red"> |
189 | - <?php echo $swap->getOldUserRole()->getUser()->getFirstName().' '.$swap->getOldUserRole()->getUser()->getLastName() ?> (<?php echo $swap->getOldUserRole()->getRole()->getName() ?>) |
|
189 | + <?php echo $swap->getOldUserRole()->getUser()->getFirstName() . ' ' . $swap->getOldUserRole()->getUser()->getLastName() ?> (<?php echo $swap->getOldUserRole()->getRole()->getName() ?>) |
|
190 | 190 | </s> |
191 | 191 | → |
192 | 192 | <span class="text-green"> |
193 | - <?php echo $swap->getNewUserRole()->getUser()->getFirstName().' '.$swap->getNewUserRole()->getUser()->getLastName() ?> (<?php echo $swap->getNewUserRole()->getRole()->getName() ?>) |
|
193 | + <?php echo $swap->getNewUserRole()->getUser()->getFirstName() . ' ' . $swap->getNewUserRole()->getUser()->getLastName() ?> (<?php echo $swap->getNewUserRole()->getRole()->getName() ?>) |
|
194 | 194 | </span> |
195 | 195 | </strong> |
196 | 196 | </p> |
@@ -225,16 +225,16 @@ discard block |
||
225 | 225 | <select name="newUserRole" class="form-control"> |
226 | 226 | <?php |
227 | 227 | if (roleCanSwapToOtherRoleInGroup($role->roleId)) { |
228 | - $whereAnd = 'r.groupId = '.groupIdWithRole($role->roleId).' AND r.allowRoleSwaps IS NOT FALSE'; |
|
228 | + $whereAnd = 'r.groupId = ' . groupIdWithRole($role->roleId) . ' AND r.allowRoleSwaps IS NOT FALSE'; |
|
229 | 229 | } else { |
230 | - $whereAnd = 'r.id = '.$role->roleId; |
|
230 | + $whereAnd = 'r.id = ' . $role->roleId; |
|
231 | 231 | } |
232 | - $sql = 'SELECT ur.id, u.firstName, u.lastName, r.name FROM cr_users u INNER JOIN cr_userRoles ur ON ur.userId = u.id INNER JOIN cr_roles r ON r.id = ur.roleId WHERE u.id <> '.$role->userId.' AND '.$whereAnd.' ORDER BY lastName, firstName, r.name'; |
|
232 | + $sql = 'SELECT ur.id, u.firstName, u.lastName, r.name FROM cr_users u INNER JOIN cr_userRoles ur ON ur.userId = u.id INNER JOIN cr_roles r ON r.id = ur.roleId WHERE u.id <> ' . $role->userId . ' AND ' . $whereAnd . ' ORDER BY lastName, firstName, r.name'; |
|
233 | 233 | $result = mysqli_query(db(), $sql) or die(mysqli_error(db())); |
234 | 234 | |
235 | 235 | while ($row = mysqli_fetch_array($result, MYSQLI_ASSOC)) { |
236 | 236 | ?> |
237 | - <option value='<?php echo $row['id']; ?>'><?php echo $row['firstName'].' '.$row['lastName'].' ('.$row['name'].')'; ?></option> |
|
237 | + <option value='<?php echo $row['id']; ?>'><?php echo $row['firstName'] . ' ' . $row['lastName'] . ' (' . $row['name'] . ')'; ?></option> |
|
238 | 238 | <?php |
239 | 239 | } ?> |
240 | 240 | </select> |
@@ -51,7 +51,7 @@ discard block |
||
51 | 51 | // fetch events |
52 | 52 | |
53 | 53 | switch ($_GET['format']) { |
54 | - case 'ical': |
|
54 | + case 'ical': |
|
55 | 55 | icalOutput($events); |
56 | 56 | break; |
57 | 57 | } |
@@ -125,9 +125,9 @@ discard block |
||
125 | 125 | $value = trim($value); |
126 | 126 | $value = strip_tags($value); |
127 | 127 | $value = preg_replace('/\n+/', ' ', $value); // remove newlines |
128 | - $value = preg_replace('/\s{2,}/', ' ', $value); // remove whitespace |
|
129 | - $value = str_replace(',', '\,', $value); // escape commas |
|
130 | - $preamble_len = strlen($preamble); |
|
128 | + $value = preg_replace('/\s{2,}/', ' ', $value); // remove whitespace |
|
129 | + $value = str_replace(',', '\,', $value); // escape commas |
|
130 | + $preamble_len = strlen($preamble); |
|
131 | 131 | $lines = []; |
132 | 132 | while (strlen($value) > (75 - $preamble_len)) { |
133 | 133 | $space = (75 - $preamble_len); |
@@ -68,7 +68,7 @@ discard block |
||
68 | 68 | METHOD:PUBLISH |
69 | 69 | VERSION:2.0 |
70 | 70 | PRODID:-//Church Rota//Church Rota//EN |
71 | -X-WR-CALNAME:'.siteSettings()->getOwner()." Rota |
|
71 | +X-WR-CALNAME:'.siteSettings()->getOwner() . " Rota |
|
72 | 72 | CALSCALE:GREGORIAN |
73 | 73 | BEGIN:VTIMEZONE |
74 | 74 | TZID:Europe/London |
@@ -94,16 +94,16 @@ discard block |
||
94 | 94 | foreach ($events as $event): |
95 | 95 | $output .= |
96 | 96 | 'BEGIN:VEVENT |
97 | -SUMMARY:'.$event->role.($event->name ? ' | '.$event->name.' ('.$event->type.')' : ' ('.$event->type.')').' |
|
98 | -DESCRIPTION:'.ical_split('DESCRIPTION:', $event->series.':\n'.$event->sermonTitle.' ('.$event->bibleVerse.')\n\nIf you are unable to do '.$event->role.' at this event, please request a swap:\n'.siteSettings()->getSiteUrl().'/swap.php?event='.$event->id.'\n\nOnce the swap is accepted, this event will be removed from your calendar.\nPlease be aware that changes may take up to 24 hours or longer to be reflected. This is due to your calendar, not on the rota system.').' |
|
99 | -UID:ROTA'.$event->id.' |
|
100 | -ORGANIZER;CN="'.siteSettings()->getOwner().'":MAILTO:'.siteSettings()->getAdminEmailAddress().' |
|
101 | -STATUS:'.'CONFIRMED'.' |
|
102 | -DTSTART;TZID="Europe/London":'.date(DATE_ICAL, strtotime($event->date)).' |
|
103 | -DTEND;TZID="Europe/London":'.date(DATE_ICAL, strtotime($event->date) + HOUR).' |
|
104 | -LAST-MODIFIED:'.date(DATE_ICAL, strtotime($event->updated)).'Z |
|
105 | -LOCATION:'.ical_split('LOCATION:', $event->locationName.', '.$event->locationAddress).' |
|
106 | -URL:'.siteSettings()->getSiteUrl().'/event.php?id='.$event->id." |
|
97 | +SUMMARY:'.$event->role . ($event->name ? ' | ' . $event->name . ' (' . $event->type . ')' : ' (' . $event->type . ')') . ' |
|
98 | +DESCRIPTION:'.ical_split('DESCRIPTION:', $event->series . ':\n' . $event->sermonTitle . ' (' . $event->bibleVerse . ')\n\nIf you are unable to do ' . $event->role . ' at this event, please request a swap:\n' . siteSettings()->getSiteUrl() . '/swap.php?event=' . $event->id . '\n\nOnce the swap is accepted, this event will be removed from your calendar.\nPlease be aware that changes may take up to 24 hours or longer to be reflected. This is due to your calendar, not on the rota system.') . ' |
|
99 | +UID:ROTA'.$event->id . ' |
|
100 | +ORGANIZER;CN="'.siteSettings()->getOwner() . '":MAILTO:' . siteSettings()->getAdminEmailAddress() . ' |
|
101 | +STATUS:'.'CONFIRMED' . ' |
|
102 | +DTSTART;TZID="Europe/London":'.date(DATE_ICAL, strtotime($event->date)) . ' |
|
103 | +DTEND;TZID="Europe/London":'.date(DATE_ICAL, strtotime($event->date) + HOUR) . ' |
|
104 | +LAST-MODIFIED:'.date(DATE_ICAL, strtotime($event->updated)) . 'Z |
|
105 | +LOCATION:'.ical_split('LOCATION:', $event->locationName . ', ' . $event->locationAddress) . ' |
|
106 | +URL:'.siteSettings()->getSiteUrl() . '/event.php?id=' . $event->id . " |
|
107 | 107 | BEGIN:VALARM |
108 | 108 | ACTION:DISPLAY |
109 | 109 | DESCRIPTION:Reminder for Rota |
@@ -33,7 +33,7 @@ discard block |
||
33 | 33 | exit; |
34 | 34 | } |
35 | 35 | if (!isAdmin()) { |
36 | - header('Location: error.php?no=100&page='.basename($_SERVER['SCRIPT_FILENAME'])); |
|
36 | + header('Location: error.php?no=100&page=' . basename($_SERVER['SCRIPT_FILENAME'])); |
|
37 | 37 | exit; |
38 | 38 | } |
39 | 39 | |
@@ -57,20 +57,20 @@ discard block |
||
57 | 57 | if ($action == 'update') { |
58 | 58 | //if ($language='de-de') |
59 | 59 | if ($rowSettings['lang_locale'] == 'en_GB') { |
60 | - executeDbSql("update cr_settings set lang_locale = 'de_DE'"); // de_DE |
|
60 | + executeDbSql("update cr_settings set lang_locale = 'de_DE'"); // de_DE |
|
61 | 61 | executeDbSql("update cr_settings set time_format_long = '%A, %e. %B %Y, %R Uhr, KW%V'"); // de_DE: %A, %e. %B %Y, %R Uhr, KW%V |
62 | 62 | executeDbSql("update cr_settings set time_format_normal = '%d.%m.%Y %H:%M '"); // de_DE: %d.%m.%Y %H:%M |
63 | - executeDbSql("update cr_settings set time_format_short = '%a, <strong>%e. %b</strong>, %R'"); // de_DE: %a, <strong>%e. %b</strong>, KW%V |
|
63 | + executeDbSql("update cr_settings set time_format_short = '%a, <strong>%e. %b</strong>, %R'"); // de_DE: %a, <strong>%e. %b</strong>, KW%V |
|
64 | 64 | executeDbSql("update cr_settings set time_zone = 'Europe/Berlin'"); //de_DE: Europe/Berlin |
65 | 65 | executeDbSql("update cr_settings set google_group_calendar = ''"); |
66 | 66 | executeDbSql("update cr_settings set overviewemail = '{{Gottesdienst-Planung [MONTH] [YEAR]}}\r\nHallo zusammen,\r\n\r\nanbei die Gottesdienst-Planung fuer [MONTH] [YEAR]\r\n\r\n[OVERVIEW]\r\n\r\nBitte fruehzeitig Bescheid geben, wenn etwas NICHT passt, ansonsten gehe ich davon aus, dass ihr wie geplant koennt.\r\n\r\nAlles Gute und Gottes Segen f�r Euch und Euren Dienst.\r\nEuer Gottesdienst Orga-Team'"); |
67 | 67 | } |
68 | 68 | //else |
69 | 69 | if ($rowSettings['lang_locale'] == 'de_DE') { |
70 | - executeDbSql("update cr_settings set lang_locale = 'en_GB'"); // de_DE |
|
70 | + executeDbSql("update cr_settings set lang_locale = 'en_GB'"); // de_DE |
|
71 | 71 | executeDbSql("update cr_settings set time_format_long = '%A, %B %e @ %I:%M %p'"); // de_DE: %A, %e. %B %Y, %R Uhr, KW%V |
72 | 72 | executeDbSql("update cr_settings set time_format_normal = '%m/%d/%y %I:%M %p'"); // de_DE: %d.%m.%Y %H:%M |
73 | - executeDbSql("update cr_settings set time_format_short = '%a, <strong>%b %e</strong>, %I:%M %p'"); // de_DE: %a, <strong>%e. %b</strong>, KW%V |
|
73 | + executeDbSql("update cr_settings set time_format_short = '%a, <strong>%b %e</strong>, %I:%M %p'"); // de_DE: %a, <strong>%e. %b</strong>, KW%V |
|
74 | 74 | executeDbSql("update cr_settings set time_zone = 'Europe/London'"); //de_DE: Europe/Berlin |
75 | 75 | executeDbSql("update cr_settings set google_group_calendar = ''"); |
76 | 76 | executeDbSql("update cr_settings set overviewemail = 'Hello,\r\n\r\nIn this email you find the Rota for [MONTH] [YEAR].\r\n\r\n[OVERVIEW]\r\n\r\nPlease inform us as soon as possible, if you are not able to serve as scheduled.\r\n\r\nBe blessed.\r\nChurch Support Stuff'"); |
@@ -82,7 +82,7 @@ discard block |
||
82 | 82 | $resultSettings = mysqli_query(db(), $sqlSettings) or die(mysqli_error(db())); |
83 | 83 | $rowSettings = mysqli_fetch_array($resultSettings, MYSQLI_ASSOC); |
84 | 84 | |
85 | - $updateNotification = 'Settings updated successfully to: '.$rowSettings['lang_locale'].' <br> <br>'; |
|
85 | + $updateNotification = 'Settings updated successfully to: ' . $rowSettings['lang_locale'] . ' <br> <br>'; |
|
86 | 86 | } |
87 | 87 | |
88 | 88 | $formatting = 'true'; |
@@ -94,8 +94,8 @@ discard block |
||
94 | 94 | <hr> |
95 | 95 | This page has only beta status. <br>Please do only use it in testing environments! |
96 | 96 | <hr> |
97 | - <?php echo 'Your web browser identifies your language as: '.$language; ?><br> |
|
98 | - <?php echo 'Church Rota is set to use: '.$rowSettings['lang_locale']; ?><br> <br> |
|
97 | + <?php echo 'Your web browser identifies your language as: ' . $language; ?><br> |
|
98 | + <?php echo 'Church Rota is set to use: ' . $rowSettings['lang_locale']; ?><br> <br> |
|
99 | 99 | |
100 | 100 | <?php |
101 | 101 | if ($updateNotification == '') { |
@@ -8,7 +8,7 @@ discard block |
||
8 | 8 | ini_set('log_errors', true); |
9 | 9 | error_reporting(E_ALL); |
10 | 10 | |
11 | - date_default_timezone_set('Europe/London'); |
|
11 | + date_default_timezone_set('Europe/London'); |
|
12 | 12 | |
13 | 13 | // Include files, including the database connection |
14 | 14 | include 'includes/config.php'; |
@@ -24,10 +24,10 @@ discard block |
||
24 | 24 | } require_once 'vendor/autoload.php'; |
25 | 25 | |
26 | 26 | $fb = new Facebook\Facebook([ |
27 | - 'app_id' => $config['auth']['facebook']['appId'], |
|
28 | - 'app_secret' => $config['auth']['facebook']['appSecret'], |
|
29 | - 'default_graph_version' => 'v2.2', |
|
30 | - ]); |
|
27 | + 'app_id' => $config['auth']['facebook']['appId'], |
|
28 | + 'app_secret' => $config['auth']['facebook']['appSecret'], |
|
29 | + 'default_graph_version' => 'v2.2', |
|
30 | + ]); |
|
31 | 31 | |
32 | 32 | $accessToken = $_SESSION['fb_access_token']; |
33 | 33 |
@@ -4,7 +4,7 @@ discard block |
||
4 | 4 | |
5 | 5 | use Facebook; |
6 | 6 | |
7 | -ini_set('display_errors', false); // set on for development, off for production |
|
7 | +ini_set('display_errors', false); // set on for development, off for production |
|
8 | 8 | ini_set('log_errors', true); |
9 | 9 | error_reporting(E_ALL); |
10 | 10 | |
@@ -37,10 +37,10 @@ discard block |
||
37 | 37 | // Returns a `Facebook\FacebookResponse` object |
38 | 38 | $response = $fb->get('/me?fields=id,name,email', $accessToken); |
39 | 39 | } catch (Facebook\Exceptions\FacebookResponseException $e) { |
40 | - echo 'Graph returned an error: '.$e->getMessage(); |
|
40 | + echo 'Graph returned an error: ' . $e->getMessage(); |
|
41 | 41 | exit; |
42 | 42 | } catch (Facebook\Exceptions\FacebookSDKException $e) { |
43 | - echo 'Facebook SDK returned an error: '.$e->getMessage(); |
|
43 | + echo 'Facebook SDK returned an error: ' . $e->getMessage(); |
|
44 | 44 | exit; |
45 | 45 | } |
46 | 46 |
@@ -45,7 +45,7 @@ discard block |
||
45 | 45 | if (($userisBandAdmin) || ($userisEventEditor) || (isAdmin())) { |
46 | 46 | // Just continue the code |
47 | 47 | } else { |
48 | - header('Location: error.php?no=100&page='.basename($_SERVER['SCRIPT_FILENAME'])); |
|
48 | + header('Location: error.php?no=100&page=' . basename($_SERVER['SCRIPT_FILENAME'])); |
|
49 | 49 | } |
50 | 50 | |
51 | 51 | if ($userisBandAdmin) { |
@@ -82,7 +82,7 @@ discard block |
||
82 | 82 | $location = $row['location']; |
83 | 83 | $locationname = $row['locationname']; |
84 | 84 | if ($action == 'edit') { |
85 | - $formaction = '?action=edit&id='.$id; |
|
85 | + $formaction = '?action=edit&id=' . $id; |
|
86 | 86 | } else { |
87 | 87 | $formaction = ''; |
88 | 88 | } |
@@ -139,8 +139,8 @@ discard block |
||
139 | 139 | |
140 | 140 | // convert format of date |
141 | 141 | $date = str_replace('/', '-', $date); // ensure it isn't read as mm/dd/yyyy |
142 | - $date = strftime('%Y-%m-%d', strtotime($date.' 00:00:00')); |
|
143 | - $date = $date.' '.$time.':00'; |
|
142 | + $date = strftime('%Y-%m-%d', strtotime($date . ' 00:00:00')); |
|
143 | + $date = $date . ' ' . $time . ':00'; |
|
144 | 144 | $date = mysqli_real_escape_string(db(), $date); |
145 | 145 | |
146 | 146 | if ($action == 'edit') { |
@@ -210,10 +210,10 @@ discard block |
||
210 | 210 | //if ($userisBandAdmin) $delete_all_sql = $delete_all_sql . " and skillID in (select skillID from cr_skills where groupid=2)"; |
211 | 211 | //if ($userisEventEditor) $delete_all_sql = $delete_all_sql . " and skillID in (select skillID from cr_skills where groupid!=2)"; |
212 | 212 | if ($userisBandAdmin) { |
213 | - $delete_all_sql = $delete_all_sql.' and skillID in (select skillID from cr_skills where groupid in (2,3,4))'; |
|
213 | + $delete_all_sql = $delete_all_sql . ' and skillID in (select skillID from cr_skills where groupid in (2,3,4))'; |
|
214 | 214 | } |
215 | 215 | if ($userisEventEditor) { |
216 | - $delete_all_sql = $delete_all_sql.' and skillID in (select skillID from cr_skills where not (groupid in (2,3,4)))'; |
|
216 | + $delete_all_sql = $delete_all_sql . ' and skillID in (select skillID from cr_skills where not (groupid in (2,3,4)))'; |
|
217 | 217 | } |
218 | 218 | mysqli_query(db(), $delete_all_sql) or die(mysqli_error(db())); |
219 | 219 | } |
@@ -221,9 +221,9 @@ discard block |
||
221 | 221 | // redirect |
222 | 222 | if (isset($_SESSION['lastEventsFilter'])) { |
223 | 223 | $type = $_SESSION['lastEventsFilter']; |
224 | - header('Location: events.php?view=all&filter='.$type.'#event'.$eventID); |
|
224 | + header('Location: events.php?view=all&filter=' . $type . '#event' . $eventID); |
|
225 | 225 | } else { |
226 | - header('Location: events.php?view=all#event'.$eventID); |
|
226 | + header('Location: events.php?view=all#event' . $eventID); |
|
227 | 227 | } |
228 | 228 | exit; |
229 | 229 | } |
@@ -300,7 +300,7 @@ discard block |
||
300 | 300 | while ($ob = mysqli_fetch_object($result)) { |
301 | 301 | if (!(isset($type) && $ob->id == $type)) { |
302 | 302 | $defaultTime = strftime('%H:%M', strtotime($ob->defaultTime)); |
303 | - echo "<option value='".$ob->id."' title='".$ob->description."' data-time='".($defaultTime == '00:00' ? '' : $defaultTime)."' data-location='".(is_null($ob->defaultLocationId) ? '' : $ob->defaultLocationId)."'>".$ob->name.'</option>'; |
|
303 | + echo "<option value='" . $ob->id . "' title='" . $ob->description . "' data-time='" . ($defaultTime == '00:00' ? '' : $defaultTime) . "' data-location='" . (is_null($ob->defaultLocationId) ? '' : $ob->defaultLocationId) . "'>" . $ob->name . '</option>'; |
|
304 | 304 | } |
305 | 305 | } ?> |
306 | 306 | </select> |
@@ -326,7 +326,7 @@ discard block |
||
326 | 326 | while ($row = mysqli_fetch_array($result, MYSQLI_ASSOC)) { |
327 | 327 | if (isset($subtype) && $row['id'] == $subtype) { |
328 | 328 | } else { |
329 | - echo "<option value='".$row['id']."' title='".$row['description']."'>".$row['name'].'</option>'; |
|
329 | + echo "<option value='" . $row['id'] . "' title='" . $row['description'] . "'>" . $row['name'] . '</option>'; |
|
330 | 330 | } |
331 | 331 | } ?> |
332 | 332 | </select> |
@@ -354,7 +354,7 @@ discard block |
||
354 | 354 | while ($row = mysqli_fetch_array($result, MYSQLI_ASSOC)) { |
355 | 355 | if (isset($location) && $row['id'] == $location) { |
356 | 356 | } else { |
357 | - echo "<option value='".$row['id']."'>".$row['name'].'</option>'; |
|
357 | + echo "<option value='" . $row['id'] . "'>" . $row['name'] . '</option>'; |
|
358 | 358 | } |
359 | 359 | } ?> |
360 | 360 | </select> |
@@ -497,7 +497,7 @@ discard block |
||
497 | 497 | while ($row = mysqli_fetch_array($result, MYSQLI_ASSOC)) { |
498 | 498 | if (isset($type) && $row['id'] == $type) { |
499 | 499 | } else { |
500 | - echo "<option value='".$row['id']."' title='".$row['description']."'>".$row['name'].'</option>'; |
|
500 | + echo "<option value='" . $row['id'] . "' title='" . $row['description'] . "'>" . $row['name'] . '</option>'; |
|
501 | 501 | } |
502 | 502 | } ?> |
503 | 503 | </select> |
@@ -567,8 +567,8 @@ discard block |
||
567 | 567 | <?php foreach ($role->getUserRoles() as $userRole): ?> |
568 | 568 | <?php if (!$userRole->getReserve()): ?> |
569 | 569 | <?php $isInEvent = in_array($userRole->getId(), $usersInEvent) ?> |
570 | - <option value="<?php echo $userRole->getId() ?>" <?php echo $isInEvent ? 'selected="selected"' : '' ?>><?php echo $userRole->getUser()->getFirstName().' '.$userRole->getUser()->getLastName() ?></option> |
|
571 | - <?php else: ?> |
|
570 | + <option value="<?php echo $userRole->getId() ?>" <?php echo $isInEvent ? 'selected="selected"' : '' ?>><?php echo $userRole->getUser()->getFirstName() . ' ' . $userRole->getUser()->getLastName() ?></option> |
|
571 | + <?php else : ?> |
|
572 | 572 | <?php $countReserve += 1 ?> |
573 | 573 | <?php endif //!userRole->getReserve?> |
574 | 574 | <?php endforeach //users?> |
@@ -578,7 +578,7 @@ discard block |
||
578 | 578 | <?php foreach ($role->getUserRoles() as $userRole): ?> |
579 | 579 | <?php if ($userRole->getReserve()): ?> |
580 | 580 | <?php $isInEvent = in_array($userRole->getId(), $usersInEvent) ?> |
581 | - <option value="<?php echo $userRole->getId() ?>" <?php echo $isInEvent ? 'selected="selected"' : '' ?>><?php echo $userRole->getUser()->getFirstName().' '.$userRole->getUser()->getLastName() ?></option> |
|
581 | + <option value="<?php echo $userRole->getId() ?>" <?php echo $isInEvent ? 'selected="selected"' : '' ?>><?php echo $userRole->getUser()->getFirstName() . ' ' . $userRole->getUser()->getLastName() ?></option> |
|
582 | 582 | <?php endif ?> |
583 | 583 | <?php endforeach //users?> |
584 | 584 | </optgroup> |
@@ -111,7 +111,7 @@ discard block |
||
111 | 111 | FROM cr_eventTypes et |
112 | 112 | WHERE id IN (SELECT e.type |
113 | 113 | FROM cr_events e |
114 | - WHERE '.$whereTwoMonth.' |
|
114 | + WHERE '.$whereTwoMonth . ' |
|
115 | 115 | AND e.removed = 0) |
116 | 116 | ORDER BY name'; |
117 | 117 | $result = mysqli_query(db(), $filter_sql) or die(mysqli_error(db())); |
@@ -132,7 +132,7 @@ discard block |
||
132 | 132 | <tr> |
133 | 133 | <td ><strong>Event</strong></td> |
134 | 134 | <?php |
135 | - $sql = 'SELECT * FROM cr_groups g ORDER BY '.$group_sorting_name; |
|
135 | + $sql = 'SELECT * FROM cr_groups g ORDER BY ' . $group_sorting_name; |
|
136 | 136 | $result = mysqli_query(db(), $sql) or die(mysqli_error(db())); |
137 | 137 | |
138 | 138 | while ($row = mysqli_fetch_array($result, MYSQLI_ASSOC)) { |
@@ -163,7 +163,7 @@ discard block |
||
163 | 163 | |
164 | 164 | if ($filter == '') { |
165 | 165 | $sql .= ' |
166 | - AND '.$whereTwoMonth.' |
|
166 | + AND '.$whereTwoMonth . ' |
|
167 | 167 | ORDER BY |
168 | 168 | e.date'; |
169 | 169 | } elseif ($filter == 'all') { |
@@ -173,7 +173,7 @@ discard block |
||
173 | 173 | } elseif ($filter != '') { |
174 | 174 | $sql .= " |
175 | 175 | AND e.type = '$filter' |
176 | - AND ".$whereTwoMonth.' |
|
176 | + AND " . $whereTwoMonth . ' |
|
177 | 177 | ORDER BY |
178 | 178 | e.date'; |
179 | 179 | } |
@@ -188,34 +188,34 @@ discard block |
||
188 | 188 | echo '<tr>'; |
189 | 189 | echo '<td >'; |
190 | 190 | setlocale(LC_TIME, $lang_locale); //de_DE |
191 | - echo '<a href="event.php?id='.$row['id'].'">'; |
|
191 | + echo '<a href="event.php?id=' . $row['id'] . '">'; |
|
192 | 192 | echo strftime($time_format_short, strtotime($row['sundayDate'])); // %a, <strong>%e. %b</strong>, KW%V |
193 | 193 | echo '</a>'; |
194 | 194 | |
195 | 195 | //$row['sundayDate'] |
196 | 196 | if (!empty($row['eventType'])) { |
197 | - echo '<br /><em> '.$row['eventType'].'</em>'; |
|
197 | + echo '<br /><em> ' . $row['eventType'] . '</em>'; |
|
198 | 198 | } |
199 | 199 | if (!empty($row['eventSubType'])) { |
200 | - echo ' - <em>'.$row['eventSubType'].'</em>'; |
|
200 | + echo ' - <em>' . $row['eventSubType'] . '</em>'; |
|
201 | 201 | } |
202 | 202 | if (!empty($row['eventLocation'])) { |
203 | - echo '<br /><em> '.$row['eventLocation'].'</em>'; |
|
203 | + echo '<br /><em> ' . $row['eventLocation'] . '</em>'; |
|
204 | 204 | } |
205 | 205 | if (!empty($row['name'])) { |
206 | - echo '<br /><em> '.$row['name'].'</em>'; |
|
206 | + echo '<br /><em> ' . $row['name'] . '</em>'; |
|
207 | 207 | } |
208 | 208 | if (!empty($row['eventGroup'])) { |
209 | - echo '<br /><strong> '.$row['eventGroup'].'</strong>'; |
|
209 | + echo '<br /><strong> ' . $row['eventGroup'] . '</strong>'; |
|
210 | 210 | } |
211 | 211 | if (!empty($row['sermonTitle'])) { |
212 | - echo ': '.$row['sermonTitle']; |
|
212 | + echo ': ' . $row['sermonTitle']; |
|
213 | 213 | } |
214 | 214 | if (!empty($row['bibleVerse'])) { |
215 | - echo ' <em>('.$row['bibleVerse'].')</em>'; |
|
215 | + echo ' <em>(' . $row['bibleVerse'] . ')</em>'; |
|
216 | 216 | } |
217 | 217 | if (!empty($row['comment'])) { |
218 | - echo '<br /><em> ('.$row['comment'].')</em>'; |
|
218 | + echo '<br /><em> (' . $row['comment'] . ')</em>'; |
|
219 | 219 | } |
220 | 220 | echo '</td>'; |
221 | 221 | |
@@ -247,16 +247,16 @@ discard block |
||
247 | 247 | if ($previousName == '') { |
248 | 248 | // new name |
249 | 249 | echo ($viewPeople['userId'] == $sessionUserId) ? '<strong class="me">' : ''; |
250 | - echo $name.' <em>('.$viewPeople['role']; |
|
250 | + echo $name . ' <em>(' . $viewPeople['role']; |
|
251 | 251 | } elseif ($previousName != $name) { |
252 | 252 | echo ')</em>'; |
253 | 253 | echo ($viewPeople['userId'] != $sessionUserId) ? '</strong>' : ''; |
254 | 254 | echo '<br />'; // line break from previous name |
255 | 255 | // new name |
256 | 256 | echo ($viewPeople['userId'] == $sessionUserId) ? '<strong class="me">' : ''; |
257 | - echo $name.' <em>('.$viewPeople['role']; |
|
257 | + echo $name . ' <em>(' . $viewPeople['role']; |
|
258 | 258 | } else { |
259 | - echo ', '.$viewPeople['role']; |
|
259 | + echo ', ' . $viewPeople['role']; |
|
260 | 260 | } |
261 | 261 | |
262 | 262 | $peopleInEvent = true; |
@@ -41,19 +41,19 @@ |
||
41 | 41 | switch ($platform) { |
42 | 42 | case 'facebook': |
43 | 43 | $_SESSION['fb-callback-url'] = 'fb-link.php'; |
44 | - header('Location: fb-login.php'); |
|
45 | - exit; |
|
46 | - } |
|
47 | - break; |
|
44 | + header('Location: fb-login.php'); |
|
45 | + exit; |
|
46 | + } |
|
47 | + break; |
|
48 | 48 | case 'unlink': |
49 | 49 | removeSocialAuthFromUserWithId($id, $platform); |
50 | - createNotificationForUser($id, ucfirst($platform).' account unlinked', 'You have successfully unlinked your Facebook account. Login via Facebook is now disabled for your account. Feel free to relink your account at any time.', 'account', 'linkSocialAuth.php'); |
|
51 | - break; |
|
50 | + createNotificationForUser($id, ucfirst($platform).' account unlinked', 'You have successfully unlinked your Facebook account. Login via Facebook is now disabled for your account. Feel free to relink your account at any time.', 'account', 'linkSocialAuth.php'); |
|
51 | + break; |
|
52 | 52 | |
53 | 53 | default: |
54 | 54 | // code... |
55 | 55 | break; |
56 | - } |
|
56 | + } |
|
57 | 57 | } |
58 | 58 | |
59 | 59 | // list of possible social account links (names used as platform names in database) |
@@ -42,12 +42,12 @@ |
||
42 | 42 | |
43 | 43 | $ret = ''; |
44 | 44 | |
45 | - $chars = 26 * 2 + 10; //26 (a-z) + 26 (A-Z) + 10 (0-9) |
|
45 | + $chars = 26 * 2 + 10; //26 (a-z) + 26 (A-Z) + 10 (0-9) |
|
46 | 46 | //a-z = 97-122 |
47 | 47 | //A-Z = 65-90 |
48 | 48 | //0-9 = 48-57 |
49 | 49 | |
50 | - srand(make_seed()); //Seed with microseconds |
|
50 | + srand(make_seed()); //Seed with microseconds |
|
51 | 51 | //if you don't need this, you can just use srand(time()); |
52 | 52 | |
53 | 53 | for ($i = 1; $i <= $length; $i++) { |