TechWilk /
rota
@@ -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 | |
@@ -19,7 +19,7 @@ |
||
| 19 | 19 | } |
| 20 | 20 | |
| 21 | 21 | $client = new Client(); |
| 22 | - $url = $site->getUrl()['base'].$this->router->pathFor('home').'old/cr_daily.php'; |
|
| 22 | + $url = $site->getUrl()['base'] . $this->router->pathFor('home') . 'old/cr_daily.php'; |
|
| 23 | 23 | $guzzleResponse = $client->get($url, [ |
| 24 | 24 | 'query' => [ |
| 25 | 25 | 'token' => $args['token'], |
@@ -11,7 +11,7 @@ discard block |
||
| 11 | 11 | { |
| 12 | 12 | public function getNotificationClick(ServerRequestInterface $request, ResponseInterface $response, $args) |
| 13 | 13 | { |
| 14 | - $this->logger->info("Fetch settings GET '/notification/".$args['id']."'"); |
|
| 14 | + $this->logger->info("Fetch settings GET '/notification/" . $args['id'] . "'"); |
|
| 15 | 15 | |
| 16 | 16 | $n = NotificationQuery::create()->findPk($args['id']); |
| 17 | 17 | |
@@ -35,7 +35,7 @@ discard block |
||
| 35 | 35 | |
| 36 | 36 | return $response->withStatus(302)->withHeader('Location', $this->router->pathFor($link['route'], $link['attributes'])); |
| 37 | 37 | } else { |
| 38 | - return $response->withStatus(302)->withHeader('Location', $this->router->pathFor('home').$n->getLink()); |
|
| 38 | + return $response->withStatus(302)->withHeader('Location', $this->router->pathFor('home') . $n->getLink()); |
|
| 39 | 39 | } |
| 40 | 40 | } |
| 41 | 41 | |
@@ -139,12 +139,12 @@ |
||
| 139 | 139 | <tbody> |
| 140 | 140 | <?php |
| 141 | 141 | $sql = "SELECT s.date,s.detail1,s.detail2,s.detail3,s.type,trim(concat(u.firstName,' ',u.lastName)) AS name FROM statistics s INNER JOIN users u ON u.id = s.userid"; |
| 142 | - if (!isAdmin()) { |
|
| 143 | - $sql .= 'WHERE u.ID=s.userID'; |
|
| 144 | - if (!$debug) { |
|
| 145 | - $sql .= " AND s.type = 'system'"; |
|
| 146 | - } |
|
| 147 | - } |
|
| 142 | + if (!isAdmin()) { |
|
| 143 | + $sql .= 'WHERE u.ID=s.userID'; |
|
| 144 | + if (!$debug) { |
|
| 145 | + $sql .= " AND s.type = 'system'"; |
|
| 146 | + } |
|
| 147 | + } |
|
| 148 | 148 | $sql .= ' ORDER BY date desc '.$limit; |
| 149 | 149 | $result = mysqli_query(db(), $sql) or die(mysqli_error(db())); |
| 150 | 150 | while ($row = mysqli_fetch_array($result, MYSQLI_ASSOC)) { |
@@ -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 | |
@@ -26,28 +26,28 @@ discard block |
||
| 26 | 26 | if ($method == 'truncate') { |
| 27 | 27 | $sql = "CREATE TABLE tmp_system_statistics as SELECT * from statistics WHERE type='system'"; |
| 28 | 28 | if (!mysqli_query(db(), $sql)) { |
| 29 | - die('Error: '.mysqli_error(db())); |
|
| 29 | + die('Error: ' . mysqli_error(db())); |
|
| 30 | 30 | } |
| 31 | 31 | |
| 32 | 32 | $sql = ('TRUNCATE TABLE statistics'); |
| 33 | 33 | if (!mysqli_query(db(), $sql)) { |
| 34 | - die('Error: '.mysqli_error(db())); |
|
| 34 | + die('Error: ' . mysqli_error(db())); |
|
| 35 | 35 | } |
| 36 | 36 | |
| 37 | 37 | $sql = ('ALTER TABLE statistics AUTO_INCREMENT = 50'); |
| 38 | 38 | if (!mysqli_query(db(), $sql)) { |
| 39 | - die('Error: '.mysqli_error(db())); |
|
| 39 | + die('Error: ' . mysqli_error(db())); |
|
| 40 | 40 | } |
| 41 | 41 | |
| 42 | 42 | $sql = 'INSERT INTO statistics (userid,date,type,detail1,detail2,detail3,script) '; |
| 43 | - $sql = $sql.'SELECT userid,date,type,detail1,detail2,detail3,script from tmp_system_statistics order by date'; |
|
| 43 | + $sql = $sql . 'SELECT userid,date,type,detail1,detail2,detail3,script from tmp_system_statistics order by date'; |
|
| 44 | 44 | if (!mysqli_query(db(), $sql)) { |
| 45 | - die('Error: '.mysqli_error(db())); |
|
| 45 | + die('Error: ' . mysqli_error(db())); |
|
| 46 | 46 | } |
| 47 | 47 | |
| 48 | 48 | $sql = 'DROP TABLE tmp_system_statistics'; |
| 49 | 49 | if (!mysqli_query(db(), $sql)) { |
| 50 | - die('Error: '.mysqli_error(db())); |
|
| 50 | + die('Error: ' . mysqli_error(db())); |
|
| 51 | 51 | } |
| 52 | 52 | |
| 53 | 53 | insertStatistics('system', __FILE__, 'statistics deleted'); |
@@ -103,22 +103,22 @@ discard block |
||
| 103 | 103 | <?php |
| 104 | 104 | |
| 105 | 105 | $sql = 'SELECT VERSION( ) AS mysqli_version'; |
| 106 | - $result = mysqli_query(db(), $sql) or die('MySQL-Error: '.mysqli_error(db())); |
|
| 106 | + $result = mysqli_query(db(), $sql) or die('MySQL-Error: ' . mysqli_error(db())); |
|
| 107 | 107 | $dbv = mysqli_fetch_array($result, MYSQLI_ASSOC); |
| 108 | 108 | $mysqli_version = $dbv['mysqli_version']; |
| 109 | 109 | |
| 110 | 110 | if (substr($mysqli_version, 0, 1) == 5) { |
| 111 | - $sql = "SELECT getBrowserInfo(detail3) as browser,count(*) as count from statistics where detail1 like 'login%' and detail3!='' group by getBrowserInfo(detail3) order by count desc ".$browserLimit; |
|
| 111 | + $sql = "SELECT getBrowserInfo(detail3) as browser,count(*) as count from statistics where detail1 like 'login%' and detail3!='' group by getBrowserInfo(detail3) order by count desc " . $browserLimit; |
|
| 112 | 112 | } else { |
| 113 | - $sql = "SELECT detail3 as browser,count(*) as count from statistics where detail1 like 'login%' and detail3!='' group by detail3 order by count desc ".$browserLimit; |
|
| 113 | + $sql = "SELECT detail3 as browser,count(*) as count from statistics where detail1 like 'login%' and detail3!='' group by detail3 order by count desc " . $browserLimit; |
|
| 114 | 114 | } |
| 115 | 115 | |
| 116 | 116 | $result = mysqli_query(db(), $sql) or die(mysqli_error(db())); |
| 117 | 117 | while ($row = mysqli_fetch_array($result, MYSQLI_ASSOC)) { |
| 118 | 118 | extract($row); |
| 119 | 119 | echo '<tr>'; |
| 120 | - echo '<td>'.$browser.'</td>'; |
|
| 121 | - echo '<td>'.$count.'</td>'; |
|
| 120 | + echo '<td>' . $browser . '</td>'; |
|
| 121 | + echo '<td>' . $count . '</td>'; |
|
| 122 | 122 | echo '</tr>'; |
| 123 | 123 | } ?> |
| 124 | 124 | |
@@ -145,16 +145,16 @@ discard block |
||
| 145 | 145 | $sql .= " AND s.type = 'system'"; |
| 146 | 146 | } |
| 147 | 147 | } |
| 148 | - $sql .= ' ORDER BY date desc '.$limit; |
|
| 148 | + $sql .= ' ORDER BY date desc ' . $limit; |
|
| 149 | 149 | $result = mysqli_query(db(), $sql) or die(mysqli_error(db())); |
| 150 | 150 | while ($row = mysqli_fetch_array($result, MYSQLI_ASSOC)) { |
| 151 | 151 | extract($row); |
| 152 | 152 | echo '<tr>'; |
| 153 | - echo '<td>'.$date.'</td>'; |
|
| 154 | - echo '<td>'.$name.'</td>'; |
|
| 155 | - echo '<td>'.$type.'</td>'; |
|
| 156 | - echo '<td>'.$detail1.'</td>'; |
|
| 157 | - echo '<td>'.$detail2.'</td>'; |
|
| 153 | + echo '<td>' . $date . '</td>'; |
|
| 154 | + echo '<td>' . $name . '</td>'; |
|
| 155 | + echo '<td>' . $type . '</td>'; |
|
| 156 | + echo '<td>' . $detail1 . '</td>'; |
|
| 157 | + echo '<td>' . $detail2 . '</td>'; |
|
| 158 | 158 | //echo "<td>".$detail3."</td>"; |
| 159 | 159 | echo '</tr>'; |
| 160 | 160 | } |
@@ -111,7 +111,7 @@ discard block |
||
| 111 | 111 | FROM eventTypes et |
| 112 | 112 | WHERE id IN (SELECT e.type |
| 113 | 113 | FROM 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 groups g ORDER BY '.$group_sorting_name; |
|
| 135 | + $sql = 'SELECT * FROM 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)) { |
@@ -162,7 +162,7 @@ discard block |
||
| 162 | 162 | |
| 163 | 163 | if ($filter == '') { |
| 164 | 164 | $sql .= ' |
| 165 | - AND '.$whereTwoMonth.' |
|
| 165 | + AND '.$whereTwoMonth . ' |
|
| 166 | 166 | ORDER BY |
| 167 | 167 | e.date'; |
| 168 | 168 | } elseif ($filter == 'all') { |
@@ -172,7 +172,7 @@ discard block |
||
| 172 | 172 | } elseif ($filter != '') { |
| 173 | 173 | $sql .= " |
| 174 | 174 | AND e.type = '$filter' |
| 175 | - AND ".$whereTwoMonth.' |
|
| 175 | + AND " . $whereTwoMonth . ' |
|
| 176 | 176 | ORDER BY |
| 177 | 177 | e.date'; |
| 178 | 178 | } |
@@ -186,31 +186,31 @@ discard block |
||
| 186 | 186 | echo '<tr>'; |
| 187 | 187 | echo '<td >'; |
| 188 | 188 | setlocale(LC_TIME, $lang_locale); //de_DE |
| 189 | - echo '<a href="event.php?id='.$row['id'].'">'; |
|
| 189 | + echo '<a href="event.php?id=' . $row['id'] . '">'; |
|
| 190 | 190 | echo strftime($time_format_short, strtotime($row['sundayDate'])); // %a, <strong>%e. %b</strong>, KW%V |
| 191 | 191 | echo '</a>'; |
| 192 | 192 | |
| 193 | 193 | //$row['sundayDate'] |
| 194 | 194 | if (!empty($row['eventType'])) { |
| 195 | - echo '<br /><em> '.$row['eventType'].'</em>'; |
|
| 195 | + echo '<br /><em> ' . $row['eventType'] . '</em>'; |
|
| 196 | 196 | } |
| 197 | 197 | if (!empty($row['eventSubType'])) { |
| 198 | - echo ' - <em>'.$row['eventSubType'].'</em>'; |
|
| 198 | + echo ' - <em>' . $row['eventSubType'] . '</em>'; |
|
| 199 | 199 | } |
| 200 | 200 | if (!empty($row['eventLocation'])) { |
| 201 | - echo '<br /><em> '.$row['eventLocation'].'</em>'; |
|
| 201 | + echo '<br /><em> ' . $row['eventLocation'] . '</em>'; |
|
| 202 | 202 | } |
| 203 | 203 | if (!empty($row['name'])) { |
| 204 | - echo '<br /><em> '.$row['name'].'</em>'; |
|
| 204 | + echo '<br /><em> ' . $row['name'] . '</em>'; |
|
| 205 | 205 | } |
| 206 | 206 | if (!empty($row['eventGroup'])) { |
| 207 | - echo '<br /><strong> '.$row['eventGroup'].'</strong>'; |
|
| 207 | + echo '<br /><strong> ' . $row['eventGroup'] . '</strong>'; |
|
| 208 | 208 | } |
| 209 | 209 | if (!empty($row['sermonTitle'])) { |
| 210 | - echo ': '.$row['sermonTitle']; |
|
| 210 | + echo ': ' . $row['sermonTitle']; |
|
| 211 | 211 | } |
| 212 | 212 | if (!empty($row['bibleVerse'])) { |
| 213 | - echo ' <em>('.$row['bibleVerse'].')</em>'; |
|
| 213 | + echo ' <em>(' . $row['bibleVerse'] . ')</em>'; |
|
| 214 | 214 | } |
| 215 | 215 | echo '</td>'; |
| 216 | 216 | |
@@ -242,16 +242,16 @@ discard block |
||
| 242 | 242 | if ($previousName == '') { |
| 243 | 243 | // new name |
| 244 | 244 | echo ($viewPeople['userId'] == $sessionUserId) ? '<strong class="me">' : ''; |
| 245 | - echo $name.' <em>('.$viewPeople['role']; |
|
| 245 | + echo $name . ' <em>(' . $viewPeople['role']; |
|
| 246 | 246 | } elseif ($previousName != $name) { |
| 247 | 247 | echo ')</em>'; |
| 248 | 248 | echo ($viewPeople['userId'] != $sessionUserId) ? '</strong>' : ''; |
| 249 | 249 | echo '<br />'; // line break from previous name |
| 250 | 250 | // new name |
| 251 | 251 | echo ($viewPeople['userId'] == $sessionUserId) ? '<strong class="me">' : ''; |
| 252 | - echo $name.' <em>('.$viewPeople['role']; |
|
| 252 | + echo $name . ' <em>(' . $viewPeople['role']; |
|
| 253 | 253 | } else { |
| 254 | - echo ', '.$viewPeople['role']; |
|
| 254 | + echo ', ' . $viewPeople['role']; |
|
| 255 | 255 | } |
| 256 | 256 | |
| 257 | 257 | $peopleInEvent = true; |
@@ -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 | |
@@ -34,7 +34,7 @@ discard block |
||
| 34 | 34 | if ($role && $assignTo) { |
| 35 | 35 | $sql = "UPDATE roles r SET r.groupId = '$assignTo' WHERE r.id = '$role'"; |
| 36 | 36 | if (!mysqli_query(db(), $sql)) { |
| 37 | - die('Error: '.mysqli_error(db())); |
|
| 37 | + die('Error: ' . mysqli_error(db())); |
|
| 38 | 38 | } |
| 39 | 39 | header('Location: roles.php'); |
| 40 | 40 | exit; |
@@ -70,7 +70,7 @@ discard block |
||
| 70 | 70 | $sql = "INSERT INTO roles (name, description, rehersalId, groupId) |
| 71 | 71 | VALUES ('$newrole', '$newrole', $rehersal, $groupId)"; |
| 72 | 72 | if (!mysqli_query(db(), $sql)) { |
| 73 | - die('Error: '.mysqli_error(db())); |
|
| 73 | + die('Error: ' . mysqli_error(db())); |
|
| 74 | 74 | } |
| 75 | 75 | } else { |
| 76 | 76 | // Handle renaming of the roles |
@@ -103,11 +103,11 @@ discard block |
||
| 103 | 103 | $i = 1; |
| 104 | 104 | while ($row = mysqli_fetch_array($result, MYSQLI_ASSOC)) { |
| 105 | 105 | if ($type == 'option') { |
| 106 | - $list = $list."<option value='".$row['id']."'>".$row['name'].'</option>'; |
|
| 106 | + $list = $list . "<option value='" . $row['id'] . "'>" . $row['name'] . '</option>'; |
|
| 107 | 107 | } elseif ($type == 'li') { |
| 108 | - $list = $list.'<li>'.$row['name'].'</li>'; |
|
| 108 | + $list = $list . '<li>' . $row['name'] . '</li>'; |
|
| 109 | 109 | } elseif ($type == 'li-a') { |
| 110 | - $list = $list."<li><a href='roles.php?role=".$roleId.'&assignto='.$row['id']."'>".$row['name'].'</a></li>'; |
|
| 110 | + $list = $list . "<li><a href='roles.php?role=" . $roleId . '&assignto=' . $row['id'] . "'>" . $row['name'] . '</a></li>'; |
|
| 111 | 111 | } |
| 112 | 112 | $i++; |
| 113 | 113 | } |
@@ -173,7 +173,7 @@ discard block |
||
| 173 | 173 | $group = $row['groupId']; |
| 174 | 174 | $down = $group + 1; |
| 175 | 175 | $up = $group - 1; |
| 176 | - echo '<div><strong>'.$groupname.'</strong><br />'; |
|
| 176 | + echo '<div><strong>' . $groupname . '</strong><br />'; |
|
| 177 | 177 | } |
| 178 | 178 | // Print text input box if a role exists for the group. |
| 179 | 179 | // Allows user to update role names and move roles between groups |
@@ -35,7 +35,7 @@ discard block |
||
| 35 | 35 | exit; |
| 36 | 36 | } |
| 37 | 37 | if (!isAdmin()) { |
| 38 | - header('Location: error.php?no=100&page='.basename($_SERVER['SCRIPT_FILENAME'])); |
|
| 38 | + header('Location: error.php?no=100&page=' . basename($_SERVER['SCRIPT_FILENAME'])); |
|
| 39 | 39 | exit; |
| 40 | 40 | } |
| 41 | 41 | |
@@ -71,7 +71,7 @@ discard block |
||
| 71 | 71 | if ($editskillID != '') { |
| 72 | 72 | $sql = ("INSERT INTO eventPeople (eventID, skillID) VALUES ('$editeventID', '$editskillID')"); |
| 73 | 73 | if (!mysqli_query(db(), $sql)) { |
| 74 | - die('Error: '.mysqli_error(db())); |
|
| 74 | + die('Error: ' . mysqli_error(db())); |
|
| 75 | 75 | } |
| 76 | 76 | |
| 77 | 77 | // After we have inserted the data, we want to head back to the main page |
@@ -88,7 +88,7 @@ discard block |
||
| 88 | 88 | |
| 89 | 89 | $sql = ("INSERT INTO eventPeople (eventID, skillID) VALUES ('$editeventID', '$editskillID')"); |
| 90 | 90 | if (!mysqli_query(db(), $sql)) { |
| 91 | - die('Error: '.mysqli_error(db())); |
|
| 91 | + die('Error: ' . mysqli_error(db())); |
|
| 92 | 92 | } |
| 93 | 93 | } |
| 94 | 94 | |
@@ -294,7 +294,7 @@ discard block |
||
| 294 | 294 | <!-- Menu toggle button --> |
| 295 | 295 | <a href="#" class="dropdown-toggle" data-toggle="dropdown"> |
| 296 | 296 | <i class="fa fa-bell-o"></i> |
| 297 | - <?php echo $unseen >= 1 ? '<span class="label label-warning">'.$unseen.'</span>' : '' ?> |
|
| 297 | + <?php echo $unseen >= 1 ? '<span class="label label-warning">' . $unseen . '</span>' : '' ?> |
|
| 298 | 298 | </a> |
| 299 | 299 | <ul class="dropdown-menu"> |
| 300 | 300 | <li class="header">You have <?php echo $unseen >= 1 ? $unseen : 'no' ?> new notifications</li> |
@@ -304,7 +304,7 @@ discard block |
||
| 304 | 304 | <?php foreach ($notifications as $n): ?> |
| 305 | 305 | <li><!-- start notification --> |
| 306 | 306 | <a href="notification.php?click=notifications-panel&id=<?php echo $n->id ?>"> |
| 307 | - <i class="fa fa-users text-aqua"></i> <?php echo $n->seen ? $n->summary : '<strong>'.$n->summary.'</strong>' ?> |
|
| 307 | + <i class="fa fa-users text-aqua"></i> <?php echo $n->seen ? $n->summary : '<strong>' . $n->summary . '</strong>' ?> |
|
| 308 | 308 | <small><?php echo timeAgoInWords($n->timestamp) ?></small> |
| 309 | 309 | </a> |
| 310 | 310 | </li><!-- end notification --> |
@@ -359,7 +359,7 @@ discard block |
||
| 359 | 359 | <!-- User Account Menu --> |
| 360 | 360 | <li class="dropdown user user-menu"> |
| 361 | 361 | <?php |
| 362 | - $sql = 'SELECT u.created FROM users u WHERE id = '.$_SESSION['userid']; |
|
| 362 | + $sql = 'SELECT u.created FROM users u WHERE id = ' . $_SESSION['userid']; |
|
| 363 | 363 | $result = mysqli_query(db(), $sql) or die(mysqli_error(db())); |
| 364 | 364 | $currentUser = mysqli_fetch_object($result); |
| 365 | 365 | ?> |
