BurningFlipside / CommonCode

Auth/class.LDAPGroup.php

Indentation +1 added lines, -1 removed lines

@@ -264,7 +264,7 @@
             throw new \Exception('data must be set for LDAPGroup');
         }
         $filter = new \Data\Filter("cn eq $name");
-	$group = $data->read($data->group_base, $filter);
+    $group = $data->read($data->group_base, $filter);
         if($group === false || !isset($group[0]))
         {
             return false;

Spacing +11 added lines, -11 removed lines

@@ -72,7 +72,7 @@ 
         return substr($split[0], 4);
     }
 
-    public function getMemberUids($recursive=true)
+    public function getMemberUids($recursive = true)
     {
         $members = array();
         $rawMembers = $this->getMembersField();
@@ -117,7 +117,7 @@ 
         return LDAPUser::from_name(substr($split[0], 4), $this->server);
     }
 
-    public function members($details=false, $recursive=true, $includeGroups=true)
+    public function members($details = false, $recursive = true, $includeGroups = true)
     {
         $members = array();
         $rawMembers = $this->getMembersField();
@@ -154,7 +154,7 @@ 
         return $members;
     }
 
-    public function getNonMemebers($select=false)
+    public function getNonMemebers($select = false)
     {
         $data = array();
         $groupFilter = '(&(cn=*)(!(cn='.$this->getGroupName().'))';
@@ -163,18 +163,18 @@ 
         $count = count($members);
         for($i = 0; $i < $count; $i++)
         {
-            $dnComps = explode(',',$members[$i]);
+            $dnComps = explode(',', $members[$i]);
             if(strncmp($members[$i], "uid=", 4) == 0)
             {
-                $userFilter.='(!('.$dnComps[0].'))';
+                $userFilter .= '(!('.$dnComps[0].'))';
             }
             else
             {
-                $groupFilter.='(!('.$dnComps[0].'))';
+                $groupFilter .= '(!('.$dnComps[0].'))';
             }
         }
-        $userFilter.=')';
-        $groupFilter.=')';
+        $userFilter .= ')';
+        $groupFilter .= ')';
         $groups = $this->server->read($this->server->group_base, $groupFilter);
         $count = count($groups);
         for($i = 0; $i < $count; $i++)
@@ -207,7 +207,7 @@ 
         }
     }
 
-    public function addMember($name, $isGroup=false, $flush=true)
+    public function addMember($name, $isGroup = false, $flush = true)
     {
         $dn = false;
         if($isGroup)
@@ -254,7 +254,7 @@ 
         }
     }
 
-    static function from_dn($dn, $data=false)
+    static function from_dn($dn, $data = false)
     {
         if($data === false)
         {
@@ -268,7 +268,7 @@ 
         return new static($group[0]);
     }
 
-    static function from_name($name, $data=false)
+    static function from_name($name, $data = false)
     {
         if($data === false)
         {

Auth/class.LDAPUser.php

Indentation +1 added lines, -1 removed lines

@@ -241,7 +241,7 @@
             $obj['userPassword'] = $this->generateLDAPPass($password);
             if(isset($this->ldap_obj->uniqueidentifier))
             {
-               $obj['uniqueIdentifier'] = null;
+                $obj['uniqueIdentifier'] = null;
             }
             //Make sure we are bound in write mode
             $auth = \AuthProvider::getInstance();

Spacing +6 added lines, -6 removed lines

@@ -8,7 +8,7 @@ 
     private $ldapObj;
     private $server;
 
-    public function __construct($data=false)
+    public function __construct($data = false)
     {
         $this->server = \LDAP\LDAPServer::getInstance();
         if($data !== false && !isset($data['dn']) && !isset($data['extended']))
@@ -220,9 +220,9 @@ 
 
     private function generateLDAPPass($pass)
     {
-        mt_srand((double)microtime()*1000000);
+        mt_srand((double)microtime() * 1000000);
         $salt = pack("CCCC", mt_rand(), mt_rand(), mt_rand(), mt_rand());
-        $hash = base64_encode(pack('H*',sha1($pass.$salt)).$salt);
+        $hash = base64_encode(pack('H*', sha1($pass.$salt)).$salt);
         return '{SSHA}'.$hash;
     }
 
@@ -230,7 +230,7 @@ 
     {
         if(!is_object($this->ldapObj))
         {
-            return $this->setFieldLocal('userPassword',  $this->generateLDAPPass($password));
+            return $this->setFieldLocal('userPassword', $this->generateLDAPPass($password));
         }
         else
         {
@@ -266,7 +266,7 @@ 
         return false;
     }
 
-    static function from_name($name, $data=false)
+    static function from_name($name, $data = false)
     {
         if($data === false)
         {
@@ -281,7 +281,7 @@ 
         return new static($user[0]);
     }
 
-    static function from_dn($dn, $data=false)
+    static function from_dn($dn, $data = false)
     {
         if($data === false)
         {

Auth/class.SQLAuthenticator.php

Indentation +20 added lines, -20 removed lines

@@ -116,26 +116,26 @@
 
     private function getDataTable($name, $pending=false)
     {
-         if(isset($this->dataTables[$name]) && isset($this->dataTables[$name][$pending]))
-         {
-             return $this->dataTables[$name][$pending];
-         }
-         $dataSet = $this->dataSet;
-         if($pending)
-         {
-             $dataSet = $this->pendingDataSet;
-         }
-         if($dataSet === null)
-         {
-             throw new \Exception('Unable to obtain dataset for SQL Authentication!');
-         }
-         $dataTable = $dataSet[$name];
-         if(!isset($this->dataTables[$name]))
-         {
-             $this->dataTables[$name] = array();
-         }
-         $this->dataTables[$name][$pending] = $dataTable;
-         return $dataTable;
+            if(isset($this->dataTables[$name]) && isset($this->dataTables[$name][$pending]))
+            {
+                return $this->dataTables[$name][$pending];
+            }
+            $dataSet = $this->dataSet;
+            if($pending)
+            {
+                $dataSet = $this->pendingDataSet;
+            }
+            if($dataSet === null)
+            {
+                throw new \Exception('Unable to obtain dataset for SQL Authentication!');
+            }
+            $dataTable = $dataSet[$name];
+            if(!isset($this->dataTables[$name]))
+            {
+                $this->dataTables[$name] = array();
+            }
+            $this->dataTables[$name][$pending] = $dataTable;
+            return $dataTable;
     }
 
     private function getPendingUserDataTable()

Spacing +7 added lines, -7 removed lines

@@ -20,7 +20,7 @@ 
         }
         if(!is_int($algo))
         {
-            trigger_error("password_hash() expects parameter 2 to be long, " . gettype($algo) . " given", E_USER_WARNING);
+            trigger_error("password_hash() expects parameter 2 to be long, ".gettype($algo)." given", E_USER_WARNING);
             return false;
         }
         $resultLength = 0;
@@ -43,7 +43,7 @@ 
         $base64String = base64_encode($salt);
         $salt = strtr(rtrim($base64String, '='), $base64Digits, $bcrypt64Digits);
         $salt = substr($salt, 0, $requiredSaltLen);
-        $hash = $hashFormat . $salt;
+        $hash = $hashFormat.$salt;
         $ret = crypt($password, $hash);
         if(!is_string($ret) || strlen($ret) != $resultLength)
         {
@@ -114,7 +114,7 @@ 
         return \DataSetFactory::getDataSetByName('pending_authentication');
     }
 
-    private function getDataTable($name, $pending=false)
+    private function getDataTable($name, $pending = false)
     {
          if(isset($this->dataTables[$name]) && isset($this->dataTables[$name][$pending]))
          {
@@ -227,12 +227,12 @@ 
         return $data;
     }
 
-    public function getGroupsByFilter($filter, $select=false, $top=false, $skip=false, $orderby=false)
+    public function getGroupsByFilter($filter, $select = false, $top = false, $skip = false, $orderby = false)
     {
         return $this->convertDataToClass('group', 'SQLGroup', $filter, $select, $top, $skip, $orderby);
     }
 
-    public function getUsersByFilter($filter, $select=false, $top=false, $skip=false, $orderby=false)
+    public function getUsersByFilter($filter, $select = false, $top = false, $skip = false, $orderby = false)
     {
         return $this->convertDataToClass('group', 'SQLUser', $filter, $select, $top, $skip, $orderby);
     }
@@ -249,7 +249,7 @@ 
     {
         $userDataTable = $this->getPendingUserDataTable();
         $fieldData = $filter->to_mongo_filter();
-        $firstFilter = new \Data\Filter('substringof(data,"'.implode($fieldData,' ').'")');
+        $firstFilter = new \Data\Filter('substringof(data,"'.implode($fieldData, ' ').'")');
         $users = $userDataTable->read($firstFilter, $select, $top, $skip, $orderby);
         if($users === false)
         {
@@ -276,7 +276,7 @@ 
         return $ret;
     }
 
-    public function getPendingUsersByFilter($filter, $select=false, $top=false, $skip=false, $orderby=false)
+    public function getPendingUsersByFilter($filter, $select = false, $top = false, $skip = false, $orderby = false)
 
     {
         if($this->pending === false) return false;

Auth/class.GoogleAuthenticator.php

Indentation +1 added lines, -1 removed lines

@@ -66,7 +66,7 @@
             $ret = $auth->activatePendingUser($user);

             if($ret === false)

             {

-                 throw new \Exception('Unable to create user! '.$res);

+                    throw new \Exception('Unable to create user! '.$res);

             }

             return self::SUCCESS;

         }

Spacing +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
     public function authenticate($code, &$currentUser = false)

     {

         $googleUser = false;

-        try{

+        try {

             $this->client->authenticate($code);

             $this->token = $this->client->getAccessToken();

             \FlipSession::setVar('GoogleToken', $this->token);

Data/class.MongoDataSet.php

Indentation +1 added lines, -1 removed lines

@@ -65,7 +65,7 @@
         $collections = $this->db->getCollectionNames();
         if(in_array($name, $collections))
         {
-             return true;
+                return true;
         }
         return false;
     }

Spacing +3 added lines, -3 removed lines

@@ -7,15 +7,15 @@
     $classname = ltrim($classname, '\\');
     $filename  = '';
     $namespace = '';
-    if ($lastNsPos = strrpos($classname, '\\'))
+    if($lastNsPos = strrpos($classname, '\\'))
     {
         $namespace = substr($classname, 0, $lastNsPos);
         $classname = substr($classname, $lastNsPos + 1);
-        $filename  = str_replace('\\', DIRECTORY_SEPARATOR, $namespace) . DIRECTORY_SEPARATOR;
+        $filename  = str_replace('\\', DIRECTORY_SEPARATOR, $namespace).DIRECTORY_SEPARATOR;
     }
     if(strlen($namespace))
     {
-        $namespace.=DIRECTORY_SEPARATOR;
+        $namespace .= DIRECTORY_SEPARATOR;
     }
     $filename = __DIR__.'/../libs/mongofill/src/'.$namespace.$classname.'.php';
     if(is_readable($filename))

Data/class.SQLDataTable.php

Indentation +4 added lines, -4 removed lines

@@ -65,11 +65,11 @@ 
         $ret = $this->dataset->read($this->tablename, $where, 'COUNT(*)');
         if($ret === false || !isset($ret[0]) || !isset($ret[0]['COUNT(*)']))
         {
-             return false;
+                return false;
         }
         else
         {
-             return $ret[0]['COUNT(*)'];
+                return $ret[0]['COUNT(*)'];
         }
     }
   
@@ -93,8 +93,8 @@ 
 
     function update($filter, $data)
     {
-         $where = $filter->to_sql_string();
-         return $this->dataset->update($this->tablename, $where, $data);
+            $where = $filter->to_sql_string();
+            return $this->dataset->update($this->tablename, $where, $data);
     }
 
     function create($data)

Spacing +2 added lines, -2 removed lines

@@ -51,7 +51,7 @@ 
         }
     }
 
-    function count($filter=false)
+    function count($filter = false)
     {
         if($this->data !== null)
         {
@@ -73,7 +73,7 @@ 
         }
     }
   
-    function search($filter=false, $select=false, $count=false, $skip=false, $sort=false, $params=false)
+    function search($filter = false, $select = false, $count = false, $skip = false, $sort = false, $params = false)
     {
         if($this->data !== null)
         {

class.FlipPage.php

Indentation +217 added lines, -217 removed lines

@@ -59,239 +59,239 @@
 
 global $jsArray;
 $jsArray = array(
-     JS_JQUERY => array(
-         'no' => array(
-             'no'  => '/js/common/jquery.js',
-             'min' => '/js/common/jquery.min.js'
-         ),
-         'cdn' => array(
-             'no'  => '//ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.js',
-             'min' => '//ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js'
-         )
-     ),
-     JS_JQUERY_UI => array(
-         'no' => array(
-             'no'  => '/js/common/jquery-ui.js',
-             'min' => '/js/common/jquery-ui.min.js'
-         ),
-         'cdn' => array(
-             'no'  => '//ajax.googleapis.com/ajax/libs/jqueryui/1.11.4/jquery-ui.js',
-             'min' => '//ajax.googleapis.com/ajax/libs/jqueryui/1.11.4/jquery-ui.min.js'
-         )
-     ),
-     JS_BOOTSTRAP => array(
-         'no' => array(
-             'no'  => '/js/common/bootstrap.js',
-             'min' => '/js/common/bootstrap.min.js'
-         ),
-         'cdn' => array(
-             'no'  => '//maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.js',
-             'min' => '//maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js'
-         )
-     ),
-     JQUERY_VALIDATE => array(
-         'no' => array(
-             'no'  => '/js/common/jquery.validate.js',
-             'min' => '/js/common/jquery.validate.min.js'
-         ),
-         'cdn' => array(
-             'no'  => '//ajax.aspnetcdn.com/ajax/jquery.validate/1.13.1/jquery.validate.js',
-             'min' => '//ajax.aspnetcdn.com/ajax/jquery.validate/1.13.1/jquery.validate.min.js'
-         )
-     ),
-     JQUERY_TOUCH => array(
-         'no' => array(
-             'no'  => '/js/common/jquery.ui.touch-punch.min.js',
-             'min' => '/js/common/jquery.ui.touch-punch.min.js'
-         ),
-         'cdn' => array(
-             'no'  => '//cdnjs.cloudflare.com/ajax/libs/jqueryui-touch-punch/0.2.3/jquery.ui.touch-punch.min.js',
-             'min' => '//cdnjs.cloudflare.com/ajax/libs/jqueryui-touch-punch/0.2.3/jquery.ui.touch-punch.min.js'
-         )
-     ),
-     JS_TINYNAV => array(
-         'no' => array(
-             'no'  => '/js/common/tinynav.js',
-             'min' => '/js/common/tinynav.min.js'
-         ),
-         'cdn' => array(
-             'no'  => '//cdnjs.cloudflare.com/ajax/libs/TinyNav.js/1.2.0/tinynav.js',
-             'min' => '//cdnjs.cloudflare.com/ajax/libs/TinyNav.js/1.2.0/tinynav.min.js'
-         )
-     ),
-     JS_BOOTSTRAP_FH => array(
-         'no' => array(
-             'no'  => '/js/common/bootstrap-formhelpers.js',
-             'min' => '/js/common/bootstrap-formhelpers.min.js'
-         ),
-         'cdn' => array(
-             'no'  => '//cdnjs.cloudflare.com/ajax/libs/bootstrap-formhelpers/2.3.0/js/bootstrap-formhelpers.js',
-             'min' => '//cdnjs.cloudflare.com/ajax/libs/bootstrap-formhelpers/2.3.0/js/bootstrap-formhelpers.min.js'
-         )
-     ),
-     JS_BOOTSTRAP_SW => array(
-         'no' => array(
-             'no'  => '/js/common/bootstrap-switch.js',
-             'min' => '/js/common/bootstrap-switch.min.js'
-         ),
-         'cdn' => array(
-             'no'  => '//cdnjs.cloudflare.com/ajax/libs/bootstrap-switch/3.3.2/js/bootstrap-switch.js',
-             'min' => '//cdnjs.cloudflare.com/ajax/libs/bootstrap-switch/3.3.2/js/bootstrap-switch.min.js'
-         )
-     ),
-     JS_DATATABLE => array(
-         'no' => array(
-             'no'  => '/js/common/jquery.dataTables.js',
-             'min' => '/js/common/jquery.dataTables.min.js'
-         ),
-         'cdn' => array(
-             'no'  => '//cdn.datatables.net/1.10.7/js/jquery.dataTables.js',
-             'min' => '//cdn.datatables.net/1.10.7/js/jquery.dataTables.min.js'
-         )
-     ),
-     JS_CHART => array(
-         'no' => array(
-             'no'  => '/js/common/Chart.js',
-             'min' => '/js/common/Chart.min.js'
-         ),
-         'cdn' => array(
-             'no'  => '//cdnjs.cloudflare.com/ajax/libs/Chart.js/1.0.2/Chart.js',
-             'min' => '//cdnjs.cloudflare.com/ajax/libs/Chart.js/1.0.2/Chart.min.js'
-         )
-     ),
-     JS_METISMENU => array(
-         'no' => array(
-             'no'  => '/js/common/metisMenu.js',
-             'min' => '/js/common/metisMenu.min.js'
-         ),
-         'cdn' => array(
-             'no'  => '//cdnjs.cloudflare.com/ajax/libs/metisMenu/2.0.2/metisMenu.js',
-             'min' => '//cdnjs.cloudflare.com/ajax/libs/metisMenu/2.0.2/metisMenu.min.js'
-         )
-     ),
-     JS_BOOTBOX => array(
-         'no' => array(
-             'no'  => '/js/common/bootbox.js',
-             'min' => '/js/common/bootbox.min.js'
-         ),
-         'cdn' => array(
-             'no'  => '//cdnjs.cloudflare.com/ajax/libs/bootbox.js/4.3.0/bootbox.js',
-             'min' => '//cdnjs.cloudflare.com/ajax/libs/bootbox.js/4.3.0/bootbox.min.js'
-         )
-     ),
-     JS_DATATABLE_ODATA => array(
-         'no' => array(
-             'no'  => '/js/common/jquery.dataTables.odata.js',
-             'min' => '/js/common/jquery.dataTables.odata.js',
-         ),
-         'cdn' => array(
-             'no'  => '/js/common/jquery.dataTables.odata.js',
-             'min' => '/js/common/jquery.dataTables.odata.js',
-         )
-     ),
-     JS_CRYPTO_MD5_JS => array(
-         'no' => array(
-             'no'  => '/js/common/md5.js',
-             'min' => '/js/common/md5.js',
-         ),
-         'cdn' => array(
-             'no'  => '//cdnjs.cloudflare.com/ajax/libs/crypto-js/3.1.2/rollups/md5.js',
-             'min' => '//cdnjs.cloudflare.com/ajax/libs/crypto-js/3.1.2/rollups/md5.js',
-         )
-     ),
-     JS_JCROP => array(
-         'no' => array(
-             'no'  => '/js/common/jquery.Jcrop.min.js',
-             'min' => '/js/common/jquery.Jcrop.min.js'
-         ),
-         'cdn' => array(
-             'no'  => '//cdnjs.cloudflare.com/ajax/libs/jquery-jcrop/0.9.12/js/jquery.Jcrop.min.js',
-             'min' => '//cdnjs.cloudflare.com/ajax/libs/jquery-jcrop/0.9.12/js/jquery.Jcrop.min.js'
-         )
-     ),
-     JS_TYPEAHEAD => array(
-         'no' => array(
-             'no'  => '/js/common/typeahead.bundle.js',
-             'min' => '/js/common/typeahead.bundle.min.js'
-         ),
-         'cdn' => array(
-             'no'  => '//cdnjs.cloudflare.com/ajax/libs/typeahead.js/0.11.1/typeahead.bundle.js',
-             'min' => '//cdnjs.cloudflare.com/ajax/libs/typeahead.js/0.11.1/typeahead.bundle.min.js'
-         )
-     ),
-     JS_FLIPSIDE => array(
-         'no' => array(
-             'no'  => '/js/common/flipside.js',
-             'min' => '/js/common/flipside.min.js'
-         ),
-         'cdn' => array(
-             'no'  => '/js/common/flipside.js',
-             'min' => '/js/common/flipside.min.js'
-         )
-     ),
-     JS_LOGIN => array(
-         'no' => array(
-             'no'  => '/js/common/login.js',
-             'min' => '/js/common/login.min.js'
-         ),
-         'cdn' => array(
-             'no'  => '/js/common/login.js',
-             'min' => '/js/common/login.min.js'
-         )
-     )
+        JS_JQUERY => array(
+            'no' => array(
+                'no'  => '/js/common/jquery.js',
+                'min' => '/js/common/jquery.min.js'
+            ),
+            'cdn' => array(
+                'no'  => '//ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.js',
+                'min' => '//ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js'
+            )
+        ),
+        JS_JQUERY_UI => array(
+            'no' => array(
+                'no'  => '/js/common/jquery-ui.js',
+                'min' => '/js/common/jquery-ui.min.js'
+            ),
+            'cdn' => array(
+                'no'  => '//ajax.googleapis.com/ajax/libs/jqueryui/1.11.4/jquery-ui.js',
+                'min' => '//ajax.googleapis.com/ajax/libs/jqueryui/1.11.4/jquery-ui.min.js'
+            )
+        ),
+        JS_BOOTSTRAP => array(
+            'no' => array(
+                'no'  => '/js/common/bootstrap.js',
+                'min' => '/js/common/bootstrap.min.js'
+            ),
+            'cdn' => array(
+                'no'  => '//maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.js',
+                'min' => '//maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js'
+            )
+        ),
+        JQUERY_VALIDATE => array(
+            'no' => array(
+                'no'  => '/js/common/jquery.validate.js',
+                'min' => '/js/common/jquery.validate.min.js'
+            ),
+            'cdn' => array(
+                'no'  => '//ajax.aspnetcdn.com/ajax/jquery.validate/1.13.1/jquery.validate.js',
+                'min' => '//ajax.aspnetcdn.com/ajax/jquery.validate/1.13.1/jquery.validate.min.js'
+            )
+        ),
+        JQUERY_TOUCH => array(
+            'no' => array(
+                'no'  => '/js/common/jquery.ui.touch-punch.min.js',
+                'min' => '/js/common/jquery.ui.touch-punch.min.js'
+            ),
+            'cdn' => array(
+                'no'  => '//cdnjs.cloudflare.com/ajax/libs/jqueryui-touch-punch/0.2.3/jquery.ui.touch-punch.min.js',
+                'min' => '//cdnjs.cloudflare.com/ajax/libs/jqueryui-touch-punch/0.2.3/jquery.ui.touch-punch.min.js'
+            )
+        ),
+        JS_TINYNAV => array(
+            'no' => array(
+                'no'  => '/js/common/tinynav.js',
+                'min' => '/js/common/tinynav.min.js'
+            ),
+            'cdn' => array(
+                'no'  => '//cdnjs.cloudflare.com/ajax/libs/TinyNav.js/1.2.0/tinynav.js',
+                'min' => '//cdnjs.cloudflare.com/ajax/libs/TinyNav.js/1.2.0/tinynav.min.js'
+            )
+        ),
+        JS_BOOTSTRAP_FH => array(
+            'no' => array(
+                'no'  => '/js/common/bootstrap-formhelpers.js',
+                'min' => '/js/common/bootstrap-formhelpers.min.js'
+            ),
+            'cdn' => array(
+                'no'  => '//cdnjs.cloudflare.com/ajax/libs/bootstrap-formhelpers/2.3.0/js/bootstrap-formhelpers.js',
+                'min' => '//cdnjs.cloudflare.com/ajax/libs/bootstrap-formhelpers/2.3.0/js/bootstrap-formhelpers.min.js'
+            )
+        ),
+        JS_BOOTSTRAP_SW => array(
+            'no' => array(
+                'no'  => '/js/common/bootstrap-switch.js',
+                'min' => '/js/common/bootstrap-switch.min.js'
+            ),
+            'cdn' => array(
+                'no'  => '//cdnjs.cloudflare.com/ajax/libs/bootstrap-switch/3.3.2/js/bootstrap-switch.js',
+                'min' => '//cdnjs.cloudflare.com/ajax/libs/bootstrap-switch/3.3.2/js/bootstrap-switch.min.js'
+            )
+        ),
+        JS_DATATABLE => array(
+            'no' => array(
+                'no'  => '/js/common/jquery.dataTables.js',
+                'min' => '/js/common/jquery.dataTables.min.js'
+            ),
+            'cdn' => array(
+                'no'  => '//cdn.datatables.net/1.10.7/js/jquery.dataTables.js',
+                'min' => '//cdn.datatables.net/1.10.7/js/jquery.dataTables.min.js'
+            )
+        ),
+        JS_CHART => array(
+            'no' => array(
+                'no'  => '/js/common/Chart.js',
+                'min' => '/js/common/Chart.min.js'
+            ),
+            'cdn' => array(
+                'no'  => '//cdnjs.cloudflare.com/ajax/libs/Chart.js/1.0.2/Chart.js',
+                'min' => '//cdnjs.cloudflare.com/ajax/libs/Chart.js/1.0.2/Chart.min.js'
+            )
+        ),
+        JS_METISMENU => array(
+            'no' => array(
+                'no'  => '/js/common/metisMenu.js',
+                'min' => '/js/common/metisMenu.min.js'
+            ),
+            'cdn' => array(
+                'no'  => '//cdnjs.cloudflare.com/ajax/libs/metisMenu/2.0.2/metisMenu.js',
+                'min' => '//cdnjs.cloudflare.com/ajax/libs/metisMenu/2.0.2/metisMenu.min.js'
+            )
+        ),
+        JS_BOOTBOX => array(
+            'no' => array(
+                'no'  => '/js/common/bootbox.js',
+                'min' => '/js/common/bootbox.min.js'
+            ),
+            'cdn' => array(
+                'no'  => '//cdnjs.cloudflare.com/ajax/libs/bootbox.js/4.3.0/bootbox.js',
+                'min' => '//cdnjs.cloudflare.com/ajax/libs/bootbox.js/4.3.0/bootbox.min.js'
+            )
+        ),
+        JS_DATATABLE_ODATA => array(
+            'no' => array(
+                'no'  => '/js/common/jquery.dataTables.odata.js',
+                'min' => '/js/common/jquery.dataTables.odata.js',
+            ),
+            'cdn' => array(
+                'no'  => '/js/common/jquery.dataTables.odata.js',
+                'min' => '/js/common/jquery.dataTables.odata.js',
+            )
+        ),
+        JS_CRYPTO_MD5_JS => array(
+            'no' => array(
+                'no'  => '/js/common/md5.js',
+                'min' => '/js/common/md5.js',
+            ),
+            'cdn' => array(
+                'no'  => '//cdnjs.cloudflare.com/ajax/libs/crypto-js/3.1.2/rollups/md5.js',
+                'min' => '//cdnjs.cloudflare.com/ajax/libs/crypto-js/3.1.2/rollups/md5.js',
+            )
+        ),
+        JS_JCROP => array(
+            'no' => array(
+                'no'  => '/js/common/jquery.Jcrop.min.js',
+                'min' => '/js/common/jquery.Jcrop.min.js'
+            ),
+            'cdn' => array(
+                'no'  => '//cdnjs.cloudflare.com/ajax/libs/jquery-jcrop/0.9.12/js/jquery.Jcrop.min.js',
+                'min' => '//cdnjs.cloudflare.com/ajax/libs/jquery-jcrop/0.9.12/js/jquery.Jcrop.min.js'
+            )
+        ),
+        JS_TYPEAHEAD => array(
+            'no' => array(
+                'no'  => '/js/common/typeahead.bundle.js',
+                'min' => '/js/common/typeahead.bundle.min.js'
+            ),
+            'cdn' => array(
+                'no'  => '//cdnjs.cloudflare.com/ajax/libs/typeahead.js/0.11.1/typeahead.bundle.js',
+                'min' => '//cdnjs.cloudflare.com/ajax/libs/typeahead.js/0.11.1/typeahead.bundle.min.js'
+            )
+        ),
+        JS_FLIPSIDE => array(
+            'no' => array(
+                'no'  => '/js/common/flipside.js',
+                'min' => '/js/common/flipside.min.js'
+            ),
+            'cdn' => array(
+                'no'  => '/js/common/flipside.js',
+                'min' => '/js/common/flipside.min.js'
+            )
+        ),
+        JS_LOGIN => array(
+            'no' => array(
+                'no'  => '/js/common/login.js',
+                'min' => '/js/common/login.min.js'
+            ),
+            'cdn' => array(
+                'no'  => '/js/common/login.js',
+                'min' => '/js/common/login.min.js'
+            )
+        )
 );
 
 global $cssArray;
 $cssArray = array(
     CSS_JQUERY_UI => array(
         'no' => array(
-             'no'  => '/css/common/jquery-ui.css',
-             'min' => '/css/common/jquery-ui.min.css'
-         ),
-         'cdn' => array(
-             'no'  => '//ajax.googleapis.com/ajax/libs/jqueryui/1.11.4/themes/smoothness/jquery-ui.css',
-             'min' => '//ajax.googleapis.com/ajax/libs/jqueryui/1.11.4/themes/smoothness/jquery-ui.min.css'
-         )
+                'no'  => '/css/common/jquery-ui.css',
+                'min' => '/css/common/jquery-ui.min.css'
+            ),
+            'cdn' => array(
+                'no'  => '//ajax.googleapis.com/ajax/libs/jqueryui/1.11.4/themes/smoothness/jquery-ui.css',
+                'min' => '//ajax.googleapis.com/ajax/libs/jqueryui/1.11.4/themes/smoothness/jquery-ui.min.css'
+            )
     ),
     CSS_BOOTSTRAP => array(
-         'no' => array(
-             'no'  => '/css/common/bootstrap.css',
-             'min' => '/css/common/bootstrap.min.css'
-         ),
-         'cdn' => array(
-             'no'  => '//maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.css',
-             'min' => '//maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css'
-         )
+            'no' => array(
+                'no'  => '/css/common/bootstrap.css',
+                'min' => '/css/common/bootstrap.min.css'
+            ),
+            'cdn' => array(
+                'no'  => '//maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.css',
+                'min' => '//maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css'
+            )
     ),
     CSS_BOOTSTRAP_FH => array(
         'no' => array(
-             'no'  => '/css/common/bootstrap-formhelpers.css',
-             'min' => '/css/common/bootstrap-formhelpers.min.css'
-         ),
-         'cdn' => array(
-             'no'  => '//cdnjs.cloudflare.com/ajax/libs/bootstrap-formhelpers/2.3.0/css/bootstrap-formhelpers.css',
-             'min' => '//cdnjs.cloudflare.com/ajax/libs/bootstrap-formhelpers/2.3.0/css/bootstrap-formhelpers.min.css'
-         )
+                'no'  => '/css/common/bootstrap-formhelpers.css',
+                'min' => '/css/common/bootstrap-formhelpers.min.css'
+            ),
+            'cdn' => array(
+                'no'  => '//cdnjs.cloudflare.com/ajax/libs/bootstrap-formhelpers/2.3.0/css/bootstrap-formhelpers.css',
+                'min' => '//cdnjs.cloudflare.com/ajax/libs/bootstrap-formhelpers/2.3.0/css/bootstrap-formhelpers.min.css'
+            )
     ),
     CSS_BOOTSTRAP_SW => array(
-         'no' => array(
-             'no'  => '/css/common/bootstrap-switch.css',
-             'min' => '/css/common/bootstrap-switch.min.css'
-         ),
-         'cdn' => array(
-             'no'  => '//cdnjs.cloudflare.com/ajax/libs/bootstrap-switch/3.3.2/css/bootstrap3/bootstrap-switch.css',
-             'min' => '//cdnjs.cloudflare.com/ajax/libs/bootstrap-switch/3.3.2/css/bootstrap3/bootstrap-switch.min.css'
-         )
+            'no' => array(
+                'no'  => '/css/common/bootstrap-switch.css',
+                'min' => '/css/common/bootstrap-switch.min.css'
+            ),
+            'cdn' => array(
+                'no'  => '//cdnjs.cloudflare.com/ajax/libs/bootstrap-switch/3.3.2/css/bootstrap3/bootstrap-switch.css',
+                'min' => '//cdnjs.cloudflare.com/ajax/libs/bootstrap-switch/3.3.2/css/bootstrap3/bootstrap-switch.min.css'
+            )
     ),
     CSS_DATATABLE => array(
         'no' => array(
-             'no'  => '/css/common/jquery.dataTables.css',
-             'min' => '/css/common/jquery.dataTables.min.css'
-         ),
-         'cdn' => array(
-             'no'  => '//cdn.datatables.net/1.10.7/css/jquery.dataTables.css',
-             'min' => '//cdn.datatables.net/1.10.7/css/jquery.dataTables.min.css'
-         )
+                'no'  => '/css/common/jquery.dataTables.css',
+                'min' => '/css/common/jquery.dataTables.min.css'
+            ),
+            'cdn' => array(
+                'no'  => '//cdn.datatables.net/1.10.7/css/jquery.dataTables.css',
+                'min' => '//cdn.datatables.net/1.10.7/css/jquery.dataTables.min.css'
+            )
     ),
     CSS_JCROP => array(
         'no'  => array(

Spacing +45 added lines, -45 removed lines

@@ -30,32 +30,32 @@ 
  */
 require_once('class.WebPage.php');
 
-define('JS_JQUERY',       0);
-define('JS_JQUERY_UI',    1);
-define('JS_BOOTSTRAP',    2);
+define('JS_JQUERY', 0);
+define('JS_JQUERY_UI', 1);
+define('JS_BOOTSTRAP', 2);
 define('JQUERY_VALIDATE', 3);
-define('JQUERY_TOUCH',    4);
-define('JS_TINYNAV',      5);
+define('JQUERY_TOUCH', 4);
+define('JS_TINYNAV', 5);
 define('JS_BOOTSTRAP_FH', 6);
 define('JS_BOOTSTRAP_SW', 7);
-define('JS_DATATABLE',    8);
-define('JS_CHART',        9);
-define('JS_METISMENU',    10);
-define('JS_BOOTBOX',         11);
+define('JS_DATATABLE', 8);
+define('JS_CHART', 9);
+define('JS_METISMENU', 10);
+define('JS_BOOTBOX', 11);
 define('JS_DATATABLE_ODATA', 12);
-define('JS_CRYPTO_MD5_JS',   13);
-define('JS_JCROP',           14);
-define('JS_TYPEAHEAD',       15);
-define('JS_FLIPSIDE',     20);
-define('JS_LOGIN',        21);
-
-define('CSS_JQUERY_UI',    0);
-define('CSS_BOOTSTRAP',    1);
+define('JS_CRYPTO_MD5_JS', 13);
+define('JS_JCROP', 14);
+define('JS_TYPEAHEAD', 15);
+define('JS_FLIPSIDE', 20);
+define('JS_LOGIN', 21);
+
+define('CSS_JQUERY_UI', 0);
+define('CSS_BOOTSTRAP', 1);
 define('CSS_BOOTSTRAP_FH', 2);
 define('CSS_BOOTSTRAP_SW', 3);
-define('CSS_DATATABLE',    4);
-define('CSS_JCROP',        5);
-define('CSS_FONTAWESOME',  6);
+define('CSS_DATATABLE', 4);
+define('CSS_JCROP', 5);
+define('CSS_FONTAWESOME', 6);
 
 global $jsArray;
 $jsArray = array(
@@ -349,7 +349,7 @@ 
      *
      * @SuppressWarnings("StaticAccess")
      */
-    function __construct($title, $header=true)
+    function __construct($title, $header = true)
     {
         parent::__construct($title);
         $this->setupVars();
@@ -447,7 +447,7 @@ 
      *
      * @deprecated 2.0.0 Please use addJSByURI() instead
      */
-    function add_js_from_src($src, $async=true)
+    function add_js_from_src($src, $async = true)
     {
         $this->addJSByURI($src, $async);
     }
@@ -458,7 +458,7 @@ 
      * @param string $uri The webpath to the JavaScript file
      * @param boolean $async Can the JavaScript be loaded asynchronously?
      */
-    public function addJSByURI($uri, $async=true)
+    public function addJSByURI($uri, $async = true)
     {
         $attributes = array('src'=>$uri, 'type'=>'text/javascript');
         if($async === true)
@@ -479,7 +479,7 @@ 
      *
      * @deprecated 2.0.0 Please use addCSSByURI() instead
      */
-    function add_css_from_src($src, $import=false)
+    function add_css_from_src($src, $import = false)
     {
         $this->addCSSByURI($src, $import);
     }
@@ -490,7 +490,7 @@ 
      * @param string $src The webpath to the Cascading Style Sheet file
      * @param boolean $async Can the CSS be loaded asynchronously?
      */
-    public function addCSSByURI($uri, $async=false)
+    public function addCSSByURI($uri, $async = false)
     {
         $attributes = array('rel'=>'stylesheet', 'href'=>$uri, 'type'=>'text/css');
         if($async === true && $this->importSupport === true)
@@ -509,12 +509,12 @@ 
      *
      * @deprecated 2.0.0 Please use addWellKnownJS() instead
      */
-    function addJS($type, $async=true)
+    function addJS($type, $async = true)
     {
         $this->addWellKnownJS($type, $async);
     }
 
-    function add_js($type, $async=true)
+    function add_js($type, $async = true)
     {
         $this->addWellKnownJS($type, $async);
     }
@@ -525,7 +525,7 @@ 
      * @param string $jsFileID the ID of the JS file
      * @param boolean $async Can the JS file be loaded asynchronously?
      */
-    public function addWellKnownJS($jsFileID, $async=true)
+    public function addWellKnownJS($jsFileID, $async = true)
     {
         global $jsArray;
         $this->setupVars();
@@ -541,7 +541,7 @@ 
      *
      * @deprecated 2.0.0 Please use addWellKnownCSS() instead
      */
-    function add_css($type, $import=false)
+    function add_css($type, $import = false)
     {
         $this->addWellKnownCSS($type, $import);
     }
@@ -552,7 +552,7 @@ 
      * @param string $cssFileID the ID of the CSS file
      * @param boolean $async Can the CSS file be loaded asynchronously?
      */
-    public function addWellKnownCSS($cssFileID, $async=true)
+    public function addWellKnownCSS($cssFileID, $async = true)
     {
         global $cssArray;
         $this->setupVars();
@@ -577,7 +577,7 @@ 
         $ret = '';
         foreach($names as $name)
         {
-            $ret.='<li>'.$this->createLink($name, $sites[$name]).'</li>';
+            $ret .= '<li>'.$this->createLink($name, $sites[$name]).'</li>';
         }
         return $ret;
     }
@@ -597,14 +597,14 @@ 
     {
         $ret = '<li class="dropdown">';
         $href = $this->getHrefForDropdown($link);
-        $ret.= '<a href="'.$href.'" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">'.$name.' <span class="caret"></span></a>';
-        $ret.='<ul class="dropdown-menu">';
+        $ret .= '<a href="'.$href.'" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">'.$name.' <span class="caret"></span></a>';
+        $ret .= '<ul class="dropdown-menu">';
         $subNames = array_keys($link);
         foreach($subNames as $subName)
         {
-            $ret.=$this->getLinkByName($subName, $link);
+            $ret .= $this->getLinkByName($subName, $link);
         }
-        $ret.='</ul></li>';
+        $ret .= '</ul></li>';
         return $ret;
     }
 
@@ -627,7 +627,7 @@ 
         $ret = '';
         foreach($names as $name)
         {
-            $ret.=$this->getLinkByName($name, $this->links);
+            $ret .= $this->getLinkByName($name, $this->links);
         }
         return $ret;
     }
@@ -639,7 +639,7 @@ 
     {
         $sites = $this->getSiteLinksForHeader();
         $links = $this->getLinksMenus();
-        $header ='<nav class="navbar navbar-default navbar-fixed-top">
+        $header = '<nav class="navbar navbar-default navbar-fixed-top">
                       <div class="container-fluid">
                           <!-- Brand and toggle get grouped for better mobile display -->
                           <div class="navbar-header">
@@ -668,7 +668,7 @@ 
                       </div>
                   </nav>';
         $this->body = $header.$this->body;
-        $this->body_tags.='style="padding-top: 60px;"';
+        $this->body_tags .= 'style="padding-top: 60px;"';
     }
 
     /** Notification that is green for success */
@@ -689,7 +689,7 @@ 
      *
      * @deprecated 2.0.0 Use the addNotification function instead 
      */
-    function add_notification($msg, $sev=self::NOTIFICATION_INFO, $dismissible=1)
+    function add_notification($msg, $sev = self::NOTIFICATION_INFO, $dismissible = 1)
     {
         $notice = array('msg'=>$msg, 'sev'=>$sev, 'dismissible'=>$dismissible);
         array_push($this->notifications, $notice);
@@ -702,7 +702,7 @@ 
      * @param string $sevity The severity of the notifcation
      * @param boolean $dismissible Can the user dismiss the notificaton?
      */
-    public function addNotification($message, $severity=self::NOTIFICATION_INFO, $dismissible=true)
+    public function addNotification($message, $severity = self::NOTIFICATION_INFO, $dismissible = true)
     {
         array_push($this->notifications, array('msg'=>$message, 'sev'=>$severity, 'dismissible'=>$dismissible)); 
     }
@@ -740,10 +740,10 @@ 
                     break;
             }
             $style = '';
-            if($i+1 < count($this->notifications))
+            if($i + 1 < count($this->notifications))
             {
                 //Not the last notification, remove the end margin
-                $style='style="margin: 0px;"';
+                $style = 'style="margin: 0px;"';
             }
             $this->body = '
                 <div class="'.$class.'" role="alert" '.$style.'>
@@ -793,7 +793,7 @@ 
      * @param boolean $header Draw the header
      * @param boolean $analytics Include analytics on the page
      */
-    public function printPage($header=true)
+    public function printPage($header = true)
     {
         $this->renderNotifications();
         $this->addNoScript();
@@ -814,7 +814,7 @@ 
      *
      * @deprecated 1.0.0 Use addLink instead
      */
-    function add_link($name, $url=false, $submenu=false)
+    function add_link($name, $url = false, $submenu = false)
     {
         $this->addLink($name, $url, $submenu);
     }
@@ -826,7 +826,7 @@ 
      * @param false|string $url The URL to link to
      * @param false|array $subment Any submenu items for the dropdown
      */
-    public function addLink($name, $url=false, $submenu=false)
+    public function addLink($name, $url = false, $submenu = false)
     {
         if(is_array($submenu))
         {

class.FlipSession.php

Indentation +1 added lines, -1 removed lines

@@ -204,7 +204,7 @@
 
     static function deleteSessionById($sid)
     {
-       return unlink(ini_get('session.save_path').'/sess_'.$sid); 
+        return unlink(ini_get('session.save_path').'/sess_'.$sid); 
     }
 }
 /* vim: set tabstop=4 shiftwidth=4 expandtab: */

Spacing +2 added lines, -2 removed lines

@@ -157,7 +157,7 @@ 
             $len = $pos - $offset;
             $name = substr($sessionData, $offset, $len);
             if($name === false) break;
-            $offset += $len+1;
+            $offset += $len + 1;
             $data = @unserialize(substr($sessionData, $offset));
             $res[$name] = $data;
             $offset += strlen(serialize($data));
@@ -185,7 +185,7 @@ 
             else
             {
                 $tmp = FlipSession::unserializePhpSession($sessionData);
-                $tmp['sid' ] = $sessionId;
+                $tmp['sid'] = $sessionId;
                 array_push($res, $tmp);
             }
         }

class.WebPage.php

Indentation +9 added lines, -9 removed lines

@@ -247,15 +247,15 @@
      */
     protected function printIeCompatability($prefix='')
     {
-       //IE 8 doesn't support HTML 5. Install the shim...
-       if($this->getBrowserMajorVer() < 9)
-       {
-           echo $prefix.'<script src="js/html5.js"></script>';
-           echo "\n";
-       }
-       //Tell the browser not to use compatability mode...
-       echo $prefix.'<meta http-equiv="X-UA-Compatible" content="IE=edge"/>';
-       echo "\n";
+        //IE 8 doesn't support HTML 5. Install the shim...
+        if($this->getBrowserMajorVer() < 9)
+        {
+            echo $prefix.'<script src="js/html5.js"></script>';
+            echo "\n";
+        }
+        //Tell the browser not to use compatability mode...
+        echo $prefix.'<meta http-equiv="X-UA-Compatible" content="IE=edge"/>';
+        echo "\n";
     }
 
     /**

Spacing +10 added lines, -10 removed lines

@@ -60,7 +60,7 @@ 
         $browserName = $this->getBrowserName();
         if($browserName === 'IE' && $this->getBrowserMajorVer() <= 7)
         {
-            header( 'Location: /badbrowser.php' ) ;
+            header('Location: /badbrowser.php');
         }
         else if($browserName === 'Chrome' && $this->getBrowserMajorVer() >= 36)
         {
@@ -89,7 +89,7 @@ 
      */
     private function getBrowser()
     {
-        static $browser;//No accident can arise from depending on an unset variable.
+        static $browser; //No accident can arise from depending on an unset variable.
         if(!isset($browser))
         {
             $browser = $this->browscap->getBrowser();
@@ -190,16 +190,16 @@ 
      *
      * @return string The tag as a string
      */
-    protected function createOpenTag($tagName, $attribs=array(), $selfClose=false)
+    protected function createOpenTag($tagName, $attribs = array(), $selfClose = false)
     {
         $tag = '<'.$tagName;
         $attribNames = array_keys($attribs);
         foreach($attribNames as $attribName)
         {
-            $tag.=' '.$attribName;
+            $tag .= ' '.$attribName;
             if($attribs[$attribName])
             {
-                $tag.='="'.$attribs[$attribName].'"';
+                $tag .= '="'.$attribs[$attribName].'"';
             }
         }
         if($selfClose)
@@ -229,7 +229,7 @@ 
      *
      * @return string The link
      */
-    public function createLink($linkName, $linkTarget='#')
+    public function createLink($linkName, $linkTarget = '#')
     {
         $startTag = $this->createOpenTag('a', array('href'=>$linkTarget));
         $endTag = $this->createCloseTag('a');
@@ -245,7 +245,7 @@ 
      *
      * @param string $prefix The prefix to append to each line
      */
-    protected function printIeCompatability($prefix='')
+    protected function printIeCompatability($prefix = '')
     {
        //IE 8 doesn't support HTML 5. Install the shim...
        if($this->getBrowserMajorVer() < 9)
@@ -263,7 +263,7 @@ 
      *
      * @param string $prefix The prefix to append to each line
      */
-    protected function printHead($prefix='')
+    protected function printHead($prefix = '')
     {
         echo $prefix.'<HEAD>';
         if($this->getBrowserName() === 'IE')
@@ -284,7 +284,7 @@ 
      *
      * @param string $prefix The prefix to append to each line
      */
-    protected function printBody($prefix='')
+    protected function printBody($prefix = '')
     {
         echo $prefix.'<BODY '.$this->body_tags.'>';
         echo $prefix.$prefix.$this->body."\n";
@@ -321,7 +321,7 @@ 
         {
             $requestURI = substr($requestURI, 1);
         }
-        return 'http'.(isset($_SERVER['HTTPS'])?'s':'').'://'.$_SERVER['HTTP_HOST'].'/'.$requestURI;
+        return 'http'.(isset($_SERVER['HTTPS']) ? 's' : '').'://'.$_SERVER['HTTP_HOST'].'/'.$requestURI;
     }
 }
 /* vim: set tabstop=4 shiftwidth=4 expandtab: */