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

Braces +10 added lines, -10 removed lines

@@ -17,8 +17,7 @@ 
 if(isset($GLOBALS['FLIPSIDE_SETTINGS_LOC']))
 {
     require_once($GLOBALS['FLIPSIDE_SETTINGS_LOC'].'/class.FlipsideSettings.php');
-}
-else
+} else
 {
     require_once('/var/www/secure_settings/class.FlipsideSettings.php');
 }
@@ -41,10 +40,14 @@ 
             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;
             }
         }
@@ -165,8 +168,7 @@ 
         if($bind_write === false)
         {
             $ret = $server->bind();
-        }
-        else
+        } else
         {
             $ret = $server->bind($this->bind_dn, $this->bind_pass);
         }
@@ -299,12 +301,10 @@ 
         if($skip !== false && $top !== false)
         {
             $data = array_slice($data, $skip, $top);
-        }
-        else if($top !== false)
+        } else if($top !== false)
         {
             $data = array_slice($data, 0, $top);
-        }
-        else if($skip !== false)
+        } else if($skip !== false)
         {
             $data = array_slice($data, $skip);
         }

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 +6 added lines, -7 removed lines

@@ -8,12 +8,13 @@ 
         try
         {
             return $this->server->update($obj);
-        }
-        catch(\Exception $ex)
+        } catch(\Exception $ex)
         {
             $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);
         }
@@ -116,8 +117,7 @@ 
         if($fieldValue !== null && strlen($fieldValue) > 0)
         {
             $obj[$fieldName] = $fieldValue;
-        }
-        else
+        } else
         {
             $obj[$fieldName] = null;
         }
@@ -134,8 +134,7 @@ 
             $obj[$fieldName] = $this->ldapObj->{$fieldName};
             $obj[$fieldName][$obj[$fieldName]['count']] = $fieldValue;
             $obj[$fieldName]['count']++;
-        }
-        else
+        } else
         {
             $obj[$fieldName] = $fieldValue;
         }

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

Braces +1 added lines, -2 removed lines

@@ -34,8 +34,7 @@
             $args['RawMessage'] = array();
             $args['RawMessage']['Data'] = base64_encode($email->getRawMessage());
             return $this->ses->sendRawEmail($args);
-        }
-        else
+        } else
         {
             $args = array();
             $args['Source'] = $email->getFromAddress();

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

Braces +15 added lines, -5 removed lines

@@ -149,7 +149,9 @@ 
 
     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, 'uid,pass');
@@ -235,9 +237,13 @@ 
 
     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();
     }
 
@@ -275,7 +281,9 @@ 
     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);
@@ -296,7 +304,9 @@ 
 
     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)

Braces +1 added lines, -2 removed lines

@@ -34,8 +34,7 @@
             $args['RawMessage'] = array();
             $args['RawMessage']['Data'] = base64_encode($email->getRawMessage());
             return $this->ses->sendRawEmail($args);
-        }
-        else
+        } else
         {
             $args = array();
             $args['Source'] = $email->getFromAddress();

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

Braces +19 added lines, -8 removed lines

@@ -21,8 +21,7 @@ 
 if(isset($GLOBALS['FLIPSIDE_SETTINGS_LOC']))
 {
     require_once($GLOBALS['FLIPSIDE_SETTINGS_LOC'].'/class.FlipsideSettings.php');
-}
-else
+} else
 {
     require_once('/var/www/secure_settings/class.FlipsideSettings.php');
 }
@@ -381,7 +380,9 @@ 
         $count = count($this->methods);
         for($i = 0; $i < $count; $i++)
         {
-            if($this->methods[$i]->supplement === false) continue;
+            if($this->methods[$i]->supplement === false) {
+                continue;
+            }
 
             array_push($ret, $this->methods[$i]->getSupplementLink());
         }
@@ -420,7 +421,9 @@ 
             $count = count($this->methods);
             for($i = 0; $i < $count; $i++)
             {
-                if($this->methods[$i]->pending === false) continue;
+                if($this->methods[$i]->pending === false) {
+                    continue;
+                }
 
                 $ret = $this->methods[$i]->getTempUserByHash($hash);
                 if($ret !== false)
@@ -449,7 +452,9 @@ 
             $count = count($this->methods);
             for($i = 0; $i < $count; $i++)
             {
-                if($this->methods[$i]->pending === false) continue;
+                if($this->methods[$i]->pending === false) {
+                    continue;
+                }
 
                 $ret = $this->methods[$i]->createPendingUser($user);
                 if($ret !== false)
@@ -481,7 +486,9 @@ 
             $count = count($this->methods);
             for($i = 0; $i < $count; $i++)
             {
-                if($this->methods[$i]->current === false) continue;
+                if($this->methods[$i]->current === false) {
+                    continue;
+                }
 
                 $ret = $this->methods[$i]->activatePendingUser($user);
                 if($ret !== false)
@@ -511,7 +518,9 @@ 
             $count = count($this->methods);
             for($i = 0; $i < $count; $i++)
             {
-                if($this->methods[$i]->current === false) continue;
+                if($this->methods[$i]->current === false) {
+                    continue;
+                }
 
                 $ret = $this->methods[$i]->getUserByResetHash($hash);
                 if($ret !== false)
@@ -541,7 +550,9 @@ 
         $count = count($this->methods);
         for($i = 0; $i < $count; $i++)
         {
-            if($this->methods[$i]->supplement === false) continue;
+            if($this->methods[$i]->supplement === false) {
+                continue;
+            }
 
             if($this->methods[$i]->getHostName() === $host)
             {

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)

Braces +2 added lines, -4 removed lines

@@ -34,8 +34,7 @@ 
         if($this->user === false || $this->user === null)
         {
             $this->add_link('<i class="fa fa-sign-in"></i> Login', $this->loginUrl);
-        }
-        else
+        } else
         {
             $this->add_links();
             $this->add_link('<i class="fa fa-sign-out"></i> Logout', $this->logoutUrl);
@@ -166,8 +165,7 @@ 
                 <h1 class="page-header">You must <a href="'.$this->loginUrl.'?return='.$this->current_url().'">log in <span class="glyphicon glyphicon-log-in"></span></a> to access the '.$this->title.' Admin system!</h1>
             </div>
         </div>';
-        }
-        else if($this->is_admin === false)
+        } else if($this->is_admin === false)
         {
             $this->body = '
         <div class="row">

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

Braces +6 added lines, -7 removed lines

@@ -19,8 +19,7 @@ 
 if(isset($GLOBALS['FLIPSIDE_SETTINGS_LOC']))
 {
     require_once($GLOBALS['FLIPSIDE_SETTINGS_LOC'].'/class.FlipsideSettings.php');
-}
-else
+} else
 {
     require_once('/var/www/secure_settings/class.FlipsideSettings.php');
 }
@@ -404,8 +403,7 @@ 
             {
                 $this->addLink('Login', $this->loginUrl);
             }
-        }
-        else
+        } else
         {
             $this->add_links();
             $this->addLink('Logout', $this->logoutUrl);
@@ -423,7 +421,9 @@ 
      */
     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))
@@ -834,8 +834,7 @@ 
         {
             $submenu['_'] = $url;
             $this->links[$name] = $submenu;
-        }
-        else
+        } else
         {
             $this->links[$name] = $url;
         }