TechWilk /
rota
@@ -87,23 +87,23 @@ |
||
| 87 | 87 | WHERE |
| 88 | 88 | date >= CURDATE() |
| 89 | 89 | AND date_format( date , "%y-%m-%d" ) |
| 90 | - <= date_format( DATE_ADD(now(), INTERVAL '.$daysAlert.' DAY ) , "%y-%m-%d" )'; |
|
| 90 | + <= date_format( DATE_ADD(now(), INTERVAL '.$daysAlert . ' DAY ) , "%y-%m-%d" )'; |
|
| 91 | 91 | $resultEvents = mysqli_query(db(), $sqlEvents) or die(mysqli_error(db())); |
| 92 | 92 | $i = 0; |
| 93 | 93 | while ($rowEvents = mysqli_fetch_array($resultEvents, MYSQLI_ASSOC)) { |
| 94 | 94 | $usersNotified = notifyEveryoneForEvent($rowEvents['id']); |
| 95 | 95 | if (count($usersNotified) > 0) { |
| 96 | - $out = $out.'Automatic notifications sent to users ('.implode(', ', $usersNotified).') for event '.$rowEvents['id'].' on '.$rowEvents['date'].".<br>\r\n"; |
|
| 96 | + $out = $out . 'Automatic notifications sent to users (' . implode(', ', $usersNotified) . ') for event ' . $rowEvents['id'] . ' on ' . $rowEvents['date'] . ".<br>\r\n"; |
|
| 97 | 97 | } else { |
| 98 | - $out = $out.'No notifications sent for event '.$rowEvents['id'].' on '.$rowEvents['date'].".<br>\r\n"; |
|
| 98 | + $out = $out . 'No notifications sent for event ' . $rowEvents['id'] . ' on ' . $rowEvents['date'] . ".<br>\r\n"; |
|
| 99 | 99 | } |
| 100 | 100 | $i = $i + 1; |
| 101 | 101 | } |
| 102 | 102 | if ($i == 0) { |
| 103 | - $out = $out.'No events found to automatically notify for.'; |
|
| 103 | + $out = $out . 'No events found to automatically notify for.'; |
|
| 104 | 104 | } |
| 105 | 105 | } else { |
| 106 | - $out = $out.'Automatic notifications are disabled.'; |
|
| 106 | + $out = $out . 'Automatic notifications are disabled.'; |
|
| 107 | 107 | } ?> |
| 108 | 108 | <html> |
| 109 | 109 | <body> |
@@ -34,7 +34,7 @@ |
||
| 34 | 34 | } |
| 35 | 35 | |
| 36 | 36 | if (!isAdmin()) { |
| 37 | - header('Location: error.php?no=100&page='.basename($_SERVER['SCRIPT_FILENAME'])); |
|
| 37 | + header('Location: error.php?no=100&page=' . basename($_SERVER['SCRIPT_FILENAME'])); |
|
| 38 | 38 | exit; |
| 39 | 39 | } |
| 40 | 40 | |
@@ -11,7 +11,7 @@ discard block |
||
| 11 | 11 | if (isset($_SESSION['is_logged_in']) || $_SESSION['db_is_logged_in'] == true) { |
| 12 | 12 | // Just continue the code |
| 13 | 13 | } else { |
| 14 | - $_SESSION['redirectUrl'] = siteSettings()->getSiteUrl().'/event.php?id='.$eventId; |
|
| 14 | + $_SESSION['redirectUrl'] = siteSettings()->getSiteUrl() . '/event.php?id=' . $eventId; |
|
| 15 | 15 | header('Location: login.php'); |
| 16 | 16 | exit; |
| 17 | 17 | } |
@@ -60,7 +60,7 @@ discard block |
||
| 60 | 60 | <h2 class="box-title">Event Details</h2> |
| 61 | 61 | </div> |
| 62 | 62 | <div class="box-body"> |
| 63 | - <?php echo !empty($event->getName()) ? '<p><strong>Name:</strong> '.$event->getName().'</p>' : '' ?> |
|
| 63 | + <?php echo !empty($event->getName()) ? '<p><strong>Name:</strong> ' . $event->getName() . '</p>' : '' ?> |
|
| 64 | 64 | <p><strong>Date:</strong> <?php echo $event->getDate('d/m/y'); ?></p> |
| 65 | 65 | <p><strong>Location:</strong> <?php echo $event->getLocation()->getName() ?></p> |
| 66 | 66 | <p><strong>Type:</strong> <?php echo $event->getEventType()->getName() ?></p> |
@@ -160,16 +160,16 @@ discard block |
||
| 160 | 160 | } else { |
| 161 | 161 | echo '</ul>'; |
| 162 | 162 | } |
| 163 | - echo '<p><strong>'.$groupName.'</strong></p>'; |
|
| 163 | + echo '<p><strong>' . $groupName . '</strong></p>'; |
|
| 164 | 164 | echo '<ul>'; |
| 165 | 165 | } |
| 166 | 166 | |
| 167 | 167 | echo '<li>'; |
| 168 | - echo (isset($viewPeople->swap)) ? "<s><a class='text-danger' href='swap.php?swap=".$viewPeople->swap."'>" : ''; |
|
| 168 | + echo (isset($viewPeople->swap)) ? "<s><a class='text-danger' href='swap.php?swap=" . $viewPeople->swap . "'>" : ''; |
|
| 169 | 169 | echo $viewPeople->name; |
| 170 | 170 | |
| 171 | 171 | if ($viewPeople->rolename != '') { |
| 172 | - echo ' - <em>'.$viewPeople->rolename.'</em>'; |
|
| 172 | + echo ' - <em>' . $viewPeople->rolename . '</em>'; |
|
| 173 | 173 | } else { |
| 174 | 174 | // If there is no skill, we don't need to mention this. |
| 175 | 175 | } |
@@ -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 == '') { |
@@ -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 |
@@ -48,9 +48,9 @@ discard block |
||
| 48 | 48 | } else { |
| 49 | 49 | $urlFilters = ''; |
| 50 | 50 | if (isset($_SESSION['lastEventsFilter'])) { |
| 51 | - $urlFilters = '&filter='.$_SESSION['lastEventsFilter']; |
|
| 51 | + $urlFilters = '&filter=' . $_SESSION['lastEventsFilter']; |
|
| 52 | 52 | } |
| 53 | - header('Location: events.php?view=all'.$urlFilters); |
|
| 53 | + header('Location: events.php?view=all' . $urlFilters); |
|
| 54 | 54 | exit; |
| 55 | 55 | } |
| 56 | 56 | |
@@ -70,7 +70,7 @@ discard block |
||
| 70 | 70 | session_destroy(); |
| 71 | 71 | header('Location: login.php'); |
| 72 | 72 | } else { |
| 73 | - header('Location: events.php?view='.$sessionUserID); |
|
| 73 | + header('Location: events.php?view=' . $sessionUserID); |
|
| 74 | 74 | exit; |
| 75 | 75 | } |
| 76 | 76 | } |
@@ -108,11 +108,11 @@ discard block |
||
| 108 | 108 | if ($editskillID != '') { |
| 109 | 109 | $sql = ("INSERT INTO cr_eventPeople (eventId, userRoleId) VALUES ('$editeventID', '$editskillID')"); |
| 110 | 110 | if (!mysqli_query(db(), $sql)) { |
| 111 | - die('Error: '.mysqli_error(db())); |
|
| 111 | + die('Error: ' . mysqli_error(db())); |
|
| 112 | 112 | } |
| 113 | 113 | |
| 114 | 114 | // After we have inserted the data, we want to head back to the main page |
| 115 | - header('Location: index.php#section'.$editeventID); |
|
| 115 | + header('Location: index.php#section' . $editeventID); |
|
| 116 | 116 | exit; |
| 117 | 117 | } |
| 118 | 118 | |
@@ -125,12 +125,12 @@ discard block |
||
| 125 | 125 | |
| 126 | 126 | $sql = ("INSERT INTO cr_eventPeople (eventId, userRoleId) VALUES ('$editeventID', '$editskillID')"); |
| 127 | 127 | if (!mysqli_query(db(), $sql)) { |
| 128 | - die('Error: '.mysqli_error(db())); |
|
| 128 | + die('Error: ' . mysqli_error(db())); |
|
| 129 | 129 | } |
| 130 | 130 | } |
| 131 | 131 | |
| 132 | 132 | // After we have inserted the data, we want to head back to the main page |
| 133 | - header('Location: index.php#section'.$editeventID); |
|
| 133 | + header('Location: index.php#section' . $editeventID); |
|
| 134 | 134 | exit; |
| 135 | 135 | } |
| 136 | 136 | } |
@@ -176,7 +176,7 @@ discard block |
||
| 176 | 176 | $result = mysqli_query(db(), $mysqli_query) or die(mysqli_error(db())); |
| 177 | 177 | $row = mysqli_fetch_object($result); |
| 178 | 178 | |
| 179 | - echo $row->name.'s'; |
|
| 179 | + echo $row->name . 's'; |
|
| 180 | 180 | } elseif ($_SESSION['onlyShowUserEvents'] == '1') { |
| 181 | 181 | echo 'My Events'; |
| 182 | 182 | } else { |
@@ -202,7 +202,7 @@ discard block |
||
| 202 | 202 | |
| 203 | 203 | <?php if (!empty($pendingSwaps) && $pendingSwaps > 0): |
| 204 | 204 | if ($pendingSwaps > 1) { |
| 205 | - $swapsMessage = $pendingSwaps.' swaps are pending approval. Emails have been sent to the people covering to approve the swaps.'; |
|
| 205 | + $swapsMessage = $pendingSwaps . ' swaps are pending approval. Emails have been sent to the people covering to approve the swaps.'; |
|
| 206 | 206 | } else { |
| 207 | 207 | $swapsMessage = 'A swap is pending approval. An email has been sent to the person covering to approve the swap.'; |
| 208 | 208 | } ?> |
@@ -270,7 +270,7 @@ discard block |
||
| 270 | 270 | WHERE e.type = '$filter' |
| 271 | 271 | AND e.date >= DATE(NOW()) |
| 272 | 272 | AND e.removed = 0 |
| 273 | - ORDER BY ".$dateOrderBy; |
|
| 273 | + ORDER BY " . $dateOrderBy; |
|
| 274 | 274 | } else { |
| 275 | 275 | $sql = "SELECT |
| 276 | 276 | DISTINCT e.id AS id, |
@@ -298,7 +298,7 @@ discard block |
||
| 298 | 298 | WHERE e.date >= DATE(NOW()) |
| 299 | 299 | AND ur.userId = '$view' |
| 300 | 300 | AND e.removed = 0 |
| 301 | - ORDER BY ".$dateOrderBy; |
|
| 301 | + ORDER BY " . $dateOrderBy; |
|
| 302 | 302 | } |
| 303 | 303 | $result = mysqli_query(db(), $sql) or die(mysqli_error(db())); |
| 304 | 304 | |
@@ -316,7 +316,7 @@ discard block |
||
| 316 | 316 | $newMonth = strftime('%B %Y', strtotime($row->sundayDate)); |
| 317 | 317 | if ($month != $newMonth) { |
| 318 | 318 | $month = $newMonth; |
| 319 | - echo '<li class="time-label"><span class="bg-green">'.$month.'</span></li>'; |
|
| 319 | + echo '<li class="time-label"><span class="bg-green">' . $month . '</span></li>'; |
|
| 320 | 320 | } |
| 321 | 321 | |
| 322 | 322 | // Event details |
@@ -332,9 +332,9 @@ discard block |
||
| 332 | 332 | <h4><?php |
| 333 | 333 | echo date('jS: ', strtotime($row->sundayDate)); |
| 334 | 334 | if ($eventName != '') { |
| 335 | - echo '<strong>'.$eventName.'</strong><br />'.$subType.' - <em>'.$type.'</em>'; |
|
| 335 | + echo '<strong>' . $eventName . '</strong><br />' . $subType . ' - <em>' . $type . '</em>'; |
|
| 336 | 336 | } else { |
| 337 | - echo $subType.' - <em>'.$type.'</em>'; |
|
| 337 | + echo $subType . ' - <em>' . $type . '</em>'; |
|
| 338 | 338 | } ?> |
| 339 | 339 | </h4> |
| 340 | 340 | </a> |
@@ -346,7 +346,7 @@ discard block |
||
| 346 | 346 | <?php //<p><strong>Rehearsal:</strong> <?php |
| 347 | 347 | //echo ($row->rehearsalDateFormatted = "0000-00-00 00:00:00") ? "none" : strftime(siteSettings()->time_format_normal,strtotime($row->rehearsalDateFormatted));</p>?> |
| 348 | 348 | |
| 349 | - <p><strong><?php echo $row->eventGroup ? $row->eventGroup.': ' : '' ?></strong><?php echo $row->sermonTitle ?> <?php echo $row->bibleVerse ? '('.$row->bibleVerse.')' : '' ?></p> |
|
| 349 | + <p><strong><?php echo $row->eventGroup ? $row->eventGroup . ': ' : '' ?></strong><?php echo $row->sermonTitle ?> <?php echo $row->bibleVerse ? '(' . $row->bibleVerse . ')' : '' ?></p> |
|
| 350 | 350 | |
| 351 | 351 | <p><strong>Location:</strong> <?php echo $row->eventLocation; ?></p> |
| 352 | 352 | |
@@ -418,16 +418,16 @@ discard block |
||
| 418 | 418 | } else { |
| 419 | 419 | echo '</ul>'; |
| 420 | 420 | } |
| 421 | - echo '<p><strong>'.$groupName.'</strong></p>'; |
|
| 421 | + echo '<p><strong>' . $groupName . '</strong></p>'; |
|
| 422 | 422 | echo '<ul>'; |
| 423 | 423 | } |
| 424 | 424 | |
| 425 | 425 | echo '<li>'; |
| 426 | - echo (isset($viewPeople->swap)) ? "<s><a class='text-danger' href='swap.php?swap=".$viewPeople->swap."'>" : ''; |
|
| 426 | + echo (isset($viewPeople->swap)) ? "<s><a class='text-danger' href='swap.php?swap=" . $viewPeople->swap . "'>" : ''; |
|
| 427 | 427 | echo $viewPeople->name; |
| 428 | 428 | |
| 429 | 429 | if ($viewPeople->rolename != '') { |
| 430 | - echo ' - <em>'.$viewPeople->rolename.'</em>'; |
|
| 430 | + echo ' - <em>' . $viewPeople->rolename . '</em>'; |
|
| 431 | 431 | } else { |
| 432 | 432 | // If there is no skill, we don't need to mention this. |
| 433 | 433 | } |
@@ -453,9 +453,9 @@ discard block |
||
| 453 | 453 | |
| 454 | 454 | <?php |
| 455 | 455 | if (isAdmin() || $userisBandAdmin || $userisEventEditor) { |
| 456 | - echo " <a class ='btn btn-primary' href='createEvent.php?action=edit&id=".$eventID."'><i class='fa fa-pencil'></i><span> Edit</span></a> "; /* Edit event */ |
|
| 457 | - echo " <a class ='btn btn-primary' href='createEvent.php?action=copy&id=".$eventID."'><i class='fa fa-pencil'></i><span> Copy</span></a> "; /* Edit event */ |
|
| 458 | - echo " <a class ='btn btn-primary' href='emailEvent.php?event=".$eventID."'><i class='fa fa-envelope-o'></i><span> Send email</span></a> "; /* Send email */ |
|
| 456 | + echo " <a class ='btn btn-primary' href='createEvent.php?action=edit&id=" . $eventID . "'><i class='fa fa-pencil'></i><span> Edit</span></a> "; /* Edit event */ |
|
| 457 | + echo " <a class ='btn btn-primary' href='createEvent.php?action=copy&id=" . $eventID . "'><i class='fa fa-pencil'></i><span> Copy</span></a> "; /* Edit event */ |
|
| 458 | + echo " <a class ='btn btn-primary' href='emailEvent.php?event=" . $eventID . "'><i class='fa fa-envelope-o'></i><span> Send email</span></a> "; /* Send email */ |
|
| 459 | 459 | } |
| 460 | 460 | if (isAdmin()) { |
| 461 | 461 | //echo "<a class='btn btn-primary' href='index.php?notifyEveryone=true&eventID=$eventID'><i class='fa fa-envelope-o'></i><span> Send email</span></a> "; /* Send email */ |
@@ -464,7 +464,7 @@ discard block |
||
| 464 | 464 | |
| 465 | 465 | echo "<ul class='dropdown-menu'>"; |
| 466 | 466 | |
| 467 | - echo "<li><button type='button' class='btn btn-danger btn-block' data-toggle='modal' data-target='#deleteModal".$eventID."'>Delete</button></li>"; /* Delete Event */ |
|
| 467 | + echo "<li><button type='button' class='btn btn-danger btn-block' data-toggle='modal' data-target='#deleteModal" . $eventID . "'>Delete</button></li>"; /* Delete Event */ |
|
| 468 | 468 | |
| 469 | 469 | echo '</ul>'; |
| 470 | 470 | } ?> |
@@ -14,7 +14,7 @@ |
||
| 14 | 14 | exit; |
| 15 | 15 | } |
| 16 | 16 | if (!isAdmin()) { |
| 17 | - header('Location: error.php?no=100&page='.basename($_SERVER['SCRIPT_FILENAME'])); |
|
| 17 | + header('Location: error.php?no=100&page=' . basename($_SERVER['SCRIPT_FILENAME'])); |
|
| 18 | 18 | exit; |
| 19 | 19 | } |
| 20 | 20 | |
@@ -14,7 +14,7 @@ discard block |
||
| 14 | 14 | exit; |
| 15 | 15 | } |
| 16 | 16 | if (!isAdmin()) { |
| 17 | - header('Location: error.php?no=100&page='.basename($_SERVER['SCRIPT_FILENAME'])); |
|
| 17 | + header('Location: error.php?no=100&page=' . basename($_SERVER['SCRIPT_FILENAME'])); |
|
| 18 | 18 | exit; |
| 19 | 19 | } |
| 20 | 20 | |
@@ -40,7 +40,7 @@ discard block |
||
| 40 | 40 | $sql = "UPDATE cr_eventGroups SET name = '$name', description = '$description' WHERE id = '$editid'"; |
| 41 | 41 | } |
| 42 | 42 | if (!mysqli_query(db(), $sql)) { |
| 43 | - die('Error: '.mysqli_error(db())); |
|
| 43 | + die('Error: ' . mysqli_error(db())); |
|
| 44 | 44 | } |
| 45 | 45 | } else { |
| 46 | 46 | $name = $_POST['seriesName']; |
@@ -54,7 +54,7 @@ discard block |
||
| 54 | 54 | } else { |
| 55 | 55 | $sql = ("INSERT INTO cr_eventGroups (name, description) VALUES ('$name', '$description')"); |
| 56 | 56 | if (!mysqli_query(db(), $sql)) { |
| 57 | - die('Error: '.mysqli_error(db())); |
|
| 57 | + die('Error: ' . mysqli_error(db())); |
|
| 58 | 58 | } |
| 59 | 59 | |
| 60 | 60 | // After we have inserted the data, we want to head back to the main users page |
@@ -97,9 +97,9 @@ discard block |
||
| 97 | 97 | |
| 98 | 98 | while ($row = mysqli_fetch_array($result, MYSQLI_ASSOC)) { |
| 99 | 99 | $seriesId = $row['id']; |
| 100 | - echo "<span id='".$seriesId."' class='edit'><strong>".$row['name'].'</strong></span>'; |
|
| 101 | - echo " <a href='series.php?method=remove&series=".$seriesId."'><i class='fa fa-close'></i></a><br />"; |
|
| 102 | - echo "<p id='".$seriesId."' class='edit'>".$row['description'].'</p>'; |
|
| 100 | + echo "<span id='" . $seriesId . "' class='edit'><strong>" . $row['name'] . '</strong></span>'; |
|
| 101 | + echo " <a href='series.php?method=remove&series=" . $seriesId . "'><i class='fa fa-close'></i></a><br />"; |
|
| 102 | + echo "<p id='" . $seriesId . "' class='edit'>" . $row['description'] . '</p>'; |
|
| 103 | 103 | echo '<hr />'; |
| 104 | 104 | } ?> |
| 105 | 105 | </div><!-- /.box-body --> |
@@ -14,7 +14,7 @@ discard block |
||
| 14 | 14 | exit; |
| 15 | 15 | } |
| 16 | 16 | if (!isAdmin()) { |
| 17 | - header('Location: error.php?no=100&page='.basename($_SERVER['SCRIPT_FILENAME'])); |
|
| 17 | + header('Location: error.php?no=100&page=' . basename($_SERVER['SCRIPT_FILENAME'])); |
|
| 18 | 18 | exit; |
| 19 | 19 | } |
| 20 | 20 | |
@@ -31,14 +31,14 @@ discard block |
||
| 31 | 31 | case 'approve': |
| 32 | 32 | $userId = approvePendingUser($id); |
| 33 | 33 | mailNewUser($userId); |
| 34 | - header('Location: addUser.php?action=edit&user='.$userId); |
|
| 34 | + header('Location: addUser.php?action=edit&user=' . $userId); |
|
| 35 | 35 | break; |
| 36 | 36 | case 'merge': |
| 37 | 37 | $existingUserId = $_POST['existingUser']; |
| 38 | 38 | $existingUserId = filter_var($existingUserId, FILTER_SANITIZE_NUMBER_INT); |
| 39 | 39 | mergePendingUserWithUserId($id, $existingUserId); |
| 40 | 40 | mailNewUser($existingUserId); |
| 41 | - header('Location: addUser.php?action=edit&user='.$existingUserId); |
|
| 41 | + header('Location: addUser.php?action=edit&user=' . $existingUserId); |
|
| 42 | 42 | break; |
| 43 | 43 | case 'decline': |
| 44 | 44 | declinePendingUser($id); |
@@ -90,7 +90,7 @@ discard block |
||
| 90 | 90 | <div class="box box-primary"> |
| 91 | 91 | <div class="box-header"> |
| 92 | 92 | <h2 class="box-title"> |
| 93 | - <?php echo $user->approved ? 'Approved' : ($user->declined ? 'Declined' : 'Pending') ?>: <?php echo $user->firstName.' '.$user->lastName ?> |
|
| 93 | + <?php echo $user->approved ? 'Approved' : ($user->declined ? 'Declined' : 'Pending') ?>: <?php echo $user->firstName . ' ' . $user->lastName ?> |
|
| 94 | 94 | </h2> |
| 95 | 95 | </div> |
| 96 | 96 | <div class="box-body"> |
@@ -131,7 +131,7 @@ discard block |
||
| 131 | 131 | <?php |
| 132 | 132 | $users = allUsersNames(); |
| 133 | 133 | foreach ($users as $existingUser): ?> |
| 134 | - <option value="<?php echo $existingUser->id?>" <?php echo($existingUser->firstName == $user->firstName) && ($existingUser->lastName == $user->lastName) ? "selected='selected'" : '' ?>><?php echo $existingUser->firstName.' '.$existingUser->lastName ?></option> |
|
| 134 | + <option value="<?php echo $existingUser->id?>" <?php echo($existingUser->firstName == $user->firstName) && ($existingUser->lastName == $user->lastName) ? "selected='selected'" : '' ?>><?php echo $existingUser->firstName . ' ' . $existingUser->lastName ?></option> |
|
| 135 | 135 | <?php endforeach; ?> |
| 136 | 136 | </select> |
| 137 | 137 | </div> |
