ci-bonfire / Sprint

application/mailers/CronMailer.php

Spacing +3 added lines, -3 removed lines

@@ -7,7 +7,7 @@ 
 
     public function __construct()
     {
-        $this->from = [ config_item('site.auth_email'), config_item('site.name') ];
+        $this->from = [config_item('site.auth_email'), config_item('site.name')];
         $this->to   = config_item('site.auth_email');
     }
 
@@ -18,7 +18,7 @@ 
      *
      * @param $output
      */
-    public function results($output=null)
+    public function results($output = null)
     {
         $data = [
             'output' => $output,
@@ -26,7 +26,7 @@ 
         ];
 
         // Send it immediately - don't queue.
-        return $this->send($this->to, "Cron Results from ". config_item('site.name'), $data);
+        return $this->send($this->to, "Cron Results from ".config_item('site.name'), $data);
     }
 
     //--------------------------------------------------------------------

application/mailers/UserMailer.php

Spacing +5 added lines, -5 removed lines

@@ -7,7 +7,7 @@ 
 
     public function __construct()
     {
-        $this->from = [ config_item('site.auth_email'), config_item('site.name') ];
+        $this->from = [config_item('site.auth_email'), config_item('site.name')];
     }
 
     //--------------------------------------------------------------------
@@ -23,12 +23,12 @@ 
      * @param $params
      * @return bool
      */
-    public function didRegister($params=null)
+    public function didRegister($params = null)
     {
         $data = [
             'user_id'   => $params['user_id'],
             'email'     => $params['email'],
-            'link'      => site_url( \Myth\Route::named('activate_user') ),
+            'link'      => site_url(\Myth\Route::named('activate_user')),
             'token'     => $params['token'],
             'site_name' => config_item('site.name'),
             'site_link' => site_url()
@@ -52,7 +52,7 @@ 
         $data = [
             'email' => $user['email'],
             'code'  => $token,
-            'link'  => site_url( \Myth\Route::named('reset_pass') ),
+            'link'  => site_url(\Myth\Route::named('reset_pass')),
             'site_name' => config_item('site.name'),
             'site_link' => site_url()
         ];
@@ -73,7 +73,7 @@ 
     {
         $data = [
             'email' => $user['email'],
-            'link'  => site_url( \Myth\Route::named('forgot_pass') ),
+            'link'  => site_url(\Myth\Route::named('forgot_pass')),
             'site_name' => config_item('site.name'),
             'site_link' => site_url()
         ];

application/models/User_model.php

Spacing +19 added lines, -19 removed lines

@@ -136,11 +136,11 @@ 
 
         // If it's an update, we probably won't have the username/email
         // so grab it so that we can use it.
-        if (! empty($data[ $this->primary_key ]))
+        if ( ! empty($data[$this->primary_key]))
         {
-            if (! isset($data[$field]) )
+            if ( ! isset($data[$field]))
             {
-                $value = $this->get_field( $data['id'], $field );
+                $value = $this->get_field($data['id'], $field);
             }
         }
         // However, if it's an insert, then we should have it, If we don't, leave.
@@ -155,9 +155,9 @@ 
         }
 
         // Still here? then create the hash based on the current realm.
-        if (! empty($data['password']) )
+        if ( ! empty($data['password']))
         {
-            $key = md5($value .':'. config_item('api.realm') .':'. $data['password']);
+            $key = md5($value.':'.config_item('api.realm').':'.$data['password']);
             $data['api_key'] = $key;
         }
 
@@ -228,20 +228,20 @@ 
      *
      * @return object
      */
-    public function saveMetaToUser($user_id, $key, $value=null)
+    public function saveMetaToUser($user_id, $key, $value = null)
     {
-        if (! Events::trigger('beforeAddMetaToUser', [$user_id, $key]))
+        if ( ! Events::trigger('beforeAddMetaToUser', [$user_id, $key]))
         {
             return false;
         }
 
-        $user_id = (int)$user_id;
+        $user_id = (int) $user_id;
 
         // Does this key already exist?
-        $test = $this->db->where([ 'user_id' => $user_id, 'meta_key' => $key ])->get('user_meta');
+        $test = $this->db->where(['user_id' => $user_id, 'meta_key' => $key])->get('user_meta');
 
         // Doesn't exist, so insert it.
-        if (! $test->num_rows())
+        if ( ! $test->num_rows())
         {
             $data = [
                 'user_id'       => $user_id,
@@ -271,12 +271,12 @@ 
      */
     public function getMetaItem($user_id, $key)
     {
-        $query = $this->db->where('user_id', (int)$user_id)
+        $query = $this->db->where('user_id', (int) $user_id)
                           ->where('meta_key', $key)
                           ->select('meta_value')
                           ->get('user_meta');
 
-        if (! $query->num_rows())
+        if ( ! $query->num_rows())
         {
             return null;
         }
@@ -296,7 +296,7 @@ 
      */
     public function removeMetaFromUser($user_id, $key)
     {
-        if (! Events::trigger('beforeRemoveMetaFromUser', [$user_id, $key]))
+        if ( ! Events::trigger('beforeRemoveMetaFromUser', [$user_id, $key]))
         {
             return false;
         }
@@ -310,7 +310,7 @@ 
 		    $this->db->where('meta_key', $key);
 	    }
 
-        $this->db->where('user_id', (int)$user_id)
+        $this->db->where('user_id', (int) $user_id)
                  ->delete('user_meta');
     }
 
@@ -318,7 +318,7 @@ 
 
     public function getMetaForUser($user_id)
     {
-        $query = $this->db->where('user_id', (int)$user_id)
+        $query = $this->db->where('user_id', (int) $user_id)
                           ->select('meta_key, meta_value')
                           ->get('user_meta');
 
@@ -328,9 +328,9 @@ 
 
         if (count($rows))
         {
-            array_walk( $rows, function ( $row ) use ( &$meta )
+            array_walk($rows, function($row) use (&$meta)
             {
-                $meta[ $row->meta_key ] = $row->meta_value;
+                $meta[$row->meta_key] = $row->meta_value;
             } );
         }
 
@@ -350,11 +350,11 @@ 
 
         if (is_object($data['fields']))
         {
-            $data['fields']->meta = (object)$meta;
+            $data['fields']->meta = (object) $meta;
         }
         else
         {
-            $data['fields']['meta']= $meta;
+            $data['fields']['meta'] = $meta;
         }
 
         return $data;

application/third_party/HMVC/Loader.php

Spacing +11 added lines, -11 removed lines

@@ -29,7 +29,7 @@ 
  *
  */
 
-if (!defined("BASEPATH"))
+if ( ! defined("BASEPATH"))
     exit("No direct script access allowed");
 
 class HMVC_Loader extends CI_Loader {
@@ -78,11 +78,11 @@ 
     public function controller($uri, $params = array(), $return = FALSE) {
         // No valid module detected, add current module to uri
         list($module) = $this->detect_module($uri);
-        if (!isset($module)) {
+        if ( ! isset($module)) {
             $router = & $this->_ci_get_component('router');
             if ($router->module) {
                 $module = $router->module;
-                $uri = $module . '/' . $uri;
+                $uri = $module.'/'.$uri;
             }
         }
 
@@ -199,7 +199,7 @@ 
     {
         // Allow application/views/* to override any module
         // views for easier app customization.
-        if (file_exists(APPPATH .'views/'. $view .'.php'))
+        if (file_exists(APPPATH.'views/'.$view.'.php'))
         {
             return parent::view($view, $vars, $return);
         }
@@ -359,7 +359,7 @@ 
             $void = $this->widget($module.'/'.$widget);
 
             // Remove module if widget not found within it
-            if (!$void) {
+            if ( ! $void) {
                 $this->remove_module();
             }
 
@@ -440,13 +440,13 @@ 
         $method = isset($segments[1]) ? $segments[1] : "index";
 
         // Controller not found
-        if (!$class) {
+        if ( ! $class) {
             return;
         }
 
-        if (!array_key_exists(strtolower($class), $this->_ci_controllers)) {
+        if ( ! array_key_exists(strtolower($class), $this->_ci_controllers)) {
             // Determine filepath
-            $filepath = APPPATH . 'controllers/' . $router->fetch_directory() . $class . '.php';
+            $filepath = APPPATH.'controllers/'.$router->fetch_directory().$class.'.php';
 
             // Load the controller file
             if (file_exists($filepath)) {
@@ -454,7 +454,7 @@ 
             }
 
             // Controller class not found, show 404
-            if (!class_exists($class)) {
+            if ( ! class_exists($class)) {
                 show_404("{$class}/{$method}");
             }
 
@@ -465,7 +465,7 @@ 
         $controller = $this->_ci_controllers[strtolower($class)];
 
         // Method does not exists
-        if (!method_exists($controller, $method)) {
+        if ( ! method_exists($controller, $method)) {
             show_404("{$class}/{$method}");
         }
 
@@ -524,7 +524,7 @@ 
 
         // Check all locations for this module
         foreach ($config->item('modules_locations') as $location) {
-            $path = $location . rtrim($module, '/') . '/';
+            $path = $location.rtrim($module, '/').'/';
             if (is_dir($path)) {
                 return $path;
             }

application/third_party/HMVC/Router.php

Spacing +25 added lines, -25 removed lines

@@ -33,7 +33,7 @@ 
  * THE SOFTWARE.
  */
 
-if (!defined("BASEPATH"))
+if ( ! defined("BASEPATH"))
     exit("No direct script access allowed");
 
 class HMVC_Router extends CI_Router {
@@ -53,14 +53,14 @@ 
      */
     function __construct() {
 
-        $this->config =& load_class('Config', 'core');
+        $this->config = & load_class('Config', 'core');
 
         // Process 'modules_locations' from config
         $locations = $this->config->item('modules_locations');
 
-        if (!$locations) {
-            $locations = array(APPPATH . 'modules/');
-        } else if (!is_array($locations)) {
+        if ( ! $locations) {
+            $locations = array(APPPATH.'modules/');
+        } else if ( ! is_array($locations)) {
             $locations = array($locations);
         }
 
@@ -68,7 +68,7 @@ 
         foreach ($locations as &$location) {
             $location = realpath($location);
             $location = str_replace('\\', '/', $location);
-            $location = rtrim($location, '/') . '/';
+            $location = rtrim($location, '/').'/';
         }
 
         $this->config->set_item('modules_locations', $locations);
@@ -96,7 +96,7 @@ 
         }
 
         // Is there a 404 override?
-        if (!empty($this->routes['404_override'])) {
+        if ( ! empty($this->routes['404_override'])) {
             $segments = explode('/', $this->routes['404_override']);
             if ($located = $this->locate($segments)) {
                 return $located;
@@ -125,14 +125,14 @@ 
         // Apply the current module's routing config
 
         // CI v3.x has URI starting at segment 1
-        $segstart = (intval(substr(CI_VERSION,0,1)) > 2) ? 1 : 0;
+        $segstart = (intval(substr(CI_VERSION, 0, 1)) > 2) ? 1 : 0;
 
         if ($module = $this->uri->segment($segstart)) {
             foreach ($this->config->item('modules_locations') as $location) {
-                if (is_file($file = $location . $module . '/config/routes.php')) {
+                if (is_file($file = $location.$module.'/config/routes.php')) {
                     include ($file);
 
-                    $route = (!isset($route) or !is_array($route)) ? array() : $route;
+                    $route = ( ! isset($route) or ! is_array($route)) ? array() : $route;
                     $this->routes = array_merge($this->routes, $route);
                     unset($route);
                 }
@@ -151,7 +151,7 @@ 
      */
     function locate($segments) {
         // anon function to ucfirst a string if CI ver > 2 (for backwards compatibility)
-        $_ucfirst = function($cn) {return (intval(substr(CI_VERSION,0,1)) > 2) ? ucfirst($cn) : $cn;};
+        $_ucfirst = function($cn) {return (intval(substr(CI_VERSION, 0, 1)) > 2) ? ucfirst($cn) : $cn; };
 
         list($module, $directory, $controller) = array_pad($segments, 3, NULL);
 
@@ -170,7 +170,7 @@ 
                 $this->set_directory(array_shift($s), TRUE);
                 continue;
             }
-            elseif (file_exists(APPPATH .'controllers/'. $test .'.php'))
+            elseif (file_exists(APPPATH.'controllers/'.$test.'.php'))
             {
                 return $s;
             }
@@ -188,7 +188,7 @@ 
 
             // Iterate all parts and replace absolute part with relative part
             for ($i = 1; $i <= count($parts); $i++) {
-                $relative = str_replace(implode('/', $parts) . '/', str_repeat('../', $i), $relative, $count);
+                $relative = str_replace(implode('/', $parts).'/', str_repeat('../', $i), $relative, $count);
                 array_pop($parts);
 
                 // Stop iteration if found
@@ -197,45 +197,45 @@ 
             }
 
             // Does a module exist? (/modules/xyz/controllers/)
-            if (is_dir($source = $location . $module . '/controllers/')) {
+            if (is_dir($source = $location.$module.'/controllers/')) {
                 $this->module = $module;
-                $this->directory = $relative . $module . '/controllers/';
+                $this->directory = $relative.$module.'/controllers/';
 
                 // Module root controller?
-                if ($directory && is_file($source . $_ucfirst($directory) . '.php')) {
+                if ($directory && is_file($source.$_ucfirst($directory).'.php')) {
                     $this->class = $directory;
                     return array_slice($segments, 1);
                 }
 
                 // Module sub-directory?
-                if ($directory && is_dir($source . $directory . '/')) {
-                    $source = $source . $directory . '/';
-                    $this->directory .= $directory . '/';
+                if ($directory && is_dir($source.$directory.'/')) {
+                    $source = $source.$directory.'/';
+                    $this->directory .= $directory.'/';
 
                     // Module sub-directory controller?
-                    if (is_file($source . $_ucfirst($directory) . '.php')) {
+                    if (is_file($source.$_ucfirst($directory).'.php')) {
                         return array_slice($segments, 1);
                     }
 
                     // Module sub-directory  default controller?
-                    if (is_file($source . $_ucfirst($this->default_controller) . '.php')) {
+                    if (is_file($source.$_ucfirst($this->default_controller).'.php')) {
                         $segments[1] = $this->default_controller;
                         return array_slice($segments, 1);
                     }
 
                     // Module sub-directory sub-controller?
-                    if ($controller && is_file($source . $_ucfirst($controller) . '.php')) {
+                    if ($controller && is_file($source.$_ucfirst($controller).'.php')) {
                         return array_slice($segments, 2);
                     }
                 }
 
                 // Module controller?
-                if (is_file($source . $_ucfirst($module) . '.php')) {
+                if (is_file($source.$_ucfirst($module).'.php')) {
                     return $segments;
                 }
 
                 // Module default controller?
-                if (is_file($source . $_ucfirst($this->default_controller) . '.php')) {
+                if (is_file($source.$_ucfirst($this->default_controller).'.php')) {
                     $segments[0] = $this->default_controller;
                     return $segments;
                 }
@@ -243,7 +243,7 @@ 
         }
 
         // Default controller?
-        if (is_file(APPPATH . 'controllers/' . $module . '/' . $_ucfirst($this->default_controller) . '.php')) {
+        if (is_file(APPPATH.'controllers/'.$module.'/'.$_ucfirst($this->default_controller).'.php')) {
             $segments[0] = $this->default_controller;
             return $segments;
         }

application/views/emails/usermailer/didRegister.html.php

Spacing +2 added lines, -2 removed lines

@@ -11,8 +11,8 @@
             <p>If that was you - then click the link below to activate your account:</p>
 
             <p>
-                <a href="<?= $link ."?e={$email}&code={$token}" ?>">
-                    <?= $link ."?e={$email}&code={$token}" ?>
+                <a href="<?= $link."?e={$email}&code={$token}" ?>">
+                    <?= $link."?e={$email}&code={$token}" ?>
                 </a>
             </p>
 

application/views/emails/usermailer/didRegister.text.php

Spacing +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
 
 If that was you - then click the link below to activate your account:
 
-<?= $link ."?e={$email}&code={$token}" ?>
+<?= $link."?e={$email}&code={$token}" ?>
 
 If the link does not work, please visit the following page: <?= $link ?> and enter the following token when asked:
 

application/views/emails/usermailer/remindUser.html.php

Spacing +2 added lines, -2 removed lines

@@ -11,8 +11,8 @@
             <p>If you do need to reset your password, please visit the following link:</p>
             
             <p>
-                <a href="<?= $link ."?e={$email}&code={$code}" ?>">
-                    <?= $link ."?e={$email}&code={$code}" ?>
+                <a href="<?= $link."?e={$email}&code={$code}" ?>">
+                    <?= $link."?e={$email}&code={$code}" ?>
                 </a>
             </p>
 

application/views/emails/usermailer/reminduser.text.php

Spacing +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
 
 If you do need to reset your password, please visit the following link:
 
-<?= $link ."?e={$email}&code={$code}" ?>
+<?= $link."?e={$email}&code={$code}" ?>
 
 If the link does not work, please visit the following page: <?= $link ?> and enter the following code when asked: