TechWilk / rota

api-classes/User.php

Indentation +7 added lines, -7 removed lines

@@ -28,13 +28,13 @@
         $currentTimestamp = $date = strftime('%F %T', time());
 
         $data = [
-      ['field' => 'name', 'type' => 'string', 'value' => $this->name],
-      ['field' => 'date', 'type' => 'string', 'value' => $this->datetime],
-      ['field' => 'eventGroup', 'type' => 'int', 'value' => $this->series->getId()],
-      ['field' => 'type', 'type' => 'int', 'value' => $this->type->getId()],
-      ['field' => 'subType', 'type' => 'int', 'value' => $this->sub_type->getId()],
-      ['field' => 'location', 'type' => 'int', 'value' => $this->location->getId()],
-      ['field' => 'created', 'type' => 'datetime', 'value' => $currentTimestamp],
+        ['field' => 'name', 'type' => 'string', 'value' => $this->name],
+        ['field' => 'date', 'type' => 'string', 'value' => $this->datetime],
+        ['field' => 'eventGroup', 'type' => 'int', 'value' => $this->series->getId()],
+        ['field' => 'type', 'type' => 'int', 'value' => $this->type->getId()],
+        ['field' => 'subType', 'type' => 'int', 'value' => $this->sub_type->getId()],
+        ['field' => 'location', 'type' => 'int', 'value' => $this->location->getId()],
+        ['field' => 'created', 'type' => 'datetime', 'value' => $currentTimestamp],
     ];
 
         if (isset($this->notes)) {

api-classes/Database.php

Indentation +2 added lines, -2 removed lines

@@ -272,8 +272,8 @@
     public function count($table, $column, $where = null)
     {
         $columns = [
-      'COUNT('.$column.') AS count',
-     ];
+        'COUNT('.$column.') AS count',
+        ];
         $statement = $this->selectStatement($table, $columns, $where);
 
         return $statement->fetchObject()->count;

api-classes/Event.php

Indentation +21 added lines, -21 removed lines

@@ -131,13 +131,13 @@ 
         $currentTimestamp = $date = strftime('%F %T', time());
 
         $data = [
-      ['field' => 'name', 'type' => 'string', 'value' => $this->name],
-      ['field' => 'date', 'type' => 'string', 'value' => $this->datetime],
-      ['field' => 'eventGroup', 'type' => 'int', 'value' => $this->series->getId()],
-      ['field' => 'type', 'type' => 'int', 'value' => $this->type->getId()],
-      ['field' => 'subType', 'type' => 'int', 'value' => $this->subType->getId()],
-      ['field' => 'location', 'type' => 'int', 'value' => $this->location->getId()],
-      ['field' => 'created', 'type' => 'datetime', 'value' => $currentTimestamp],
+        ['field' => 'name', 'type' => 'string', 'value' => $this->name],
+        ['field' => 'date', 'type' => 'string', 'value' => $this->datetime],
+        ['field' => 'eventGroup', 'type' => 'int', 'value' => $this->series->getId()],
+        ['field' => 'type', 'type' => 'int', 'value' => $this->type->getId()],
+        ['field' => 'subType', 'type' => 'int', 'value' => $this->subType->getId()],
+        ['field' => 'location', 'type' => 'int', 'value' => $this->location->getId()],
+        ['field' => 'created', 'type' => 'datetime', 'value' => $currentTimestamp],
     ];
 
         if (isset($this->notes)) {
@@ -164,23 +164,23 @@ 
         }
 
         $columns = [
-      'id',
-      'name',
-      'date',
-      'eventGroup',
-      'type',
-      'subType',
-      'location',
-      'comment',
-      'sermonTitle',
-      'bibleVerse',
-      'deleted',
-      'created',
-      'updated',
+        'id',
+        'name',
+        'date',
+        'eventGroup',
+        'type',
+        'subType',
+        'location',
+        'comment',
+        'sermonTitle',
+        'bibleVerse',
+        'deleted',
+        'created',
+        'updated',
     ];
 
         $where = [
-      'id = '.$id,
+        'id = '.$id,
     ];
 
         $result = $db->selectSingle('Event', $this->db_table, $columns, $where);

generated-classes/TechWilk/Rota/User.php

Indentation +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
         if (!password_verify($v, $this->password)) {
             $bcrypt_options = [
         'cost' => 12,
-      ];
+        ];
             $this->password = password_hash($v, PASSWORD_BCRYPT, $bcrypt_options);
 
             $this->modifiedColumns[UserTableMap::COL_PASSWORD] = true;

public/old/index.php

Indentation +48 added lines, -48 removed lines

@@ -177,10 +177,10 @@ 
     <div class="col-sm-8 col-md-8 col-lg-6">
 
       <?php
-      // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-      // ~~~~~~~~ Events this week ~~~~~~~~
-      // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-      ?>
+        // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+        // ~~~~~~~~ Events this week ~~~~~~~~
+        // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+        ?>
 
       <h2>Events this week:</h2>
 
@@ -204,17 +204,17 @@ 
             <div class="timeline-header">
               <a href="event.php?id=<?php echo $event->getId() ?>">
                 <h4><?php
-                  echo $event->getDate('jS: ');
-                  $eventPeople = EventPersonQuery::create()->filterByEvent($event)->find();
-                  $roles = [];
-                  foreach ($eventPeople as $eventPerson) {
-                      if ($eventPerson->getUserRole()->getUserId() == $user->getId()) {
-                          $roles[] = $eventPerson->getUserRole()->getRole()->getName();
-                      }
-                  }
-                  $roles = implode(', ', $roles);
-                  echo $roles != '' ? $roles : 'No involvement';
-                  ?>
+                    echo $event->getDate('jS: ');
+                    $eventPeople = EventPersonQuery::create()->filterByEvent($event)->find();
+                    $roles = [];
+                    foreach ($eventPeople as $eventPerson) {
+                        if ($eventPerson->getUserRole()->getUserId() == $user->getId()) {
+                            $roles[] = $eventPerson->getUserRole()->getRole()->getName();
+                        }
+                    }
+                    $roles = implode(', ', $roles);
+                    echo $roles != '' ? $roles : 'No involvement';
+                    ?>
                 </h4>
               </a>
               <a class="label label-default" href="events.php?view=all&filter=<?php echo $event->getEventTypeId() ?>"><?php echo $event->getEventType()->getName() ?></a>
@@ -269,7 +269,7 @@ 
                 <div class="modal-body">
                   <?php
 
-                  $sqlPeople = "SELECT
+                    $sqlPeople = "SELECT
                                 CONCAT(u.firstname, ' ', u.lastname) AS `name`,
                                 r.name AS `rolename`,
                                 ep.notified AS `notified`,
@@ -285,13 +285,13 @@ 
                                   AND ep.removed = 0
                                 ORDER BY g.name, r.name";
 
-                  $resultPeople = mysqli_query(db(), $sqlPeople) or die(mysqli_error(db()));
-                  $groupName = '';
-                  $groupId = 0;
-                  $identifier = '1';
-                  $firstTime = true;
+                    $resultPeople = mysqli_query(db(), $sqlPeople) or die(mysqli_error(db()));
+                    $groupName = '';
+                    $groupId = 0;
+                    $identifier = '1';
+                    $firstTime = true;
 
-                  if (mysqli_num_rows($resultPeople) > 0):
+                    if (mysqli_num_rows($resultPeople) > 0):
 
                     ?>
                     <?php while ($viewPeople = mysqli_fetch_object($resultPeople)) {
@@ -324,9 +324,9 @@ 
                         echo '</li>';
                     }
                     echo '</ul>';
-                  else:
+                    else:
                     echo '<p>No roles assigned to this event.';
-                  endif;
+                    endif;
                 ?>
                 </div>
                 <div class="modal-footer">
@@ -360,10 +360,10 @@ 
 
 
       <?php
-      // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-      // ~~~~~~~~~ User's events ~~~~~~~~~~
-      // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-      ?>
+        // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+        // ~~~~~~~~~ User's events ~~~~~~~~~~
+        // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+        ?>
 
       <h2>My events:</h2>
 
@@ -388,9 +388,9 @@ 
             <div class="timeline-header">
               <a href="event.php?id=<?php echo $event->id ?>">
                 <h4><?php
-                  echo date('jS: ', strtotime($event->date));
-                  echo $event->roles;
-                  ?>
+                    echo date('jS: ', strtotime($event->date));
+                    echo $event->roles;
+                    ?>
                 </h4>
               </a>
               <a class="label label-default" href="events.php?view=all&filter=<?php echo $event->eventTypeId ?>"><?php echo $event->eventType ?></a>
@@ -446,7 +446,7 @@ 
                 <div class="modal-body">
                   <?php
 
-                  $sqlPeople = "SELECT
+                    $sqlPeople = "SELECT
                                 CONCAT(u.firstname, ' ', u.lastname) AS `name`,
                                 r.name AS `rolename`,
                                 ep.notified AS `notified`,
@@ -462,13 +462,13 @@ 
                                   AND ep.removed = 0
                                 ORDER BY g.name, r.name";
 
-                  $resultPeople = mysqli_query(db(), $sqlPeople) or die(mysqli_error(db()));
-                  $groupName = '';
-                  $groupId = 0;
-                  $identifier = '1';
-                  $firstTime = true;
+                    $resultPeople = mysqli_query(db(), $sqlPeople) or die(mysqli_error(db()));
+                    $groupName = '';
+                    $groupId = 0;
+                    $identifier = '1';
+                    $firstTime = true;
 
-                  if (mysqli_num_rows($resultPeople) > 0):
+                    if (mysqli_num_rows($resultPeople) > 0):
 
                     ?>
                     <?php while ($viewPeople = mysqli_fetch_object($resultPeople)) {
@@ -501,9 +501,9 @@ 
                         echo '</li>';
                     }
                     echo '</ul>';
-                  else:
+                    else:
                     echo '<p>No roles assigned to this event.';
-                  endif;
+                    endif;
                 ?>
                 </div>
                 <div class="modal-footer">
@@ -538,10 +538,10 @@ 
     <div class="col-sm-4 col-md-4 col-lg-6">
 
       <?php
-      // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-      // ~~~~~~~ Remaining events ~~~~~~~~~
-      // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-      ?>
+        // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+        // ~~~~~~~ Remaining events ~~~~~~~~~
+        // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+        ?>
       <?php if (isset($remainingEventsInGroups)): ?>
 
       <div class="row">
@@ -617,10 +617,10 @@ 
 
 
       <?php
-      // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-      // ~~~~~~~~~ User details ~~~~~~~~~~~
-      // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-      ?>
+        // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+        // ~~~~~~~~~ User details ~~~~~~~~~~~
+        // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+        ?>
 
       <div class="box box-widget widget-user-2">
         <div class="widget-user-header bg-yellow">

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 statistics s INNER JOIN 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)) {

public/old/swap.php

Indentation +25 added lines, -25 removed lines

@@ -47,7 +47,7 @@ 
 $swapId = filter_var($swapId, FILTER_SANITIZE_NUMBER_INT);
 
 switch ($action) {
-  case 'swap':
+    case 'swap':
     if ($_SERVER['REQUEST_METHOD'] == 'POST') {
         $eventPersonId = $_POST['eventPerson'];
         $newUserRoleId = $_POST['newUserRole'];
@@ -61,48 +61,48 @@ 
         $err = 'Swap details incorrect, please try again.';
     }
     break;
-  case 'accept':
+    case 'accept':
     if (canAcceptSwap($swapId) || $verify == verificationCodeForSwap($swapId)) {
         switch (acceptSwap($swapId)) {
         case '1':
           $message = 'Swap Successful';
-          break;
+            break;
         case '2':
           $message = 'Swap already accepted.';
-          break;
+            break;
         case '3':
           $message = 'Swap already declined.';
-          break;
+            break;
         case '4':
           $message = 'Swap already reverted.';
-          break;
+            break;
         default:
           $err = 'Technical issue - please inform system administrator';
-          break;
-      }
+            break;
+        }
     } else {
         $err = 'Swap Already Actioned or Verification Code Invalid';
     }
     break;
-  case 'decline':
+    case 'decline':
     if (canDeclineSwap($swapId) || $verify == verificationCodeForSwap($swapId)) {
         switch (declineSwap($swapId)) {
         case '1':
           $message = 'Swap declined';
-          break;
+            break;
         case '2':
           $message = 'Swap already declined.';
-          break;
+            break;
         default:
           $err = 'Technical issue - please inform system administrator';
-          break;
+            break;
         }
     } else {
         $err = 'Swap Already Actioned or Verification Code Invalid';
     }
     break;
 
-  default:
+    default:
     // code...
     break;
 }
@@ -163,7 +163,7 @@ 
 		<section class="content">
       
       <?php
-      if (isset($message)): ?>
+        if (isset($message)): ?>
       
         <p><?php echo $message ?></p>
 
@@ -224,19 +224,19 @@ 
                 <label for="newUserRole">Swap To:</label>
                 <select name="newUserRole" class="form-control">
                   <?php
-                  if (roleCanSwapToOtherRoleInGroup($role->roleId)) {
-                      $whereAnd = 'r.groupId = '.groupIdWithRole($role->roleId).' AND r.allowRoleSwaps IS NOT FALSE';
-                  } else {
-                      $whereAnd = 'r.id = '.$role->roleId;
-                  }
-                  $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';
-                  $result = mysqli_query(db(), $sql) or die(mysqli_error(db()));
-
-                  while ($row = mysqli_fetch_array($result, MYSQLI_ASSOC)) {
-                      ?>
+                    if (roleCanSwapToOtherRoleInGroup($role->roleId)) {
+                        $whereAnd = 'r.groupId = '.groupIdWithRole($role->roleId).' AND r.allowRoleSwaps IS NOT FALSE';
+                    } else {
+                        $whereAnd = 'r.id = '.$role->roleId;
+                    }
+                    $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';
+                    $result = mysqli_query(db(), $sql) or die(mysqli_error(db()));
+
+                    while ($row = mysqli_fetch_array($result, MYSQLI_ASSOC)) {
+                        ?>
                     <option value='<?php echo $row['id']; ?>'><?php echo $row['firstName'].' '.$row['lastName'].' ('.$row['name'].')'; ?></option>
                   <?php
-                  } ?>
+                    } ?>
                 </select>
               </div>
             </div>