BurningFlipside / CommonCode

Auth/class.NullAuthenticator.php

Braces +10 added lines, -10 removed lines

@@ -1,24 +1,24 @@
 <?php

 namespace Auth;

 

-class NullAuthenticator extends Authenticator

-{

-    public function login($username, $password)

-    {

+class NullAuthenticator extends Authenticator
+{
+    public function login($username, $password)
+    {
         return array('res'=>true, 'extended'=>null);

     }

 

-    public function isLoggedIn($data)

-    {

-        if(isset($data['res']))

-        {

+    public function isLoggedIn($data)
+    {
+        if(isset($data['res']))
+        {
             return $data['res'];

         }

         return false;

     }

 

-    public function getUser($data)

-    {

+    public function getUser($data)
+    {
         return null;

     }

 }

LDAP/class.LDAPObject.php

Braces +8 added lines, -2 removed lines

@@ -16,8 +16,14 @@
          $ret = array();
          foreach ($this as $key => $value)
          {
-            if($key === 'server' || $key === 'count') continue;
-            if(is_numeric($key)) continue;
+            if($key === 'server' || $key === 'count')
+            {
+                continue;
+            }
+            if(is_numeric($key))
+            {
+                continue;
+            }
             if($key === 'jpegphoto')
             {
                 $ret[$key] = base64_encode($value[0]);

class.FlipSession.php

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;

Auth/class.Group.php

Braces +4 added lines, -1 removed lines

@@ -90,7 +90,10 @@
                 {
                     $isLast = true;
                 }
-                if(!isset($group->member[$i]->type)) continue;
+                if(!isset($group->member[$i]->type))
+                {
+                    continue;
+                }
                 if($group->member[$i]->type === 'Group')
                 {
                     $this->addMember($group->member[$i]->cn, true, $isLast);

Doc Comments +1 added lines, -1 removed lines

@@ -44,7 +44,7 @@
     /**
      * Get the UID's of the Group Members
      *
-     * @param boolean $recursie Include members of child groups
+     * @param boolean $recursive Include members of child groups
      *
      * @return array Array of UIDs
      *

Auth/class.GoogleAuthenticator.php

Braces +35 added lines, -33 removed lines

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

 require dirname(__FILE__).'/../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,63 +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();

@@ -92,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;

         }

     }

Auth/class.LDAPCachableObject.php

Doc Comments +24 added lines

@@ -88,6 +88,9 @@ 
         return $this->appendFieldServer($fieldName, $fieldValue);
     }
 
+    /**
+     * @param string $fieldName
+     */
     private function getFieldLocal($fieldName)
     {
         if($this->ldapObj === false)
@@ -101,6 +104,9 @@ 
         return $this->ldapObj[$fieldName];
     }
 
+    /**
+     * @param string $fieldName
+     */
     private function getFieldServer($fieldName)
     {
         $lowerName = strtolower($fieldName);
@@ -111,6 +117,9 @@ 
         return $this->ldapObj->{$lowerName};
     }
 
+    /**
+     * @param string $fieldName
+     */
     private function getFieldLocalSingleValue($fieldName)
     {
         if($this->ldapObj === false)
@@ -128,6 +137,9 @@ 
         return $this->ldapObj[$fieldName];
     }
 
+    /**
+     * @param string $fieldName
+     */
     private function getFieldServerSingleValue($fieldName)
     {
         $lowerName = strtolower($fieldName);
@@ -143,6 +155,9 @@ 
         return $field[0];
     }
 
+    /**
+     * @param string $fieldName
+     */
     private function setFieldServer($fieldName, $fieldValue)
     {
         $obj = array('dn'=>$this->ldapObj->dn);
@@ -159,6 +174,9 @@ 
         return $this->update($obj);
     }
 
+    /**
+     * @param string $fieldName
+     */
     private function appendFieldServer($fieldName, $fieldValue)
     {
         $obj = array('dn'=>$this->ldapObj->dn);
@@ -175,6 +193,9 @@ 
         return $this->update($obj);
     }
 
+    /**
+     * @param string $fieldName
+     */
     private function setFieldLocal($fieldName, $fieldValue)
     {
         if($this->ldapObj === false)
@@ -193,6 +214,9 @@ 
         return true;
     }
 
+    /**
+     * @param string $fieldName
+     */
     private function appendFieldLocal($fieldName, $fieldValue)
     {
         if($this->ldapObj === false)

Auth/class.PendingUser.php

Doc Comments +1 added lines, -1 removed lines

@@ -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 boolean|string The current password
+     * @return boolean The current password
      */
     public function getPassword()
     {

Auth/class.SQLAuthenticator.php

Doc Comments +7 added lines, -1 removed lines

@@ -140,7 +140,7 @@ 
     /**
      * Get the data table for Pending Users
      *
-     * @return boolean|\Data\DataTable The Pending User Data Table
+     * @return boolean The Pending User Data Table
      */
     private function getPendingUserDataTable()
     {
@@ -213,6 +213,9 @@ 
         return new SQLUser($users[0], $this);
     }
 
+    /**
+     * @param string $dataTableName
+     */
     private function getDataByFilter($dataTableName, $filter, $select, $top, $skip, $orderby)
     {
         $dataTable = $this->getDataTable($dataTableName);
@@ -278,6 +281,9 @@ 
         return $dataTable->count();
     }
 
+    /**
+     * @param \Data\Filter $filter
+     */
     private function searchPendingUsers($filter, $select, $top, $skip, $orderby)
     {
         $userDataTable = $this->getPendingUserDataTable();

Data/class.SQLDataSet.php

Doc Comments +12 added lines

@@ -113,6 +113,9 @@ 
         throw new \Exception('No such table '.$name);
     }
 
+    /**
+     * @param string $tablename
+     */
     function read($tablename, $where = false, $select = '*', $count = false, $skip = false, $sort = false)
     {
         if($select === false)
@@ -158,6 +161,9 @@ 
         return $ret;
     }
 
+    /**
+     * @param string $tablename
+     */
     function update($tablename, $where, $data)
     {
         $set = array();
@@ -180,6 +186,9 @@ 
         return true;
     }
 
+    /**
+     * @param string $tablename
+     */
     function create($tablename, $data)
     {
         $set = array();
@@ -203,6 +212,9 @@ 
         return true;
     }
 
+    /**
+     * @param string $tablename
+     */
     function delete($tablename, $where)
     {
         $sql = "DELETE FROM $tablename WHERE $where";