Nickbur / Sunrise-CMS

engine/adaptor/session/db.php

Spacing +2 added lines, -2 removed lines

@@ -65,7 +65,7 @@ 
             SELECT `data` 
             FROM `session` 
             WHERE session_id = '" . $this->db->escape($session_id) . "' 
-                AND expire > '" . $this->db->escape(date('Y-m-d H:i:s'))  . "'
+                AND expire > '" . $this->db->escape(date('Y-m-d H:i:s')) . "'
         ");
 
         if ($query->num_rows) {
@@ -83,7 +83,7 @@ 
                 expire = '" . $this->db->escape(date('Y-m-d H:i:s', time() + $this->expire)) . "' 
             FROM `session` 
             WHERE session_id = '" . $this->db->escape($session_id) . "' 
-                AND expire > '" . $this->db->escape(date('Y-m-d H:i:s'))  . "'
+                AND expire > '" . $this->db->escape(date('Y-m-d H:i:s')) . "'
         ");
 
         return true;

engine/core/Loader.php

Spacing +7 added lines, -7 removed lines

@@ -36,7 +36,7 @@ 
     public function model($route)
     {
         // Sanitize the call
-        $route = preg_replace('/[^a-zA-Z0-9_\/]/', '', (string) $route);
+        $route = preg_replace('/[^a-zA-Z0-9_\/]/', '', (string)$route);
 
         if (!$this->registry->has('model_' . str_replace(array('/', '-', '.'), array('_', '', ''), $route))) {
             $file  = SR_APPLICATION . 'model/' . $route . '.php';
@@ -52,7 +52,7 @@ 
                 }
 
                 $this->registry->set(
-                    'model_' . str_replace(array('/', '-', '.'), array('_', '', ''), (string) $route),
+                    'model_' . str_replace(array('/', '-', '.'), array('_', '', ''), (string)$route),
                     $proxy
                 );
             } else {
@@ -64,7 +64,7 @@ 
     public function controller($route, $data = array())
     {
         // Sanitize the call
-        $route = preg_replace('/[^a-zA-Z0-9_\/]/', '', (string) $route);
+        $route = preg_replace('/[^a-zA-Z0-9_\/]/', '', (string)$route);
 
         $output = null;
 
@@ -81,7 +81,7 @@ 
         $output = null;
 
         // Sanitize the call
-        $route = preg_replace('/[^a-zA-Z0-9_\/]/', '', (string) $route);
+        $route = preg_replace('/[^a-zA-Z0-9_\/]/', '', (string)$route);
 
         if (!$output) {
             $template = new \Sunrise\Engine\Library\Template(
@@ -118,7 +118,7 @@ 
     public function library($route)
     {
         // Sanitize the call
-        $route = preg_replace('/[^a-zA-Z0-9_\/]/', '', (string) $route);
+        $route = preg_replace('/[^a-zA-Z0-9_\/]/', '', (string)$route);
 
         $file = $_SERVER['DOCUMENT_ROOT'] . '/engine/library/' . $route . '.php';
         $class = str_replace('/', '\\', $route);
@@ -151,14 +151,14 @@ 
 
     protected function callback($registry, $route)
     {
-        return function ($args) use ($registry, &$route) {
+        return function($args) use ($registry, &$route) {
             static $model = array();
 
             $output = null;
 
             // Store the model object
             if (!isset($model[$route])) {
-                $file = SR_APPLICATION . 'model/' .  substr($route, 0, strrpos($route, '/')) . '.php';
+                $file = SR_APPLICATION . 'model/' . substr($route, 0, strrpos($route, '/')) . '.php';
                 $class = 'Model' . preg_replace('/[^a-zA-Z0-9]/', '', substr($route, 0, strrpos($route, '/')));
 
                 if (is_file($file)) {

engine/config/administration.php

Spacing +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
     along with this program. If not, see <http://www.gnu.org/licenses/>. */
 
 // Site
-$_['app_url']        = '/administration/';
+$_['app_url'] = '/administration/';
 
 // Cache (file or redis)
 $_['cache_type']       = 'file';

engine/config/application.php

Spacing +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
     along with this program. If not, see <http://www.gnu.org/licenses/>. */
 
 // Site
-$_['app_url']        = '/application/';
+$_['app_url'] = '/application/';
 
 // Cache ( file or redis)
 $_['cache_type']       = 'redis';

engine/library/Mail.php

Spacing +1 added lines, -1 removed lines

@@ -272,7 +272,7 @@
                     stream_socket_enable_crypto($handle, true, STREAM_CRYPTO_METHOD_TLS_CLIENT);
                 }
 
-                if (!empty($this->smtp_username)  && !empty($this->smtp_password)) {
+                if (!empty($this->smtp_username) && !empty($this->smtp_password)) {
                     fputs($handle, 'EHLO ' . getenv('SERVER_NAME') . "\r\n");
 
                     $reply = '';

administration/controller/extension/payment/bank_transfer.php

Spacing +1 added lines, -1 removed lines

@@ -167,7 +167,7 @@
 
         foreach ($languages as $language) {
             if (empty($this->request->post['bank_transfer_bank' . $language['language_id']])) {
-                $this->error['bank' .  $language['language_id']] = $this->language->get('error_bank');
+                $this->error['bank' . $language['language_id']] = $this->language->get('error_bank');
             }
         }
 

administration/controller/extension/shipping/xshipping.php

Spacing +19 added lines, -19 removed lines

@@ -89,41 +89,41 @@
 
         $data['cancel'] = $this->url->link('extension/extension', 'token=' . $this->session->data['token'] . '&type=shipping', true);
         
-        for ($i=1;$i<=12;$i++) {
-            if (isset($this->request->post['xshipping_cost'.$i])) {
-                $data['xshipping_cost'.$i] = $this->request->post['xshipping_cost'.$i];
+        for ($i = 1; $i <= 12; $i++) {
+            if (isset($this->request->post['xshipping_cost' . $i])) {
+                $data['xshipping_cost' . $i] = $this->request->post['xshipping_cost' . $i];
             } else {
-                $data['xshipping_cost'.$i] = $this->config->get('xshipping_cost'.$i);
+                $data['xshipping_cost' . $i] = $this->config->get('xshipping_cost' . $i);
             }
                 
-            if (isset($this->request->post['xshipping_name'.$i])) {
-                $data['xshipping_name'.$i] = $this->request->post['xshipping_name'.$i];
+            if (isset($this->request->post['xshipping_name' . $i])) {
+                $data['xshipping_name' . $i] = $this->request->post['xshipping_name' . $i];
             } else {
-                $data['xshipping_name'.$i] = $this->config->get('xshipping_name'.$i);
+                $data['xshipping_name' . $i] = $this->config->get('xshipping_name' . $i);
             }
                 
-            if (isset($this->request->post['xshipping_free'.$i])) {
-                $data['xshipping_free'.$i] = $this->request->post['xshipping_free'.$i];
+            if (isset($this->request->post['xshipping_free' . $i])) {
+                $data['xshipping_free' . $i] = $this->request->post['xshipping_free' . $i];
             } else {
-                $data['xshipping_free'.$i] = $this->config->get('xshipping_free'.$i);
+                $data['xshipping_free' . $i] = $this->config->get('xshipping_free' . $i);
             }
         
-            if (isset($this->request->post['xshipping_geo_zone_id'.$i])) {
-                $data['xshipping_geo_zone_id'.$i] = $this->request->post['xshipping_geo_zone_id'.$i];
+            if (isset($this->request->post['xshipping_geo_zone_id' . $i])) {
+                $data['xshipping_geo_zone_id' . $i] = $this->request->post['xshipping_geo_zone_id' . $i];
             } else {
-                $data['xshipping_geo_zone_id'.$i] = $this->config->get('xshipping_geo_zone_id'.$i);
+                $data['xshipping_geo_zone_id' . $i] = $this->config->get('xshipping_geo_zone_id' . $i);
             }
                 
-            if (isset($this->request->post['xshipping_status'.$i])) {
-                $data['xshipping_status'.$i] = $this->request->post['xshipping_status'.$i];
+            if (isset($this->request->post['xshipping_status' . $i])) {
+                $data['xshipping_status' . $i] = $this->request->post['xshipping_status' . $i];
             } else {
-                $data['xshipping_status'.$i] = $this->config->get('xshipping_status'.$i);
+                $data['xshipping_status' . $i] = $this->config->get('xshipping_status' . $i);
             }
                 
-            if (isset($this->request->post['xshipping_sort_order'.$i])) {
-                $data['xshipping_sort_order'.$i] = $this->request->post['xshipping_sort_order'.$i];
+            if (isset($this->request->post['xshipping_sort_order' . $i])) {
+                $data['xshipping_sort_order' . $i] = $this->request->post['xshipping_sort_order' . $i];
             } else {
-                $data['xshipping_sort_order'.$i] = $this->config->get('xshipping_sort_order'.$i);
+                $data['xshipping_sort_order' . $i] = $this->config->get('xshipping_sort_order' . $i);
             }
         }
          

administration/controller/localisation/location.php

Spacing +6 added lines, -6 removed lines

@@ -170,14 +170,14 @@ 
             $url .= '&page=' . $this->request->get['page'];
         }
 
-        $data['breadcrumbs'] =   array();
+        $data['breadcrumbs'] = array();
 
-        $data['breadcrumbs'][] =   array(
+        $data['breadcrumbs'][] = array(
             'text' =>  $this->language->get('text_home'),
             'href' => $this->url->link('common/dashboard', 'token=' . $this->session->data['token'], true)
         );
 
-        $data['breadcrumbs'][] =   array(
+        $data['breadcrumbs'][] = array(
             'text' =>  $this->language->get('heading_title'),
             'href' =>  $this->url->link('localisation/location', 'token=' . $this->session->data['token'] . $url, true)
         );
@@ -199,7 +199,7 @@ 
         $results = $this->model_localisation_location->getLocations($filter_data);
 
         foreach ($results as $result) {
-            $data['location'][] =   array(
+            $data['location'][] = array(
                 'location_id' => $result['location_id'],
                 'name'        => $result['name'],
                 'address'     => $result['address'],
@@ -365,7 +365,7 @@ 
         if (!isset($this->request->get['location_id'])) {
             $data['action'] = $this->url->link('localisation/location/add', 'token=' . $this->session->data['token'] . $url, true);
         } else {
-            $data['action'] = $this->url->link('localisation/location/edit', 'token=' . $this->session->data['token'] .  '&location_id=' . $this->request->get['location_id'] . $url, true);
+            $data['action'] = $this->url->link('localisation/location/edit', 'token=' . $this->session->data['token'] . '&location_id=' . $this->request->get['location_id'] . $url, true);
         }
 
         $data['cancel'] = $this->url->link('localisation/location', 'token=' . $this->session->data['token'] . $url, true);
@@ -381,7 +381,7 @@ 
         } elseif (!empty($location_info)) {
             $data['name'] = $location_info['name'];
         } else {
-            $data['name'] =   '';
+            $data['name'] = '';
         }
 
         if (isset($this->request->post['address'])) {

administration/controller/design/custommenu.php

Spacing +10 added lines, -10 removed lines

@@ -125,7 +125,7 @@ 
 
         foreach ($custommenus as $id => $custommenu) {
             $rent_custommenu[] = array(
-                'name'          => $custommenu['name'] ,
+                'name'          => $custommenu['name'],
                 'custommenu_id'       => $custommenu['custommenu_id'],
                 'custommenu_type'     => $custommenu['custommenu_type'],
                 'status'        => $custommenu['status'],
@@ -226,7 +226,7 @@ 
         $html  = '<li id="custommenu-item-' . $custommenu['custommenu_id'] . '" class="custommenu-item custommenu-item-depth-0 custommenu-item-page custommenu-item-edit-inactive pending">';
         $html .= '	<dl class="custommenu-item-bar">';
         $html .= '		<dt class="custommenu-item-handle">';
-        $html .= '			<span class="item-title"><span class="custommenu-item-title">' . $custommenu['name'] .'</span> <span class="is-subcustommenu" style="display: none;">' . $this->language->get('text_sub_item') . '</span></span>';
+        $html .= '			<span class="item-title"><span class="custommenu-item-title">' . $custommenu['name'] . '</span> <span class="is-subcustommenu" style="display: none;">' . $this->language->get('text_sub_item') . '</span></span>';
         $html .= '          <span class="item-controls">';
         $html .= '			<span class="item-type">' . ucwords($custommenu['custommenu_type']) . '</span>';
         $html .= '				<a class="item-edit opencustommenuItem ' . $custommenu['custommenu_type'] . '" id="edit-' . $custommenu['custommenu_id'] . '" title="">';
@@ -243,7 +243,7 @@ 
 
         foreach ($languages as $language) {
             $html .= '<div class="input-group"><span class="input-group-addon"><img src="language/' . $language["code"] . '/' . $language["code"] . '.png' . '" title="' . $language["name"] . '"/></span>';
-            $html .= '   <input type="text" name="custommenu_name[' . $language['language_id'] . ']" value="' . $custommenu_desc[$custommenu['custommenu_id']][$language['language_id']]['name']. '" placeholder="' . $this->language->get('text_custommenu_name') . '" class="form-control" />';
+            $html .= '   <input type="text" name="custommenu_name[' . $language['language_id'] . ']" value="' . $custommenu_desc[$custommenu['custommenu_id']][$language['language_id']]['name'] . '" placeholder="' . $this->language->get('text_custommenu_name') . '" class="form-control" />';
             $html .= '</div>';
         }
         $html .= '<br>';
@@ -266,15 +266,15 @@ 
         $html .= '</div>';
         $html .= '<br>';
         $html .= '<div class="pull-right">';
-        $html .= ' <a id="disablecustommenu-'. $count . '" onclick="statuscustommenu(\'disable\', \'' . $custommenu['custommenu_id'] . '\', \'custommenu-item-' . $custommenu['custommenu_id'] . '\', \'disablecustommenu-' . $count .'\')" data-type="iframe" style="top:2px!important;font-size:1.2em !important;" title="' . $this->language->get('button_disable') . '" class="btn btn-danger btn-xs btn-edit btn-group"><i class="fa fa-times-circle"></i></a>';
+        $html .= ' <a id="disablecustommenu-' . $count . '" onclick="statuscustommenu(\'disable\', \'' . $custommenu['custommenu_id'] . '\', \'custommenu-item-' . $custommenu['custommenu_id'] . '\', \'disablecustommenu-' . $count . '\')" data-type="iframe" style="top:2px!important;font-size:1.2em !important;" title="' . $this->language->get('button_disable') . '" class="btn btn-danger btn-xs btn-edit btn-group"><i class="fa fa-times-circle"></i></a>';
         $html .= ' <a onclick="savecustommenu(\'custommenu-item-settings-edit-' . $custommenu['custommenu_id'] . '\', \'custommenu-item-' . $custommenu['custommenu_id'] . '\')" data-type="iframe" style="top:2px!important;font-size:1.2em !important;" title="' . $this->language->get('button_save') . '" class="btn btn-success btn-xs btn-edit btn-group"><i class="fa fa-save"></i></a>';
         $html .= ' <button type="button" title="" style="top:2px!important;font-size:1.2em !important;" class="btn btn-danger btn-xs btn-edit btn-group btn-loading" onclick="confirm(\'Are you sure?\') ? deletecustommenu(\'' . $custommenu['custommenu_id'] . '\', \'custommenu-item-' . $custommenu['custommenu_id'] . '\') : false;" data-original-title="Delete"><i class="fa fa-trash-o"></i></button>';
         $html .= '</div>';
         $html .= '<br><br>';
 
-        $html .= '<input class="custommenu-item-data-typecustommenu" type="hidden" name="custommenu-item-typecustommenu[Maincustommenu-' . $custommenu['custommenu_id'].']" value="Maincustommenu">';
+        $html .= '<input class="custommenu-item-data-typecustommenu" type="hidden" name="custommenu-item-typecustommenu[Maincustommenu-' . $custommenu['custommenu_id'] . ']" value="Maincustommenu">';
         $html .= '<input class="custommenu-item-data-db-id" type="hidden" name="custommenu-item-db-id[Maincustommenu-' . $custommenu['custommenu_id'] . ']" value="' . $custommenu['custommenu_id'] . '">';
-        $html .= '<input class="custommenu-item-data-parent-id" type="hidden" name="custommenu-item-parent-id[Maincustommenu-' . $custommenu['custommenu_id'] .']" value="0">';
+        $html .= '<input class="custommenu-item-data-parent-id" type="hidden" name="custommenu-item-parent-id[Maincustommenu-' . $custommenu['custommenu_id'] . ']" value="0">';
         $html .= '<input class="custommenu-item-data-position" type="hidden" name="custommenu-item-position[Maincustommenu-' . $custommenu['custommenu_id'] . ']" value="' . $custommenu['custommenu_id'] . '">';
         $html .= '<input class="custommenu-item-data-type" type="hidden" name="custommenu-item-type[Maincustommenu-' . $custommenu['custommenu_id'] . ']" value="post_type">';
 
@@ -365,7 +365,7 @@ 
 
         $id = explode('-', $this->request->post['id']);
 
-        $button = "<a id=\"disablecustommenu-" . $id[1] . "\" onclick=\"statuscustommenu('disable', '" . $this->request->post['custommenu_id'] . "', 'custommenu-item-" .  $this->request->post['custommenu_id'] . "', 'disablecustommenu-" . $id[1] . "')\" data-type=\"iframe\" data-toggle=\"tooltip\" style=\"top:2px!important;font-size:1.2em !important;\" title=\"\" class=\"btn btn-danger btn-xs btn-edit btn-group\"><i class=\"fa fa-times-circle\"></i></a>";
+        $button = "<a id=\"disablecustommenu-" . $id[1] . "\" onclick=\"statuscustommenu('disable', '" . $this->request->post['custommenu_id'] . "', 'custommenu-item-" . $this->request->post['custommenu_id'] . "', 'disablecustommenu-" . $id[1] . "')\" data-type=\"iframe\" data-toggle=\"tooltip\" style=\"top:2px!important;font-size:1.2em !important;\" title=\"\" class=\"btn btn-danger btn-xs btn-edit btn-group\"><i class=\"fa fa-times-circle\"></i></a>";
 
         echo $button;
         exit();
@@ -384,7 +384,7 @@ 
 
         $id = explode('-', $this->request->post['id']);
 
-        $button = "<a id=\"enablecustommenu-" . $id[1] . "\" onclick=\"statuscustommenu('enable', '" . $this->request->post['custommenu_id'] . "', 'custommenu-item-" .  $this->request->post['custommenu_id'] . "', 'enablecustommenu-" . $id[1] . "')\" data-type=\"iframe\" data-toggle=\"tooltip\" style=\"top:2px!important;font-size:1.2em !important;\" title=\"\" class=\"btn btn-success btn-xs btn-edit btn-group\"><i class=\"fa fa-check-circle\"></i></a>";
+        $button = "<a id=\"enablecustommenu-" . $id[1] . "\" onclick=\"statuscustommenu('enable', '" . $this->request->post['custommenu_id'] . "', 'custommenu-item-" . $this->request->post['custommenu_id'] . "', 'enablecustommenu-" . $id[1] . "')\" data-type=\"iframe\" data-toggle=\"tooltip\" style=\"top:2px!important;font-size:1.2em !important;\" title=\"\" class=\"btn btn-success btn-xs btn-edit btn-group\"><i class=\"fa fa-check-circle\"></i></a>";
 
         echo $button;
         exit();
@@ -403,7 +403,7 @@ 
 
         $id = explode('-', $this->request->post['id']);
 
-        $button = "<a id=\"disablecustommenu-" . $id[1] . "\" onclick=\"statuscustommenu('disable', '" . $this->request->post['custommenu_id'] . "', 'custommenu-child-item-" .  $this->request->post['custommenu_id'] . "', 'disablecustommenu-" . $id[1] . "')\" data-type=\"iframe\" data-toggle=\"tooltip\" style=\"top:2px!important;font-size:1.2em !important;\" title=\"\" class=\"btn btn-danger btn-xs btn-edit btn-group\"><i class=\"fa fa-times-circle\"></i></a>";
+        $button = "<a id=\"disablecustommenu-" . $id[1] . "\" onclick=\"statuscustommenu('disable', '" . $this->request->post['custommenu_id'] . "', 'custommenu-child-item-" . $this->request->post['custommenu_id'] . "', 'disablecustommenu-" . $id[1] . "')\" data-type=\"iframe\" data-toggle=\"tooltip\" style=\"top:2px!important;font-size:1.2em !important;\" title=\"\" class=\"btn btn-danger btn-xs btn-edit btn-group\"><i class=\"fa fa-times-circle\"></i></a>";
 
         echo $button;
         exit();
@@ -422,7 +422,7 @@ 
 
         $id = explode('-', $this->request->post['id']);
 
-        $button = "<a id=\"enablecustommenu-" . $id[1] . "\" onclick=\"statuscustommenu('enable', '" . $this->request->post['custommenu_id'] . "', 'custommenu-child-item-" .  $this->request->post['custommenu_id'] . "', 'enablecustommenu-" . $id[1] . "')\" data-type=\"iframe\" data-toggle=\"tooltip\" style=\"top:2px!important;font-size:1.2em !important;\" title=\"\" class=\"btn btn-success btn-xs btn-edit btn-group\"><i class=\"fa fa-check-circle\"></i></a>";
+        $button = "<a id=\"enablecustommenu-" . $id[1] . "\" onclick=\"statuscustommenu('enable', '" . $this->request->post['custommenu_id'] . "', 'custommenu-child-item-" . $this->request->post['custommenu_id'] . "', 'enablecustommenu-" . $id[1] . "')\" data-type=\"iframe\" data-toggle=\"tooltip\" style=\"top:2px!important;font-size:1.2em !important;\" title=\"\" class=\"btn btn-success btn-xs btn-edit btn-group\"><i class=\"fa fa-check-circle\"></i></a>";
 
         echo $button;
         exit();