BurningFlipside / CommonCode

Log/class.LogService.php

Spacing +4 added lines, -4 removed lines

@@ -12,7 +12,7 @@ 
         \Psr\Log\LogLevel::WARNING,
         \Psr\Log\LogLevel::NOTICE);
 
-    public function __construct($params=false)
+    public function __construct($params = false)
     {
         if(isset($params['defaultLogLevels']))
         {
@@ -27,10 +27,10 @@ 
     {
         // build a replacement array with braces around the context keys
         $replace = array();
-        foreach ($context as $key => $val) {
+        foreach($context as $key => $val) {
             // check that the value can be casted to string
-            if (!is_array($val) && (!is_object($val) || method_exists($val, '__toString'))) {
-                $replace['{' . $key . '}'] = $val;
+            if(!is_array($val) && (!is_object($val) || method_exists($val, '__toString'))) {
+                $replace['{'.$key.'}'] = $val;
             }
         }
 

Braces +4 added lines, -2 removed lines

@@ -27,9 +27,11 @@
     {
         // build a replacement array with braces around the context keys
         $replace = array();
-        foreach ($context as $key => $val) {
+        foreach ($context as $key => $val)
+        {
             // check that the value can be casted to string
-            if (!is_array($val) && (!is_object($val) || method_exists($val, '__toString'))) {
+            if (!is_array($val) && (!is_object($val) || method_exists($val, '__toString')))
+            {
                 $replace['{' . $key . '}'] = $val;
             }
         }

Log/class.PHPLog.php

Spacing +1 added lines, -1 removed lines

@@ -3,7 +3,7 @@
 
 class PHPLog extends \Log\LogService
 {
-    public function __construct($params=false)
+    public function __construct($params = false)
     {
         parent::__construct($params);
     }

cron.php

Spacing +2 added lines, -2 removed lines

@@ -14,8 +14,8 @@
 /**
  * This cron script recompiles the Browscap cache
  */
-ini_set('memory_limit','-1');      // turn off memory limit for this script
-set_time_limit(120);               // change to 2 minutes for this script
+ini_set('memory_limit', '-1'); // turn off memory limit for this script
+set_time_limit(120); // change to 2 minutes for this script
 
 require('vendor/autoload.php');
 

Http/Rest/class.DataTableAPI.php

Indentation +2 added lines, -2 removed lines

@@ -91,7 +91,7 @@ 
         $odata = $request->getAttribute('odata', new \ODataParams(array()));
         $params = $this->manipulateParameters($request, $odata);
         $areas = $dataTable->read($odata->filter, $odata->select, $odata->top,
-                                  $odata->skip, $odata->orderby, $params);
+                                    $odata->skip, $odata->orderby, $params);
         if($areas === false)
         {
             $areas = array();
@@ -133,7 +133,7 @@ 
         $odata = $request->getAttribute('odata', new \ODataParams(array()));
         $filter = $this->getFilterForPrimaryKey($args['name']);
         $areas = $dataTable->read($filter, $odata->select, $odata->top,
-                                  $odata->skip, $odata->orderby);
+                                    $odata->skip, $odata->orderby);
         if(empty($areas))
         {
             return $response->withStatus(404);

Http/class.WebSite.php

Spacing +2 added lines, -2 removed lines

@@ -13,7 +13,7 @@ 
         $settings = array("settings"=>["determineRouteBeforeAppMiddleware"=>true]);
         parent::__construct($settings);
         $c = $this->getContainer();
-        $c['errorHandler'] = function($c) { return new WebErrorHandler();};
+        $c['errorHandler'] = function($c) { return new WebErrorHandler(); };
         $this->add(new AuthMiddleware());
         $this->add(new ODataMiddleware());
     }
@@ -25,7 +25,7 @@ 
 
     public function registerAPI($uri, $api)
     {
-        $group = $this->group($uri, function() use($api){$api->setup($this);});
+        $group = $this->group($uri, function() use($api){$api->setup($this); });
         $group->add(new \Http\Rest\SerializationMiddleware());
         $group->add(new \Http\Rest\CORSMiddleware($this->getContainer()));
     }

Braces +6 added lines, -2 removed lines

@@ -13,7 +13,9 @@ 
         $settings = array("settings"=>["determineRouteBeforeAppMiddleware"=>true]);
         parent::__construct($settings);
         $c = $this->getContainer();
-        $c['errorHandler'] = function($c) { return new WebErrorHandler();};
+        $c['errorHandler'] = function($c)
+        {
+return new WebErrorHandler();};
         $this->add(new AuthMiddleware());
         $this->add(new ODataMiddleware());
     }
@@ -25,7 +27,9 @@ 
 
     public function registerAPI($uri, $api)
     {
-        $group = $this->group($uri, function() use($api){$api->setup($this);});
+        $group = $this->group($uri, function() use($api)
+        {
+$api->setup($this);});
         $group->add(new \Http\Rest\SerializationMiddleware());
         $group->add(new \Http\Rest\CORSMiddleware($this->getContainer()));
     }

Email/class.AmazonSES.php

Braces +10 added lines, -4 removed lines

@@ -42,10 +42,13 @@ 
             $args = array();
             $args['RawMessage'] = array();
             $args['RawMessage']['Data'] = $email->getRawMessage();
-            try {
+            try
+            {
                 $res = $this->ses->sendRawEmail($args);
                 return $res;
-            } catch(\Exception $e) {
+            }
+            catch(\Exception $e)
+            {
                 return false;
             }
         }
@@ -66,9 +69,12 @@ 
             $args['Message']['Body']['Text']['Data'] = $email->getTextBody();
             $args['Message']['Body']['Html']['Data'] = $email->getHtmlBody();
             $args['ReplyToAddresses'] = array($email->getReplyTo());
-            try {
+            try
+            {
                 return $this->ses->sendEmail($args);
-            } catch(\Exception $e) {
+            }
+            catch(\Exception $e)
+            {
                 return false;
             }
         }

Serialize/class.SpreadSheetSerializer.php

Spacing +1 added lines, -1 removed lines

@@ -89,7 +89,7 @@
             {
                 $this->addValueByColName($res[0], $tmp, $colName, $row[$colName]);
             }
-            $tmp = $tmp+array_fill_keys(range(0,max(array_keys($tmp))),false);
+            $tmp = $tmp + array_fill_keys(range(0, max(array_keys($tmp))), false);
             ksort($tmp);
             $res[] = $tmp;
         }

Http/class.FlipAdminPage.php

Doc Comments +3 added lines

@@ -11,6 +11,9 @@
         $this->setTemplateName('admin.html');
     }
 
+    /**
+     * @param string $adminGroup
+     */
     protected function userIsAdmin($adminGroup)
     {
         if($this->user === false || $this->user === null)

Indentation +4 added lines, -4 removed lines

@@ -49,7 +49,7 @@ 
         $this->addLink('Home', '..');
         if($this->user === false || $this->user === null)
         {
-          $this->content['body'] = '
+            $this->content['body'] = '
             <div id="content">
               <div class="row">
                 <div class="col-lg-12">
@@ -61,7 +61,7 @@ 
         }
         else if($this->isAdmin() === false)
         {
-          $this->content['body'] = '
+            $this->content['body'] = '
             <div id="content">
               <div class="row">
                 <div class="col-lg-12">
@@ -70,8 +70,8 @@ 
               </div>
             </div>
           ';
-          $this->content['header'] = array();
-          $this->content['cards'] = array();
+            $this->content['header'] = array();
+            $this->content['cards'] = array();
         }
         return parent::getContent();
     }

Http/class.WebPage.php

Doc Comments +3 added lines, -1 removed lines

@@ -78,6 +78,9 @@ 
         $this->loader->addPath($dir, $namespace);
     }
 
+    /**
+     * @param string $name
+     */
     public function setTemplateName($name)
     {
         $this->templateName = $name;
@@ -112,7 +115,6 @@ 
      * Add a JavaScript file from a set of files known to the framework
      *
      * @param string $jsFileID the ID of the JS file
-     * @param boolean $async Can the JS file be loaded asynchronously?
      */
     public function addWellKnownJS($jsFileID)
     {

Spacing +3 added lines, -3 removed lines

@@ -89,7 +89,7 @@ 
             $this->content['css'] = array($uri);
             return;
         }
-        array_push($this->content['css'],$uri);
+        array_push($this->content['css'], $uri);
     }
 
     /**
@@ -104,7 +104,7 @@ 
             $this->content['js'] = array($uri);
             return;
         }
-        array_push($this->content['js'],$uri);
+        array_push($this->content['js'], $uri);
     }
 
     /**
@@ -146,7 +146,7 @@ 
         {
             $data['menu'] = $submenu;
         }
-        $this->content['header']['right'] = array($name => $data)+$this->content['header']['right'];
+        $this->content['header']['right'] = array($name => $data) + $this->content['header']['right'];
     }
 
     /** Notification that is green for success */

Braces +1 added lines, -1 removed lines

@@ -60,7 +60,7 @@
         $this->content['urls']['logoutUrl'] = $this->logoutUrl;
 
 	if($this->user === false || $this->user === null)
-        {
+	{
             if(isset($_SERVER['REQUEST_URI']) && strstr($_SERVER['REQUEST_URI'], 'logout.php') === false)
             {
                 $this->addLink('Login', $this->loginUrl);

Indentation +5 added lines, -5 removed lines

@@ -41,8 +41,8 @@ 
 
         $this->aboutUrl = $this->settings->getGlobalSetting('about_url', $this->wwwUrl.'/about');
         $this->content['header']['right']['About'] = array(
-          'url' => $this->aboutUrl,
-          'menu' => $this->settings->getGlobalSetting('about_menu', array(
+            'url' => $this->aboutUrl,
+            'menu' => $this->settings->getGlobalSetting('about_menu', array(
             'Burning Flipside' => $this->wwwUrl.'/about/event',
             'AAR, LLC' => $this->wwwUrl.'/organization/aar',
             'Privacy Policy' => $this->wwwUrl.'/about/privacy'
@@ -58,7 +58,7 @@ 
         $this->content['urls']['loginUrl'] = $this->loginUrl;
         $this->content['urls']['logoutUrl'] = $this->logoutUrl;
 
-	if($this->user === false || $this->user === null)
+    if($this->user === false || $this->user === null)
         {
             if(isset($_SERVER['REQUEST_URI']) && strstr($_SERVER['REQUEST_URI'], 'logout.php') === false)
             {
@@ -181,7 +181,7 @@ 
     {
         if(!isset($this->content['notifications']))
         {
-          $this->content['notifications'] = array();
+            $this->content['notifications'] = array();
         }
         array_push($this->content['notifications'], array('msg'=>$message, 'sev'=>$severity, 'dismissible'=>$dismissible));
     }
@@ -194,7 +194,7 @@ 
     {
         if(!isset($this->content['body']))
         {
-          $this->content['body'] = $this->body;
+            $this->content['body'] = $this->body;
         }
         //Add page JS just before rednering so it is after any added by the page explicitly
         // $this->addJS('js/'.basename($_SERVER['SCRIPT_NAME'], '.php').'.js');