BurningFlipside / CommonCode

class.AuthProvider.php

Spacing +52 added lines, -52 removed lines

@@ -36,11 +36,11 @@ 
     protected function __construct()
     {
         $this->methods = array();
-        if(isset(FlipsideSettings::$authProviders))
+        if (isset(FlipsideSettings::$authProviders))
         {
             $keys = array_keys(FlipsideSettings::$authProviders);
             $count = count($keys);
-            for($i = 0; $i < $count; $i++)
+            for ($i = 0; $i < $count; $i++)
             {
                 $class = $keys[$i];
                 array_push($this->methods, new $class(FlipsideSettings::$authProviders[$keys[$i]]));
@@ -58,9 +58,9 @@ 
     public function getAuthenticator($methodName)
     {
         $count = count($this->methods);
-        for($i = 0; $i < $count; $i++)
+        for ($i = 0; $i < $count; $i++)
         {
-            if(strcasecmp(get_class($this->methods[$i]), $methodName) === 0)
+            if (strcasecmp(get_class($this->methods[$i]), $methodName) === 0)
             {
                 return $this->methods[$i];
             }
@@ -82,10 +82,10 @@ 
     {
         $res = false;
         $count = count($this->methods);
-        for($i = 0; $i < $count; $i++)
+        for ($i = 0; $i < $count; $i++)
         {
             $res = $this->methods[$i]->login($username, $password);
-            if($res !== false)
+            if ($res !== false)
             {
                 return $this->methods[$i]->getUser($res);
             }
@@ -105,10 +105,10 @@ 
     {
         $res = false;
         $count = count($this->methods);
-        for($i = 0; $i < $count; $i++)
+        for ($i = 0; $i < $count; $i++)
         {
             $res = $this->methods[$i]->login($username, $password);
-            if($res !== false)
+            if ($res !== false)
             {
                 FlipSession::setVar('AuthMethod', get_class($this->methods[$i]));
                 FlipSession::setVar('AuthData', $res);
@@ -156,11 +156,11 @@ 
      */
     private function mergeResult(&$returnValue, $res)
     {
-        if($res === false)
+        if ($res === false)
         {
             return;
         }
-        if($returnValue === false)
+        if ($returnValue === false)
         {
             $returnValue = $res;
             return;
@@ -182,11 +182,11 @@ 
     {
         $ret = false;
         $count = count($this->methods);
-        for($i = 0; $i < $count; $i++)
+        for ($i = 0; $i < $count; $i++)
         {
-            if($checkField)
+            if ($checkField)
             {
-                if($this->methods[$i]->{$checkField} === $checkValue)
+                if ($this->methods[$i]->{$checkField} === $checkValue)
                 {
                     continue;
                 }
@@ -210,11 +210,11 @@ 
     {
         $retCount = 0;
         $count = count($this->methods);
-        for($i = 0; $i < $count; $i++)
+        for ($i = 0; $i < $count; $i++)
         {
-            if($checkField)
+            if ($checkField)
             {
-                if($this->methods[$i]->{$checkField} === $checkValue)
+                if ($this->methods[$i]->{$checkField} === $checkValue)
                 {
                     continue;
                 }
@@ -235,7 +235,7 @@ 
      */
     public function getGroupByName($name, $methodName = false)
     {
-        if($methodName === false)
+        if ($methodName === false)
         {
             return $this->callOnEach('getGroupByName', array($name));
         }
@@ -255,9 +255,9 @@ 
      *
      * @return array|false An array of Auth\User objects or false if no users were found
      */
-    public function getUsersByFilter($filter, $select=false, $top=false, $skip=false, $orderby=false, $methodName = false)
+    public function getUsersByFilter($filter, $select = false, $top = false, $skip = false, $orderby = false, $methodName = false)
     {
-        if($methodName === false)
+        if ($methodName === false)
         {
             return $this->callOnEach('getUsersByFilter', array($filter, $select, $top, $skip, $orderby), 'current');
         }
@@ -277,9 +277,9 @@ 
      *
      * @return array|false An array of Auth\PendingUser objects or false if no pending users were found
      */
-    public function getPendingUsersByFilter($filter, $select=false, $top=false, $skip=false, $orderby=false, $methodName = false)
+    public function getPendingUsersByFilter($filter, $select = false, $top = false, $skip = false, $orderby = false, $methodName = false)
     {
-        if($methodName === false)
+        if ($methodName === false)
         {
             return $this->callOnEach('getPendingUsersByFilter', array($filter, $select, $top, $skip, $orderby), 'pending');
         }
@@ -299,9 +299,9 @@ 
      *
      * @return array|false An array of Auth\Group objects or false if no pending users were found
      */
-    public function getGroupsByFilter($filter, $select=false, $top=false, $skip=false, $orderby=false, $methodName = false)
+    public function getGroupsByFilter($filter, $select = false, $top = false, $skip = false, $orderby = false, $methodName = false)
     {
-        if($methodName === false)
+        if ($methodName === false)
         {
             return $this->callOnEach('getGroupsByFilter', array($filter, $select, $top, $skip, $orderby), 'current');
         }
@@ -318,7 +318,7 @@ 
      */
     public function getActiveUserCount($methodName = false)
     {
-        if($methodName === false)
+        if ($methodName === false)
         {
             return $this->addFromEach('getActiveUserCount', 'current');
         }
@@ -335,7 +335,7 @@ 
      */
     public function getPendingUserCount($methodName = false)
     {
-        if($methodName === false)
+        if ($methodName === false)
         {
             return $this->addFromEach('getPendingUserCount', 'pending');
         }
@@ -352,7 +352,7 @@ 
      */
     public function getGroupCount($methodName = false)
     {
-        if($methodName === false)
+        if ($methodName === false)
         {
             return $this->addFromEach('getGroupCount', 'current');
         }
@@ -372,9 +372,9 @@ 
     {
         $ret = array();
         $count = count($this->methods);
-        for($i = 0; $i < $count; $i++)
+        for ($i = 0; $i < $count; $i++)
         {
-            if($this->methods[$i]->supplement === false) continue;
+            if ($this->methods[$i]->supplement === false) continue;
 
             array_push($ret, $this->methods[$i]->getSupplementLink());
         }
@@ -391,7 +391,7 @@ 
      */
     public function impersonateUser($userArray)
     {
-        if(!is_object($userArray))
+        if (!is_object($userArray))
         {
             $user = new $userArray['class']($userArray);
         }
@@ -408,15 +408,15 @@ 
      */
     public function getTempUserByHash($hash, $methodName = false)
     {
-        if($methodName === false)
+        if ($methodName === false)
         {
             $count = count($this->methods);
-            for($i = 0; $i < $count; $i++)
+            for ($i = 0; $i < $count; $i++)
             {
-                if($this->methods[$i]->pending === false) continue;
+                if ($this->methods[$i]->pending === false) continue;
 
                 $ret = $this->methods[$i]->getTempUserByHash($hash);
-                if($ret !== false)
+                if ($ret !== false)
                 {
                     return $ret;
                 }
@@ -437,15 +437,15 @@ 
      */
     public function createPendingUser($user, $methodName = false)
     {
-        if($methodName === false)
+        if ($methodName === false)
         {
             $count = count($this->methods);
-            for($i = 0; $i < $count; $i++)
+            for ($i = 0; $i < $count; $i++)
             {
-                if($this->methods[$i]->pending === false) continue;
+                if ($this->methods[$i]->pending === false) continue;
 
                 $ret = $this->methods[$i]->createPendingUser($user);
-                if($ret !== false)
+                if ($ret !== false)
                 {
                     return true;
                 }
@@ -469,15 +469,15 @@ 
      */
     public function activatePendingUser($user, $methodName = false)
     {
-        if($methodName === false)
+        if ($methodName === false)
         {
             $count = count($this->methods);
-            for($i = 0; $i < $count; $i++)
+            for ($i = 0; $i < $count; $i++)
             {
-                if($this->methods[$i]->current === false) continue;
+                if ($this->methods[$i]->current === false) continue;
 
                 $ret = $this->methods[$i]->activatePendingUser($user);
-                if($ret !== false)
+                if ($ret !== false)
                 {
                     $this->impersonateUser($ret);
                     return true;
@@ -499,15 +499,15 @@ 
      */
     public function getUserByResetHash($hash, $methodName = false)
     {
-        if($methodName === false)
+        if ($methodName === false)
         {
             $count = count($this->methods);
-            for($i = 0; $i < $count; $i++)
+            for ($i = 0; $i < $count; $i++)
             {
-                if($this->methods[$i]->current === false) continue;
+                if ($this->methods[$i]->current === false) continue;
 
                 $ret = $this->methods[$i]->getUserByResetHash($hash);
-                if($ret !== false)
+                if ($ret !== false)
                 {
                     return $ret;
                 }
@@ -515,7 +515,7 @@ 
             return false;
         }
         $auth = $this->getAuthenticator($methodName);
-        if($auth === false)
+        if ($auth === false)
         {
             return $this->getUserByResetHash($hash, false);
         }
@@ -532,11 +532,11 @@ 
     public function getSuplementalProviderByHost($host)
     {
         $count = count($this->methods);
-        for($i = 0; $i < $count; $i++)
+        for ($i = 0; $i < $count; $i++)
         {
-            if($this->methods[$i]->supplement === false) continue;
+            if ($this->methods[$i]->supplement === false) continue;
 
-            if($this->methods[$i]->getHostName() === $host)
+            if ($this->methods[$i]->getHostName() === $host)
             {
                 return $this->methods[$i];
             }
@@ -544,15 +544,15 @@ 
         return false;
     }
 
-    public function deletePendingUsersByFilter($filter, $methodName=false)
+    public function deletePendingUsersByFilter($filter, $methodName = false)
     {
         $users = $this->getPendingUsersByFilter($filter, false, false, false, false, $methodName);
-        if($users === false)
+        if ($users === false)
         {
             return false;
         }
         $count = count($users);
-        for($i = 0; $i < $count; $i++)
+        for ($i = 0; $i < $count; $i++)
         {
             $users[$i]->delete();
         }

class.FlipsideMail.php

Spacing +4 added lines, -4 removed lines

@@ -22,7 +22,7 @@ 
 
     public function send_HTML($mail)
     {
-        if(isset($mail['from']))
+        if (isset($mail['from']))
         {
             $this->From = $mail['from'];
         }
@@ -30,7 +30,7 @@ 
         {
             $this->From = $this->Username;
         }
-        if(isset($mail['from_name']))
+        if (isset($mail['from_name']))
         {
             $this->FromName = $mail['from_name'];
         }
@@ -39,7 +39,7 @@ 
             $this->FromName = 'Burning Flipside';
         }
         $this->clearAllRecipients();
-        if(is_array($mail['to']))
+        if (is_array($mail['to']))
         {
             array_walk($mail['to'], 'FlipsideMail::addTo', $this);
         }
@@ -47,7 +47,7 @@ 
         {
             $this->addAddress($mail['to']);
         }
-        if(isset($mail['reply_to']))
+        if (isset($mail['reply_to']))
         {
             $this->addReplyTo($mail['reply_to']);
         }

class.FlipsideCAPTCHA.php

Spacing +15 added lines, -15 removed lines

@@ -11,7 +11,7 @@ 
         $datatable = $dataset['captcha'];
         $data = $datatable->read(false, array('id'));
         $count = count($data);
-        for($i = 0; $i < $count; $i++)
+        for ($i = 0; $i < $count; $i++)
         {
             $data[$i] = $data[$i]['id'];
         }
@@ -22,7 +22,7 @@ 
     {
         $res = array();
         $ids = FlipsideCAPTCHA::get_valid_captcha_ids();
-        for($i = 0; $i < count($ids); $i++)
+        for ($i = 0; $i < count($ids); $i++)
         {
             $captcha = new FlipsideCAPTCHA();
             $captcha->random_id = $ids[$i]; 
@@ -35,13 +35,13 @@ 
     {
         $dataset = DataSetFactory::get_data_set('profiles');
         $datatable = $dataset['captcha'];
-        return $datatable->create(array('question'=>$question,'hint'=>$hint,'answer'=>$answer));
+        return $datatable->create(array('question'=>$question, 'hint'=>$hint, 'answer'=>$answer));
     }
 
     public function __construct()
     {
         $this->validIDs = FlipsideCAPTCHA::get_valid_captcha_ids();
-        $this->random_id = mt_rand(0, count($this->validIDs)-1);
+        $this->random_id = mt_rand(0, count($this->validIDs) - 1);
         $this->random_id = $this->validIDs[$this->random_id];
     }
 
@@ -50,7 +50,7 @@ 
         $dataset = DataSetFactory::get_data_set('profiles');
         $datatable = $dataset['captcha'];
         $data = $datatable->read(new \Data\Filter('id eq '.$this->random_id), array('question'));
-        if($data === false)
+        if ($data === false)
         {
             return false;
         }
@@ -62,7 +62,7 @@ 
         $dataset = DataSetFactory::get_data_set('profiles');
         $datatable = $dataset['captcha'];
         $data = $datatable->read(new \Data\Filter('id eq '.$this->random_id), array('hint'));
-        if($data === false)
+        if ($data === false)
         {
             return false;
         }
@@ -74,7 +74,7 @@ 
         $dataset = DataSetFactory::get_data_set('profiles');
         $datatable = $dataset['captcha'];
         $data = $datatable->read(new \Data\Filter('id eq '.$this->random_id), array('answer'));
-        if($data === false)
+        if ($data === false)
         {
             return false;
         }
@@ -83,29 +83,29 @@ 
 
     public function is_answer_right($answer)
     {
-        return strcasecmp($this->get_answer(),$answer) == 0;
+        return strcasecmp($this->get_answer(), $answer) == 0;
     }
 
-    public function draw_captcha($explination=true, $return=false, $ownForm=false)
+    public function draw_captcha($explination = true, $return = false, $ownForm = false)
     {
         $string = '';
 
-        if($ownForm)
+        if ($ownForm)
         {
-            $string.= '<form id="flipcaptcha" name="flipcaptcha">';
+            $string .= '<form id="flipcaptcha" name="flipcaptcha">';
         }
 
         $string .= '<label for="captcha" class="col-sm-2 control-label">'.$this->get_question().'</label><div class="col-sm-10"><input class="form-control" type="text" id="captcha" name="captcha" placeholder="'.$this->get_hint().'" required/></div>';
-        if($ownForm)
+        if ($ownForm)
         {
-            $string.='</form>';
+            $string .= '</form>';
         }
-        if($explination)
+        if ($explination)
         {
             $string .= '<div class="col-sm-10">The answer to this question may be found in the Burning Flipside Survival Guide. It may be found <a href="http://www.burningflipside.com/sg">here</a>.</div>';
         }
         
-        if(!$return)
+        if (!$return)
         {
             echo $string;
         }

class.Singleton.php

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
     {
         static $instances = array();
         $class = get_called_class();
-        if(!isset($instances[$class]))
+        if (!isset($instances[$class]))
         {
             $instances[$class] = new static();
         }

class.SerializableObject.php

Spacing +18 added lines, -18 removed lines

@@ -16,18 +16,18 @@ 
  *
  * This class can be serialized to various formats
  */
-class SerializableObject implements ArrayAccess,JsonSerializable
+class SerializableObject implements ArrayAccess, JsonSerializable
 {
     /**
      * Create the object from an array
      *
      * @param array $array The array of object properties
      */
-    public function __construct($array=false)
+    public function __construct($array = false)
     {
-        if($array !== false && is_array($array))
+        if ($array !== false && is_array($array))
         {
-            foreach($array as $key => $value)
+            foreach ($array as $key => $value)
             {
                 $this->{$key} = $value;
             }
@@ -54,7 +54,7 @@ 
         $xml = new XmlWriter();
         $xml->openMemory();
         $xml->startDocument('1.0');
-        if(isset($this[0]))
+        if (isset($this[0]))
         {
             $xml->startElement('Array');
             $this->array2XML($xml, 'Entity', (array)$this);
@@ -76,13 +76,13 @@ 
      */
     private function object2XML(XMLWriter $xml, $data)
     {
-        foreach($data as $key => $value)
+        foreach ($data as $key => $value)
         {
-            if(is_array($value) || is_numeric($key))
+            if (is_array($value) || is_numeric($key))
             {
                 $this->array2XML($xml, $key, (array)$value);
             }
-            else if(is_object($value))
+            else if (is_object($value))
             {
                 $xml->startElement($key);
                 $this->object2XML($xml, $value);
@@ -90,7 +90,7 @@ 
             }
             else
             {
-                if($key[0] === '$')
+                if ($key[0] === '$')
                 {
                     $xml->writeElement(substr($key, 1), $value);
                 }
@@ -112,29 +112,29 @@ 
      */
     private function array2XML(XMLWriter $xml, $keyParent, $data)
     {
-        foreach($data as $key => $value)
+        foreach ($data as $key => $value)
         {
-	    if(is_string($value))
+	    if (is_string($value))
             {
                 $xml->writeElement($keyParent, $value);
                 continue;
             }
-            if(is_numeric($key))
+            if (is_numeric($key))
             {
                 $xml->startElement($keyParent);
             }
  
-            if(is_object($value))
+            if (is_object($value))
             {
                 $this->object2XML($xml, $value);
             }
-            else if(is_array($value))
+            else if (is_array($value))
             {
                 $this->array2XML($xml, $key, $value);
                 continue;
             }
  
-            if(is_numeric($key))
+            if (is_numeric($key))
             {
                 $xml->endElement();
             }
@@ -165,16 +165,16 @@ 
     public function serializeObject($fmt = 'json', $select = false)
     {
         $copy = $this;
-        if($select !== false)
+        if ($select !== false)
         {
             $copy = new self();
             $count = count($select);
-            for($i = 0; $i < $count; $i++)
+            for ($i = 0; $i < $count; $i++)
             {
                 $copy->{$select[$i]} = $this->offsetGet($select[$i]);
             }
         }
-        switch($fmt)
+        switch ($fmt)
         {
             case 'json':
                 return json_encode($copy);

js/js-webshim/dev/shims/FlashCanvas/proxy.php

Spacing +2 added lines, -2 removed lines

@@ -58,7 +58,7 @@ 
     } else {
         $host = FCgetHostName();
     }
-    $pattern = '#^https?://' . str_replace('.', '\.', $host) . '(:\d*)?/#';
+    $pattern = '#^https?://'.str_replace('.', '\.', $host).'(:\d*)?/#';
     if (!preg_match($pattern, $_SERVER['HTTP_REFERER'])) {
         exit;
     }
@@ -73,7 +73,7 @@ 
 }
 
 // Percent-encode special characters in the URL
-$search  = array(  '%',   '#',   ' ');
+$search  = array('%', '#', ' ');
 $replace = array('%25', '%23', '%20');
 $url     = str_replace($search, $replace, $_GET['url']);
 

js/js-webshim/dev/shims/FlashCanvas/save.php

Spacing +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
 
     // Force download
     header('Content-Type: application/octet-stream');
-    header('Content-Disposition: attachment; filename="' . $filename . '"');
+    header('Content-Disposition: attachment; filename="'.$filename.'"');
 
     if (isset($_POST['dataurl'])) {
         // Decode the base64-encoded data

js/js-webshim/dev/shims/FlashCanvasPro/proxy.php

Spacing +2 added lines, -2 removed lines

@@ -58,7 +58,7 @@ 
     } else {
         $host = FCgetHostName();
     }
-    $pattern = '#^https?://' . str_replace('.', '\.', $host) . '(:\d*)?/#';
+    $pattern = '#^https?://'.str_replace('.', '\.', $host).'(:\d*)?/#';
     if (!preg_match($pattern, $_SERVER['HTTP_REFERER'])) {
         exit;
     }
@@ -73,7 +73,7 @@ 
 }
 
 // Percent-encode special characters in the URL
-$search  = array(  '%',   '#',   ' ');
+$search  = array('%', '#', ' ');
 $replace = array('%25', '%23', '%20');
 $url     = str_replace($search, $replace, $_GET['url']);
 

js/js-webshim/dev/shims/FlashCanvasPro/save.php

Spacing +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
 
     // Force download
     header('Content-Type: application/octet-stream');
-    header('Content-Disposition: attachment; filename="' . $filename . '"');
+    header('Content-Disposition: attachment; filename="'.$filename.'"');
 
     if (isset($_POST['dataurl'])) {
         // Decode the base64-encoded data