BurningFlipside / CommonCode

Auth/class.Authenticator.php

Doc Comments +14 added lines, -14 removed lines

@@ -24,7 +24,7 @@ 
      * @param string $username The username
      * @param string $password The password
      *
-     * @return mixed False if unsuccessfuly login, opaque data otherwise
+     * @return boolean False if unsuccessfuly login, opaque data otherwise
      *
      * @SuppressWarnings("UnusedFormalParameter")
      */
@@ -36,7 +36,7 @@ 
     /**
      * Does the data indicate a logged in user?
      *
-     * @param mixed $data The data returned from login
+     * @param \stdClass $data The data returned from login
      *
      * @return boolean True if successfully logged in, false otherwise
      *
@@ -50,7 +50,7 @@ 
     /**
      * Get the user data for the specified data
      *
-     * @param mixed $data The data returned from login
+     * @param \stdClass $data The data returned from login
      *
      * @return Auth\User The user object if successfully logged in or null otherwise
      *
@@ -93,12 +93,12 @@ 
      * Get the groups that match the filters
      *
      * @param mixed $filter The filter to use to find a set of groups
-     * @param mixed $select The list of fields to select
+     * @param boolean $select The list of fields to select
      * @param mixed $top The number of groups to select
      * @param mixed $skip The number of groups to skip
      * @param mixed $orderby The fields to sort by
      *
-     * @return array All groups that fit the filters
+     * @return boolean All groups that fit the filters
      *
      * @SuppressWarnings("UnusedFormalParameter")
      */
@@ -111,12 +111,12 @@ 
      * Get the users that match the filters
      *
      * @param mixed $filter The filter to use to find a set of users
-     * @param mixed $select The list of fields to select
+     * @param boolean $select The list of fields to select
      * @param mixed $top The number of users to select
      * @param mixed $skip The number of users to skip
      * @param mixed $orderby The fields to sort by
      *
-     * @return array All users that fit the filters
+     * @return boolean All users that fit the filters
      *
      * @SuppressWarnings("UnusedFormalParameter")
      */
@@ -129,12 +129,12 @@ 
      * Get the pending users that match the filters
      *
      * @param mixed $filter The filter to use to find a set of users
-     * @param mixed $select The list of fields to select
+     * @param boolean $select The list of fields to select
      * @param mixed $top The number of users to select
      * @param mixed $skip The number of users to skip
      * @param mixed $orderby The fields to sort by
      *
-     * @return array All users that fit the filters
+     * @return boolean All users that fit the filters
      *
      * @SuppressWarnings("UnusedFormalParameter")
      */
@@ -191,7 +191,7 @@ 
     /**
      * Get the link to login using this method
      *
-     * @return string The link to login using this method
+     * @return boolean The link to login using this method
      */
     public function getSupplementLink()
     {
@@ -215,7 +215,7 @@ 
     /**
      * Convert a pending user to an active user
      *
-     * @param Auth\PendingUser $user The user to activate
+     * @param PendingUser $user The user to activate
      *
      * @return boolean True if activated, false otherwise
      *
@@ -231,7 +231,7 @@ 
      *
      * @param string $hash The hash to search by
      *
-     * @return Auth\User The user whoes hash was specified
+     * @return boolean The user whoes hash was specified
      *
      * @SuppressWarnings("UnusedFormalParameter")
      */
@@ -245,7 +245,7 @@ 
      *
      * @param string $hash The hash to search by
      *
-     * @return Auth\PendingUser The user whoes hash was specified
+     * @return boolean The user whoes hash was specified
      *
      * @SuppressWarnings("UnusedFormalParameter")
      */
@@ -257,7 +257,7 @@ 
     /**
      * Get the host name this authenticator uses
      *
-     * @return string The host name this authenticator uses
+     * @return boolean The host name this authenticator uses
      */
     public function getHostName()
     {

Auth/class.LDAPAuthenticator.php

Doc Comments +9 added lines

@@ -279,6 +279,12 @@ 
         return $server->count($this->user_base);
     }
 
+    /**
+     * @param boolean $select
+     * @param boolean $top
+     * @param boolean $skip
+     * @param boolean $orderby
+     */
     private function processFilteringParams(&$data, &$select, $top, $skip, $orderby)
     {
         if($orderby !== false)
@@ -303,6 +309,9 @@ 
         }
     }
 
+    /**
+     * @param \Data\Filter $filter
+     */
     public function getUsersByFilter($filter, $select=false, $top=false, $skip=false, $orderby=false)
     {
         $server = $this->get_and_bind_server();

Spacing +5 added lines, -5 removed lines

@@ -92,7 +92,7 @@ 
         $this->host       = $this->getHostParam($params);
         $this->user_base  = $this->getParam($params, 'user_base');
         $this->group_base = $this->getParam($params, 'group_base');
-        $this->bind_dn    = $this->getParam($params, 'bind_dn',   '$ldap_auth', 'read_write_pass');
+        $this->bind_dn    = $this->getParam($params, 'bind_dn', '$ldap_auth', 'read_write_pass');
         $this->bind_pass  = $this->getParam($params, 'bind_pass', '$ldap_auth', 'read_write_user');
     }
 
@@ -130,7 +130,7 @@ 
      *
      * @SuppressWarnings("StaticAccess")
      */
-    private function getParam($params, $paramName, $settingsLocation='$ldap', $settingsName=false)
+    private function getParam($params, $paramName, $settingsLocation = '$ldap', $settingsName = false)
     {
         if($settingsName === false)
         {
@@ -156,7 +156,7 @@ 
      *
      * @SuppressWarnings("StaticAccess")
      */
-    public function get_and_bind_server($bind_write=false)
+    public function get_and_bind_server($bind_write = false)
     {
         $server = \LDAP\LDAPServer::getInstance();
         $server->user_base = $this->user_base;
@@ -246,7 +246,7 @@ 
         return LDAPGroup::from_name($name, $server);
     }
 
-    public function getGroupsByFilter($filter, $select=false, $top=false, $skip=false, $orderby=false)
+    public function getGroupsByFilter($filter, $select = false, $top = false, $skip = false, $orderby = false)
     {
         $server = $this->get_and_bind_server();
         if($server === false)
@@ -310,7 +310,7 @@ 
         }
     }
 
-    public function getUsersByFilter($filter, $select=false, $top=false, $skip=false, $orderby=false)
+    public function getUsersByFilter($filter, $select = false, $top = false, $skip = false, $orderby = false)
     {
         $server = $this->get_and_bind_server();
         if($server === false)

Braces +8 added lines, -2 removed lines

@@ -41,10 +41,16 @@
             switch($orderby[$keys[0]])
             {
                 case 1:
-                    if($d > 0) swap($array, $i, $j);
+                    if($d > 0)
+                    {
+                        swap($array, $i, $j);
+                    }
                     break;
                 case 0:
-                    if($d < 0) swap($array, $i, $j);
+                    if($d < 0)
+                    {
+                        swap($array, $i, $j);
+                    }
                     break;
             }
         }

Auth/class.LDAPCachableObject.php

Doc Comments +12 added lines

@@ -18,6 +18,9 @@ 
         }
     }
 
+    /**
+     * @param string $fieldName
+     */
     protected function getField($fieldName)
     {
         if(!is_object($this->ldapObj))
@@ -27,6 +30,9 @@ 
         return $this->getFieldServer($fieldName);
     }
 
+    /**
+     * @param string $fieldName
+     */
     protected function getFieldSingleValue($fieldName)
     {
         if(!is_object($this->ldapObj))
@@ -36,6 +42,9 @@ 
         return $this->getFieldServerSingleValue($fieldName);
     }
 
+    /**
+     * @param string $fieldName
+     */
     protected function setField($fieldName, $fieldValue)
     {
         if(!is_object($this->ldapObj))
@@ -45,6 +54,9 @@ 
         return $this->setFieldServer($fieldName, $fieldValue);
     }
 
+    /**
+     * @param string $fieldName
+     */
     protected function appendField($fieldName, $fieldValue)
     {
         if(!is_object($this->ldapObj))

Braces +5 added lines, -2 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 namespace Auth;
 
-trait LDAPCachableObject 
+trait LDAPCachableObject
 {
     protected function update($obj)
     {
@@ -13,7 +13,10 @@ 
         {
             $auth = \AuthProvider::getInstance();
             $ldap = $auth->getAuthenticator('Auth\LDAPAuthenticator');
-            if($ldap === false) return false;
+            if($ldap === false)
+            {
+                return false;
+            }
             $this->server = $ldap->get_and_bind_server(true);
             return $this->server->update($obj);
         }

Auth/class.PendingUser.php

Doc Comments +5 added lines, -6 removed lines

@@ -35,7 +35,7 @@ 
      *
      * @param string $name The name of the group to check if the user is in
      *
-     * @return true|false True if the user is in the group, false otherwise
+     * @return boolean True if the user is in the group, false otherwise
      */
     public function isInGroupNamed($name)
     {
@@ -90,7 +90,7 @@ 
      * We need the ability to obtain the user's unhashed plain text password to allow for it to be sent 
      * to the correct backend which will hash it
      *
-     * @return string The current password
+     * @return boolean The current password
      */
     public function getPassword()
     {
@@ -135,7 +135,7 @@ 
      *
      * @param string $email The user's new email address
      *
-     * @return true|false true if the user's email address was changed, false otherwise
+     * @return boolean true if the user's email address was changed, false otherwise
      */
     public function setEmail($email)
     {
@@ -146,9 +146,8 @@ 
     /**
      * Set the user's given (first) name
      *
-     * @param string $name The user's new given name
      *
-     * @return true|false true if the user's given name was changed, false otherwise
+     * @return boolean true if the user's given name was changed, false otherwise
      */
     public function setGivenName($givenName)
     {
@@ -161,7 +160,7 @@ 
      *
      * @param string $sn The user's new last name
      *
-     * @return true|false true if the user's last name was changed, false otherwise
+     * @return boolean true if the user's last name was changed, false otherwise
      */
     public function setLastName($sn)
     {

Auth/class.SQLAuthenticator.php

Doc Comments +20 added lines

@@ -138,6 +138,9 @@ 
          return $dataTable;
     }
 
+    /**
+     * @return boolean
+     */
     private function getPendingUserDataTable()
     {
         if(isset($this->params['pending_user_table']))
@@ -208,6 +211,14 @@ 
         return $dataTable->read($filter, $select, $top, $skip, $orderby);
     }
 
+    /**
+     * @param string $dataTableName
+     * @param string $className
+     * @param boolean $select
+     * @param boolean $top
+     * @param boolean $skip
+     * @param boolean $orderby
+     */
     private function convertDataToClass($dataTableName, $className, $filter, $select, $top, $skip, $orderby)
     {
         $data = $this->getDataByFilter($dataTableName, $filter, $select, $top, $skip, $orderby);
@@ -241,6 +252,12 @@ 
         return $dataTable->count();
     }
 
+    /**
+     * @param boolean $select
+     * @param boolean $top
+     * @param boolean $skip
+     * @param boolean $orderby
+     */
     private function searchPendingUsers($filter, $select, $top, $skip, $orderby)
     {
         $userDataTable = $this->getPendingUserDataTable();
@@ -272,6 +289,9 @@ 
         return $ret;
     }
 
+    /**
+     * @param \Data\Filter $filter
+     */
     public function getPendingUsersByFilter($filter, $select=false, $top=false, $skip=false, $orderby=false)
 
     {

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;

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/OAuth2/class.OAuth2Authenticator.php

Doc Comments +1 added lines, -1 removed lines

@@ -109,7 +109,7 @@
      * @param $params The set of parameters obtained from the authentication call
      * @param $current_user The user from the current system if the user is not authorized to login via this method
      *
-     * @return SUCCESS|LOGIN_FAILED|ALREADY_PRESENT SUCCESS if the user is now logged in. ALREADY_PRESENT if the authorization was
+     * @return integer SUCCESS if the user is now logged in. ALREADY_PRESENT if the authorization was
      *                                              successful, but the user has not authorized that login method. LOGIN_FAILED for all other errors
      */
     public function authenticate($params, &$current_user)

Spacing +1 added lines, -1 removed lines

@@ -16,7 +16,7 @@
 /** Only load the HTTPFul bootstrap if it isn't already loaded*/
 if(!class_exists('Httpful\Request'))
 {
-    require dirname(__FILE__) . '/../../libs/httpful/bootstrap.php';
+    require dirname(__FILE__).'/../../libs/httpful/bootstrap.php';
 }
 
 /**

class.AuthProvider.php

Doc Comments +6 added lines, -6 removed lines

@@ -53,7 +53,7 @@ 
      *
      * @param string $methodName The class name of the Authenticator to get the instance for
      *
-     * @return Auth\Authenticator|false The specified Authenticator class instance or false if it is not loaded
+     * @return string The specified Authenticator class instance or false if it is not loaded
      */
     public function getAuthenticator($methodName)
     {
@@ -269,11 +269,11 @@ 
      * Get an array of Auth\PendingUser from a filtered set
      *
      * @param Data\Filter|false $filter The filter conditions or false to retreive all
-     * @param array|false $methodName The user fields to obtain or false to obtain all
-     * @param integer|false $top The number of users to obtain or false to obtain all
-     * @param integer|false $skip The number of users to skip or false to skip none
-     * @param array|false $orderby The field to sort by and the method to sort or false to not sort
-     * @param string|false $methodName The AuthMethod if information is desired only from a particular Auth\Authenticator
+     * @param boolean $methodName The user fields to obtain or false to obtain all
+     * @param boolean $top The number of users to obtain or false to obtain all
+     * @param boolean $skip The number of users to skip or false to skip none
+     * @param boolean $orderby The field to sort by and the method to sort or false to not sort
+     * @param boolean $methodName The AuthMethod if information is desired only from a particular Auth\Authenticator
      *
      * @return array|false An array of Auth\PendingUser objects or false if no pending users were found
      */

class.FlipAdminPage.php

Doc Comments +3 added lines

@@ -20,6 +20,9 @@
         $this->addWellKnownJS(JS_METISMENU, false);
     }
 
+    /**
+     * @param string $adminGroup
+     */
     protected function userIsAdmin($adminGroup)
     {
         if($this->user === false || $this->user === null)

class.FlipPage.php

Doc Comments +10 added lines, -6 removed lines

@@ -487,7 +487,6 @@ 
     /**
      * Add a Cascading Style Sheet file from its src URI
      *
-     * @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)
@@ -514,6 +513,9 @@ 
         $this->addWellKnownJS($type, $async);
     }
 
+    /**
+     * @param integer $type
+     */
     function add_js($type, $async=true)
     {
         $this->addWellKnownJS($type, $async);
@@ -582,6 +584,9 @@ 
         return $ret;
     }
 
+    /**
+     * @return string
+     */
     protected function getHrefForDropdown(&$link)
     {
         if(isset($link['_']))
@@ -685,7 +690,7 @@ 
      *
      * @param string $msg The message to show in the notifcation
      * @param string $sev The severity of the notifcation
-     * @param boolean $dismissible Can the user dismiss the notificaton?
+     * @param integer $dismissible Can the user dismiss the notificaton?
      *
      * @deprecated 2.0.0 Use the addNotification function instead 
      */
@@ -699,7 +704,7 @@ 
      * Add a notification to the page
      *
      * @param string $message The message to show in the notifcation
-     * @param string $sevity The severity of the notifcation
+     * @param string $severity The severity of the notifcation
      * @param boolean $dismissible Can the user dismiss the notificaton?
      *
      * @deprecated 2.0.0 Use the addNotification function instead
@@ -793,7 +798,6 @@ 
      * Draw the page
      *
      * @param boolean $header Draw the header
-     * @param boolean $analytics Include analytics on the page
      */
     public function printPage($header=true)
     {
@@ -812,7 +816,7 @@ 
      *
      * @param string $name The name of the link
      * @param false|string $url The URL to link to
-     * @param false|array $subment Any submenu items for the dropdown
+     * @param false|array $submenu Any submenu items for the dropdown
      *
      * @deprecated 1.0.0 Use addLink instead
      */
@@ -826,7 +830,7 @@ 
      *
      * @param string $name The name of the link
      * @param false|string $url The URL to link to
-     * @param false|array $subment Any submenu items for the dropdown
+     * @param false|array $submenu Any submenu items for the dropdown
      */
     public function addLink($name, $url=false, $submenu=false)
     {

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

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