TechWilk / rota

public/old/viewBands.php

Indentation +1 added lines, -1 removed lines

@@ -68,7 +68,7 @@
         }
     }
     // After we have inserted the data, we want to head back to the main page
-     header('Location: viewBands.php');
+        header('Location: viewBands.php');
     exit;
 }
 

Spacing +9 added lines, -9 removed lines

@@ -33,7 +33,7 @@ 
     exit;
 }
 if (!isAdmin()) {
-    header('Location: error.php?no=100&page='.basename($_SERVER['SCRIPT_FILENAME']));
+    header('Location: error.php?no=100&page=' . basename($_SERVER['SCRIPT_FILENAME']));
     exit;
 }
 
@@ -56,7 +56,7 @@ 
         $bandName = $_POST['bandname'];
         $sql = ("INSERT INTO cr_bands (bandLeader) VALUES ('$bandName')");
         if (!mysqli_query(db(), $sql)) {
-            die('Error: '.mysqli_error(db()));
+            die('Error: ' . mysqli_error(db()));
         }
     } else {
         $editbandID = $_GET['band'];
@@ -64,7 +64,7 @@ 
 
         $sql = ("INSERT INTO cr_bandMembers (bandID, skillID) VALUES ('$editbandID', '$editskillID')");
         if (!mysqli_query(db(), $sql)) {
-            die('Error: '.mysqli_error(db()));
+            die('Error: ' . mysqli_error(db()));
         }
     }
     // After we have inserted the data, we want to head back to the main page
@@ -99,8 +99,8 @@ 
 		<div class="elementBackground">
 			<h2><a name="section<?php echo $row['bandID']; ?>"><?php echo $row['bandLeader']; ?></a> <?php if (isAdmin()) {
                 echo "
-			<a href='editBand.php?id=".$bandid."'><img src='graphics/tool.png' /></a>
-			<a href='viewBands.php?skillremove=true&bandid=".$bandid."'><img src='graphics/close.png' /></a>";
+			<a href='editBand.php?id=".$bandid . "'><img src='graphics/tool.png' /></a>
+			<a href='viewBands.php?skillremove=true&bandid=".$bandid . "'><img src='graphics/close.png' /></a>";
             } ?></h2>
 			
 				<?php
@@ -120,8 +120,8 @@ 
                     while ($rowskills = mysqli_fetch_array($resultskills, MYSQLI_ASSOC)) {
                         $bandMembersID = $bandMember['bandMembersID'];
                         $sqlusers = '';
-                        echo '<strong>'.$rowskills['name'].'</strong> ';
-                        echo '<em> '.$rowskills['skill'].'</em>'." <a href='viewBands.php?skillremove=true&bandMembersID=".$bandMembersID."'><img src='graphics/close.png' /></a><br />";
+                        echo '<strong>' . $rowskills['name'] . '</strong> ';
+                        echo '<em> ' . $rowskills['skill'] . '</em>' . " <a href='viewBands.php?skillremove=true&bandMembersID=" . $bandMembersID . "'><img src='graphics/close.png' /></a><br />";
                     }
                 }
             }
@@ -136,8 +136,8 @@ 
 					<label for="name">Add members:</label>
 					<select name="name" id="name">
 						<?php while ($addMember = mysqli_fetch_array($resultaddMembers, MYSQLI_ASSOC)) {
-                echo "<option value='".$addMember['skillID']."'>";
-                echo $addMember['name'].' - '.$addMember['skill'];
+                echo "<option value='" . $addMember['skillID'] . "'>";
+                echo $addMember['name'] . ' - ' . $addMember['skill'];
                 echo '</option>';
             } ?>
 					</select>

public/old/statistics.php

Indentation +6 added lines, -6 removed lines

@@ -139,12 +139,12 @@
     		<tbody>
     		<?php
                 $sql = "SELECT s.date,s.detail1,s.detail2,s.detail3,s.type,trim(concat(u.firstName,' ',u.lastName)) AS name FROM cr_statistics s INNER JOIN cr_users u ON u.id = s.userid";
-          if (!isAdmin()) {
-              $sql .= 'WHERE u.ID=s.userID';
-              if (!$debug) {
-                  $sql .= " AND s.type = 'system'";
-              }
-          }
+            if (!isAdmin()) {
+                $sql .= 'WHERE u.ID=s.userID';
+                if (!$debug) {
+                    $sql .= " AND s.type = 'system'";
+                }
+            }
                 $sql .= ' ORDER BY date desc '.$limit;
                 $result = mysqli_query(db(), $sql) or die(mysqli_error(db()));
                 while ($row = mysqli_fetch_array($result, MYSQLI_ASSOC)) {

Spacing +18 added lines, -18 removed lines

@@ -14,7 +14,7 @@ 
     exit;
 }
 if (!isAdmin()) {
-    header('Location: error.php?no=100&page='.basename($_SERVER['SCRIPT_FILENAME']));
+    header('Location: error.php?no=100&page=' . basename($_SERVER['SCRIPT_FILENAME']));
     exit;
 }
 
@@ -26,28 +26,28 @@ 
     if ($method == 'truncate') {
         $sql = "CREATE TABLE tmp_system_statistics as SELECT * from cr_statistics WHERE type='system'";
         if (!mysqli_query(db(), $sql)) {
-            die('Error: '.mysqli_error(db()));
+            die('Error: ' . mysqli_error(db()));
         }
 
         $sql = ('TRUNCATE TABLE cr_statistics');
         if (!mysqli_query(db(), $sql)) {
-            die('Error: '.mysqli_error(db()));
+            die('Error: ' . mysqli_error(db()));
         }
 
         $sql = ('ALTER TABLE cr_statistics  AUTO_INCREMENT = 50');
         if (!mysqli_query(db(), $sql)) {
-            die('Error: '.mysqli_error(db()));
+            die('Error: ' . mysqli_error(db()));
         }
 
         $sql = 'INSERT INTO cr_statistics (userid,date,type,detail1,detail2,detail3,script) ';
-        $sql = $sql.'SELECT userid,date,type,detail1,detail2,detail3,script from tmp_system_statistics order by date';
+        $sql = $sql . 'SELECT userid,date,type,detail1,detail2,detail3,script from tmp_system_statistics order by date';
         if (!mysqli_query(db(), $sql)) {
-            die('Error: '.mysqli_error(db()));
+            die('Error: ' . mysqli_error(db()));
         }
 
         $sql = 'DROP TABLE tmp_system_statistics';
         if (!mysqli_query(db(), $sql)) {
-            die('Error: '.mysqli_error(db()));
+            die('Error: ' . mysqli_error(db()));
         }
 
         insertStatistics('system', __FILE__, 'statistics deleted');
@@ -103,22 +103,22 @@ 
               <?php
 
                         $sql = 'SELECT VERSION( ) AS mysqli_version';
-            $result = mysqli_query(db(), $sql) or die('MySQL-Error: '.mysqli_error(db()));
+            $result = mysqli_query(db(), $sql) or die('MySQL-Error: ' . mysqli_error(db()));
             $dbv = mysqli_fetch_array($result, MYSQLI_ASSOC);
             $mysqli_version = $dbv['mysqli_version'];
 
             if (substr($mysqli_version, 0, 1) == 5) {
-                $sql = "SELECT getBrowserInfo(detail3) as browser,count(*) as count from cr_statistics where detail1 like 'login%' and detail3!='' group by getBrowserInfo(detail3) order by count desc ".$browserLimit;
+                $sql = "SELECT getBrowserInfo(detail3) as browser,count(*) as count from cr_statistics where detail1 like 'login%' and detail3!='' group by getBrowserInfo(detail3) order by count desc " . $browserLimit;
             } else {
-                $sql = "SELECT detail3 as browser,count(*) as count from cr_statistics where detail1 like 'login%' and detail3!='' group by detail3 order by count desc ".$browserLimit;
+                $sql = "SELECT detail3 as browser,count(*) as count from cr_statistics where detail1 like 'login%' and detail3!='' group by detail3 order by count desc " . $browserLimit;
             }
 
             $result = mysqli_query(db(), $sql) or die(mysqli_error(db()));
             while ($row = mysqli_fetch_array($result, MYSQLI_ASSOC)) {
                 extract($row);
                 echo '<tr>';
-                echo '<td>'.$browser.'</td>';
-                echo '<td>'.$count.'</td>';
+                echo '<td>' . $browser . '</td>';
+                echo '<td>' . $count . '</td>';
                 echo '</tr>';
             } ?>
 
@@ -145,16 +145,16 @@ 
                   $sql .= " AND s.type = 'system'";
               }
           }
-                $sql .= ' ORDER BY date desc '.$limit;
+                $sql .= ' ORDER BY date desc ' . $limit;
                 $result = mysqli_query(db(), $sql) or die(mysqli_error(db()));
                 while ($row = mysqli_fetch_array($result, MYSQLI_ASSOC)) {
                     extract($row);
                     echo '<tr>';
-                    echo '<td>'.$date.'</td>';
-                    echo '<td>'.$name.'</td>';
-                    echo '<td>'.$type.'</td>';
-                    echo '<td>'.$detail1.'</td>';
-                    echo '<td>'.$detail2.'</td>';
+                    echo '<td>' . $date . '</td>';
+                    echo '<td>' . $name . '</td>';
+                    echo '<td>' . $type . '</td>';
+                    echo '<td>' . $detail1 . '</td>';
+                    echo '<td>' . $detail2 . '</td>';
                     //echo "<td>".$detail3."</td>";
                     echo '</tr>';
                 }

public/old/createEvent.php

Spacing +15 added lines, -15 removed lines

@@ -45,7 +45,7 @@ 
 if (($userisBandAdmin) || ($userisEventEditor) || (isAdmin())) {
     // Just continue the code
 } else {
-    header('Location: error.php?no=100&page='.basename($_SERVER['SCRIPT_FILENAME']));
+    header('Location: error.php?no=100&page=' . basename($_SERVER['SCRIPT_FILENAME']));
 }
 
 if ($userisBandAdmin) {
@@ -82,7 +82,7 @@ 
         $location = $row['location'];
         $locationname = $row['locationname'];
         if ($action == 'edit') {
-            $formaction = '?action=edit&id='.$id;
+            $formaction = '?action=edit&id=' . $id;
         } else {
             $formaction = '';
         }
@@ -139,8 +139,8 @@ 
 
     // convert format of date
     $date = str_replace('/', '-', $date); // ensure it isn't read as mm/dd/yyyy
-    $date = strftime('%Y-%m-%d', strtotime($date.' 00:00:00'));
-    $date = $date.' '.$time.':00';
+    $date = strftime('%Y-%m-%d', strtotime($date . ' 00:00:00'));
+    $date = $date . ' ' . $time . ':00';
     $date = mysqli_real_escape_string(db(), $date);
 
     if ($action == 'edit') {
@@ -210,10 +210,10 @@ 
         //if ($userisBandAdmin) $delete_all_sql = $delete_all_sql . " and skillID in (select skillID from cr_skills where groupid=2)";
         //if ($userisEventEditor) $delete_all_sql = $delete_all_sql . " and skillID in (select skillID from cr_skills where groupid!=2)";
         if ($userisBandAdmin) {
-            $delete_all_sql = $delete_all_sql.' and skillID in (select skillID from cr_skills where groupid in (2,3,4))';
+            $delete_all_sql = $delete_all_sql . ' and skillID in (select skillID from cr_skills where groupid in (2,3,4))';
         }
     if ($userisEventEditor) {
-        $delete_all_sql = $delete_all_sql.' and skillID in (select skillID from cr_skills where not (groupid in (2,3,4)))';
+        $delete_all_sql = $delete_all_sql . ' and skillID in (select skillID from cr_skills where not (groupid in (2,3,4)))';
     }
     mysqli_query(db(), $delete_all_sql) or die(mysqli_error(db()));
 }
@@ -221,9 +221,9 @@ 
     // redirect
     if (isset($_SESSION['lastEventsFilter'])) {
         $type = $_SESSION['lastEventsFilter'];
-        header('Location: events.php?view=all&filter='.$type.'#event'.$eventID);
+        header('Location: events.php?view=all&filter=' . $type . '#event' . $eventID);
     } else {
-        header('Location: events.php?view=all#event'.$eventID);
+        header('Location: events.php?view=all#event' . $eventID);
     }
     exit;
 }
@@ -300,7 +300,7 @@ 
                                         while ($ob = mysqli_fetch_object($result)) {
                                             if (!(isset($type) && $ob->id == $type)) {
                                                 $defaultTime = strftime('%H:%M', strtotime($ob->defaultTime));
-                                                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>';
+                                                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>';
                                             }
                                         } ?>
 									</select>
@@ -326,7 +326,7 @@ 
                                         while ($row = mysqli_fetch_array($result, MYSQLI_ASSOC)) {
                                             if (isset($subtype) && $row['id'] == $subtype) {
                                             } else {
-                                                echo "<option value='".$row['id']."' title='".$row['description']."'>".$row['name'].'</option>';
+                                                echo "<option value='" . $row['id'] . "' title='" . $row['description'] . "'>" . $row['name'] . '</option>';
                                             }
                                         } ?>
 									</select>
@@ -354,7 +354,7 @@ 
                                         while ($row = mysqli_fetch_array($result, MYSQLI_ASSOC)) {
                                             if (isset($location) && $row['id'] == $location) {
                                             } else {
-                                                echo "<option value='".$row['id']."'>".$row['name'].'</option>';
+                                                echo "<option value='" . $row['id'] . "'>" . $row['name'] . '</option>';
                                             }
                                         } ?>
 									</select>
@@ -497,7 +497,7 @@ 
                                     while ($row = mysqli_fetch_array($result, MYSQLI_ASSOC)) {
                                         if (isset($type) && $row['id'] == $type) {
                                         } else {
-                                            echo "<option value='".$row['id']."' title='".$row['description']."'>".$row['name'].'</option>';
+                                            echo "<option value='" . $row['id'] . "' title='" . $row['description'] . "'>" . $row['name'] . '</option>';
                                         }
                                     } ?>
 								</select>
@@ -566,8 +566,8 @@ 
 										<?php foreach ($role->getUserRoles() as $userRole): ?>
 											<?php if (!$userRole->getReserve()): ?>
 											<?php $isInEvent = in_array($userRole->getId(), $usersInEvent) ?>
-											<option value="<?php echo $userRole->getId() ?>" <?php echo $isInEvent ? 'selected="selected"' : '' ?>><?php echo $userRole->getUser()->getFirstName().' '.$userRole->getUser()->getLastName() ?></option>
-											<?php else: ?>
+											<option value="<?php echo $userRole->getId() ?>" <?php echo $isInEvent ? 'selected="selected"' : '' ?>><?php echo $userRole->getUser()->getFirstName() . ' ' . $userRole->getUser()->getLastName() ?></option>
+											<?php else : ?>
 											<?php $countReserve += 1 ?>
 											<?php endif //!userRole->getReserve?>
 										<?php endforeach //users?>
@@ -577,7 +577,7 @@ 
 										<?php foreach ($role->getUserRoles() as $userRole): ?>
 											<?php if ($userRole->getReserve()): ?>
 											<?php $isInEvent = in_array($userRole->getId(), $usersInEvent) ?>
-											<option value="<?php echo $userRole->getId() ?>" <?php echo $isInEvent ? 'selected="selected"' : '' ?>><?php echo $userRole->getUser()->getFirstName().' '.$userRole->getUser()->getLastName() ?></option>
+											<option value="<?php echo $userRole->getId() ?>" <?php echo $isInEvent ? 'selected="selected"' : '' ?>><?php echo $userRole->getUser()->getFirstName() . ' ' . $userRole->getUser()->getLastName() ?></option>
 											<?php endif ?>
 										<?php endforeach //users?>
 										</optgroup>

Braces +5 added lines, -2 removed lines

@@ -567,7 +567,8 @@ 
 											<?php if (!$userRole->getReserve()): ?>
 											<?php $isInEvent = in_array($userRole->getId(), $usersInEvent) ?>
 											<option value="<?php echo $userRole->getId() ?>" <?php echo $isInEvent ? 'selected="selected"' : '' ?>><?php echo $userRole->getUser()->getFirstName().' '.$userRole->getUser()->getLastName() ?></option>
-											<?php else: ?>
+											<?php else {
+    : ?>
 											<?php $countReserve += 1 ?>
 											<?php endif //!userRole->getReserve?>
 										<?php endforeach //users?>
@@ -646,4 +647,6 @@ 
   </div><!-- /.createSeries -->
 
 
-<?php include 'includes/footer.php'; ?>
+<?php include 'includes/footer.php';
+}
+?>

public/old/locations.php

Indentation +5 added lines, -5 removed lines

@@ -54,8 +54,8 @@ 
         }
 
     // After we have inserted the data, we want to head back to the main users page
-     header('Location: locations.php'); // Move to the home page of the admin section
-      exit;
+        header('Location: locations.php'); // Move to the home page of the admin section
+        exit;
     }
 }
 
@@ -121,10 +121,10 @@ 
 	</form>
 </div><!-- /.box -->
   <?php
-  if (isAdmin()) {
-      ?>
+    if (isAdmin()) {
+        ?>
   <div id="right">
   		<div class="item"><a href="settings.php">Back to settings</a></div>
 <?php
-  } ?>
+    } ?>
 <?php include 'includes/footer.php'; ?>

Spacing +5 added lines, -5 removed lines

@@ -14,7 +14,7 @@ 
     exit;
 }
 if (!isAdmin()) {
-    header('Location: error.php?no=100&page='.basename($_SERVER['SCRIPT_FILENAME']));
+    header('Location: error.php?no=100&page=' . basename($_SERVER['SCRIPT_FILENAME']));
     exit;
 }
 
@@ -39,7 +39,7 @@ 
             $sql = "UPDATE cr_locations SET name = '$name' WHERE id = '$editid'";
         }
         if (!mysqli_query(db(), $sql)) {
-            die('Error: '.mysqli_error(db()));
+            die('Error: ' . mysqli_error(db()));
         }
     } else {
         $newlocation = $_POST['newlocation'];
@@ -50,7 +50,7 @@ 
 
         $sql = ("INSERT INTO cr_locations (name) VALUES ('$newlocation')");
         if (!mysqli_query(db(), $sql)) {
-            die('Error: '.mysqli_error(db()));
+            die('Error: ' . mysqli_error(db()));
         }
 
     // After we have inserted the data, we want to head back to the main users page
@@ -95,8 +95,8 @@ 
 
     while ($row = mysqli_fetch_array($result, MYSQLI_ASSOC)) {
         $locationID = $row['id'];
-        echo "<span id='".$locationID."' class='edit'>".$row['name'].'</span> ';
-        echo " <a href='locations.php?locationremove=true&locationID=".$locationID."'><i class='fa fa-close'></i></a><br />";
+        echo "<span id='" . $locationID . "' class='edit'>" . $row['name'] . '</span> ';
+        echo " <a href='locations.php?locationremove=true&locationID=" . $locationID . "'><i class='fa fa-close'></i></a><br />";
     } ?>
  </div><!-- /.box-body -->
 </div><!-- /.box -->

public/old/cr_daily.php

Spacing +5 added lines, -5 removed lines

@@ -87,23 +87,23 @@
 									WHERE
 										date >= CURDATE()
 										AND date_format( date , "%y-%m-%d" )
-												<= date_format( DATE_ADD(now(), INTERVAL '.$daysAlert.' DAY ) , "%y-%m-%d" )';
+												<= date_format( DATE_ADD(now(), INTERVAL '.$daysAlert . ' DAY ) , "%y-%m-%d" )';
         $resultEvents = mysqli_query(db(), $sqlEvents) or die(mysqli_error(db()));
         $i = 0;
         while ($rowEvents = mysqli_fetch_array($resultEvents, MYSQLI_ASSOC)) {
             $usersNotified = notifyEveryoneForEvent($rowEvents['id']);
             if (count($usersNotified) > 0) {
-                $out = $out.'Automatic notifications sent to users ('.implode(', ', $usersNotified).') for event '.$rowEvents['id'].' on '.$rowEvents['date'].".<br>\r\n";
+                $out = $out . 'Automatic notifications sent to users (' . implode(', ', $usersNotified) . ') for event ' . $rowEvents['id'] . ' on ' . $rowEvents['date'] . ".<br>\r\n";
             } else {
-                $out = $out.'No notifications sent for event '.$rowEvents['id'].' on '.$rowEvents['date'].".<br>\r\n";
+                $out = $out . 'No notifications sent for event ' . $rowEvents['id'] . ' on ' . $rowEvents['date'] . ".<br>\r\n";
             }
             $i = $i + 1;
         }
         if ($i == 0) {
-            $out = $out.'No events found to automatically notify for.';
+            $out = $out . 'No events found to automatically notify for.';
         }
     } else {
-        $out = $out.'Automatic notifications are disabled.';
+        $out = $out . 'Automatic notifications are disabled.';
     } ?>
 <html>
 	<body>

public/old/editRole.php

Spacing +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
 }
 
 if (!isAdmin()) {
-    header('Location: error.php?no=100&page='.basename($_SERVER['SCRIPT_FILENAME']));
+    header('Location: error.php?no=100&page=' . basename($_SERVER['SCRIPT_FILENAME']));
     exit;
 }
 

public/old/event.php

Spacing +5 added lines, -5 removed lines

@@ -11,7 +11,7 @@ 
 if (isset($_SESSION['is_logged_in']) || $_SESSION['db_is_logged_in'] == true) {
     // Just continue the code
 } else {
-    $_SESSION['redirectUrl'] = siteSettings()->getSiteUrl().'/event.php?id='.$eventId;
+    $_SESSION['redirectUrl'] = siteSettings()->getSiteUrl() . '/event.php?id=' . $eventId;
     header('Location: login.php');
     exit;
 }
@@ -60,7 +60,7 @@ 
 					<h2 class="box-title">Event Details</h2>
 				</div>
 				<div class="box-body">
-					<?php echo !empty($event->getName()) ? '<p><strong>Name:</strong> '.$event->getName().'</p>' : '' ?>
+					<?php echo !empty($event->getName()) ? '<p><strong>Name:</strong> ' . $event->getName() . '</p>' : '' ?>
 					<p><strong>Date:</strong> <?php echo $event->getDate('d/m/y'); ?></p>
 					<p><strong>Location:</strong> <?php echo $event->getLocation()->getName() ?></p>
 					<p><strong>Type:</strong> <?php echo $event->getEventType()->getName() ?></p>
@@ -160,16 +160,16 @@ 
                                 } else {
                                     echo '</ul>';
                                 }
-                                echo '<p><strong>'.$groupName.'</strong></p>';
+                                echo '<p><strong>' . $groupName . '</strong></p>';
                                 echo '<ul>';
                             }
 
                             echo '<li>';
-                            echo (isset($viewPeople->swap)) ? "<s><a class='text-danger' href='swap.php?swap=".$viewPeople->swap."'>" : '';
+                            echo (isset($viewPeople->swap)) ? "<s><a class='text-danger' href='swap.php?swap=" . $viewPeople->swap . "'>" : '';
                             echo $viewPeople->name;
 
                             if ($viewPeople->rolename != '') {
-                                echo ' - <em>'.$viewPeople->rolename.'</em>';
+                                echo ' - <em>' . $viewPeople->rolename . '</em>';
                             } else {
                                 // If there is no skill, we don't need to mention this.
                             }

public/old/update.settings.php

Spacing +8 added lines, -8 removed lines

@@ -33,7 +33,7 @@ 
     exit;
 }
 if (!isAdmin()) {
-    header('Location: error.php?no=100&page='.basename($_SERVER['SCRIPT_FILENAME']));
+    header('Location: error.php?no=100&page=' . basename($_SERVER['SCRIPT_FILENAME']));
     exit;
 }
 
@@ -57,20 +57,20 @@ 
 if ($action == 'update') {
     //if ($language='de-de')
         if ($rowSettings['lang_locale'] == 'en_GB') {
-            executeDbSql("update cr_settings set lang_locale = 'de_DE'");                     // de_DE
+            executeDbSql("update cr_settings set lang_locale = 'de_DE'"); // de_DE
             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
             executeDbSql("update cr_settings set time_format_normal = '%d.%m.%Y %H:%M '"); // de_DE: %d.%m.%Y %H:%M
-            executeDbSql("update cr_settings set time_format_short = '%a, <strong>%e. %b</strong>, %R'");              // de_DE: %a, <strong>%e. %b</strong>, KW%V
+            executeDbSql("update cr_settings set time_format_short = '%a, <strong>%e. %b</strong>, %R'"); // de_DE: %a, <strong>%e. %b</strong>, KW%V
             executeDbSql("update cr_settings set time_zone = 'Europe/Berlin'"); //de_DE: Europe/Berlin
             executeDbSql("update cr_settings set google_group_calendar = ''");
             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'");
         }
         //else
         if ($rowSettings['lang_locale'] == 'de_DE') {
-            executeDbSql("update cr_settings set lang_locale = 'en_GB'");                     // de_DE
+            executeDbSql("update cr_settings set lang_locale = 'en_GB'"); // de_DE
             executeDbSql("update cr_settings set time_format_long = '%A, %B %e @ %I:%M %p'"); // de_DE: %A, %e. %B %Y, %R Uhr, KW%V
             executeDbSql("update cr_settings set time_format_normal = '%m/%d/%y %I:%M %p'"); // de_DE: %d.%m.%Y %H:%M
-            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
+            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
             executeDbSql("update cr_settings set time_zone = 'Europe/London'"); //de_DE: Europe/Berlin
             executeDbSql("update cr_settings set google_group_calendar = ''");
             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 @@ 
     $resultSettings = mysqli_query(db(), $sqlSettings) or die(mysqli_error(db()));
     $rowSettings = mysqli_fetch_array($resultSettings, MYSQLI_ASSOC);
 
-    $updateNotification = 'Settings updated successfully to: '.$rowSettings['lang_locale'].' <br>&nbsp;<br>';
+    $updateNotification = 'Settings updated successfully to: ' . $rowSettings['lang_locale'] . ' <br>&nbsp;<br>';
 }
 
 $formatting = 'true';
@@ -94,8 +94,8 @@ 
 	<hr>
 	This page has only beta status. <br>Please do only use it in testing environments!
 	<hr>
-	<?php echo 'Your web browser identifies your language as: '.$language; ?><br>
-	<?php echo 'Church Rota is set to use: '.$rowSettings['lang_locale']; ?><br>&nbsp;<br>
+	<?php echo 'Your web browser identifies your language as: ' . $language; ?><br>
+	<?php echo 'Church Rota is set to use: ' . $rowSettings['lang_locale']; ?><br>&nbsp;<br>
 	
 <?php
 if ($updateNotification == '') {

public/old/calendar.php

Indentation +11 added lines, -11 removed lines

@@ -51,7 +51,7 @@ 
 // fetch events
 
 switch ($_GET['format']) {
-  case 'ical':
+    case 'ical':
     icalOutput($events);
     break;
 }
@@ -59,12 +59,12 @@ 
 function icalOutput($events)
 {
     // the iCal date format.
-  define('DATE_ICAL', 'Ymd\THis');
+    define('DATE_ICAL', 'Ymd\THis');
     define('HOUR', 60 * 60);
 
-  // max line length is 75 chars. New line is \r\n
+    // max line length is 75 chars. New line is \r\n
 
-  $output = 'BEGIN:VCALENDAR
+    $output = 'BEGIN:VCALENDAR
 METHOD:PUBLISH
 VERSION:2.0
 PRODID:-//Church Rota//Church Rota//EN
@@ -90,8 +90,8 @@ 
 END:STANDARD
 END:VTIMEZONE\r\n";
 
-  // loop over events
-  foreach ($events as $event):
+    // loop over events
+    foreach ($events as $event):
     $output .=
 'BEGIN:VEVENT
 SUMMARY:'.$event->role.($event->name ? ' | '.$event->name.' ('.$event->type.')' : ' ('.$event->type.')').'
@@ -112,8 +112,8 @@ 
 END:VEVENT\r\n";
     endforeach;
 
-  // close calendar
-  $output .= 'END:VCALENDAR';
+    // close calendar
+    $output .= 'END:VCALENDAR';
 
     echo $output;
 }
@@ -125,9 +125,9 @@ 
     $value = trim($value);
     $value = strip_tags($value);
     $value = preg_replace('/\n+/', ' ', $value); // remove newlines
-  $value = preg_replace('/\s{2,}/', ' ', $value); // remove whitespace
-  $value = str_replace(',', '\,', $value); // escape commas
-  $preamble_len = strlen($preamble);
+    $value = preg_replace('/\s{2,}/', ' ', $value); // remove whitespace
+    $value = str_replace(',', '\,', $value); // escape commas
+    $preamble_len = strlen($preamble);
     $lines = [];
     while (strlen($value) > (75 - $preamble_len)) {
         $space = (75 - $preamble_len);

Spacing +11 added lines, -11 removed lines

@@ -68,7 +68,7 @@ 
 METHOD:PUBLISH
 VERSION:2.0
 PRODID:-//Church Rota//Church Rota//EN
-X-WR-CALNAME:'.siteSettings()->getOwner()." Rota
+X-WR-CALNAME:'.siteSettings()->getOwner() . " Rota
 CALSCALE:GREGORIAN
 BEGIN:VTIMEZONE
 TZID:Europe/London
@@ -94,16 +94,16 @@ 
   foreach ($events as $event):
     $output .=
 'BEGIN:VEVENT
-SUMMARY:'.$event->role.($event->name ? ' | '.$event->name.' ('.$event->type.')' : ' ('.$event->type.')').'
-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.').'
-UID:ROTA'.$event->id.'
-ORGANIZER;CN="'.siteSettings()->getOwner().'":MAILTO:'.siteSettings()->getAdminEmailAddress().'
-STATUS:'.'CONFIRMED'.'
-DTSTART;TZID="Europe/London":'.date(DATE_ICAL, strtotime($event->date)).'
-DTEND;TZID="Europe/London":'.date(DATE_ICAL, strtotime($event->date) + HOUR).'
-LAST-MODIFIED:'.date(DATE_ICAL, strtotime($event->updated)).'Z
-LOCATION:'.ical_split('LOCATION:', $event->locationName.', '.$event->locationAddress).'
-URL:'.siteSettings()->getSiteUrl().'/event.php?id='.$event->id."
+SUMMARY:'.$event->role . ($event->name ? ' | ' . $event->name . ' (' . $event->type . ')' : ' (' . $event->type . ')') . '
+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.') . '
+UID:ROTA'.$event->id . '
+ORGANIZER;CN="'.siteSettings()->getOwner() . '":MAILTO:' . siteSettings()->getAdminEmailAddress() . '
+STATUS:'.'CONFIRMED' . '
+DTSTART;TZID="Europe/London":'.date(DATE_ICAL, strtotime($event->date)) . '
+DTEND;TZID="Europe/London":'.date(DATE_ICAL, strtotime($event->date) + HOUR) . '
+LAST-MODIFIED:'.date(DATE_ICAL, strtotime($event->updated)) . 'Z
+LOCATION:'.ical_split('LOCATION:', $event->locationName . ', ' . $event->locationAddress) . '
+URL:'.siteSettings()->getSiteUrl() . '/event.php?id=' . $event->id . "
 BEGIN:VALARM
 ACTION:DISPLAY
 DESCRIPTION:Reminder for Rota