TechWilk /
rota
@@ -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 | |
@@ -39,7 +39,7 @@ discard block |
||
| 39 | 39 | $sql = "UPDATE locations SET name = '$name' WHERE id = '$editid'"; |
| 40 | 40 | } |
| 41 | 41 | if (!mysqli_query(db(), $sql)) { |
| 42 | - die('Error: '.mysqli_error(db())); |
|
| 42 | + die('Error: ' . mysqli_error(db())); |
|
| 43 | 43 | } |
| 44 | 44 | } else { |
| 45 | 45 | $newlocation = $_POST['newlocation']; |
@@ -50,7 +50,7 @@ discard block |
||
| 50 | 50 | |
| 51 | 51 | $sql = ("INSERT INTO locations (name) VALUES ('$newlocation')"); |
| 52 | 52 | if (!mysqli_query(db(), $sql)) { |
| 53 | - die('Error: '.mysqli_error(db())); |
|
| 53 | + die('Error: ' . mysqli_error(db())); |
|
| 54 | 54 | } |
| 55 | 55 | |
| 56 | 56 | // After we have inserted the data, we want to head back to the main users page |
@@ -95,8 +95,8 @@ discard block |
||
| 95 | 95 | |
| 96 | 96 | while ($row = mysqli_fetch_array($result, MYSQLI_ASSOC)) { |
| 97 | 97 | $locationID = $row['id']; |
| 98 | - echo "<span id='".$locationID."' class='edit'>".$row['name'].'</span> '; |
|
| 99 | - echo " <a href='locations.php?locationremove=true&locationID=".$locationID."'><i class='fa fa-close'></i></a><br />"; |
|
| 98 | + echo "<span id='" . $locationID . "' class='edit'>" . $row['name'] . '</span> '; |
|
| 99 | + echo " <a href='locations.php?locationremove=true&locationID=" . $locationID . "'><i class='fa fa-close'></i></a><br />"; |
|
| 100 | 100 | } ?> |
| 101 | 101 | </div><!-- /.box-body --> |
| 102 | 102 | </div><!-- /.box --> |
@@ -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 |
@@ -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 users u INNER JOIN userRoles ur ON ur.userId = u.id INNER JOIN 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 users u INNER JOIN userRoles ur ON ur.userId = u.id INNER JOIN 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> |
@@ -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 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 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 | |
@@ -37,7 +37,7 @@ discard block |
||
| 37 | 37 | |
| 38 | 38 | $sql = ("INSERT INTO eventSubTypes (name, description) VALUES ('$name', '$description')"); |
| 39 | 39 | if (!mysqli_query(db(), $sql)) { |
| 40 | - die('Error: '.mysqli_error(db())); |
|
| 40 | + die('Error: ' . mysqli_error(db())); |
|
| 41 | 41 | } |
| 42 | 42 | } else { |
| 43 | 43 | // Otherwise we are dealing with edits, not new stuff |
@@ -88,10 +88,10 @@ discard block |
||
| 88 | 88 | $result = mysqli_query(db(), $sql) or die(mysqli_error(db())); |
| 89 | 89 | |
| 90 | 90 | while ($row = mysqli_fetch_array($result, MYSQLI_ASSOC)) { |
| 91 | - echo '<input type="hidden" name="formindex[]" value="'.$row['id'].'" />'; |
|
| 92 | - echo "<input name='name[]' value='".$row['name']."' />"; |
|
| 91 | + echo '<input type="hidden" name="formindex[]" value="' . $row['id'] . '" />'; |
|
| 92 | + echo "<input name='name[]' value='" . $row['name'] . "' />"; |
|
| 93 | 93 | |
| 94 | - echo " <a href='subTypes.php?method=remove&subType=".$row['id']."'><i class='fa fa-times'></i></a><br />"; |
|
| 94 | + echo " <a href='subTypes.php?method=remove&subType=" . $row['id'] . "'><i class='fa fa-times'></i></a><br />"; |
|
| 95 | 95 | } ?> |
| 96 | 96 | </div><!-- /.box-body --> |
| 97 | 97 | <div class="box-footer"> |
@@ -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 | } |
@@ -136,8 +136,8 @@ discard block |
||
| 136 | 136 | |
| 137 | 137 | // convert format of date |
| 138 | 138 | $date = str_replace('/', '-', $date); // ensure it isn't read as mm/dd/yyyy |
| 139 | - $date = strftime('%Y-%m-%d', strtotime($date.' 00:00:00')); |
|
| 140 | - $date = $date.' '.$time.':00'; |
|
| 139 | + $date = strftime('%Y-%m-%d', strtotime($date . ' 00:00:00')); |
|
| 140 | + $date = $date . ' ' . $time . ':00'; |
|
| 141 | 141 | $date = mysqli_real_escape_string(db(), $date); |
| 142 | 142 | |
| 143 | 143 | if ($action == 'edit') { |
@@ -207,10 +207,10 @@ discard block |
||
| 207 | 207 | //if ($userisBandAdmin) $delete_all_sql = $delete_all_sql . " and skillID in (select skillID from skills where groupid=2)"; |
| 208 | 208 | //if ($userisEventEditor) $delete_all_sql = $delete_all_sql . " and skillID in (select skillID from skills where groupid!=2)"; |
| 209 | 209 | if ($userisBandAdmin) { |
| 210 | - $delete_all_sql = $delete_all_sql.' and skillID in (select skillID from skills where groupid in (2,3,4))'; |
|
| 210 | + $delete_all_sql = $delete_all_sql . ' and skillID in (select skillID from skills where groupid in (2,3,4))'; |
|
| 211 | 211 | } |
| 212 | 212 | if ($userisEventEditor) { |
| 213 | - $delete_all_sql = $delete_all_sql.' and skillID in (select skillID from skills where not (groupid in (2,3,4)))'; |
|
| 213 | + $delete_all_sql = $delete_all_sql . ' and skillID in (select skillID from skills where not (groupid in (2,3,4)))'; |
|
| 214 | 214 | } |
| 215 | 215 | mysqli_query(db(), $delete_all_sql) or die(mysqli_error(db())); |
| 216 | 216 | } |
@@ -218,9 +218,9 @@ discard block |
||
| 218 | 218 | // redirect |
| 219 | 219 | if (isset($_SESSION['lastEventsFilter'])) { |
| 220 | 220 | $type = $_SESSION['lastEventsFilter']; |
| 221 | - header('Location: events.php?view=all&filter='.$type.'#event'.$eventID); |
|
| 221 | + header('Location: events.php?view=all&filter=' . $type . '#event' . $eventID); |
|
| 222 | 222 | } else { |
| 223 | - header('Location: events.php?view=all#event'.$eventID); |
|
| 223 | + header('Location: events.php?view=all#event' . $eventID); |
|
| 224 | 224 | } |
| 225 | 225 | exit; |
| 226 | 226 | } |
@@ -297,7 +297,7 @@ discard block |
||
| 297 | 297 | while ($ob = mysqli_fetch_object($result)) { |
| 298 | 298 | if (!(isset($type) && $ob->id == $type)) { |
| 299 | 299 | $defaultTime = strftime('%H:%M', strtotime($ob->defaultTime)); |
| 300 | - 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>'; |
|
| 300 | + 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>'; |
|
| 301 | 301 | } |
| 302 | 302 | } ?> |
| 303 | 303 | </select> |
@@ -323,7 +323,7 @@ discard block |
||
| 323 | 323 | while ($row = mysqli_fetch_array($result, MYSQLI_ASSOC)) { |
| 324 | 324 | if (isset($subtype) && $row['id'] == $subtype) { |
| 325 | 325 | } else { |
| 326 | - echo "<option value='".$row['id']."' title='".$row['description']."'>".$row['name'].'</option>'; |
|
| 326 | + echo "<option value='" . $row['id'] . "' title='" . $row['description'] . "'>" . $row['name'] . '</option>'; |
|
| 327 | 327 | } |
| 328 | 328 | } ?> |
| 329 | 329 | </select> |
@@ -351,7 +351,7 @@ discard block |
||
| 351 | 351 | while ($row = mysqli_fetch_array($result, MYSQLI_ASSOC)) { |
| 352 | 352 | if (isset($location) && $row['id'] == $location) { |
| 353 | 353 | } else { |
| 354 | - echo "<option value='".$row['id']."'>".$row['name'].'</option>'; |
|
| 354 | + echo "<option value='" . $row['id'] . "'>" . $row['name'] . '</option>'; |
|
| 355 | 355 | } |
| 356 | 356 | } ?> |
| 357 | 357 | </select> |
@@ -482,7 +482,7 @@ discard block |
||
| 482 | 482 | while ($row = mysqli_fetch_array($result, MYSQLI_ASSOC)) { |
| 483 | 483 | if (isset($type) && $row['id'] == $type) { |
| 484 | 484 | } else { |
| 485 | - echo "<option value='".$row['id']."' title='".$row['description']."'>".$row['name'].'</option>'; |
|
| 485 | + echo "<option value='" . $row['id'] . "' title='" . $row['description'] . "'>" . $row['name'] . '</option>'; |
|
| 486 | 486 | } |
| 487 | 487 | } ?> |
| 488 | 488 | </select> |
@@ -552,8 +552,8 @@ discard block |
||
| 552 | 552 | <?php foreach ($role->getUserRoles() as $userRole): ?> |
| 553 | 553 | <?php if (!$userRole->getReserve()): ?> |
| 554 | 554 | <?php $isInEvent = in_array($userRole->getId(), $usersInEvent) ?> |
| 555 | - <option value="<?php echo $userRole->getId() ?>" <?php echo $isInEvent ? 'selected="selected"' : '' ?>><?php echo $userRole->getUser()->getFirstName().' '.$userRole->getUser()->getLastName() ?></option> |
|
| 556 | - <?php else: ?> |
|
| 555 | + <option value="<?php echo $userRole->getId() ?>" <?php echo $isInEvent ? 'selected="selected"' : '' ?>><?php echo $userRole->getUser()->getFirstName() . ' ' . $userRole->getUser()->getLastName() ?></option> |
|
| 556 | + <?php else : ?> |
|
| 557 | 557 | <?php $countReserve += 1 ?> |
| 558 | 558 | <?php endif //!userRole->getReserve?> |
| 559 | 559 | <?php endforeach //users?> |
@@ -563,7 +563,7 @@ discard block |
||
| 563 | 563 | <?php foreach ($role->getUserRoles() as $userRole): ?> |
| 564 | 564 | <?php if ($userRole->getReserve()): ?> |
| 565 | 565 | <?php $isInEvent = in_array($userRole->getId(), $usersInEvent) ?> |
| 566 | - <option value="<?php echo $userRole->getId() ?>" <?php echo $isInEvent ? 'selected="selected"' : '' ?>><?php echo $userRole->getUser()->getFirstName().' '.$userRole->getUser()->getLastName() ?></option> |
|
| 566 | + <option value="<?php echo $userRole->getId() ?>" <?php echo $isInEvent ? 'selected="selected"' : '' ?>><?php echo $userRole->getUser()->getFirstName() . ' ' . $userRole->getUser()->getLastName() ?></option> |
|
| 567 | 567 | <?php endif ?> |
| 568 | 568 | <?php endforeach //users?> |
| 569 | 569 | </optgroup> |
@@ -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 | ?> |
@@ -17,7 +17,7 @@ discard block |
||
| 17 | 17 | $_SESSION['db_is_logged_in'] = true; |
| 18 | 18 | $_SESSION['isAdmin'] = $row['isAdmin']; // Set the admin status to be carried across this session |
| 19 | 19 | $_SESSION['userid'] = $row['id']; |
| 20 | - $_SESSION['name'] = $row['firstName'].' '.$row['lastName']; |
|
| 20 | + $_SESSION['name'] = $row['firstName'] . ' ' . $row['lastName']; |
|
| 21 | 21 | $_SESSION['isBandAdmin'] = $row['isBandAdmin']; // Set the band admin status to be carried across this session |
| 22 | 22 | $_SESSION['isEventEditor'] = $row['isEventEditor']; // Set the event editor status to be carried across this session |
| 23 | 23 | $_SESSION['onlyShowUserEvents'] = $users_start_with_myevents; // 1 if users_start_with_myevents is set in settings, can be changed by user during session |
@@ -29,13 +29,13 @@ discard block |
||
| 29 | 29 | |
| 30 | 30 | // admin section |
| 31 | 31 | if ($_SESSION['isAdmin'] == 1) { |
| 32 | - updateDatabase(); //check for db updates |
|
| 32 | + updateDatabase(); //check for db updates |
|
| 33 | 33 | //$_SESSION['onlyShowUserEvents'] = '0'; //show all events for admin, regardless what settings say |
| 34 | 34 | } |
| 35 | 35 | |
| 36 | 36 | // Update last login timestamp |
| 37 | 37 | $currentTimestamp = date('Y-m-d H:i:s'); |
| 38 | - $sql = "UPDATE users SET lastLogin = '$currentTimestamp' WHERE id = '".$row['id']."'"; |
|
| 38 | + $sql = "UPDATE users SET lastLogin = '$currentTimestamp' WHERE id = '" . $row['id'] . "'"; |
|
| 39 | 39 | mysqli_query(db(), $sql) or die(mysqli_error(db())); |
| 40 | 40 | |
| 41 | 41 | // redirect |
@@ -44,11 +44,11 @@ discard block |
||
| 44 | 44 | $redirectFromSession = strip_tags($_SESSION['redirectUrl']); |
| 45 | 45 | unset($_SESSION['redirectUrl']); |
| 46 | 46 | // check is url is on same domain and prevents redirecting to logout page |
| 47 | - if (strncmp(strtolower(siteSettings()->getSiteUrl().'/'), strtolower($redirectFromSession), (strlen(siteSettings()->getSiteUrl()) + 1)) == 0 && strpos($redirectFromSession, 'logout.php') === false) { |
|
| 47 | + if (strncmp(strtolower(siteSettings()->getSiteUrl() . '/'), strtolower($redirectFromSession), (strlen(siteSettings()->getSiteUrl()) + 1)) == 0 && strpos($redirectFromSession, 'logout.php') === false) { |
|
| 48 | 48 | $redirectUrl = $redirectFromSession; |
| 49 | 49 | } |
| 50 | 50 | } |
| 51 | - header('Location: '.$redirectUrl); |
|
| 51 | + header('Location: ' . $redirectUrl); |
|
| 52 | 52 | exit; |
| 53 | 53 | } |
| 54 | 54 | } |
