View GitHub Repository CommonCode

Schedule Inspection
Subscribe
Completed
Push — master ( 3952d5...0ae0e5 )
by Patrick
03:00
created
Status
Category
Toggle Patches
Auth/class.PendingUser.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch 
@@ -49,7 +49,7 @@  discard block
 
 block discarded – undo
49 49 
      */
50 50 
     public function getEmail()
51 51 
     {
52 
-        if(isset($this->email))
52 
+        if (isset($this->email))
53 53 
         {
54 54 
             return $this->email;
55 55 
         }
 
@@ -63,7 +63,7 @@  discard block
 
 block discarded – undo
63 63 
      */
64 64 
     public function getGivenName()
65 65 
     {
66 
-        if(isset($this->givenName))
66 
+        if (isset($this->givenName))
67 67 
         {
68 68 
             return $this->givenName;
69 69 
         }
 
@@ -77,7 +77,7 @@  discard block
 
 block discarded – undo
77 77 
      */
78 78 
     public function getLastName()
79 79 
     {
80 
-        if(isset($this->sn))
80 
+        if (isset($this->sn))
81 81 
         {
82 82 
             return $this->sn;
83 83 
         }
 
@@ -104,7 +104,7 @@  discard block
 
 block discarded – undo
104 104 
      */
105 105 
     function getLoginProviders()
106 106 
     {
107 
-        if(isset($this->host))
107 
+        if (isset($this->host))
108 108 
         {
109 109 
             return $this->host;
110 110 
         }
 
@@ -120,7 +120,7 @@  discard block
 
 block discarded – undo
120 120 
      */
121 121 
     function addLoginProvider($provider)
122 122 
     {
123 
-        if(isset($this->host))
123 
+        if (isset($this->host))
124 124 
         {
125 125 
             array_push($this->host, $provider);
126 126 
         }
 
@@ -199,7 +199,7 @@  discard block
 
 block discarded – undo
199 199 
                 Burning Flipside Technology Team');
200 200 
         $email_msg->setSubject('Burning Flipside Registration');
201 201 
         $email_provider = \EmailProvider::getInstance();
202 
-        if($email_provider->sendEmail($email_msg) === false)
202 
+        if ($email_provider->sendEmail($email_msg) === false)
203 203 
         {
204 204 
             throw new \Exception('Unable to send email!');
205 205 
         }
Please login to merge, or discard this patch.
Auth/class.FlipsideAPIUser.php 1 patch
Spacing   +24 added lines, -24 removed lines patch added patch discarded remove patch 
@@ -1,6 +1,6 @@  discard block
 
 block discarded – undo
1 1 
 <?php
2 2 
 namespace Auth;
3 
-if(!class_exists('Httpful\Request'))
3 
+if (!class_exists('Httpful\Request'))
4 4 
 {
5 5 
     require(realpath(dirname(__FILE__)).'/../libs/httpful/bootstrap.php');
6 6 
 }
 
@@ -10,16 +10,16 @@  discard block
 
 block discarded – undo
10 10 
     private $userData;
11 11 
     private $groupData = null;
12 12
13 
-    public function __construct($data=false)
13 
+    public function __construct($data = false)
14 14 
     {
15 
-        if($data !== false && !isset($data['extended']))
15 
+        if ($data !== false && !isset($data['extended']))
16 16 
         {
17 17 
             //Generic user object
18 18 
             //TODO get from API
19 19 
         }
20 20 
         else
21 21 
         {
22 
-            if(isset($data['extended']))
22 
+            if (isset($data['extended']))
23 23 
             {
24 24 
                 $this->userData = $data['extended'];
25 25 
             }
 
@@ -28,19 +28,19 @@  discard block
 
 block discarded – undo
28 28
29 29 
     function isInGroupNamed($name)
30 30 
     {
31 
-        if($this->groupData === null)
31 
+        if ($this->groupData === null)
32 32 
         {
33 33 
             $resp = \Httpful\Request::get('https://profiles.test.burningflipside.com/api/v1/users/me/groups')->authenticateWith($this->userData->uid, $this->userData->userPassword)->send();
34 
-            if($resp->hasErrors())
34 
+            if ($resp->hasErrors())
35 35 
             {
36 36 
                 return false;
37 37 
             }
38 38 
             $this->groupData = $resp->body;
39 39 
         }
40 40 
         $count = count($this->groupData);
41 
-        for($i = 0; $i < $count; $i++)
41 
+        for ($i = 0; $i < $count; $i++)
42 42 
         {
43 
-            if($this->groupData[$i]->cn === $name)
43 
+            if ($this->groupData[$i]->cn === $name)
44 44 
             {
45 45 
                 return true;
46 46 
             }
 
@@ -50,7 +50,7 @@  discard block
 
 block discarded – undo
50 50
51 51 
     function getDisplayName()
52 52 
     {
53 
-        if($this->userData === null)
53 
+        if ($this->userData === null)
54 54 
         {
55 55 
             return parent::getDisplayName();
56 56 
         }
 
@@ -59,7 +59,7 @@  discard block
 
 block discarded – undo
59 59
60 60 
     function getGivenName()
61 61 
     {
62 
-        if($this->userData === null)
62 
+        if ($this->userData === null)
63 63 
         {
64 64 
             return parent::getGivenName();
65 65 
         }
 
@@ -68,7 +68,7 @@  discard block
 
 block discarded – undo
68 68
69 69 
     function getEmail()
70 70 
     {
71 
-        if($this->userData === null)
71 
+        if ($this->userData === null)
72 72 
         {
73 73 
             return parent::getEmail();
74 74 
         }
 
@@ -77,7 +77,7 @@  discard block
 
 block discarded – undo
77 77
78 78 
     function getUid()
79 79 
     {
80 
-        if($this->userData === null)
80 
+        if ($this->userData === null)
81 81 
         {
82 82 
             return parent::getUid();
83 83 
         }
 
@@ -86,7 +86,7 @@  discard block
 
 block discarded – undo
86 86
87 87 
     function getPhoneNumber()
88 88 
     {
89 
-        if($this->userData === null)
89 
+        if ($this->userData === null)
90 90 
         {
91 91 
             return parent::getPhoneNumber();
92 92 
         }
 
@@ -95,7 +95,7 @@  discard block
 
 block discarded – undo
95 95
96 96 
     function getOrganization()
97 97 
     {
98 
-        if($this->userData === null)
98 
+        if ($this->userData === null)
99 99 
         {
100 100 
             return parent::getOrganization();
101 101 
         }
 
@@ -104,7 +104,7 @@  discard block
 
 block discarded – undo
104 104
105 105 
     function getTitles()
106 106 
     {
107 
-        if($this->userData === null)
107 
+        if ($this->userData === null)
108 108 
         {
109 109 
             return parent::getTitles();
110 110 
         }
 
@@ -113,7 +113,7 @@  discard block
 
 block discarded – undo
113 113
114 114 
     function getState()
115 115 
     {
116 
-        if($this->userData === null)
116 
+        if ($this->userData === null)
117 117 
         {
118 118 
             return parent::getState();
119 119 
         }
 
@@ -122,7 +122,7 @@  discard block
 
 block discarded – undo
122 122
123 123 
     function getCity()
124 124 
     {
125 
-        if($this->userData === null)
125 
+        if ($this->userData === null)
126 126 
         {
127 127 
             return parent::getCity();
128 128 
         }
 
@@ -131,7 +131,7 @@  discard block
 
 block discarded – undo
131 131
132 132 
     function getLastName()
133 133 
     {
134 
-        if($this->userData === null)
134 
+        if ($this->userData === null)
135 135 
         {
136 136 
             return parent::getLastName();
137 137 
         }
 
@@ -140,7 +140,7 @@  discard block
 
 block discarded – undo
140 140
141 141 
     function getNickName()
142 142 
     {
143 
-        if($this->userData === null)
143 
+        if ($this->userData === null)
144 144 
         {
145 145 
             return parent::getNickName();
146 146 
         }
 
@@ -149,7 +149,7 @@  discard block
 
 block discarded – undo
149 149
150 150 
     function getAddress()
151 151 
     {
152 
-        if($this->userData === null)
152 
+        if ($this->userData === null)
153 153 
         {
154 154 
             return parent::getAddress();
155 155 
         }
 
@@ -158,7 +158,7 @@  discard block
 
 block discarded – undo
158 158
159 159 
     function getPostalCode()
160 160 
     {
161 
-        if($this->userData === null)
161 
+        if ($this->userData === null)
162 162 
         {
163 163 
             return parent::getPostalCode();
164 164 
         }
 
@@ -167,7 +167,7 @@  discard block
 
 block discarded – undo
167 167
168 168 
     function getCountry()
169 169 
     {
170 
-        if($this->userData === null)
170 
+        if ($this->userData === null)
171 171 
         {
172 172 
             return parent::getCountry();
173 173 
         }
 
@@ -176,7 +176,7 @@  discard block
 
 block discarded – undo
176 176
177 177 
     function getOrganizationUnits()
178 178 
     {
179 
-        if($this->userData === null)
179 
+        if ($this->userData === null)
180 180 
         {
181 181 
             return parent::getOrganizationUnits();
182 182 
         }
 
@@ -185,7 +185,7 @@  discard block
 
 block discarded – undo
185 185
186 186 
     function getLoginProviders()
187 187 
     {
188 
-        if($this->userData === null)
188 
+        if ($this->userData === null)
189 189 
         {
190 190 
             return parent::getLoginProviders();
191 191 
         }
Please login to merge, or discard this patch.
Auth/class.Group.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch 
@@ -23,12 +23,12 @@  discard block
 
 block discarded – undo
23 23 
         return false;
24 24 
     }
25 25
26 
-    public function getMemberUids($recursive=true)
26 
+    public function getMemberUids($recursive = true)
27 27 
     {
28 28 
         return array();
29 29 
     }
30 30
31 
-    public function members($details=false, $recursive=true, $includeGroups=true)
31 
+    public function members($details = false, $recursive = true, $includeGroups = true)
32 32 
     {
33 33 
         return array();
34 34 
     }
 
@@ -46,20 +46,20 @@  discard block
 
 block discarded – undo
46 46 
     public function jsonSerialize()
47 47 
     {
48 48 
         $group = array();
49 
-        try{
49 
+        try {
50 50 
         $group['cn'] = $this->getGroupName();
51 51 
         $group['description'] = $this->getDescription();
52 52 
         $group['member'] = $this->getMemberUids();
53 
-        } catch(\Exception $e) {echo $e->getMessage(); die();}
53 
+        } catch (\Exception $e) {echo $e->getMessage(); die(); }
54 54 
         return $group;
55 55 
     }
56 56
57 
-    public function getNonMembers($select=false)
57 
+    public function getNonMembers($select = false)
58 58 
     {
59 59 
         return array();
60 60 
     }
61 61
62 
-    public function addMember($name, $isGroup=false, $flush=true)
62 
+    public function addMember($name, $isGroup = false, $flush = true)
63 63 
     {
64 64 
         return false;
65 65 
     }
 
@@ -70,24 +70,24 @@  discard block
 
 block discarded – undo
70 70 
         $auth = \AuthProvider::getInstance();
71 71 
         $ldap = $auth->getAuthenticator('Auth\LDAPAuthenticator');
72 72 
         $ldap->get_and_bind_server(true);
73 
-        if(isset($group->description))
73 
+        if (isset($group->description))
74 74 
         {
75 75 
             $this->setDescription($group->description);
76 76 
             unset($group->description);
77 77 
         }
78 
-        if(isset($group->member))
78 
+        if (isset($group->member))
79 79 
         {
80 80 
             $this->clearMembers();
81 81 
             $count = count($group->member);
82 
-            for($i = 0; $i < $count; $i++)
82 
+            for ($i = 0; $i < $count; $i++)
83 83 
             {
84 84 
                 $isLast = false;
85 
-                if($i === $count - 1)
85 
+                if ($i === $count - 1)
86 86 
                 {
87 87 
                     $isLast = true;
88 88 
                 }
89 
-                if(!isset($group->member[$i]->type)) continue;
90 
-                if($group->member[$i]->type === 'Group')
89 
+                if (!isset($group->member[$i]->type)) continue;
90 
+                if ($group->member[$i]->type === 'Group')
91 91 
                 {
92 92 
                     $this->addMember($group->member[$i]->cn, true, $isLast);
93 93 
                 }
 
@@ -101,7 +101,7 @@  discard block
 
 block discarded – undo
101 101 
         return true;
102 102 
     }
103 103
104 
-    static function from_name($name, $data=false)
104 
+    static function from_name($name, $data = false)
105 105 
     {
106 106 
         return false;
107 107 
     }
Please login to merge, or discard this patch.
Auth/class.SQLPendingUser.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch 
@@ -28,7 +28,7 @@  discard block
 
 block discarded – undo
28 28
29 29 
     function getEmail()
30 30 
     {
31 
-        if(is_array($this->blob->mail))
31 
+        if (is_array($this->blob->mail))
32 32 
         {
33 33 
             return $this->blob->mail[0];
34 34 
         }
 
@@ -37,7 +37,7 @@  discard block
 
 block discarded – undo
37 37
38 38 
     function getUid()
39 39 
     {
40 
-        if(is_array($this->blob->uid))
40 
+        if (is_array($this->blob->uid))
41 41 
         {
42 42 
             return $this->blob->uid[0];
43 43 
         }
 
@@ -46,7 +46,7 @@  discard block
 
 block discarded – undo
46 46
47 47 
     function getPassword()
48 48 
     {
49 
-        if(is_array($this->blob->password))
49 
+        if (is_array($this->blob->password))
50 50 
         {
51 51 
             return $this->blob->password[0];
52 52 
         }
Please login to merge, or discard this patch.
Auth/class.LDAPGroup.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch 
@@ -264,7 +264,7 @@
 
 block discarded – undo
264 264 
             throw new \Exception('data must be set for LDAPGroup');
265 265 
         }
266 266 
         $filter = new \Data\Filter("cn eq $name");
267 
-	$group = $data->read($data->group_base, $filter);
267 
+    $group = $data->read($data->group_base, $filter);
268 268 
         if($group === false || !isset($group[0]))
269 269 
         {
270 270 
             return false;
Please login to merge, or discard this patch.
Spacing   +48 added lines, -48 removed lines patch added patch discarded remove patch 
@@ -1,6 +1,6 @@  discard block
 
 block discarded – undo
1 1 
 <?php
2 2 
 namespace Auth;
3 
-if(isset($GLOBALS['FLIPSIDE_SETTINGS_LOC']))
3 
+if (isset($GLOBALS['FLIPSIDE_SETTINGS_LOC']))
4 4 
 {
5 5 
     require_once($GLOBALS['FLIPSIDE_SETTINGS_LOC'].'/class.FlipsideSettings.php');
6 6 
 }
 
@@ -20,7 +20,7 @@  discard block
 
 block discarded – undo
20 20 
     {
21 21 
         $this->ldapObj = $data;
22 22 
         $this->server = \LDAP\LDAPServer::getInstance();
23 
-        if(!is_object($data))
23 
+        if (!is_object($data))
24 24 
         {
25 25 
             throw new \Exception('Unable to setup LDAPGroup!');
26 26 
         }
 
@@ -45,17 +45,17 @@  discard block
 
 block discarded – undo
45 45 
     {
46 46 
         $rawMembers = $this->getField('member');
47 47 
         $fieldName  = 'member';
48 
-        if($rawMembers === false)
48 
+        if ($rawMembers === false)
49 49 
         {
50 50 
             $rawMembers = $this->getField('uniqueMember');
51 51 
             $fieldName  = 'uniqueMember';
52 52 
         }
53 
-        if($rawMembers === false)
53 
+        if ($rawMembers === false)
54 54 
         {
55 55 
             $rawMembers = $this->getField('memberUid');
56 56 
             $fieldName  = 'memberUid';
57 57 
         }
58 
-        if(!isset($rawMembers['count']))
58 
+        if (!isset($rawMembers['count']))
59 59 
         {
60 60 
             $rawMembers['count'] = count($rawMembers);
61 61 
         }
 
@@ -65,23 +65,23 @@  discard block
 
 block discarded – undo
65 65 
     private function getIDFromDN($dn)
66 66 
     {
67 67 
         $split = explode(',', $dn);
68 
-        if(strncmp('cn=', $split[0], 3) === 0)
68 
+        if (strncmp('cn=', $split[0], 3) === 0)
69 69 
         {
70 70 
             return substr($split[0], 3);
71 71 
         }
72 72 
         return substr($split[0], 4);
73 73 
     }
74 74
75 
-    public function getMemberUids($recursive=true)
75 
+    public function getMemberUids($recursive = true)
76 76 
     {
77 77 
         $members = array();
78 78 
         $rawMembers = $this->getMembersField();
79 
-        for($i = 0; $i < $rawMembers['count']; $i++)
79 
+        for ($i = 0; $i < $rawMembers['count']; $i++)
80 80 
         {
81 
-            if($recursive && strncmp($rawMembers[$i], 'cn=', 3) === 0)
81 
+            if ($recursive && strncmp($rawMembers[$i], 'cn=', 3) === 0)
82 82 
             {
83 83 
                 $child = self::from_dn($rawMembers[$i], $this->server);
84 
-                if($child !== false)
84 
+                if ($child !== false)
85 85 
                 {
86 86 
                     $members = array_merge($members, $child->members());
87 87 
                 }
 
@@ -92,7 +92,7 @@  discard block
 
 block discarded – undo
92 92 
             }
93 93 
         }
94 94 
         $count = count($members);
95 
-        for($i = 0; $i < $count; $i++)
95 
+        for ($i = 0; $i < $count; $i++)
96 96 
         {
97 97 
             $members[$i] = $this->getIDFromDN($members[$i]);
98 98 
         }
 
@@ -102,36 +102,36 @@  discard block
 
 block discarded – undo
102 102 
     private function getObjectFromDN($dn)
103 103 
     {
104 104 
         $split = explode(',', $dn);
105 
-        if(strncmp('cn=', $dn, 3) === 0)
105 
+        if (strncmp('cn=', $dn, 3) === 0)
106 106 
         {
107 
-            if(count($split) === 1)
107 
+            if (count($split) === 1)
108 108 
             {
109 109 
                 return LDAPGroup::from_name($dn, $this->server);
110 110 
             }
111 111 
             return LDAPGroup::from_name(substr($split[0], 3), $this->server);
112 112 
         }
113 
-        if(count($split) === 1)
113 
+        if (count($split) === 1)
114 114 
         {
115 115 
             return LDAPUser::from_name($dn, $this->server);
116 116 
         }
117 117 
         return LDAPUser::from_name(substr($split[0], 4), $this->server);
118 118 
     }
119 119
120 
-    public function members($details=false, $recursive=true, $includeGroups=true)
120 
+    public function members($details = false, $recursive = true, $includeGroups = true)
121 121 
     {
122 122 
         $members = array();
123 123 
         $rawMembers = $this->getMembersField();
124 
-        for($i = 0; $i < $rawMembers['count']; $i++)
124 
+        for ($i = 0; $i < $rawMembers['count']; $i++)
125 125 
         {
126 
-            if($recursive && strncmp($rawMembers[$i], 'cn=', 3) === 0)
126 
+            if ($recursive && strncmp($rawMembers[$i], 'cn=', 3) === 0)
127 127 
             {
128 128 
                 $child = self::from_dn($rawMembers[$i], $this->server);
129 
-                if($child !== false)
129 
+                if ($child !== false)
130 130 
                 {
131 131 
                     $members = array_merge($members, $child->members());
132 132 
                 }
133 133 
             }
134 
-            else if($includeGroups === false && strncmp($rawMembers[$i], 'cn=', 3) === 0)
134 
+            else if ($includeGroups === false && strncmp($rawMembers[$i], 'cn=', 3) === 0)
135 135 
             {
136 136 
                 //Drop this member
137 137 
             }
 
@@ -140,11 +140,11 @@  discard block
 
 block discarded – undo
140 140 
                 array_push($members, $rawMembers[$i]);
141 141 
             }
142 142 
         }
143 
-        if($details === true)
143 
+        if ($details === true)
144 144 
         {
145 145 
             $details = array();
146 146 
             $count = count($members);
147 
-            for($i = 0; $i < $count; $i++)
147 
+            for ($i = 0; $i < $count; $i++)
148 148 
             {
149 149 
                 $details[$i] = $this->getObjectFromDN($members[$i]);
150 150 
             }
 
@@ -154,37 +154,37 @@  discard block
 
 block discarded – undo
154 154 
         return $members;
155 155 
     }
156 156
157 
-    public function getNonMemebers($select=false)
157 
+    public function getNonMemebers($select = false)
158 158 
     {
159 159 
         $data = array();
160 160 
         $groupFilter = '(&(cn=*)(!(cn='.$this->getGroupName().'))';
161 161 
         $userFilter = '(&(cn=*)';
162 162 
         $members = $this->members();
163 163 
         $count = count($members);
164 
-        for($i = 0; $i < $count; $i++)
164 
+        for ($i = 0; $i < $count; $i++)
165 165 
         {
166 
-            $dnComps = explode(',',$members[$i]);
167 
-            if(strncmp($members[$i], "uid=", 4) == 0)
166 
+            $dnComps = explode(',', $members[$i]);
167 
+            if (strncmp($members[$i], "uid=", 4) == 0)
168 168 
             {
169 
-                $userFilter.='(!('.$dnComps[0].'))';
169 
+                $userFilter .= '(!('.$dnComps[0].'))';
170 170 
             }
171 171 
             else
172 172 
             {
173 
-                $groupFilter.='(!('.$dnComps[0].'))';
173 
+                $groupFilter .= '(!('.$dnComps[0].'))';
174 174 
             }
175 175 
         }
176 
-        $userFilter.=')';
177 
-        $groupFilter.=')';
176 
+        $userFilter .= ')';
177 
+        $groupFilter .= ')';
178 178 
         $groups = $this->server->read($this->server->group_base, $groupFilter);
179 179 
         $count = count($groups);
180 
-        for($i = 0; $i < $count; $i++)
180 
+        for ($i = 0; $i < $count; $i++)
181 181 
         {
182 
-            if($groups[$i] === false || $groups[$i] === null) continue;
182 
+            if ($groups[$i] === false || $groups[$i] === null) continue;
183 183 
             array_push($data, new LDAPGroup($groups[$i]));
184 184 
         }
185 185 
         $users = $this->server->read($this->server->user_base, $userFilter, false, $select);
186 186 
         $count = count($users);
187 
-        for($i = 0; $i < $count; $i++)
187 
+        for ($i = 0; $i < $count; $i++)
188 188 
         {
189 189 
             array_push($data, new LDAPUser($users[$i]));
190 190 
         } 
@@ -193,24 +193,24 @@  discard block
 
 block discarded – undo
193 193
194 194 
     public function clearMembers()
195 195 
     {
196 
-        if(isset($this->ldapObj['member']))
196 
+        if (isset($this->ldapObj['member']))
197 197 
         {
198 198 
             $this->ldapObj['member'] = array();
199 199 
         }
200 
-        else if(isset($this->ldapObj['uniquemember']))
200 
+        else if (isset($this->ldapObj['uniquemember']))
201 201 
         {
202 202 
             $this->ldapObj['uniquemember'] = array();
203 203 
         }
204 
-        else if(isset($this->ldapObj['memberuid']))
204 
+        else if (isset($this->ldapObj['memberuid']))
205 205 
         {
206 206 
             $this->ldapObj['memberuid'] = array();
207 207 
         }
208 208 
     }
209 209
210 
-    public function addMember($name, $isGroup=false, $flush=true)
210 
+    public function addMember($name, $isGroup = false, $flush = true)
211 211 
     {
212 212 
         $dn = false;
213 
-        if($isGroup)
213 
+        if ($isGroup)
214 214 
         {
215 215 
             $dn = 'cn='.$name.','.$this->server->group_base;
216 216 
         }
 
@@ -220,17 +220,17 @@  discard block
 
 block discarded – undo
220 220 
         }
221 221 
         $propName   = false;
222 222 
         $rawMembers = $this->getMembersField($propName);
223 
-        if(isset($rawMembers['count']))
223 
+        if (isset($rawMembers['count']))
224 224 
         {
225 225 
             unset($rawMembers['count']);
226 226 
         }
227 
-        if(in_array($dn, $rawMembers) || in_array($name, $rawMembers))
227 
+        if (in_array($dn, $rawMembers) || in_array($name, $rawMembers))
228 228 
         {
229 229 
             return true;
230 230 
         }
231 
-        if($propName === 'memberUid')
231 
+        if ($propName === 'memberUid')
232 232 
         {
233 
-            if($isGroup)
233 
+            if ($isGroup)
234 234 
             {
235 235 
                 throw new \Exception('Unable to add a group as a child of this group type');
236 236 
             }
 
@@ -242,7 +242,7 @@  discard block
 
 block discarded – undo
242 242 
         }
243 243 
         $tmp = strtolower($propName);
244 244 
         $this->ldapObj->$tmp = $rawMembers;
245 
-        if($flush === true)
245 
+        if ($flush === true)
246 246 
         {
247 247 
             $obj = array('dn'=>$this->ldapObj->dn);
248 248 
             $obj[$propName] = $rawMembers;
 
@@ -254,29 +254,29 @@  discard block
 
 block discarded – undo
254 254 
         }
255 255 
     }
256 256
257 
-    static function from_dn($dn, $data=false)
257 
+    static function from_dn($dn, $data = false)
258 258 
     {
259 
-        if($data === false)
259 
+        if ($data === false)
260 260 
         {
261 261 
             throw new \Exception('data must be set for LDAPGroup');
262 262 
         }
263 263 
         $group = $data->read($dn, false, true);
264 
-        if($group === false || !isset($group[0]))
264 
+        if ($group === false || !isset($group[0]))
265 265 
         {
266 266 
             return false;
267 267 
         }
268 268 
         return new static($group[0]);
269 269 
     }
270 270
271 
-    static function from_name($name, $data=false)
271 
+    static function from_name($name, $data = false)
272 272 
     {
273 
-        if($data === false)
273 
+        if ($data === false)
274 274 
         {
275 275 
             throw new \Exception('data must be set for LDAPGroup');
276 276 
         }
277 277 
         $filter = new \Data\Filter("cn eq $name");
278 278 
 	$group = $data->read($data->group_base, $filter);
279 
-        if($group === false || !isset($group[0]))
279 
+        if ($group === false || !isset($group[0]))
280 280 
         {
281 281 
             return false;
282 282 
         }
Please login to merge, or discard this patch.
Auth/class.LDAPUser.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch 
@@ -241,7 +241,7 @@
 
 block discarded – undo
241 241 
             $obj['userPassword'] = $this->generateLDAPPass($password);
242 242 
             if(isset($this->ldap_obj->uniqueidentifier))
243 243 
             {
244 
-               $obj['uniqueIdentifier'] = null;
244 
+                $obj['uniqueIdentifier'] = null;
245 245 
             }
246 246 
             //Make sure we are bound in write mode
247 247 
             $auth = \AuthProvider::getInstance();
Please login to merge, or discard this patch.
Spacing   +40 added lines, -40 removed lines patch added patch discarded remove patch 
@@ -8,15 +8,15 @@  discard block
 
 block discarded – undo
8 8 
     private $ldapObj;
9 9 
     private $server;
10 10
11 
-    public function __construct($data=false)
11 
+    public function __construct($data = false)
12 12 
     {
13 13 
         $this->server = \LDAP\LDAPServer::getInstance();
14 
-        if($data !== false && !isset($data['dn']) && !isset($data['extended']))
14 
+        if ($data !== false && !isset($data['dn']) && !isset($data['extended']))
15 15 
         {
16 16 
             //Generic user object
17 17 
             $filter = new \Data\Filter('mail eq '.$data['mail']);
18 18 
             $users = $this->server->read($this->server->user_base, $filter);
19 
-            if($users === false || !isset($users[0]))
19 
+            if ($users === false || !isset($users[0]))
20 20 
             {
21 21 
                 throw new \Exception('No such LDAP User!');
22 22 
             }
 
@@ -24,7 +24,7 @@  discard block
 
 block discarded – undo
24 24 
         }
25 25 
         else
26 26 
         {
27 
-            if(isset($data['extended']))
27 
+            if (isset($data['extended']))
28 28 
             {
29 29 
                 $this->ldapObj = $data['extended'];
30 30 
             }
 
@@ -38,13 +38,13 @@  discard block
 
 block discarded – undo
38 38 
     private function check_child_group($array)
39 39 
     {
40 40 
         $res = false;
41 
-        for($i = 0; $i < $array['count']; $i++)
41 
+        for ($i = 0; $i < $array['count']; $i++)
42 42 
         {
43 
-            if(strpos($array[$i], $this->server->group_base) !== false)
43 
+            if (strpos($array[$i], $this->server->group_base) !== false)
44 44 
             {
45 45 
                 $dn = explode(',', $array[$i]);
46 46 
                 $res = $this->isInGroupNamed(substr($dn[0], 3));
47 
-                if($res) return $res;
47 
+                if ($res) return $res;
48 48 
             }
49 49 
         }
50 50 
         return $res;
 
@@ -52,11 +52,11 @@  discard block
 
 block discarded – undo
52 52
53 53 
     private function isInListOrChild($listName, $group, $dn)
54 54 
     {
55 
-        if(!isset($group[$listName]))
55 
+        if (!isset($group[$listName]))
56 56 
         {
57 57 
             return false;
58 58 
         }
59 
-        if(in_array($dn, $group[$listName]))
59 
+        if (in_array($dn, $group[$listName]))
60 60 
         {
61 61 
             return true;
62 62 
         }
 
@@ -67,17 +67,17 @@  discard block
 
 block discarded – undo
67 67 
     {
68 68 
         $filter = new \Data\Filter('cn eq '.$name);
69 69 
         $group = $this->server->read($this->server->group_base, $filter);
70 
-        if(!empty($group))
70 
+        if (!empty($group))
71 71 
         {
72 72 
             $group = $group[0];
73 73 
             $dn  = $this->ldapObj->dn;
74 74 
             $uid = $this->ldapObj->uid[0];
75 75 
             $ret = $this->isInListOrChild('member', $group, $dn);
76 
-            if($ret === false)
76 
+            if ($ret === false)
77 77 
             {
78 78 
                 $ret = $this->isInListOrChild('uniquemember', $group, $dn);
79 79 
             }
80 
-            if($ret === false && isset($group['memberUid']) && in_array($uid, $group['memberUid']))
80 
+            if ($ret === false && isset($group['memberUid']) && in_array($uid, $group['memberUid']))
81 81 
             {
82 82 
                 return true;
83 83 
             }
 
@@ -119,7 +119,7 @@  discard block
 
 block discarded – undo
119 119 
     public function getOrganization()
120 120 
     {
121 121 
         $org = $this->getFieldSingleValue('o');
122 
-        if($org === false)
122 
+        if ($org === false)
123 123 
         {
124 124 
             return 'Volunteer';
125 125 
         }
 
@@ -129,7 +129,7 @@  discard block
 
 block discarded – undo
129 129 
     public function getTitles()
130 130 
     {
131 131 
         $titles = $this->getField('title');
132 
-        if(isset($titles['count']))
132 
+        if (isset($titles['count']))
133 133 
         {
134 134 
             unset($titles['count']);
135 135 
         }
 
@@ -174,7 +174,7 @@  discard block
 
 block discarded – undo
174 174 
     public function getOrganizationUnits()
175 175 
     {
176 176 
         $units = $this->getField('ou');
177 
-        if(isset($units['count']))
177 
+        if (isset($units['count']))
178 178 
         {
179 179 
             unset($units['count']);
180 180 
         }
 
@@ -184,7 +184,7 @@  discard block
 
 block discarded – undo
184 184 
     public function getLoginProviders()
185 185 
     {
186 186 
         $hosts = $this->getField('host');
187 
-        if(isset($hosts['count']))
187 
+        if (isset($hosts['count']))
188 188 
         {
189 189 
             unset($hosts['count']);
190 190 
         }
 
@@ -195,12 +195,12 @@  discard block
 
 block discarded – undo
195 195 
     {
196 196 
         $res = array();
197 197 
         $groups = $this->server->read($this->server->group_base);
198 
-        if(!empty($groups))
198 
+        if (!empty($groups))
199 199 
         {
200 200 
             $count = count($groups);
201 
-            for($i = 0; $i < $count; $i++)
201 
+            for ($i = 0; $i < $count; $i++)
202 202 
             {
203 
-                if($this->isInGroupNamed($groups[$i]['cn'][0]))
203 
+                if ($this->isInGroupNamed($groups[$i]['cn'][0]))
204 204 
                 {
205 205 
                     array_push($res, new LDAPGroup($groups[$i]));
206 206 
                 }
 
@@ -220,23 +220,23 @@  discard block
 
 block discarded – undo
220 220
221 221 
     private function generateLDAPPass($pass)
222 222 
     {
223 
-        mt_srand((double)microtime()*1000000);
223 
+        mt_srand((double)microtime() * 1000000);
224 224 
         $salt = pack("CCCC", mt_rand(), mt_rand(), mt_rand(), mt_rand());
225 
-        $hash = base64_encode(pack('H*',sha1($pass.$salt)).$salt);
225 
+        $hash = base64_encode(pack('H*', sha1($pass.$salt)).$salt);
226 226 
         return '{SSHA}'.$hash;
227 227 
     }
228 228
229 229 
     public function setPass($password)
230 230 
     {
231 
-        if(!is_object($this->ldapObj))
231 
+        if (!is_object($this->ldapObj))
232 232 
         {
233 
-            return $this->setFieldLocal('userPassword',  $this->generateLDAPPass($password));
233 
+            return $this->setFieldLocal('userPassword', $this->generateLDAPPass($password));
234 234 
         }
235 235 
         else
236 236 
         {
237 237 
             $obj = array('dn'=>$this->ldapObj->dn);
238 238 
             $obj['userPassword'] = $this->generateLDAPPass($password);
239 
-            if(isset($this->ldapObj->uniqueidentifier))
239 
+            if (isset($this->ldapObj->uniqueidentifier))
240 240 
             {
241 241 
                $obj['uniqueIdentifier'] = null;
242 242 
             }
 
@@ -250,7 +250,7 @@  discard block
 
 block discarded – undo
250 250
251 251 
     public function validate_password($password)
252 252 
     {
253 
-        if($this->server->bind($this->ldapObj->dn, $password))
253 
+        if ($this->server->bind($this->ldapObj->dn, $password))
254 254 
         {
255 255 
             return true;
256 256 
         }
 
@@ -259,37 +259,37 @@  discard block
 
 block discarded – undo
259 259
260 260 
     public function validate_reset_hash($hash)
261 261 
     {
262 
-        if(isset($this->ldapObj->uniqueidentifier) && strcmp($this->ldapObj->uniqueidentifier[0], $hash) === 0)
262 
+        if (isset($this->ldapObj->uniqueidentifier) && strcmp($this->ldapObj->uniqueidentifier[0], $hash) === 0)
263 263 
         {
264 264 
             return true;
265 265 
         }
266 266 
         return false;
267 267 
     }
268 268
269 
-    static function from_name($name, $data=false)
269 
+    static function from_name($name, $data = false)
270 270 
     {
271 
-        if($data === false)
271 
+        if ($data === false)
272 272 
         {
273 273 
             throw new \Exception('data must be set for LDAPUser');
274 274 
         }
275 275 
         $filter = new \Data\Filter("uid eq $name");
276 276 
         $user = $data->read($data->user_base, $filter);
277 
-        if($user === false || !isset($user[0]))
277 
+        if ($user === false || !isset($user[0]))
278 278 
         {
279 279 
             return false;
280 280 
         }
281 281 
         return new static($user[0]);
282 282 
     }
283 283
284 
-    static function from_dn($dn, $data=false)
284 
+    static function from_dn($dn, $data = false)
285 285 
     {
286 
-        if($data === false)
286 
+        if ($data === false)
287 287 
         {
288 288 
             throw new \Exception('data must be set for LDAPUser');
289 289 
         }
290 290 
         $filter = new \Data\Filter("dn eq $dn");
291 291 
         $user = $data->read($data->user_base, $filter);
292 
-        if($user === false || !isset($user[0]))
292 
+        if ($user === false || !isset($user[0]))
293 293 
         {
294 294 
             return false;
295 295 
         }
 
@@ -318,7 +318,7 @@  discard block
 
 block discarded – undo
318 318
319 319 
     public function setUid($uid)
320 320 
     {
321 
-        if(!is_object($this->ldapObj))
321 
+        if (!is_object($this->ldapObj))
322 322 
         {
323 323 
             return $this->setFieldLocal('uid', $uid);
324 324 
         }
 
@@ -366,7 +366,7 @@  discard block
 
 block discarded – undo
366 366
367 367 
     public function setTitles($titles)
368 368 
     {
369 
-        if(!is_array($titles))
369 
+        if (!is_array($titles))
370 370 
         {
371 371 
             $titles = array($titles);
372 372 
         }
 
@@ -375,7 +375,7 @@  discard block
 
 block discarded – undo
375 375
376 376 
     public function setOrganizationUnits($ous)
377 377 
     {
378 
-        if(!is_array($ous))
378 
+        if (!is_array($ous))
379 379 
         {
380 380 
             $ous = array($ous);
381 381 
         }
 
@@ -384,7 +384,7 @@  discard block
 
 block discarded – undo
384 384
385 385 
     public function flushUser()
386 386 
     {
387 
-        if(is_object($this->ldapObj))
387 
+        if (is_object($this->ldapObj))
388 388 
         {
389 389 
             //In this mode we are always up to date
390 390 
             return true;
 
@@ -392,11 +392,11 @@  discard block
 
 block discarded – undo
392 392 
         $obj = $this->ldapObj;
393 393 
         $obj['objectClass'] = array('top', 'inetOrgPerson', 'extensibleObject');
394 394 
         $obj['dn'] = 'uid='.$this->ldapObj['uid'].','.$this->server->user_base;
395 
-        if(!isset($obj['sn']))
395 
+        if (!isset($obj['sn']))
396 396 
         {
397 397 
             $obj['sn'] = $obj['uid'];
398 398 
         }
399 
-        if(!isset($obj['cn']))
399 
+        if (!isset($obj['cn']))
400 400 
         {
401 401 
             $obj['cn'] = $obj['uid'];
402 402 
         }
 
@@ -413,7 +413,7 @@  discard block
 
 block discarded – undo
413 413 
         $ldapObj = $this->server->read($ldap->user_base, new \Data\Filter('uid eq '.$this->getUid()));
414 414 
         $ldapObj = $ldapObj[0];
415 415 
         $hash = false;
416 
-        if(isset($ldapObj->userpassword))
416 
+        if (isset($ldapObj->userpassword))
417 417 
         {
418 418 
             $hash = hash('sha512', $ldapObj->dn.';'.$ldapObj->userpassword[0].';'.$ldapObj->mail[0]);
419 419 
         }
 
@@ -423,7 +423,7 @@  discard block
 
 block discarded – undo
423 423 
         }
424 424 
         $obj = array('dn'=>$this->ldapObj->dn);
425 425 
         $obj['uniqueIdentifier'] = $hash;
426 
-        if($this->server->update($obj) === false)
426 
+        if ($this->server->update($obj) === false)
427 427 
         {
428 428 
             throw new \Exception('Unable to create hash in LDAP object!');
429 429 
         }
Please login to merge, or discard this patch.
Auth/class.SQLAuthenticator.php 2 patches
Indentation   +20 added lines, -20 removed lines patch added patch discarded remove patch 
@@ -116,26 +116,26 @@
 
 block discarded – undo
116 116
117 117 
     private function getDataTable($name, $pending=false)
118 118 
     {
119 
-         if(isset($this->dataTables[$name]) && isset($this->dataTables[$name][$pending]))
120 
-         {
121 
-             return $this->dataTables[$name][$pending];
122 
-         }
123 
-         $dataSet = $this->dataSet;
124 
-         if($pending)
125 
-         {
126 
-             $dataSet = $this->pendingDataSet;
127 
-         }
128 
-         if($dataSet === null)
129 
-         {
130 
-             throw new \Exception('Unable to obtain dataset for SQL Authentication!');
131 
-         }
132 
-         $dataTable = $dataSet[$name];
133 
-         if(!isset($this->dataTables[$name]))
134 
-         {
135 
-             $this->dataTables[$name] = array();
136 
-         }
137 
-         $this->dataTables[$name][$pending] = $dataTable;
138 
-         return $dataTable;
119 
+            if(isset($this->dataTables[$name]) && isset($this->dataTables[$name][$pending]))
120 
+            {
121 
+                return $this->dataTables[$name][$pending];
122 
+            }
123 
+            $dataSet = $this->dataSet;
124 
+            if($pending)
125 
+            {
126 
+                $dataSet = $this->pendingDataSet;
127 
+            }
128 
+            if($dataSet === null)
129 
+            {
130 
+                throw new \Exception('Unable to obtain dataset for SQL Authentication!');
131 
+            }
132 
+            $dataTable = $dataSet[$name];
133 
+            if(!isset($this->dataTables[$name]))
134 
+            {
135 
+                $this->dataTables[$name] = array();
136 
+            }
137 
+            $this->dataTables[$name][$pending] = $dataTable;
138 
+            return $dataTable;
139 139 
     }
140 140
141 141 
     private function getPendingUserDataTable()
Please login to merge, or discard this patch.
Spacing   +49 added lines, -49 removed lines patch added patch discarded remove patch 
@@ -1,7 +1,7 @@  discard block
 
 block discarded – undo
1 1 
 <?php
2 2 
 namespace Auth;
3 3
4 
-if(!function_exists('password_hash') || !function_exists('password_verify'))
4 
+if (!function_exists('password_hash') || !function_exists('password_verify'))
5 5 
 {
6 6 
     define('PASSWORD_BCRYPT', 1);
7 7 
     define('PASSWORD_DEFAULT', PASSWORD_BCRYPT);
 
@@ -9,22 +9,22 @@  discard block
 
 block discarded – undo
9 9
10 10 
     function password_hash($password, $algo = PASSWORD_DEFAULT)
11 11 
     {
12 
-        if(is_null($password) || is_int($password))
12 
+        if (is_null($password) || is_int($password))
13 13 
         {
14 14 
             $password = (string)$password;
15 15 
         }
16 
-        if(!is_string($password))
16 
+        if (!is_string($password))
17 17 
         {
18 18 
             trigger_error("password_hash(): Password must be a string", E_USER_WARNING);
19 19 
             return false;
20 20 
         }
21 
-        if(!is_int($algo))
21 
+        if (!is_int($algo))
22 22 
         {
23 
-            trigger_error("password_hash() expects parameter 2 to be long, " . gettype($algo) . " given", E_USER_WARNING);
23 
+            trigger_error("password_hash() expects parameter 2 to be long, ".gettype($algo)." given", E_USER_WARNING);
24 24 
             return false;
25 25 
         }
26 26 
         $resultLength = 0;
27 
-        switch($algo)
27 
+        switch ($algo)
28 28 
         {
29 29 
             case PASSWORD_BCRYPT:
30 30 
                 $cost = PASSWORD_BCRYPT_DEFAULT_COST;
 
@@ -43,9 +43,9 @@  discard block
 
 block discarded – undo
43 43 
         $base64String = base64_encode($salt);
44 44 
         $salt = strtr(rtrim($base64String, '='), $base64Digits, $bcrypt64Digits);
45 45 
         $salt = substr($salt, 0, $requiredSaltLen);
46 
-        $hash = $hashFormat . $salt;
46 
+        $hash = $hashFormat.$salt;
47 47 
         $ret = crypt($password, $hash);
48 
-        if(!is_string($ret) || strlen($ret) != $resultLength)
48 
+        if (!is_string($ret) || strlen($ret) != $resultLength)
49 49 
         {
50 50 
             return false;
51 51 
         }
 
@@ -55,13 +55,13 @@  discard block
 
 block discarded – undo
55 55 
     function password_verify($password, $hash)
56 56 
     {
57 57 
         $ret = crypt($password, $hash);
58 
-        if(!is_string($ret) || strlen($ret) != strlen($hash) || strlen($ret) <= 13)
58 
+        if (!is_string($ret) || strlen($ret) != strlen($hash) || strlen($ret) <= 13)
59 59 
         {
60 60 
             return false;
61 61 
         }
62 62 
         $status = 0;
63 63 
         $count  = strlen($ret);
64 
-        for($i = 0; $i < $count; $i++)
64 
+        for ($i = 0; $i < $count; $i++)
65 65 
         {
66 66 
             $status |= (ord($ret[$i]) ^ ord($hash[$i]));
67 67 
         }
 
@@ -80,11 +80,11 @@  discard block
 
 block discarded – undo
80 80 
     {
81 81 
         parent::__construct($params);
82 82 
         $this->params = $params;
83 
-        if($this->current)
83 
+        if ($this->current)
84 84 
         {
85 85 
             $this->dataSet = $this->getCurrentDataSet();
86 86 
         }
87 
-        if($this->pending)
87 
+        if ($this->pending)
88 88 
         {
89 89 
             $this->pendingDataSet = $this->getPendingDataSet();
90 90 
         }
 
@@ -95,7 +95,7 @@  discard block
 
 block discarded – undo
95 95 
      */
96 96 
     private function getCurrentDataSet()
97 97 
     {
98 
-        if(isset($this->params['current_data_set']))
98 
+        if (isset($this->params['current_data_set']))
99 99 
         {
100 100 
             return \DataSetFactory::getDataSetByName($this->params['current_data_set']);
101 101 
         }
 
@@ -107,30 +107,30 @@  discard block
 
 block discarded – undo
107 107 
      */
108 108 
     private function getPendingDataSet()
109 109 
     {
110 
-        if(isset($this->params['pending_data_set']))
110 
+        if (isset($this->params['pending_data_set']))
111 111 
         {
112 112 
             return \DataSetFactory::getDataSetByName($this->params['pending_data_set']);
113 113 
         }
114 114 
         return \DataSetFactory::getDataSetByName('pending_authentication');
115 115 
     }
116 116
117 
-    private function getDataTable($name, $pending=false)
117 
+    private function getDataTable($name, $pending = false)
118 118 
     {
119 
-         if(isset($this->dataTables[$name]) && isset($this->dataTables[$name][$pending]))
119 
+         if (isset($this->dataTables[$name]) && isset($this->dataTables[$name][$pending]))
120 120 
          {
121 121 
              return $this->dataTables[$name][$pending];
122 122 
          }
123 123 
          $dataSet = $this->dataSet;
124 
-         if($pending)
124 
+         if ($pending)
125 125 
          {
126 126 
              $dataSet = $this->pendingDataSet;
127 127 
          }
128 
-         if($dataSet === null)
128 
+         if ($dataSet === null)
129 129 
          {
130 130 
              throw new \Exception('Unable to obtain dataset for SQL Authentication!');
131 131 
          }
132 132 
          $dataTable = $dataSet[$name];
133 
-         if(!isset($this->dataTables[$name]))
133 
+         if (!isset($this->dataTables[$name]))
134 134 
          {
135 135 
              $this->dataTables[$name] = array();
136 136 
          }
 
@@ -140,7 +140,7 @@  discard block
 
 block discarded – undo
140 140
141 141 
     private function getPendingUserDataTable()
142 142 
     {
143 
-        if(isset($this->params['pending_user_table']))
143 
+        if (isset($this->params['pending_user_table']))
144 144 
         {
145 145 
             return $this->getDataTable($this->params['pending_user_table'], true);
146 146 
         }
 
@@ -149,15 +149,15 @@  discard block
 
 block discarded – undo
149 149
150 150 
     public function login($username, $password)
151 151 
     {
152 
-        if($this->current === false) return false;
152 
+        if ($this->current === false) return false;
153 153 
         $userDataTable = $this->getDataTable('user');
154 154 
         $filter = new \Data\Filter("uid eq '$username'");
155 155 
         $users = $userDataTable->read($filter);
156 
-        if($users === false || !isset($users[0]))
156 
+        if ($users === false || !isset($users[0]))
157 157 
         {
158 158 
             return false;
159 159 
         }
160 
-        if(password_verify($password, $users[0]['pass']))
160 
+        if (password_verify($password, $users[0]['pass']))
161 161 
         {
162 162 
             return array('res'=>true, 'extended'=>$users[0]);
163 163 
         }
 
@@ -166,7 +166,7 @@  discard block
 
 block discarded – undo
166 166
167 167 
     public function isLoggedIn($data)
168 168 
     {
169 
-        if(isset($data['res']))
169 
+        if (isset($data['res']))
170 170 
         {
171 171 
             return $data['res'];
172 172 
         }
 
@@ -175,7 +175,7 @@  discard block
 
 block discarded – undo
175 175
176 176 
     public function getUser($data)
177 177 
     {
178 
-        if(isset($this->params['current_data_set']))
178 
+        if (isset($this->params['current_data_set']))
179 179 
         {
180 180 
             $data['current_data_set'] = $this->params['current_data_set'];
181 181 
         }
 
@@ -187,7 +187,7 @@  discard block
 
 block discarded – undo
187 187 
         $groupDataTable = $this->getDataTable('group');
188 188 
         $filter = new \Data\Filter("gid eq '$name'");
189 189 
         $groups = $groupDataTable->read($filter);
190 
-        if($groups === false || !isset($groups[0]))
190 
+        if ($groups === false || !isset($groups[0]))
191 191 
         {
192 192 
             return false;
193 193 
         }
 
@@ -199,7 +199,7 @@  discard block
 
 block discarded – undo
199 199 
         $userDataTable = $this->getDataTable('user');
200 200 
         $filter = new \Data\Filter("uid eq '$name'");
201 201 
         $users = $userDataTable->read($filter);
202 
-        if($users === false || !isset($users[0]))
202 
+        if ($users === false || !isset($users[0]))
203 203 
         {
204 204 
             return false;
205 205 
         }
 
@@ -215,33 +215,33 @@  discard block
 
 block discarded – undo
215 215 
     private function convertDataToClass($dataTableName, $className, $filter, $select, $top, $skip, $orderby)
216 216 
     {
217 217 
         $data = $this->getDataByFilter($dataTableName, $filter, $select, $top, $skip, $orderby);
218 
-        if($data === false)
218 
+        if ($data === false)
219 219 
         {
220 220 
             return false;
221 221 
         }
222 222 
         $count = count($data);
223 
-        for($i = 0; $i < $count; $i++)
223 
+        for ($i = 0; $i < $count; $i++)
224 224 
         {
225 225 
             $data[$i] = new $className($groups[$i]);
226 226 
         }
227 227 
         return $data;
228 228 
     }
229 229
230 
-    public function getGroupsByFilter($filter, $select=false, $top=false, $skip=false, $orderby=false)
230 
+    public function getGroupsByFilter($filter, $select = false, $top = false, $skip = false, $orderby = false)
231 231 
     {
232 232 
         return $this->convertDataToClass('group', 'SQLGroup', $filter, $select, $top, $skip, $orderby);
233 233 
     }
234 234
235 
-    public function getUsersByFilter($filter, $select=false, $top=false, $skip=false, $orderby=false)
235 
+    public function getUsersByFilter($filter, $select = false, $top = false, $skip = false, $orderby = false)
236 236 
     {
237 237 
         return $this->convertDataToClass('group', 'SQLUser', $filter, $select, $top, $skip, $orderby);
238 238 
     }
239 239
240 240 
     public function getPendingUserCount()
241 241 
     {
242 
-        if($this->pending === false) return 0;
242 
+        if ($this->pending === false) return 0;
243 243 
         $dataTable = $this->getPendingUserDataTable();
244 
-        if($dataTable === null) return 0;
244 
+        if ($dataTable === null) return 0;
245 245 
         return $dataTable->count();
246 246 
     }
247 247 
 
@@ -249,26 +249,26 @@  discard block
 
 block discarded – undo
249 249 
     {
250 250 
         $userDataTable = $this->getPendingUserDataTable();
251 251 
         $fieldData = $filter->to_mongo_filter();
252 
-        $firstFilter = new \Data\Filter('substringof(data,"'.implode($fieldData,' ').'")');
252 
+        $firstFilter = new \Data\Filter('substringof(data,"'.implode($fieldData, ' ').'")');
253 253 
         $users = $userDataTable->read($firstFilter, $select, $top, $skip, $orderby);
254 
-        if($users === false)
254 
+        if ($users === false)
255 255 
         {
256 256 
             return false;
257 257 
         }
258 258 
         $ret = array();
259 259 
         $count = count($users);
260 
-        for($i = 0; $i < $count; $i++)
260 
+        for ($i = 0; $i < $count; $i++)
261 261 
         {
262 262 
             $user = new SQLPendingUser($users[$i], $userDataTable);
263 263 
             $err = false;
264 
-            foreach($fieldData as $field=>$data)
264 
+            foreach ($fieldData as $field=>$data)
265 265 
             {
266 
-                if(strcasecmp($user[$field], $data) !== 0)
266 
+                if (strcasecmp($user[$field], $data) !== 0)
267 267 
                 {
268 268 
                     $err = true; break;
269 269 
                 }
270 270 
             }
271 
-            if(!$err)
271 
+            if (!$err)
272 272 
             {
273 273 
                 array_push($ret, $user);
274 274 
             }
 
@@ -276,22 +276,22 @@  discard block
 
 block discarded – undo
276 276 
         return $ret;
277 277 
     }
278 278
279 
-    public function getPendingUsersByFilter($filter, $select=false, $top=false, $skip=false, $orderby=false)
279 
+    public function getPendingUsersByFilter($filter, $select = false, $top = false, $skip = false, $orderby = false)
280 280
281 281 
     {
282 
-        if($this->pending === false) return false;
283 
-        if($filter !== false && !$filter->contains('hash'))
282 
+        if ($this->pending === false) return false;
283 
+        if ($filter !== false && !$filter->contains('hash'))
284 284 
         {
285 285 
             return $this->searchPendingUsers($filter, $select, $top, $skip, $orderby);
286 286 
         }
287 287 
         $userDataTable = $this->getPendingUserDataTable();
288 288 
         $users = $userDataTable->read($filter, $select, $top, $skip, $orderby);
289 
-        if($users === false)
289 
+        if ($users === false)
290 290 
         {
291 291 
             return false;
292 292 
         }
293 293 
         $count = count($users);
294 
-        for($i = 0; $i < $count; $i++)
294 
+        for ($i = 0; $i < $count; $i++)
295 295 
         {
296 296 
             $users[$i] = new SQLPendingUser($users[$i], $userDataTable);
297 297 
         }
 
@@ -300,9 +300,9 @@  discard block
 
 block discarded – undo
300 300
301 301 
     public function createPendingUser($user)
302 302 
     {
303 
-        if($this->pending === false) return false;
303 
+        if ($this->pending === false) return false;
304 304 
         $userDataTable = $this->getPendingUserDataTable();
305 
-        if(isset($user->password2))
305 
+        if (isset($user->password2))
306 306 
         {
307 307 
             unset($user->password2);
308 308 
         }
 
@@ -310,10 +310,10 @@  discard block
 
 block discarded – undo
310 310 
         $hash = hash('sha512', $json);
311 311 
         $array = array('hash'=>$hash, 'data'=>$json);
312 312 
         $ret = $userDataTable->create($array);
313 
-        if($ret !== false)
313 
+        if ($ret !== false)
314 314 
         {
315 315 
             $users = $this->getPendingUsersByFilter(new \Data\Filter("hash eq '$hash'"));
316 
-            if($users === false || !isset($users[0]))
316 
+            if ($users === false || !isset($users[0]))
317 317 
             {
318 318 
                 throw new \Exception('Error retreiving user object after successful create!');
319 319 
             }
 
@@ -325,7 +325,7 @@  discard block
 
 block discarded – undo
325 325 
     public function getTempUserByHash($hash)
326 326 
     {
327 327 
         $users = $this->getPendingUsersByFilter(new \Data\Filter("hash eq '$hash'"));
328 
-        if($users === false || !isset($users[0]))
328 
+        if ($users === false || !isset($users[0]))
329 329 
         {
330 330 
             return false;
331 331 
         }
Please login to merge, or discard this patch.
Auth/class.GoogleAuthenticator.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch 
@@ -66,7 +66,7 @@
 
 block discarded – undo
66 66 
             $ret = $auth->activatePendingUser($user);
67 67 
             if($ret === false)
68 68 
             {
69 
-                 throw new \Exception('Unable to create user! '.$res);
69 
+                    throw new \Exception('Unable to create user! '.$res);
70 70 
             }
71 71 
             return self::SUCCESS;
72 72 
         }
Please login to merge, or discard this patch.
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch 
@@ -10,11 +10,11 @@  discard block
 
 block discarded – undo
10 10 
     public function __construct($params)
11 11 
     {
12 12 
         parent::__construct($params);
13 
-        if(!isset($params['client_secrets_path']))
13 
+        if (!isset($params['client_secrets_path']))
14 14 
         {
15 15 
             throw new \Exception('Missing required parameter client_secrets_path!');
16 16 
         }
17 
-        if(!isset($params['redirect_url']))
17 
+        if (!isset($params['redirect_url']))
18 18 
         {
19 19 
             $params['redirect_url'] = 'https://'.$_SERVER['HTTP_HOST'].'/oauth2callback.php?src=google';
20 20 
         }

@@ -34,21 +34,21 @@  discard block
 
 block discarded – undo
34 34 
     public function authenticate($code, &$currentUser = false)
35 35 
     {
36 36 
         $googleUser = false;
37 
-        try{
37 
+        try {
38 38 
             $this->client->authenticate($code);
39 39 
             $this->token = $this->client->getAccessToken();
40 40 
             \FlipSession::setVar('GoogleToken', $this->token);
41 41 
             $oauth2Service = new \Google_Service_Oauth2($this->client);
42 42 
             $googleUser = $oauth2Service->userinfo->get();
43 
-        } catch(\Exception $ex) {
43 
+        } catch (\Exception $ex) {
44 44 
             return self::LOGIN_FAILED;
45 45 
         }
46 46
47 47 
         $auth = \AuthProvider::getInstance();
48 48 
         $localUsers = $auth->getUsersByFilter(new \Data\Filter('mail eq '.$googleUser->email));
49 
-        if($localUsers !== false && isset($localUsers[0]))
49 
+        if ($localUsers !== false && isset($localUsers[0]))
50 50 
         {
51 
-            if($localUsers[0]->canLoginWith('google.com'))
51 
+            if ($localUsers[0]->canLoginWith('google.com'))
52 52 
             {
53 53 
                 $auth->impersonateUser($localUsers[0]);
54 54 
                 return self::SUCCESS;

@@ -64,7 +64,7 @@  discard block
 
 block discarded – undo
64 64 
             $user->setLastName($googleUser->familyName);
65 65 
             $user->addLoginProvider('google.com');
66 66 
             $ret = $auth->activatePendingUser($user);
67 
-            if($ret === false)
67 
+            if ($ret === false)
68 68 
             {
69 69 
                  throw new \Exception('Unable to create user! '.$res);
70 70 
             }

@@ -74,7 +74,7 @@  discard block
 
 block discarded – undo
74 74
75 75 
     public function getUser($data = false)
76 76 
     {
77 
-        if($data === false)
77 
+        if ($data === false)
78 78 
         {
79 79 
             $data = $this->token;
80 80 
         }

@@ -89,7 +89,7 @@  discard block
 
 block discarded – undo
89 89 
             $profileUser['displayName'] = $googleUser->name;
90 90 
             $profileUser['jpegPhoto'] = base64_encode(file_get_contents($googleUser->picture));
91 91 
             return $profileUser;
92 
-        } catch(\Exception $e)
92 
+        } catch (\Exception $e)
93 93 
         {
94 94 
             return false;
95 95 
         }
Please login to merge, or discard this patch.
Auth/OAuth2/class.OAuth2Authenticator.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch 
@@ -14,7 +14,7 @@  discard block
 
 block discarded – undo
14 14 
 namespace Auth\OAuth2;
15 15
16 16 
 /** Only load the HTTPFul bootstrap if it isn't already loaded*/
17 
-if(!class_exists('Httpful\Request'))
17 
+if (!class_exists('Httpful\Request'))
18 18 
 {
19 19 
     require('/var/www/common/libs/httpful/bootstrap.php');
20 20 
 }
 
@@ -37,7 +37,7 @@  discard block
 
 block discarded – undo
37 37 
     public function __construct($params)
38 38 
     {
39 39 
         parent::__construct($params);
40 
-        if(!isset($params['redirect_url']))
40 
+        if (!isset($params['redirect_url']))
41 41 
         {
42 42 
             $this->redirect_uri = 'https://'.$_SERVER['HTTP_HOST'].'/oauth/callbacks/'.$this->getHostName();
43 43 
         }
 
@@ -115,21 +115,21 @@  discard block
 
 block discarded – undo
115 115 
     public function authenticate($params, &$current_user)
116 116 
     {
117 117 
         $resp = $this->doAuthPost($params);
118 
-        if($resp->hasErrors())
118 
+        if ($resp->hasErrors())
119 119 
         {
120 120 
             return self::LOGIN_FAILED;
121 121 
         }
122 122 
         \FlipSession::setVar('OAuthToken', $resp->body);
123 123 
         $user = $this->getUserFromToken($resp->body);
124 
-        if($user === false)
124 
+        if ($user === false)
125 125 
         {
126 126 
             return self::LOGIN_FAILED;
127 127 
         }
128 128 
         $auth = \AuthProvider::getInstance();
129 129 
         $local_users = $auth->getUsersByFilter(new \Data\Filter('mail eq '.$user->getEmail()));
130 
-        if($local_users !== false && isset($local_users[0]))
130 
+        if ($local_users !== false && isset($local_users[0]))
131 131 
         {
132 
-            if($local_users[0]->canLoginWith($this->getHostName()))
132 
+            if ($local_users[0]->canLoginWith($this->getHostName()))
133 133 
             {
134 134 
                 $auth->impersonateUser($local_users[0]);
135 135 
                 return self::SUCCESS;
 
@@ -138,7 +138,7 @@  discard block
 
 block discarded – undo
138 138 
             return self::ALREADY_PRESENT;
139 139 
         }
140 140 
         $ret = $auth->activatePendingUser($user);
141 
-        if($ret === false)
141 
+        if ($ret === false)
142 142 
         {
143 143 
             throw new \Exception('Unable to create user! '.$res);
144 144 
         }
Please login to merge, or discard this patch.