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;

Braces +4 added lines, -1 removed lines

@@ -179,7 +179,10 @@
         $count = count($groups);
         for($i = 0; $i < $count; $i++)
         {
-            if($groups[$i] === false || $groups[$i] === null) continue;
+            if($groups[$i] === false || $groups[$i] === null)
+            {
+                continue;
+            }
             array_push($data, new LDAPGroup($groups[$i]));
         }
         $users = $this->server->read($this->server->user_base, $userFilter, false, $select);

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();

Braces +4 added lines, -1 removed lines

@@ -44,7 +44,10 @@
             {
                 $dn = explode(',', $array[$i]);
                 $res = $this->isInGroupNamed(substr($dn[0], 3));
-                if($res) return $res;
+                if($res)
+                {
+                    return $res;
+                }
             }
         }
         return $res;

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()

Braces +21 added lines, -7 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 namespace Auth;
 
-if(!function_exists('password_hash') || !function_exists('password_verify')) 
+if(!function_exists('password_hash') || !function_exists('password_verify'))
 {
     define('PASSWORD_BCRYPT', 1);
     define('PASSWORD_DEFAULT', PASSWORD_BCRYPT);
@@ -149,7 +149,10 @@ 
 
     public function login($username, $password)
     {
-        if($this->current === false) return false;
+        if($this->current === false)
+        {
+            return false;
+        }
         $userDataTable = $this->getDataTable('user');
         $filter = new \Data\Filter("uid eq '$username'");
         $users = $userDataTable->read($filter);
@@ -239,9 +242,15 @@ 
 
     public function getPendingUserCount()
     {
-        if($this->pending === false) return 0;
+        if($this->pending === false)
+        {
+            return 0;
+        }
         $dataTable = $this->getPendingUserDataTable();
-        if($dataTable === null) return 0;
+        if($dataTable === null)
+        {
+            return 0;
+        }
         return $dataTable->count();
     }
 
@@ -277,9 +286,11 @@ 
     }
 
     public function getPendingUsersByFilter($filter, $select=false, $top=false, $skip=false, $orderby=false)
-
     {
-        if($this->pending === false) return false;
+        if($this->pending === false)
+        {
+            return false;
+        }
         if($filter !== false && !$filter->contains('hash'))
         {
             return $this->searchPendingUsers($filter, $select, $top, $skip, $orderby);
@@ -300,7 +311,10 @@ 
 
     public function createPendingUser($user)
     {
-        if($this->pending === false) return false;
+        if($this->pending === false)
+        {
+            return false;
+        }
         $userDataTable = $this->getPendingUserDataTable();
         if(isset($user->password2))
         {

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;

         }

Braces +35 added lines, -30 removed lines

@@ -2,20 +2,20 @@ 
 namespace Auth;

 require_once('/var/www/common/libs/google/src/Google/autoload.php');

 

-class GoogleAuthenticator extends Authenticator

-{

+class GoogleAuthenticator extends Authenticator
+{
     protected $client;

     protected $token = null;

 

-    public function __construct($params)

-    {

+    public function __construct($params)
+    {
         parent::__construct($params);

-        if(!isset($params['client_secrets_path']))

-        {

+        if(!isset($params['client_secrets_path']))
+        {
             throw new \Exception('Missing required parameter client_secrets_path!');

         }

-        if(!isset($params['redirect_url']))

-        {

+        if(!isset($params['redirect_url']))
+        {
             $params['redirect_url'] = 'https://'.$_SERVER['HTTP_HOST'].'/oauth2callback.php?src=google';

         }

         $this->token = \FlipSession::getVar('GoogleToken', null);

@@ -25,60 +25,64 @@ 
         $this->client->setRedirectUri($params['redirect_url']);

     }

 

-    public function getSupplementLink()

-    {

+    public function getSupplementLink()
+    {
         $authUrl = $this->client->createAuthUrl();

         return '<a href="'.filter_var($authUrl, FILTER_SANITIZE_URL).'"><img src="/img/common/google_sign_in.png" style="width: 2em;"/></a>';

     }

 

-    public function authenticate($code, &$currentUser = false)

-    {

+    public function authenticate($code, &$currentUser = false)
+    {
         $googleUser = false;

-        try{

+        try
+        {
             $this->client->authenticate($code);

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

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

             $oauth2Service = new \Google_Service_Oauth2($this->client);

             $googleUser = $oauth2Service->userinfo->get();

-        } catch(\Exception $ex) {

+        }
+        catch(\Exception $ex)
+        {
             return self::LOGIN_FAILED;

         }

 

         $auth = \AuthProvider::getInstance();

         $localUsers = $auth->getUsersByFilter(new \Data\Filter('mail eq '.$googleUser->email));

-        if($localUsers !== false && isset($localUsers[0]))

-        {

-            if($localUsers[0]->canLoginWith('google.com'))

-            {

+        if($localUsers !== false && isset($localUsers[0]))
+        {
+            if($localUsers[0]->canLoginWith('google.com'))
+            {
                 $auth->impersonateUser($localUsers[0]);

                 return self::SUCCESS;

             }

             $currentUser = $localUsers[0];

             return self::ALREADY_PRESENT;

-        }

-        else

-        {

+        }
+        else
+        {
             $user = new PendingUser();

             $user->setEmail($googleUser->email);

             $user->setGivenName($googleUser->givenName);

             $user->setLastName($googleUser->familyName);

             $user->addLoginProvider('google.com');

             $ret = $auth->activatePendingUser($user);

-            if($ret === false)

-            {

+            if($ret === false)
+            {
                  throw new \Exception('Unable to create user! '.$res);

             }

             return self::SUCCESS;

         }

     }

 

-    public function getUser($data = false)

-    {

-        if($data === false)

-        {

+    public function getUser($data = false)
+    {
+        if($data === false)
+        {
             $data = $this->token;

         }

-        try {

+        try
+        {
             $this->client->setAccessToken($data);

             $oauth2Service = new \Google_Service_Oauth2($this->client);

             $googleUser = $oauth2Service->userinfo->get();

@@ -89,8 +93,9 @@ 
             $profileUser['displayName'] = $googleUser->name;

             $profileUser['jpegPhoto'] = base64_encode(file_get_contents($googleUser->picture));

             return $profileUser;

-        } catch(\Exception $e)

-        {

+        }
+        catch(\Exception $e)
+        {
             return false;

         }

     }

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;
     }

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)

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(

Braces +4 added lines, -1 removed lines

@@ -423,7 +423,10 @@
      */
     private function setupVars()
     {
-        if($this->minified !== null && $this->cdn !== null) return;
+        if($this->minified !== null && $this->cdn !== null)
+        {
+            return;
+        }
         $this->minified = 'min';
         $this->cdn      = 'cdn';
         if(isset(FlipsideSettings::$global))

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: */

Braces +7 added lines, -2 removed lines

@@ -1,6 +1,8 @@ 
 <?php
 require_once('Autoload.php');
-if(!isset($_SESSION) && php_sapi_name() !== 'cli') { session_start(); }
+if(!isset($_SESSION) && php_sapi_name() !== 'cli')
+{
+session_start(); }
 if(!isset($_SESSION['ip_address']) && isset($_SERVER['REMOTE_ADDR']))
 {
     $_SESSION['ip_address'] = $_SERVER['REMOTE_ADDR'];
@@ -156,7 +158,10 @@ 
             $pos = strpos($sessionData, "|", $offset);
             $len = $pos - $offset;
             $name = substr($sessionData, $offset, $len);
-            if($name === false) break;
+            if($name === false)
+            {
+                break;
+            }
             $offset += $len+1;
             $data = @unserialize(substr($sessionData, $offset));
             $res[$name] = $data;

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";
     }
 
     /**