@@ -92,7 +92,7 @@ discard block |
||
| 92 | 92 | if ($availableCommits[0]['sha'] !== $commitHash) { |
| 93 | 93 | $updateAvailable = true; |
| 94 | 94 | |
| 95 | - $email = siteSettings()->getOwner().' <'.siteSettings()->getAdminEmailAddress().'>'; |
|
| 95 | + $email = siteSettings()->getOwner() . ' <' . siteSettings()->getAdminEmailAddress() . '>'; |
|
| 96 | 96 | $message = <<<'MESSAGE' |
| 97 | 97 | There is an update available for your installation of Rota. |
| 98 | 98 | |
@@ -114,23 +114,23 @@ discard block |
||
| 114 | 114 | WHERE |
| 115 | 115 | date >= CURDATE() |
| 116 | 116 | AND date_format( date , "%y-%m-%d" ) |
| 117 | - <= date_format( DATE_ADD(now(), INTERVAL '.$daysAlert.' DAY ) , "%y-%m-%d" )'; |
|
| 117 | + <= date_format( DATE_ADD(now(), INTERVAL '.$daysAlert . ' DAY ) , "%y-%m-%d" )'; |
|
| 118 | 118 | $resultEvents = mysqli_query(db(), $sqlEvents) or die(mysqli_error(db())); |
| 119 | 119 | $i = 0; |
| 120 | 120 | while ($rowEvents = mysqli_fetch_array($resultEvents, MYSQLI_ASSOC)) { |
| 121 | 121 | $usersNotified = notifyEveryoneForEvent($rowEvents['id']); |
| 122 | 122 | if (count($usersNotified) > 0) { |
| 123 | - $out = $out.'Automatic notifications sent to users ('.implode(', ', $usersNotified).') for event '.$rowEvents['id'].' on '.$rowEvents['date'].".<br>\r\n"; |
|
| 123 | + $out = $out . 'Automatic notifications sent to users (' . implode(', ', $usersNotified) . ') for event ' . $rowEvents['id'] . ' on ' . $rowEvents['date'] . ".<br>\r\n"; |
|
| 124 | 124 | } else { |
| 125 | - $out = $out.'No notifications sent for event '.$rowEvents['id'].' on '.$rowEvents['date'].".<br>\r\n"; |
|
| 125 | + $out = $out . 'No notifications sent for event ' . $rowEvents['id'] . ' on ' . $rowEvents['date'] . ".<br>\r\n"; |
|
| 126 | 126 | } |
| 127 | 127 | $i = $i + 1; |
| 128 | 128 | } |
| 129 | 129 | if ($i == 0) { |
| 130 | - $out = $out.'No events found to automatically notify for.'; |
|
| 130 | + $out = $out . 'No events found to automatically notify for.'; |
|
| 131 | 131 | } |
| 132 | 132 | } else { |
| 133 | - $out = $out.'Automatic notifications are disabled.'; |
|
| 133 | + $out = $out . 'Automatic notifications are disabled.'; |
|
| 134 | 134 | } ?> |
| 135 | 135 | <html> |
| 136 | 136 | <body> |
@@ -6,16 +6,16 @@ discard block |
||
| 6 | 6 | use Monolog\Handler\StreamHandler; |
| 7 | 7 | use Monolog\Logger; |
| 8 | 8 | |
| 9 | -include __DIR__.'/errors.php'; |
|
| 9 | +include __DIR__ . '/errors.php'; |
|
| 10 | 10 | |
| 11 | 11 | // setup the autoloading |
| 12 | -require_once __DIR__.'/../../../vendor/autoload.php'; |
|
| 12 | +require_once __DIR__ . '/../../../vendor/autoload.php'; |
|
| 13 | 13 | |
| 14 | 14 | // setup Propel |
| 15 | -require_once __DIR__.'/../../../generated-conf/config.php'; |
|
| 15 | +require_once __DIR__ . '/../../../generated-conf/config.php'; |
|
| 16 | 16 | |
| 17 | 17 | $defaultLogger = new Logger('defaultLogger'); |
| 18 | -$defaultLogger->pushHandler(new StreamHandler(__DIR__.'/../../../logs/propel.log', Logger::WARNING)); |
|
| 18 | +$defaultLogger->pushHandler(new StreamHandler(__DIR__ . '/../../../logs/propel.log', Logger::WARNING)); |
|
| 19 | 19 | |
| 20 | 20 | $serviceContainer->setLogger('defaultLogger', $defaultLogger); |
| 21 | 21 | |
@@ -64,18 +64,18 @@ discard block |
||
| 64 | 64 | return SettingsQuery::create()->findOne(); |
| 65 | 65 | } |
| 66 | 66 | |
| 67 | -include __DIR__.'/functions.auth.php'; |
|
| 68 | -include __DIR__.'/functions.notifications.php'; |
|
| 69 | -include __DIR__.'/functions.mail.php'; |
|
| 70 | -include __DIR__.'/functions.remove.php'; |
|
| 71 | -include __DIR__.'/functions.discussion.php'; |
|
| 72 | -include __DIR__.'/functions.event.php'; |
|
| 73 | -include __DIR__.'/functions.password.php'; |
|
| 74 | -include __DIR__.'/functions.users.php'; |
|
| 75 | -include __DIR__.'/functions.roles.php'; |
|
| 76 | -include __DIR__.'/functions.database.php'; |
|
| 77 | -include __DIR__.'/functions.calendars.php'; |
|
| 78 | -include __DIR__.'/functions.facebook.php'; |
|
| 67 | +include __DIR__ . '/functions.auth.php'; |
|
| 68 | +include __DIR__ . '/functions.notifications.php'; |
|
| 69 | +include __DIR__ . '/functions.mail.php'; |
|
| 70 | +include __DIR__ . '/functions.remove.php'; |
|
| 71 | +include __DIR__ . '/functions.discussion.php'; |
|
| 72 | +include __DIR__ . '/functions.event.php'; |
|
| 73 | +include __DIR__ . '/functions.password.php'; |
|
| 74 | +include __DIR__ . '/functions.users.php'; |
|
| 75 | +include __DIR__ . '/functions.roles.php'; |
|
| 76 | +include __DIR__ . '/functions.database.php'; |
|
| 77 | +include __DIR__ . '/functions.calendars.php'; |
|
| 78 | +include __DIR__ . '/functions.facebook.php'; |
|
| 79 | 79 | |
| 80 | 80 | date_default_timezone_set(siteSettings()->getTimeZone()); |
| 81 | 81 | |
@@ -175,7 +175,7 @@ discard block |
||
| 175 | 175 | $stat_id = $_SESSION['login_statistic_id']; |
| 176 | 176 | if (($stat_id != '') && ($stat_id != '0')) { |
| 177 | 177 | $stat = StatisticQuery::create()->findPk($stat_id); |
| 178 | - $stat->setDetail1($stat->getDetail1().'/'.$detail1); |
|
| 178 | + $stat->setDetail1($stat->getDetail1() . '/' . $detail1); |
|
| 179 | 179 | $stat->setDetail2($stat->getDate()->diff(new DateTime())); |
| 180 | 180 | $stat->save(); |
| 181 | 181 | |
@@ -208,7 +208,7 @@ discard block |
||
| 208 | 208 | return 'never'; |
| 209 | 209 | } |
| 210 | 210 | |
| 211 | - return timeInWords($time).' ago'; |
|
| 211 | + return timeInWords($time) . ' ago'; |
|
| 212 | 212 | } |
| 213 | 213 | |
| 214 | 214 | function timeInWordsWithTense($time) |
@@ -222,9 +222,9 @@ discard block |
||
| 222 | 222 | } |
| 223 | 223 | |
| 224 | 224 | if ($time->getTimestamp() > (new DateTime())->getTimestamp()) { |
| 225 | - return 'in '.timeInWords($time); |
|
| 225 | + return 'in ' . timeInWords($time); |
|
| 226 | 226 | } else { |
| 227 | - return timeInWords($time).' ago'; |
|
| 227 | + return timeInWords($time) . ' ago'; |
|
| 228 | 228 | } |
| 229 | 229 | } |
| 230 | 230 | |