Completed
Push — master ( f5e261...211f4d )
by Patrick
03:40 queued 49s
created
class.FlipSession.php 1 patch
Spacing   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -1,11 +1,11 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 require_once('Autoload.php');
3
-if(!isset($_SESSION) && php_sapi_name() !== 'cli') { session_start(); }
4
-if(!isset($_SESSION['ip_address']) && isset($_SERVER['REMOTE_ADDR']))
3
+if (!isset($_SESSION) && php_sapi_name() !== 'cli') { session_start(); }
4
+if (!isset($_SESSION['ip_address']) && isset($_SERVER['REMOTE_ADDR']))
5 5
 {
6 6
     $_SESSION['ip_address'] = $_SERVER['REMOTE_ADDR'];
7 7
 }
8
-if(!isset($_SESSION['init_time']))
8
+if (!isset($_SESSION['init_time']))
9 9
 {
10 10
     $_SESSION['init_time'] = date('c');
11 11
 }
@@ -29,7 +29,7 @@  discard block
 block discarded – undo
29 29
      */
30 30
     static function getVar($name, $default = false)
31 31
     {
32
-        if(FlipSession::doesVarExist($name))
32
+        if (FlipSession::doesVarExist($name))
33 33
         {
34 34
             return $_SESSION[$name];
35 35
         }
@@ -56,11 +56,11 @@  discard block
 block discarded – undo
56 56
      */
57 57
     static function isLoggedIn()
58 58
     {
59
-        if(isset($_SESSION['flipside_user']))
59
+        if (isset($_SESSION['flipside_user']))
60 60
         {
61 61
             return true;
62 62
         }
63
-        else if(isset($_SESSION['AuthMethod']) && isset($_SESSION['AuthData']))
63
+        else if (isset($_SESSION['AuthMethod']) && isset($_SESSION['AuthData']))
64 64
         {
65 65
             $auth = AuthProvider::getInstance();
66 66
             return $auth->isLoggedIn($_SESSION['AuthData'], $_SESSION['AuthMethod']);
@@ -78,15 +78,15 @@  discard block
 block discarded – undo
78 78
      */
79 79
     static function getUser()
80 80
     {
81
-        if(isset($_SESSION['flipside_user']))
81
+        if (isset($_SESSION['flipside_user']))
82 82
         {
83 83
             return $_SESSION['flipside_user'];
84 84
         }
85
-        else if(isset($_SESSION['AuthMethod']) && isset($_SESSION['AuthData']))
85
+        else if (isset($_SESSION['AuthMethod']) && isset($_SESSION['AuthData']))
86 86
         {
87 87
             $auth = AuthProvider::getInstance();
88 88
             $user = $auth->getUser($_SESSION['AuthData'], $_SESSION['AuthMethod']);
89
-            if($user !== null)
89
+            if ($user !== null)
90 90
             {
91 91
                 $_SESSION['flipside_user'] = $user;
92 92
             }
@@ -115,16 +115,16 @@  discard block
 block discarded – undo
115 115
      */
116 116
     static function getUserEmail()
117 117
     {
118
-        if(isset($_SESSION['flipside_email']))
118
+        if (isset($_SESSION['flipside_email']))
119 119
         {
120 120
             return $_SESSION['flipside_email'];
121 121
         }
122 122
         $user = FlipSession::getUser();
123
-        if($user === false || $user === null)
123
+        if ($user === false || $user === null)
124 124
         {
125 125
             return false;
126 126
         }
127
-        if(isset($user->mail) && isset($user->mail[0]))
127
+        if (isset($user->mail) && isset($user->mail[0]))
128 128
         {
129 129
             $_SESSION['flipside_email'] = $user->mail[0];
130 130
             return $_SESSION['flipside_email'];
@@ -139,7 +139,7 @@  discard block
 block discarded – undo
139 139
      */
140 140
     static function end()
141 141
     {
142
-        if(isset($_SESSION) && !empty($_SESSION))
142
+        if (isset($_SESSION) && !empty($_SESSION))
143 143
         {
144 144
             $_SESSION = array();
145 145
             session_destroy();
@@ -151,13 +151,13 @@  discard block
 block discarded – undo
151 151
         $res = array();
152 152
         $offset = 0;
153 153
         $length = strlen($sessionData);
154
-        while($offset < $length)
154
+        while ($offset < $length)
155 155
         {
156 156
             $pos = strpos($sessionData, "|", $offset);
157 157
             $len = $pos - $offset;
158 158
             $name = substr($sessionData, $offset, $len);
159
-            if($name === false) break;
160
-            $offset += $len+1;
159
+            if ($name === false) break;
160
+            $offset += $len + 1;
161 161
             $data = @unserialize(substr($sessionData, $offset));
162 162
             $res[$name] = $data;
163 163
             $offset += strlen(serialize($data));
@@ -170,26 +170,26 @@  discard block
 block discarded – undo
170 170
         $res = array();
171 171
         $sessFiles = scandir(ini_get('session.save_path'));
172 172
         $count = count($sessFiles);
173
-        for($i = 0; $i < $count; $i++)
173
+        for ($i = 0; $i < $count; $i++)
174 174
         {
175
-            if($sessFiles[$i][0] === '.')
175
+            if ($sessFiles[$i][0] === '.')
176 176
             {
177 177
                 continue;
178 178
             }
179 179
             $sessionId = substr($sessFiles[$i], 5);
180 180
             $sessionData = file_get_contents(ini_get('session.save_path').'/'.$sessFiles[$i]);
181
-            if($sessionData === false)
181
+            if ($sessionData === false)
182 182
             {
183 183
                 array_push($res, array('sid' => $sessionId));
184 184
             }
185 185
             else
186 186
             {
187 187
                 $tmp = FlipSession::unserializePhpSession($sessionData);
188
-                $tmp['sid' ] = $sessionId;
188
+                $tmp['sid'] = $sessionId;
189 189
                 array_push($res, $tmp);
190 190
             }
191 191
         }
192
-        if(count($res) == 0)
192
+        if (count($res) == 0)
193 193
         {
194 194
             return false;
195 195
         }
Please login to merge, or discard this patch.
class.JsonSerializable.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -10,7 +10,7 @@
 block discarded – undo
10 10
 * @link http://www.php.net/manual/en/class.jsonserializable.php
11 11
 */
12 12
 
13
-if(PHP_VERSION_ID < 50400)
13
+if (PHP_VERSION_ID < 50400)
14 14
 {
15 15
 /**
16 16
 * JsonSerializable interface
Please login to merge, or discard this patch.
class.WebPage.php 1 patch
Spacing   +24 added lines, -24 removed lines patch added patch discarded remove patch
@@ -58,11 +58,11 @@  discard block
 block discarded – undo
58 58
         $this->importSupport = false;
59 59
         
60 60
         $browserName = $this->getBrowserName();
61
-        if($browserName === 'IE' && $this->getBrowserMajorVer() <= 7)
61
+        if ($browserName === 'IE' && $this->getBrowserMajorVer() <= 7)
62 62
         {
63
-            header( 'Location: /badbrowser.php' ) ;
63
+            header('Location: /badbrowser.php');
64 64
         }
65
-        else if($browserName === 'Chrome' && $this->getBrowserMajorVer() >= 36)
65
+        else if ($browserName === 'Chrome' && $this->getBrowserMajorVer() >= 36)
66 66
         {
67 67
             $this->importSupport = true;
68 68
         }
@@ -77,7 +77,7 @@  discard block
 block discarded – undo
77 77
      */
78 78
     protected function getBrowscap()
79 79
     {
80
-        if(isset($GLOBALS['BROWSCAP_CACHE']))
80
+        if (isset($GLOBALS['BROWSCAP_CACHE']))
81 81
         {
82 82
             return new Browscap($GLOBALS['BROWSCAP_CACHE']);
83 83
         }
@@ -89,8 +89,8 @@  discard block
 block discarded – undo
89 89
      */
90 90
     private function getBrowser()
91 91
     {
92
-        static $browser;//No accident can arise from depending on an unset variable.
93
-        if(!isset($browser))
92
+        static $browser; //No accident can arise from depending on an unset variable.
93
+        if (!isset($browser))
94 94
         {
95 95
             $browser = $this->browscap->getBrowser();
96 96
         }
@@ -102,7 +102,7 @@  discard block
 block discarded – undo
102 102
      */
103 103
     private function getBrowserName()
104 104
     {
105
-        if(isset($this->browser->Browser))
105
+        if (isset($this->browser->Browser))
106 106
         {
107 107
             return $this->browser->Browser;
108 108
         }
@@ -117,7 +117,7 @@  discard block
 block discarded – undo
117 117
      */
118 118
     private function getBrowserMajorVer()
119 119
     {
120
-        if(isset($this->browser->MajorVer))
120
+        if (isset($this->browser->MajorVer))
121 121
         {
122 122
             return $this->browser->MajorVer;
123 123
         }
@@ -190,19 +190,19 @@  discard block
 block discarded – undo
190 190
      *
191 191
      * @return string The tag as a string
192 192
      */
193
-    protected function createOpenTag($tagName, $attribs=array(), $selfClose=false)
193
+    protected function createOpenTag($tagName, $attribs = array(), $selfClose = false)
194 194
     {
195 195
         $tag = '<'.$tagName;
196 196
         $attribNames = array_keys($attribs);
197
-        foreach($attribNames as $attribName)
197
+        foreach ($attribNames as $attribName)
198 198
         {
199
-            $tag.=' '.$attribName;
200
-            if($attribs[$attribName])
199
+            $tag .= ' '.$attribName;
200
+            if ($attribs[$attribName])
201 201
             {
202
-                $tag.='="'.$attribs[$attribName].'"';
202
+                $tag .= '="'.$attribs[$attribName].'"';
203 203
             }
204 204
         }
205
-        if($selfClose)
205
+        if ($selfClose)
206 206
         {
207 207
             return $tag.'/>';
208 208
         }
@@ -229,7 +229,7 @@  discard block
 block discarded – undo
229 229
      *
230 230
      * @return string The link
231 231
      */
232
-    public function createLink($linkName, $linkTarget='#')
232
+    public function createLink($linkName, $linkTarget = '#')
233 233
     {
234 234
         $startTag = $this->createOpenTag('a', array('href'=>$linkTarget));
235 235
         $endTag = $this->createCloseTag('a');
@@ -245,10 +245,10 @@  discard block
 block discarded – undo
245 245
      *
246 246
      * @param string $prefix The prefix to append to each line
247 247
      */
248
-    protected function printIeCompatability($prefix='')
248
+    protected function printIeCompatability($prefix = '')
249 249
     {
250 250
        //IE 8 doesn't support HTML 5. Install the shim...
251
-       if($this->getBrowserMajorVer() < 9)
251
+       if ($this->getBrowserMajorVer() < 9)
252 252
        {
253 253
            echo $prefix.'<script src="js/html5.js"></script>';
254 254
            echo "\n";
@@ -263,16 +263,16 @@  discard block
 block discarded – undo
263 263
      *
264 264
      * @param string $prefix The prefix to append to each line
265 265
      */
266
-    protected function printHead($prefix='')
266
+    protected function printHead($prefix = '')
267 267
     {
268 268
         echo $prefix.'<HEAD>';
269
-        if($this->getBrowserName() === 'IE')
269
+        if ($this->getBrowserName() === 'IE')
270 270
         {
271 271
             $this->printIeCompatability($prefix.$prefix);
272 272
         }
273 273
         echo $prefix.$prefix.'<TITLE>'.$this->title.'</TITLE>';
274 274
         echo $prefix.$prefix.'<meta name="viewport" content="width=device-width, initial-scale=1.0">';
275
-        foreach($this->headTags as $tag)
275
+        foreach ($this->headTags as $tag)
276 276
         {
277 277
             echo $prefix.$prefix.$tag."\n";
278 278
         }
@@ -284,7 +284,7 @@  discard block
 block discarded – undo
284 284
      *
285 285
      * @param string $prefix The prefix to append to each line
286 286
      */
287
-    protected function printBody($prefix='')
287
+    protected function printBody($prefix = '')
288 288
     {
289 289
         echo $prefix.'<BODY '.$this->body_tags.'>';
290 290
         echo $prefix.$prefix.$this->body."\n";
@@ -312,16 +312,16 @@  discard block
 block discarded – undo
312 312
      */
313 313
     public function currentURL()
314 314
     {
315
-        if(!isset($_SERVER['REQUEST_URI']))
315
+        if (!isset($_SERVER['REQUEST_URI']))
316 316
         {
317 317
             return '';
318 318
         }
319 319
         $requestURI = $_SERVER['REQUEST_URI'];
320
-        if($requestURI[0] === '/')
320
+        if ($requestURI[0] === '/')
321 321
         {
322 322
             $requestURI = substr($requestURI, 1);
323 323
         }
324
-        return 'http'.(isset($_SERVER['HTTPS'])?'s':'').'://'.$_SERVER['HTTP_HOST'].'/'.$requestURI;
324
+        return 'http'.(isset($_SERVER['HTTPS']) ? 's' : '').'://'.$_SERVER['HTTP_HOST'].'/'.$requestURI;
325 325
     }
326 326
 }
327 327
 /* vim: set tabstop=4 shiftwidth=4 expandtab: */
Please login to merge, or discard this patch.
class.EmailProvider.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -37,11 +37,11 @@  discard block
 block discarded – undo
37 37
     protected function __construct()
38 38
     {
39 39
         $this->methods = array();
40
-        if(isset(FlipsideSettings::$email_providers))
40
+        if (isset(FlipsideSettings::$email_providers))
41 41
         {
42 42
             $keys = array_keys(FlipsideSettings::$email_providers);
43 43
             $count = count($keys);
44
-            for($i = 0; $i < $count; $i++)
44
+            for ($i = 0; $i < $count; $i++)
45 45
             {
46 46
                 $class = $keys[$i];
47 47
                 array_push($this->methods, new $class(FlipsideSettings::$email_providers[$keys[$i]]));
@@ -59,9 +59,9 @@  discard block
 block discarded – undo
59 59
     public function getEmailMethod($methodName)
60 60
     {
61 61
         $count = count($this->methods);
62
-        for($i = 0; $i < $count; $i++)
62
+        for ($i = 0; $i < $count; $i++)
63 63
         {
64
-            if(strcasecmp(get_class($this->methods[$i]), $methodName) === 0)
64
+            if (strcasecmp(get_class($this->methods[$i]), $methodName) === 0)
65 65
             {
66 66
                 return $this->methods[$i];
67 67
             }
@@ -79,14 +79,14 @@  discard block
 block discarded – undo
79 79
      */
80 80
     public function sendEmail($email, $methodName = false)
81 81
     {
82
-        if($methodName === false)
82
+        if ($methodName === false)
83 83
         {
84 84
             $res = false;
85 85
             $count = count($this->methods);
86
-            for($i = 0; $i < $count; $i++)
86
+            for ($i = 0; $i < $count; $i++)
87 87
             {
88 88
                 $res = $this->methods[$i]->sendEmail($email);
89
-                if($res !== false)
89
+                if ($res !== false)
90 90
                 {
91 91
                     return $res;
92 92
                 }
Please login to merge, or discard this patch.
Email/class.AmazonSES.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -27,7 +27,7 @@
 block discarded – undo
27 27
 
28 28
     public function sendEmail($email)
29 29
     {
30
-        if($email->hasAttachments())
30
+        if ($email->hasAttachments())
31 31
         {
32 32
             //Amazeon sendEmail doesn't support attachments. We need to use sendRawEmail
33 33
             $args = array();
Please login to merge, or discard this patch.
LDAP/class.LDAPObject.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -5,7 +5,7 @@  discard block
 block discarded – undo
5 5
 {
6 6
      public $server;
7 7
 
8
-     function __construct($array=false, $server=false)
8
+     function __construct($array = false, $server = false)
9 9
      {
10 10
          parent::__construct($array);
11 11
          $this->server = $server;
@@ -16,14 +16,14 @@  discard block
 block discarded – undo
16 16
          $ret = array();
17 17
          foreach ($this as $key => $value)
18 18
          {
19
-            if($key === 'server' || $key === 'count') continue;
20
-            if(is_numeric($key)) continue;
21
-            if($key === 'jpegphoto')
19
+            if ($key === 'server' || $key === 'count') continue;
20
+            if (is_numeric($key)) continue;
21
+            if ($key === 'jpegphoto')
22 22
             {
23 23
                 $ret[$key] = base64_encode($value[0]);
24 24
                 continue;
25 25
             }
26
-            if(is_array($value) && $value['count'] === 1)
26
+            if (is_array($value) && $value['count'] === 1)
27 27
             {
28 28
                 $ret[$key] = $value[0];
29 29
             }
Please login to merge, or discard this patch.
class.DataSetFactory.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -14,7 +14,7 @@  discard block
 block discarded – undo
14 14
 /**
15 15
  * use the FlipsideSettings class
16 16
  */
17
-if(isset($GLOBALS['FLIPSIDE_SETTINGS_LOC']))
17
+if (isset($GLOBALS['FLIPSIDE_SETTINGS_LOC']))
18 18
 {
19 19
     require_once($GLOBALS['FLIPSIDE_SETTINGS_LOC'].'/class.FlipsideSettings.php');
20 20
 }
@@ -59,11 +59,11 @@  discard block
 block discarded – undo
59 59
     static function getDataSetByName($setName)
60 60
     {
61 61
         static $instances = array();
62
-        if(isset($instances[$setName]))
62
+        if (isset($instances[$setName]))
63 63
         {
64 64
             return $instances[$setName];
65 65
         }
66
-        if(!isset(FlipsideSettings::$dataset) || !isset(FlipsideSettings::$dataset[$setName]))
66
+        if (!isset(FlipsideSettings::$dataset) || !isset(FlipsideSettings::$dataset[$setName]))
67 67
         {
68 68
             throw new Exception('Unknown dataset name '.$setName);
69 69
         }
Please login to merge, or discard this patch.
class.FlipsideMail.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -22,7 +22,7 @@  discard block
 block discarded – undo
22 22
 
23 23
     public function send_HTML($mail)
24 24
     {
25
-        if(isset($mail['from']))
25
+        if (isset($mail['from']))
26 26
         {
27 27
             $this->From = $mail['from'];
28 28
         }
@@ -30,7 +30,7 @@  discard block
 block discarded – undo
30 30
         {
31 31
             $this->From = $this->Username;
32 32
         }
33
-        if(isset($mail['from_name']))
33
+        if (isset($mail['from_name']))
34 34
         {
35 35
             $this->FromName = $mail['from_name'];
36 36
         }
@@ -39,7 +39,7 @@  discard block
 block discarded – undo
39 39
             $this->FromName = 'Burning Flipside';
40 40
         }
41 41
         $this->clearAllRecipients();
42
-        if(is_array($mail['to']))
42
+        if (is_array($mail['to']))
43 43
         {
44 44
             array_walk($mail['to'], 'FlipsideMail::addTo', $this);
45 45
         }
@@ -47,7 +47,7 @@  discard block
 block discarded – undo
47 47
         {
48 48
             $this->addAddress($mail['to']);
49 49
         }
50
-        if(isset($mail['reply_to']))
50
+        if (isset($mail['reply_to']))
51 51
         {
52 52
             $this->addReplyTo($mail['reply_to']);
53 53
         }
Please login to merge, or discard this patch.
class.Singleton.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -28,7 +28,7 @@
 block discarded – undo
28 28
     {
29 29
         static $instances = array();
30 30
         $class = get_called_class();
31
-        if(!isset($instances[$class]))
31
+        if (!isset($instances[$class]))
32 32
         {
33 33
             $instances[$class] = new static();
34 34
         }
Please login to merge, or discard this patch.