TechWilk / rota

api-classes/Database.php

Doc Comments +11 added lines

@@ -148,6 +148,12 @@ 
         return $statement->fetchAll(PDO::FETCH_CLASS, $returnClass);
     }
 
+    /**
+     * @param string $returnClass
+     * @param string $table
+     * @param string[] $columns
+     * @param string[] $where
+     */
     public function selectSingle($returnClass, $table, $columns, $where = null)
     {
         $statement = $this->selectStatement($table, $columns, $where);
@@ -215,6 +221,8 @@ 
 
   /**
    * Use with caution: it is often better to archive items to prevent creating null references.
+   * @param string $table
+   * @param string[] $where
    */
   public function delete($table, $where)
   {
@@ -253,6 +261,9 @@ 
         return $table;
     }
 
+    /**
+     * @param string $table
+     */
     private function tableExists($table)
     {
         // todo: implement table check

Indentation +160 added lines, -160 removed lines

@@ -31,37 +31,37 @@ 
         $this->disconnect();
     }
 
-  /**
-   * Initiate connection to database if not already connected
-   * returns bool.
-   */
-  public function connect()
-  {
-      if (!self::$con) {
-          $this->db_connection = new PDO("mysql:host=$this->db_host;dbname=$this->db_name", $this->db_user, $this->db_pass);
-      // set the PDO error mode to exception
-      $this->db_connection->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
-      } else {
-          return true;
-      }
-  }
-
-  /**
-   * Initiate connection to database if not already connected.
-   */
-  public function disconnect()
-  {
-      if (self::$con) {
-          $this->db_connection = null;
-          self::$con = false;
-
-          return true;
-      } else {
-          return false;
-      }
-  }
-
-  /* SAMPLE EXPECTED DATA
+    /**
+     * Initiate connection to database if not already connected
+     * returns bool.
+     */
+    public function connect()
+    {
+        if (!self::$con) {
+            $this->db_connection = new PDO("mysql:host=$this->db_host;dbname=$this->db_name", $this->db_user, $this->db_pass);
+        // set the PDO error mode to exception
+        $this->db_connection->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+        } else {
+            return true;
+        }
+    }
+
+    /**
+     * Initiate connection to database if not already connected.
+     */
+    public function disconnect()
+    {
+        if (self::$con) {
+            $this->db_connection = null;
+            self::$con = false;
+
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    /* SAMPLE EXPECTED DATA
 
   $columns = array(
     "col1",
@@ -81,65 +81,65 @@ 
 
   **Does not acceot INNER JOIN at the moment**
   */
-  public function selectStatement($table, $columns, $where = null, $order = null)
-  {
-      $table = $this->addPrefix($table);
-
-      if (!$this->tableExists($table)) {
-          return false;
-      }
-
-      $sql = 'SELECT ';
-
-      $first = true;
-      foreach ($columns as $column) {
-          if ($first) {
-              $first = false;
-              $sql .= $column;
-          } else {
-              $sql .= ', ';
-              $sql .= $column;
-          }
-      }
-
-      $sql .= ' FROM ';
-      $sql .= $table;
-
-      if ($where) {
-          $sql .= ' WHERE ';
-
-          $first = true;
-          foreach ($where as $condition) {
-              if ($first) {
-                  $first = false;
-                  $sql .= $condition;
-              } else {
-                  $sql .= ' AND ';
-                  $sql .= $condition;
-              }
-          }
-      }
-
-      if ($order) {
-          $sql .= ' ORDER BY ';
-
-          $first = true;
-          foreach ($order as $condition) {
-              if ($first) {
-                  $first = false;
-                  $sql .= $condition;
-              } else {
-                  $sql .= ', ';
-                  $sql .= $condition;
-              }
-          }
-      }
-
-      $statement = $this->db_connection->prepare($sql);
-      $statement->execute();
-
-      return $statement;
-  }
+    public function selectStatement($table, $columns, $where = null, $order = null)
+    {
+        $table = $this->addPrefix($table);
+
+        if (!$this->tableExists($table)) {
+            return false;
+        }
+
+        $sql = 'SELECT ';
+
+        $first = true;
+        foreach ($columns as $column) {
+            if ($first) {
+                $first = false;
+                $sql .= $column;
+            } else {
+                $sql .= ', ';
+                $sql .= $column;
+            }
+        }
+
+        $sql .= ' FROM ';
+        $sql .= $table;
+
+        if ($where) {
+            $sql .= ' WHERE ';
+
+            $first = true;
+            foreach ($where as $condition) {
+                if ($first) {
+                    $first = false;
+                    $sql .= $condition;
+                } else {
+                    $sql .= ' AND ';
+                    $sql .= $condition;
+                }
+            }
+        }
+
+        if ($order) {
+            $sql .= ' ORDER BY ';
+
+            $first = true;
+            foreach ($order as $condition) {
+                if ($first) {
+                    $first = false;
+                    $sql .= $condition;
+                } else {
+                    $sql .= ', ';
+                    $sql .= $condition;
+                }
+            }
+        }
+
+        $statement = $this->db_connection->prepare($sql);
+        $statement->execute();
+
+        return $statement;
+    }
 
     public function select($returnClass, $table, $columns, $where = null, $order = null)
     {
@@ -155,7 +155,7 @@ 
         return $statement->fetchObject($returnClass);
     }
 
-  /* SAMPLE EXPECTED DATA
+    /* SAMPLE EXPECTED DATA
   $data = [
     ['field' => "name", 'type' => "string", 'value' => "bob"],
     ['field' => "age", 'type' => "int", 'value' => "57"],
@@ -166,72 +166,72 @@ 
   TRANSITION TO MYSQLI OR OTHER ANOTHER DRIVER
   EASILY IN THE FUTURE
   */
-  public function insert($table, $data)
-  {
-      $table = $this->addPrefix($table);
-
-      if (!$this->tableExists($table)) {
-          return false;
-      }
-
-      $first = true;
-
-      foreach ($data as $item) {
-          if ($first) {
-              $first = false;
-              $fields .= $item['field'];
-              $valuesPlaceholder .= ':'.$item['field'];
-          } else {
-              $fields .= ', '.$item['field'];
-              $valuesPlaceholder .= ', :'.$item['field'];
-          }
-
-          if ($item['type'] == 's' || $item['type'] == 'string') {
-              $types .= 's';
-          } elseif ($item['type'] == 'i' || $item['type'] == 'int' || $item['type'] == 'integer') {
-              $types .= 'i';
-          } elseif ($item['type'] == 'bit' || $item['type'] == 'bool' || $item['type'] == 'boolean') {
-              $types .= 'i';
-          } elseif ($item['type'] == 'd' || $item['type'] == 'double') {
-              $types .= 'd';
-          } elseif ($item['type'] == 'b' || $item['type'] == 'blob') {
-              $types .= 'b';
-          } else {
-              return false;
-          }
-      }
-
-      $statement = $this->db_connection->prepare('INSERT INTO '.$table.' ('.$fields.') VALUES ('.$valuesPlaceholder.')');
-      foreach ($data as $item) {
-          $statement->bindParam(':'.$item['field'], $item['value']);
-      }
-
-      if ($statement->execute()) {
-          return true;
-      } else {
-          return false;
-      }
-  }
-
-  /**
-   * Use with caution: it is often better to archive items to prevent creating null references.
-   */
-  public function delete($table, $where)
-  {
-      $table = $this->addPrefix($table);
-
-      if (!$this->tableExists($table)) {
-          return false;
-      }
-
-      $sql = 'DELETE FROM ';
-      $sql .= $table;
-      $sql .= ' WHERE ';
-      foreach ($where as $condition) {
-          $sql .= $condition;
-      }
-
-      $statement = $this->db_connection->prepare($sql);
+    public function insert($table, $data)
+    {
+        $table = $this->addPrefix($table);
+
+        if (!$this->tableExists($table)) {
+            return false;
+        }
+
+        $first = true;
+
+        foreach ($data as $item) {
+            if ($first) {
+                $first = false;
+                $fields .= $item['field'];
+                $valuesPlaceholder .= ':'.$item['field'];
+            } else {
+                $fields .= ', '.$item['field'];
+                $valuesPlaceholder .= ', :'.$item['field'];
+            }
+
+            if ($item['type'] == 's' || $item['type'] == 'string') {
+                $types .= 's';
+            } elseif ($item['type'] == 'i' || $item['type'] == 'int' || $item['type'] == 'integer') {
+                $types .= 'i';
+            } elseif ($item['type'] == 'bit' || $item['type'] == 'bool' || $item['type'] == 'boolean') {
+                $types .= 'i';
+            } elseif ($item['type'] == 'd' || $item['type'] == 'double') {
+                $types .= 'd';
+            } elseif ($item['type'] == 'b' || $item['type'] == 'blob') {
+                $types .= 'b';
+            } else {
+                return false;
+            }
+        }
+
+        $statement = $this->db_connection->prepare('INSERT INTO '.$table.' ('.$fields.') VALUES ('.$valuesPlaceholder.')');
+        foreach ($data as $item) {
+            $statement->bindParam(':'.$item['field'], $item['value']);
+        }
+
+        if ($statement->execute()) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * Use with caution: it is often better to archive items to prevent creating null references.
+     */
+    public function delete($table, $where)
+    {
+        $table = $this->addPrefix($table);
+
+        if (!$this->tableExists($table)) {
+            return false;
+        }
+
+        $sql = 'DELETE FROM ';
+        $sql .= $table;
+        $sql .= ' WHERE ';
+        foreach ($where as $condition) {
+            $sql .= $condition;
+        }
+
+        $statement = $this->db_connection->prepare($sql);
 
     // todo: restructure where clause and bind parameters
 
@@ -240,7 +240,7 @@ 
     } else {
         return false;
     }
-  }
+    }
 
     public function update()
     {
@@ -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;

Spacing +7 added lines, -7 removed lines

@@ -180,10 +180,10 @@ 
           if ($first) {
               $first = false;
               $fields .= $item['field'];
-              $valuesPlaceholder .= ':'.$item['field'];
+              $valuesPlaceholder .= ':' . $item['field'];
           } else {
-              $fields .= ', '.$item['field'];
-              $valuesPlaceholder .= ', :'.$item['field'];
+              $fields .= ', ' . $item['field'];
+              $valuesPlaceholder .= ', :' . $item['field'];
           }
 
           if ($item['type'] == 's' || $item['type'] == 'string') {
@@ -201,9 +201,9 @@ 
           }
       }
 
-      $statement = $this->db_connection->prepare('INSERT INTO '.$table.' ('.$fields.') VALUES ('.$valuesPlaceholder.')');
+      $statement = $this->db_connection->prepare('INSERT INTO ' . $table . ' (' . $fields . ') VALUES (' . $valuesPlaceholder . ')');
       foreach ($data as $item) {
-          $statement->bindParam(':'.$item['field'], $item['value']);
+          $statement->bindParam(':' . $item['field'], $item['value']);
       }
 
       if ($statement->execute()) {
@@ -248,7 +248,7 @@ 
 
     private function addPrefix($table)
     {
-        $table = $this->db_prefix.$table;
+        $table = $this->db_prefix . $table;
 
         return $table;
     }
@@ -272,7 +272,7 @@ 
     public function count($table, $column, $where = null)
     {
         $columns = [
-      'COUNT('.$column.') AS count',
+      'COUNT(' . $column . ') AS count',
      ];
         $statement = $this->selectStatement($table, $columns, $where);
 

generated-classes/TechWilk/Rota/User.php

Doc Comments +1 added lines, -1 removed lines

@@ -196,7 +196,7 @@
     /**
      * Determine if the user is marked as available for an event.
      *
-     * @return bool if user is available
+     * @return null|boolean if user is available
      */
     public function isAvailableForEvent(Event $event)
     {

Indentation +22 added lines, -22 removed lines

@@ -19,31 +19,31 @@ 
 class User extends BaseUser
 {
     /**
-   * Set the value of [password] column.
-   *
-   * @param string $v new value
-   *
-   * @return $this|\User The current object (for fluent API support)
-   */
-  public function setPassword($v)
-  {
-      if ($v !== null) {
-          $v = (string) $v;
-      }
-
-      if (!password_verify($v, $this->password)) {
-          $bcrypt_options = [
+     * Set the value of [password] column.
+     *
+     * @param string $v new value
+     *
+     * @return $this|\User The current object (for fluent API support)
+     */
+    public function setPassword($v)
+    {
+        if ($v !== null) {
+            $v = (string) $v;
+        }
+
+        if (!password_verify($v, $this->password)) {
+            $bcrypt_options = [
         'cost' => 12,
-      ];
-          $this->password = password_hash($v, PASSWORD_BCRYPT, $bcrypt_options);
+        ];
+            $this->password = password_hash($v, PASSWORD_BCRYPT, $bcrypt_options);
 
-          $this->modifiedColumns[UserTableMap::COL_PASSWORD] = true;
-      }
+            $this->modifiedColumns[UserTableMap::COL_PASSWORD] = true;
+        }
 
-      return $this;
-  }
+        return $this;
+    }
 
- // setPassword()
+    // setPassword()
 
     /**
      * Check a plain text password against the value of [password] column.
@@ -63,7 +63,7 @@ 
         return password_verify($v, $this->password);
     }
 
- // checkPassword()
+    // checkPassword()
 
     public function isAdmin()
     {

Spacing +13 added lines, -13 removed lines

@@ -77,7 +77,7 @@ 
      */
     public function getName()
     {
-        return $this->firstname.' '.$this->lastname;
+        return $this->firstname . ' ' . $this->lastname;
     }
 
     /**
@@ -96,16 +96,16 @@ 
                 if ($socialAuth->getPlatform() == 'facebook') {
                     switch ($size) {
                         case 'small': // 50px x 50px
-                            return '//graph.facebook.com/'.$socialAuth->getSocialId().'/picture?type=square';
+                            return '//graph.facebook.com/' . $socialAuth->getSocialId() . '/picture?type=square';
                             break;
                         case 'medium': // 200px x 200px
-                            return '//graph.facebook.com/'.$socialAuth->getSocialId().'/picture?type=large';
+                            return '//graph.facebook.com/' . $socialAuth->getSocialId() . '/picture?type=large';
                             break;
                         case 'large': // 200px x 200px
-                            return '//graph.facebook.com/'.$socialAuth->getSocialId().'/picture?type=large';
+                            return '//graph.facebook.com/' . $socialAuth->getSocialId() . '/picture?type=large';
                             break;
                         default:
-                            return '//graph.facebook.com/'.$socialAuth->getSocialId().'/picture';
+                            return '//graph.facebook.com/' . $socialAuth->getSocialId() . '/picture';
                             break;
                     }
                 } elseif ($socialAuth->getPlatform() == 'onebody') {
@@ -114,16 +114,16 @@ 
                     $extension = pathinfo($socialAuth->getMeta()['photo-file-name'], PATHINFO_EXTENSION);
                     switch ($size) {
                         case 'small': // 50px x 50px
-                            return $baseUrl.'/system/production/people/photos/'.$socialAuth->getSocialId().'/tn/'.$photoFingerprint.'.'.$extension;
+                            return $baseUrl . '/system/production/people/photos/' . $socialAuth->getSocialId() . '/tn/' . $photoFingerprint . '.' . $extension;
                             break;
                         case 'medium': // 150px x 150px
-                            return $baseUrl.'/system/production/people/photos/'.$socialAuth->getSocialId().'/small/'.$photoFingerprint.'.'.$extension;
+                            return $baseUrl . '/system/production/people/photos/' . $socialAuth->getSocialId() . '/small/' . $photoFingerprint . '.' . $extension;
                             break;
                         case 'large': // 500px x 500px
-                            return $baseUrl.'/system/production/people/photos/'.$socialAuth->getSocialId().'/medium/'.$photoFingerprint.'.'.$extension;
+                            return $baseUrl . '/system/production/people/photos/' . $socialAuth->getSocialId() . '/medium/' . $photoFingerprint . '.' . $extension;
                             break;
                         default:
-                            return $baseUrl.'/system/production/people/photos/'.$socialAuth->getSocialId().'/tn/'.$photoFingerprint.'.'.$extension;
+                            return $baseUrl . '/system/production/people/photos/' . $socialAuth->getSocialId() . '/tn/' . $photoFingerprint . '.' . $extension;
                         break;
                     }
                 }
@@ -132,16 +132,16 @@ 
 
         switch ($size) {
             case 'small': // 50px x 50px
-                return '//www.gravatar.com/avatar/'.md5(strtolower(trim($this->email))).'?s=50&d=mm';
+                return '//www.gravatar.com/avatar/' . md5(strtolower(trim($this->email))) . '?s=50&d=mm';
                 break;
             case 'medium': // 200px x 200px
-                return '//www.gravatar.com/avatar/'.md5(strtolower(trim($this->email))).'?s=200&d=mm';
+                return '//www.gravatar.com/avatar/' . md5(strtolower(trim($this->email))) . '?s=200&d=mm';
                 break;
             case 'large': // 500px x 500px
-                return '//www.gravatar.com/avatar/'.md5(strtolower(trim($this->email))).'?s=500&d=mm';
+                return '//www.gravatar.com/avatar/' . md5(strtolower(trim($this->email))) . '?s=500&d=mm';
                 break;
             default:
-                return '//www.gravatar.com/avatar/'.md5(strtolower(trim($this->email))).'?s=50&d=mm';
+                return '//www.gravatar.com/avatar/' . md5(strtolower(trim($this->email))) . '?s=50&d=mm';
             break;
         }
     }

public/old/includes/functions.database.php

Unused Use Statements -2 removed lines

@@ -2,8 +2,6 @@
 
 namespace TechWilk\Rota;
 
-use DateTime;
-
 /*
     This file is part of Church Rota.
 

Spacing +28 added lines, -28 removed lines

@@ -26,14 +26,14 @@ 
 function executeDbSql($sql)
 {
     if (!mysqli_query(db(), $sql)) {
-        die('Error: '.mysqli_error(db()).', SQL: '.$sql);
+        die('Error: ' . mysqli_error(db()) . ', SQL: ' . $sql);
     }
 }
 
 function updateDatabase()
 {
     $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'];
     //echo $mysqli_version."<br>";
@@ -87,41 +87,41 @@ 
             executeDbSql("alter table cr_users add(isOverviewRecipient char(2) NOT NULL DEFAULT '0')");
             executeDbSql('alter table cr_groups add(short_name char(2))');
 
-            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 event_sorting_latest = 0');
             executeDbSql('update cr_settings set snapshot_show_two_month = 0');
             executeDbSql('update cr_settings set snapshot_reduce_skills_by_group = 0');
             executeDbSql('update cr_settings set logged_in_show_snapshot_button = 0');
             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 version = '2.1.0'");
             executeDbSql('update cr_settings set users_start_with_myevents = 0');
             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'");
 
-            notifyInfo(__FILE__, 'db-update='.$version.'->2.1.0', $_SESSION['userid']);
+            notifyInfo(__FILE__, 'db-update=' . $version . '->2.1.0', $_SESSION['userid']);
         case '2.1.0':
             executeDbSql('create table cr_settings_bkp2_1_0 as select * from cr_settings');
             executeDbSql('alter table cr_settings add(group_sorting_name int(1))');
             executeDbSql("update cr_settings set version = '2.1.1'");
-            notifyInfo(__FILE__, 'db-update='.$version.'->2.1.1', $_SESSION['userid']);
+            notifyInfo(__FILE__, 'db-update=' . $version . '->2.1.1', $_SESSION['userid']);
         case '2.1.1':
             executeDbSql("update cr_settings set version = '2.1.2'");
-            notifyInfo(__FILE__, 'db-update='.$version.'->2.1.2', $_SESSION['userid']);
+            notifyInfo(__FILE__, 'db-update=' . $version . '->2.1.2', $_SESSION['userid']);
         case '2.1.2':
             executeDbSql("alter table cr_settings add(debug_mode int(1) DEFAULT '0')");
-            executeDbSql('update cr_settings set group_sorting_name = 0');  //was a workaround, fixed in V2.2.1
+            executeDbSql('update cr_settings set group_sorting_name = 0'); //was a workaround, fixed in V2.2.1
 
             executeDbSql("update cr_settings set version = '2.2.0'");
-            notifyInfo(__FILE__, 'db-update='.$version.'->2.2.0', $_SESSION['userid']);
+            notifyInfo(__FILE__, 'db-update=' . $version . '->2.2.0', $_SESSION['userid']);
         case '2.2.0':
             executeDbSql("alter table cr_users add(isBandAdmin char(2) NOT NULL DEFAULT '0')");
             executeDbSql('update cr_settings set group_sorting_name = 0'); //due to an error reset it again
 
             executeDbSql("update cr_settings set version = '2.2.1'");
-            notifyInfo(__FILE__, 'db-update='.$version.'->2.2.1', $_SESSION['userid']);
+            notifyInfo(__FILE__, 'db-update=' . $version . '->2.2.1', $_SESSION['userid']);
         case '2.2.1':
                 $sql = "CREATE TABLE IF NOT EXISTS `cr_statistics` (
 				  `id` int(11) NOT NULL AUTO_INCREMENT,
@@ -137,21 +137,21 @@ 
             executeDbSql($sql);
 
             executeDbSql("update cr_settings set version = '2.3.0'");
-            notifyInfo(__FILE__, 'db-update='.$version.'->2.3.0', $_SESSION['userid']);
+            notifyInfo(__FILE__, 'db-update=' . $version . '->2.3.0', $_SESSION['userid']);
             insertStatistics('system', __FILE__, 'db-update', '2.3.0', $version);
         case '2.3.0':
             executeDbSql("alter table cr_users add(isEventEditor char(2) NOT NULL DEFAULT '0')");
 
             executeDbSql("update cr_settings set version = '2.3.1'");
-            notifyInfo(__FILE__, 'db-update='.$version.'->2.3.1', $_SESSION['userid']);
+            notifyInfo(__FILE__, 'db-update=' . $version . '->2.3.1', $_SESSION['userid']);
             insertStatistics('system', __FILE__, 'db-update', '2.3.1', $version);
         case '2.3.1':
             executeDbSql("update cr_settings set version = '2.3.2'");
-            notifyInfo(__FILE__, 'db-update='.$version.'->2.3.2', $_SESSION['userid']);
+            notifyInfo(__FILE__, 'db-update=' . $version . '->2.3.2', $_SESSION['userid']);
             insertStatistics('system', __FILE__, 'db-update', '2.3.2', $version);
         case '2.3.2':
             executeDbSql("update cr_settings set version = '2.3.3'");
-            notifyInfo(__FILE__, 'db-update='.$version.'->2.3.3', $_SESSION['userid']);
+            notifyInfo(__FILE__, 'db-update=' . $version . '->2.3.3', $_SESSION['userid']);
             insertStatistics('system', __FILE__, 'db-update', '2.3.3', $version);
         case '2.3.3':
             if (substr($mysqli_version, 0, 1) == 5) {
@@ -199,33 +199,33 @@ 
                     );
             }
             executeDbSql("update cr_settings set version = '2.3.4'");
-            notifyInfo(__FILE__, 'db-update='.$version.'->2.3.4', $_SESSION['userid']);
+            notifyInfo(__FILE__, 'db-update=' . $version . '->2.3.4', $_SESSION['userid']);
             insertStatistics('system', __FILE__, 'db-update', '2.3.4', $version);
         case '2.3.4':
             executeDbSql("update cr_settings set version = '2.3.5'");
-            notifyInfo(__FILE__, 'db-update='.$version.'->2.3.5', $_SESSION['userid']);
+            notifyInfo(__FILE__, 'db-update=' . $version . '->2.3.5', $_SESSION['userid']);
             insertStatistics('system', __FILE__, 'db-update', '2.3.5', $version);
         case '2.3.5':
             executeDbSql("update cr_settings set version = '2.4.0'");
-            notifyInfo(__FILE__, 'db-update='.$version.'->2.4.0', $_SESSION['userid']);
+            notifyInfo(__FILE__, 'db-update=' . $version . '->2.4.0', $_SESSION['userid']);
             insertStatistics('system', __FILE__, 'db-update', '2.4.0', $version);
         case '2.4.0':
             executeDbSql("update cr_settings set version = '2.4.1'");
-            notifyInfo(__FILE__, 'db-update='.$version.'->2.4.1', $_SESSION['userid']);
+            notifyInfo(__FILE__, 'db-update=' . $version . '->2.4.1', $_SESSION['userid']);
             insertStatistics('system', __FILE__, 'db-update', '2.4.1', $version);
         case '2.4.1':
             executeDbSql('alter table cr_settings add(days_to_alert int(2) DEFAULT 5) ');
             executeDbSql("alter table cr_settings add(token varchar(100) DEFAULT '') ");
             executeDbSql("update cr_settings set version = '2.4.2'");
-            notifyInfo(__FILE__, 'db-update='.$version.'->2.4.2', $_SESSION['userid']);
+            notifyInfo(__FILE__, 'db-update=' . $version . '->2.4.2', $_SESSION['userid']);
             insertStatistics('system', __FILE__, 'db-update', '2.4.2', $version);
         case '2.4.2':
             executeDbSql("update cr_settings set version = '2.4.3'");
-            notifyInfo(__FILE__, 'db-update='.$version.'->2.4.3', $_SESSION['userid']);
+            notifyInfo(__FILE__, 'db-update=' . $version . '->2.4.3', $_SESSION['userid']);
             insertStatistics('system', __FILE__, 'db-update', '2.4.3', $version);
         case '2.4.3':
             executeDbSql("update cr_settings set version = '2.4.4'");
-            notifyInfo(__FILE__, 'db-update='.$version.'->2.4.4', $_SESSION['userid']);
+            notifyInfo(__FILE__, 'db-update=' . $version . '->2.4.4', $_SESSION['userid']);
             insertStatistics('system', __FILE__, 'db-update', '2.4.4', $version);
         case '2.4.4':
             if (substr($mysqli_version, 0, 1) == 5) {
@@ -274,27 +274,27 @@ 
                 );
             }
             executeDbSql("update cr_settings set version = '2.4.5'");
-            notifyInfo(__FILE__, 'db-update='.$version.'->2.4.5', $_SESSION['userid']);
+            notifyInfo(__FILE__, 'db-update=' . $version . '->2.4.5', $_SESSION['userid']);
             insertStatistics('system', __FILE__, 'db-update', '2.4.5', $version);
         case '2.4.5':
             executeDbSql("update cr_settings set version = '2.5.0'");
-            notifyInfo(__FILE__, 'db-update='.$version.'->2.5.0', $_SESSION['userid']);
+            notifyInfo(__FILE__, 'db-update=' . $version . '->2.5.0', $_SESSION['userid']);
             insertStatistics('system', __FILE__, 'db-update', '2.5.0', $version);
         case '2.5.0':
             executeDbSql("update cr_settings set version = '2.5.1'");
-            notifyInfo(__FILE__, 'db-update='.$version.'->2.5.1', $_SESSION['userid']);
+            notifyInfo(__FILE__, 'db-update=' . $version . '->2.5.1', $_SESSION['userid']);
             insertStatistics('system', __FILE__, 'db-update', '2.5.1', $version);
         case '2.5.1':
             executeDbSql("update cr_settings set version = '2.5.2'");
-            notifyInfo(__FILE__, 'db-update='.$version.'->2.5.2', $_SESSION['userid']);
+            notifyInfo(__FILE__, 'db-update=' . $version . '->2.5.2', $_SESSION['userid']);
             insertStatistics('system', __FILE__, 'db-update', '2.5.2', $version);
         case '2.5.2':
             executeDbSql("update cr_settings set version = '2.5.3'");
-            notifyInfo(__FILE__, 'db-update='.$version.'->2.5.3', $_SESSION['userid']);
+            notifyInfo(__FILE__, 'db-update=' . $version . '->2.5.3', $_SESSION['userid']);
             insertStatistics('system', __FILE__, 'db-update', '2.5.3', $version);
         case '2.5.3':
             executeDbSql("update cr_settings set version = '2.6.0'");
-            notifyInfo(__FILE__, 'db-update='.$version.'->2.6.0', $_SESSION['userid']);
+            notifyInfo(__FILE__, 'db-update=' . $version . '->2.6.0', $_SESSION['userid']);
             insertStatistics('system', __FILE__, 'db-update', '2.6.0', $version);
         case '2.6.0':
             $sql = "ALTER TABLE cr_users
@@ -370,7 +370,7 @@ 
             executeDbSql($sql);
             executeDbSql("update cr_settings set version = '3.0.0-pre1'");
 
-            notifyInfo(__FILE__, 'db-update='.$version.'->3.0.0-pre1', $_SESSION['userid']);
+            notifyInfo(__FILE__, 'db-update=' . $version . '->3.0.0-pre1', $_SESSION['userid']);
             insertStatistics('system', __FILE__, 'db-update', '3.0.0-pre1', $version);
         case '3.0.0-pre1':
             $sql = "CREATE TABLE IF NOT EXISTS cr_notifications (

src/classes/Authentication.php

Doc Comments +3 added lines

@@ -119,6 +119,9 @@
         return true;
     }
 
+    /**
+     * @param EmailAddress $username
+     */
     private function numberOfLoginAttemptsIsOk($username)
     {
         $numberOfAllowedAttempts = 8;

public/api/v1/index.php

Indentation +50 added lines, -50 removed lines

@@ -82,7 +82,7 @@ 
     $location = $event->getLocation();
 
     $data = [
-          'data' => [
+            'data' => [
                     'id'            => $event->getId(),
                     'name'          => $event->name,
                     'date'          => $event->datetime,
@@ -95,8 +95,8 @@ 
                                                                 'related' => '/events/'.$event->getId().'/series/'.$series->getId(),
                                                     ],
                                                     'data' => [
-                                                      'type' => 'series',
-                                                      'id'   => $series->getId(),
+                                                        'type' => 'series',
+                                                        'id'   => $series->getId(),
                                                     ],
                                         ],
                                         'types' => [
@@ -105,8 +105,8 @@ 
                                                                 'related' => '/events/'.$event->getId().'/types/'.$type->getId(),
                                                     ],
                                                     'data' => [
-                                                      'type' => 'types',
-                                                      'id'   => $type->getId(),
+                                                        'type' => 'types',
+                                                        'id'   => $type->getId(),
                                                     ],
                                         ],
                                         'sub-types' => [
@@ -130,56 +130,56 @@ 
                                                     ],
                                         ],
                     ],
-          ],
-          'included' => [
-                          [
+            ],
+            'included' => [
+                            [
                             'type'       => 'series',
                             'id'         => $series->getId(),
                             'attributes' => [
-                                          'name'        => $series->name,
-                                          'description' => $series->description,
+                                            'name'        => $series->name,
+                                            'description' => $series->description,
                             ],
                             'links' => [
                                         'self' => '/series/'.$series->getId(),
                             ],
-                          ],
-                          [
+                            ],
+                            [
                             'type'       => 'types',
                             'id'         => $type->getId(),
                             'attributes' => [
-                                      'name'        => $type->name,
-                                      'description' => $type->description,
+                                        'name'        => $type->name,
+                                        'description' => $type->description,
                             ],
                             'links' => [
                                         'self' => '/types/'.$type->getId(),
                             ],
-                          ],
-                          [
+                            ],
+                            [
                             'type'       => 'sub-types',
                             'id'         => $sub_type->getId(),
                             'attributes' => [
-                                      'name'        => $sub_type->name,
-                                      'description' => $sub_type->description,
+                                        'name'        => $sub_type->name,
+                                        'description' => $sub_type->description,
                             ],
                             'links' => [
                                         'self' => '/sub-types/'.$sub_type->getId(),
                             ],
-                          ],
-                          [
+                            ],
+                            [
                             'type'       => 'locations',
                             'id'         => $location->getId(),
                             'attributes' => [
-                                      'name' => $location->name,
+                                        'name' => $location->name,
                             ],
                             'links' => [
                                         'self' => '/locations/'.$location->getId(),
                             ],
-                          ],
-          ],
-          'meta' => [
+                            ],
+            ],
+            'meta' => [
                     'status' => '200',
-          ],
-  ];
+            ],
+    ];
 
     return $response->withJson($data, 200);
 });
@@ -199,12 +199,12 @@ 
     $series->createInDb($this->db);
 
     $data = [
-          'data' => [
+            'data' => [
                     'id'          => $series->getId(),
                     'name'        => $series->name,
                     'description' => $series->description,
                     ],
-          ];
+            ];
 
     return $response->withJson($data);
 });
@@ -216,12 +216,12 @@ 
     $series->getFromDbWithId($this->db, $id);
 
     $data = [
-          'data' => [
+            'data' => [
                     'id'          => $series->getId(),
                     'name'        => $series->name,
                     'description' => $series->description,
                     ],
-          ];
+            ];
 
     return $response->withJson($data);
 });
@@ -233,11 +233,11 @@ 
     $series->deleteFromDbWithId($this->db, $id);
 
     $data = [
-          'data' => [
+            'data' => [
                     'id'       => $series->getId(),
                     'archived' => true,
                     ],
-          ];
+            ];
 
     return $response->withJson($data);
 });
@@ -257,12 +257,12 @@ 
     $type->createInDb($this->db);
 
     $data = [
-          'data' => [
+            'data' => [
                     'id'          => $type->getId(),
                     'name'        => $type->name,
                     'description' => $type->description,
                     ],
-          ];
+            ];
 
     return $response->withJson($data);
 });
@@ -274,12 +274,12 @@ 
     $type->getFromDbWithId($this->db, $id);
 
     $data = [
-          'data' => [
+            'data' => [
                     'id'          => $type->getId(),
                     'name'        => $type->name,
                     'description' => $type->description,
                     ],
-          ];
+            ];
 
     return $response->withJson($data);
 });
@@ -291,11 +291,11 @@ 
     $type->deleteFromDbWithId($this->db, $id);
 
     $data = [
-          'data' => [
+            'data' => [
                     'id'       => $type->getId(),
                     'archived' => true,
                     ],
-          ];
+            ];
 
     return $response->withJson($data);
 });
@@ -315,12 +315,12 @@ 
     $type->createInDb($this->db);
 
     $data = [
-          'data' => [
+            'data' => [
                     'id'          => $type->getId(),
                     'name'        => $type->name,
                     'description' => $type->description,
                     ],
-          ];
+            ];
 
     return $response->withJson($data);
 });
@@ -332,12 +332,12 @@ 
     $type->getFromDbWithId($this->db, $id);
 
     $data = [
-          'data' => [
+            'data' => [
                     'id'          => $type->getId(),
                     'name'        => $type->name,
                     'description' => $type->description,
                     ],
-          ];
+            ];
 
     return $response->withJson($data);
 });
@@ -349,11 +349,11 @@ 
     $type->deleteFromDbWithId($this->db, $id);
 
     $data = [
-          'data' => [
+            'data' => [
                     'id'       => $type->getId(),
                     'archived' => true,
                     ],
-          ];
+            ];
 
     return $response->withJson($data);
 });
@@ -371,11 +371,11 @@ 
     $type->createInDb($this->db);
 
     $data = [
-          'data' => [
+            'data' => [
                     'id'   => $location->getId(),
                     'name' => $location->name,
                     ],
-          ];
+            ];
 
     return $response->withJson($data);
 });
@@ -387,11 +387,11 @@ 
     $location->getFromDbWithId($this->db, $id);
 
     $data = [
-          'data' => [
+            'data' => [
                     'id'   => $location->getId(),
                     'name' => $location->name,
                     ],
-          ];
+            ];
 
     return $response->withJson($data);
 });
@@ -403,11 +403,11 @@ 
     $location->deleteFromDbWithId($this->db, $id);
 
     $data = [
-          'data' => [
+            'data' => [
                     'id'       => $location->getId(),
                     'archived' => true,
                     ],
-          ];
+            ];
 
     return $response->withJson($data);
 });

Spacing +31 added lines, -31 removed lines

@@ -23,15 +23,15 @@ 
 // Start of API
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-require_once dirname(__FILE__).'/../../../vendor/autoload.php';
+require_once dirname(__FILE__) . '/../../../vendor/autoload.php';
 
-include_once dirname(__FILE__).'/../../../config/database.php';
+include_once dirname(__FILE__) . '/../../../config/database.php';
 
 // Create and configure Slim app
 $app = new \Slim\App(['settings' => $config]);
 
-spl_autoload_register(function ($classname) {
-    require dirname(__FILE__).'/../../../api-classes/'.$classname.'.php';
+spl_autoload_register(function($classname) {
+    require dirname(__FILE__) . '/../../../api-classes/' . $classname . '.php';
 });
 
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -40,7 +40,7 @@ 
 
 $container = $app->getContainer();
 
-$container['db'] = function ($c) {
+$container['db'] = function($c) {
     $db_config = $c['settings']['db'];
     $db = new Database($db_config);
 
@@ -53,7 +53,7 @@ 
 
 // ~~~~~~~~~~~~~~~ Event ~~~~~~~~~~~~~~~
 
-$app->post('/events', function ($request, $response, $args) {
+$app->post('/events', function($request, $response, $args) {
     $postData = $request->getParsedBody();
 
     $name = filter_var($postData['name'], FILTER_SANITIZE_STRING);
@@ -65,7 +65,7 @@ 
     return $response->withJson($data);
 });
 
-$app->get('/events/{id}', function ($request, $response, $args) {
+$app->get('/events/{id}', function($request, $response, $args) {
     $id = filter_var($args['id'], FILTER_SANITIZE_NUMBER_INT);
 
     $event = new Event();
@@ -91,8 +91,8 @@ 
                     'relationships' => [
                                         'series' => [
                                                     'links' => [
-                                                                'self'    => '/events/'.$event->getId().'/relationships/series',
-                                                                'related' => '/events/'.$event->getId().'/series/'.$series->getId(),
+                                                                'self'    => '/events/' . $event->getId() . '/relationships/series',
+                                                                'related' => '/events/' . $event->getId() . '/series/' . $series->getId(),
                                                     ],
                                                     'data' => [
                                                       'type' => 'series',
@@ -101,8 +101,8 @@ 
                                         ],
                                         'types' => [
                                                     'links' => [
-                                                                'self'    => '/events/'.$event->getId().'/relationships/types',
-                                                                'related' => '/events/'.$event->getId().'/types/'.$type->getId(),
+                                                                'self'    => '/events/' . $event->getId() . '/relationships/types',
+                                                                'related' => '/events/' . $event->getId() . '/types/' . $type->getId(),
                                                     ],
                                                     'data' => [
                                                       'type' => 'types',
@@ -111,8 +111,8 @@ 
                                         ],
                                         'sub-types' => [
                                                     'links' => [
-                                                                'self'    => '/events/'.$event->getId().'/relationships/sub-types',
-                                                                'related' => '/events/'.$event->getId().'/sub-types/'.$sub_type->getId(),
+                                                                'self'    => '/events/' . $event->getId() . '/relationships/sub-types',
+                                                                'related' => '/events/' . $event->getId() . '/sub-types/' . $sub_type->getId(),
                                                     ],
                                                     'data' => [
                                                                 'type' => 'sub-types',
@@ -121,8 +121,8 @@ 
                                         ],
                                         'location' => [
                                                     'links' => [
-                                                                'self'    => '/events/'.$event->getId().'/relationships/locations',
-                                                                'related' => '/events/'.$event->getId().'/locations/'.$location->getId(),
+                                                                'self'    => '/events/' . $event->getId() . '/relationships/locations',
+                                                                'related' => '/events/' . $event->getId() . '/locations/' . $location->getId(),
                                                     ],
                                                     'data' => [
                                                                 'type' => 'locations',
@@ -140,7 +140,7 @@ 
                                           'description' => $series->description,
                             ],
                             'links' => [
-                                        'self' => '/series/'.$series->getId(),
+                                        'self' => '/series/' . $series->getId(),
                             ],
                           ],
                           [
@@ -151,7 +151,7 @@ 
                                       'description' => $type->description,
                             ],
                             'links' => [
-                                        'self' => '/types/'.$type->getId(),
+                                        'self' => '/types/' . $type->getId(),
                             ],
                           ],
                           [
@@ -162,7 +162,7 @@ 
                                       'description' => $sub_type->description,
                             ],
                             'links' => [
-                                        'self' => '/sub-types/'.$sub_type->getId(),
+                                        'self' => '/sub-types/' . $sub_type->getId(),
                             ],
                           ],
                           [
@@ -172,7 +172,7 @@ 
                                       'name' => $location->name,
                             ],
                             'links' => [
-                                        'self' => '/locations/'.$location->getId(),
+                                        'self' => '/locations/' . $location->getId(),
                             ],
                           ],
           ],
@@ -186,7 +186,7 @@ 
 
 // ~~~~~~~~~~~~~~~ Series ~~~~~~~~~~~~~~~
 
-$app->post('/series', function ($request, $response, $args) {
+$app->post('/series', function($request, $response, $args) {
     $postData = $request->getParsedBody();
 
     $name = filter_var($postData['name'], FILTER_SANITIZE_STRING);
@@ -209,7 +209,7 @@ 
     return $response->withJson($data);
 });
 
-$app->get('/series/{id}', function ($request, $response, $args) {
+$app->get('/series/{id}', function($request, $response, $args) {
     $id = (int) filter_var($args['id'], FILTER_SANITIZE_NUMBER_INT);
 
     $series = new Series();
@@ -226,7 +226,7 @@ 
     return $response->withJson($data);
 });
 
-$app->delete('/series/{id}', function ($request, $response, $args) {
+$app->delete('/series/{id}', function($request, $response, $args) {
     $id = (int) filter_var($args['id'], FILTER_SANITIZE_NUMBER_INT);
 
     $series = new Series();
@@ -244,7 +244,7 @@ 
 
 // ~~~~~~~~~~~~~~~ Type ~~~~~~~~~~~~~~~
 
-$app->post('/types', function ($request, $response, $args) {
+$app->post('/types', function($request, $response, $args) {
     $postData = $request->getParsedBody();
 
     $name = filter_var($postData['name'], FILTER_SANITIZE_STRING);
@@ -267,7 +267,7 @@ 
     return $response->withJson($data);
 });
 
-$app->get('/types/{id}', function ($request, $response, $args) {
+$app->get('/types/{id}', function($request, $response, $args) {
     $id = (int) filter_var($args['id'], FILTER_SANITIZE_NUMBER_INT);
 
     $type = new Type();
@@ -284,7 +284,7 @@ 
     return $response->withJson($data);
 });
 
-$app->delete('/types/{id}', function ($request, $response, $args) {
+$app->delete('/types/{id}', function($request, $response, $args) {
     $id = (int) filter_var($args['id'], FILTER_SANITIZE_NUMBER_INT);
 
     $type = new Type();
@@ -302,7 +302,7 @@ 
 
 // ~~~~~~~~~~~~~~~ Sub Type ~~~~~~~~~~~~~~~
 
-$app->post('/sub-types', function ($request, $response, $args) {
+$app->post('/sub-types', function($request, $response, $args) {
     $postData = $request->getParsedBody();
 
     $name = filter_var($postData['name'], FILTER_SANITIZE_STRING);
@@ -325,7 +325,7 @@ 
     return $response->withJson($data);
 });
 
-$app->get('/sub-types/{id}', function ($request, $response, $args) {
+$app->get('/sub-types/{id}', function($request, $response, $args) {
     $id = (int) filter_var($args['id'], FILTER_SANITIZE_NUMBER_INT);
 
     $type = new SubType();
@@ -342,7 +342,7 @@ 
     return $response->withJson($data);
 });
 
-$app->delete('/sub-types/{id}', function ($request, $response, $args) {
+$app->delete('/sub-types/{id}', function($request, $response, $args) {
     $id = (int) filter_var($args['id'], FILTER_SANITIZE_NUMBER_INT);
 
     $type = new SubType();
@@ -360,7 +360,7 @@ 
 
 // ~~~~~~~~~~~~~~~ Location ~~~~~~~~~~~~~~~
 
-$app->post('/locations', function ($request, $response, $args) {
+$app->post('/locations', function($request, $response, $args) {
     $postData = $request->getParsedBody();
 
     $name = filter_var($postData['name'], FILTER_SANITIZE_STRING);
@@ -380,7 +380,7 @@ 
     return $response->withJson($data);
 });
 
-$app->get('/locations/{id}', function ($request, $response, $args) {
+$app->get('/locations/{id}', function($request, $response, $args) {
     $id = (int) filter_var($args['id'], FILTER_SANITIZE_NUMBER_INT);
 
     $location = new Location();
@@ -396,7 +396,7 @@ 
     return $response->withJson($data);
 });
 
-$app->delete('/locations/{id}', function ($request, $response, $args) {
+$app->delete('/locations/{id}', function($request, $response, $args) {
     $id = (int) filter_var($args['id'], FILTER_SANITIZE_NUMBER_INT);
 
     $location = new Location();

Braces +3 added lines, -1 removed lines

@@ -419,7 +419,9 @@
 // End of very very very basic auth
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-else:
+else {
+    :
 http_response_code(401);
+}
 
 endif;

public/plugins/datatables/extensions/Scroller/examples/data/ssp.php

Spacing +5 added lines, -5 removed lines

@@ -29,11 +29,11 @@
 // parameter represents the DataTables column identifier. In this case simple
 // indexes
 $columns = [
-    ['db' => 'id',         'dt' => 0],
-    ['db' => 'firstname',  'dt' => 1],
-    ['db' => 'surname',    'dt' => 2],
-    ['db' => 'zip',        'dt' => 3],
-    ['db' => 'country',    'dt' => 4],
+    ['db' => 'id', 'dt' => 0],
+    ['db' => 'firstname', 'dt' => 1],
+    ['db' => 'surname', 'dt' => 2],
+    ['db' => 'zip', 'dt' => 3],
+    ['db' => 'country', 'dt' => 4],
 ];
 
 // SQL server connection information

public/old/swaps.php

Spacing +3 added lines, -3 removed lines

@@ -39,7 +39,7 @@ 
 // ensure user is allowed to see page
 
 if (!isAdmin() && $queryStringUser != $sessionUserId) {
-    header('Location: swaps.php?user='.$sessionUserId);
+    header('Location: swaps.php?user=' . $sessionUserId);
 }
 
 // fetch swaps
@@ -90,11 +90,11 @@ 
               <p>
                 <strong>
                   <s class="text-red">
-                    <?php echo $swap->getOldUserRole()->getUser()->getFirstName().' '.$swap->getOldUserRole()->getUser()->getLastName() ?> (<?php echo $swap->getOldUserRole()->getRole()->getName() ?>)
+                    <?php echo $swap->getOldUserRole()->getUser()->getFirstName() . ' ' . $swap->getOldUserRole()->getUser()->getLastName() ?> (<?php echo $swap->getOldUserRole()->getRole()->getName() ?>)
                   </s>
                   &#8594;
                   <span class="text-green">
-                    <?php echo $swap->getNewUserRole()->getUser()->getFirstName().' '.$swap->getNewUserRole()->getUser()->getLastName() ?> (<?php echo $swap->getNewUserRole()->getRole()->getName() ?>)
+                    <?php echo $swap->getNewUserRole()->getUser()->getFirstName() . ' ' . $swap->getNewUserRole()->getUser()->getLastName() ?> (<?php echo $swap->getNewUserRole()->getRole()->getName() ?>)
                   </span>
                 </strong>
               </p>

public/old/overview.php

Spacing +2 added lines, -2 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;
 }
 
@@ -115,7 +115,7 @@ 
 
 		  <?php
             else:
-                echo '<div class="box-body">'.$sentSuccess.'</div>';
+                echo '<div class="box-body">' . $sentSuccess . '</div>';
             endif;
             ?>
 				</div>

Braces +3 added lines, -1 removed lines

@@ -114,8 +114,10 @@
 			</form>
 
 		  <?php
-            else:
+            else {
+                :
                 echo '<div class="box-body">'.$sentSuccess.'</div>';
+            }
             endif;
             ?>
 				</div>

public/old/editBand.php

Spacing +11 added lines, -11 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;
 }
 
@@ -119,15 +119,15 @@ 
                 }
 
                 if ($viewPeople['skill'] != '') {
-                    $skill = ' - <em>'.$viewPeople['skill'].'</em>';
+                    $skill = ' - <em>' . $viewPeople['skill'] . '</em>';
                 } else {
                     $skill = '';
                 }
                 if ($position == 2) {
-                    echo "<div class='checkboxitem right'><label class='styled' for='rehearsaldate[".$viewPeople['skillID']."]'>".
-                        $viewPeople['name'].$skill."</em></label><input class='styled' ".$checked."type='checkbox' id='rehearsaldate[".
-                        $viewPeople['skillID']."]'	name='rehearsaldate[]' value='".
-                        $viewPeople['skillID']."' /></div></div>";
+                    echo "<div class='checkboxitem right'><label class='styled' for='rehearsaldate[" . $viewPeople['skillID'] . "]'>" .
+                        $viewPeople['name'] . $skill . "</em></label><input class='styled' " . $checked . "type='checkbox' id='rehearsaldate[" .
+                        $viewPeople['skillID'] . "]'	name='rehearsaldate[]' value='" .
+                        $viewPeople['skillID'] . "' /></div></div>";
 
                     $position = 1;
                 } else {
@@ -139,11 +139,11 @@ 
                         $i = '1';
                     }
 
-                    echo "<div class='row".$class."'>
-						<div class='checkboxitem'><label class='styled' for='rehearsaldate[".$viewPeople['skillID']."]'>".
-                        $viewPeople['name'].$skill."</em></label><input class='styled' ".$checked."type='checkbox' id='rehearsaldate[".
-                        $viewPeople['skillID']."]'	name='rehearsaldate[]' value='".
-                        $viewPeople['skillID']."' /></div>";
+                    echo "<div class='row" . $class . "'>
+						<div class='checkboxitem'><label class='styled' for='rehearsaldate[".$viewPeople['skillID'] . "]'>" .
+                        $viewPeople['name'] . $skill . "</em></label><input class='styled' " . $checked . "type='checkbox' id='rehearsaldate[" .
+                        $viewPeople['skillID'] . "]'	name='rehearsaldate[]' value='" .
+                        $viewPeople['skillID'] . "' /></div>";
 
                     $position = 2;
                 }