mambax7 / smartobject

include/projax_/classes/Scriptaculous.php

Spacing +23 added lines, -23 removed lines

@@ -61,9 +61,9 @@ 
         }
 
         if (in_array($name, $this->TOGGLE_EFFECTS)) {
-            return "Effect.toggle($element,'" . str_replace('toggle_', '', $name) . "'," . $this->_options_for_javascript($js_options) . ')';
+            return "Effect.toggle($element,'".str_replace('toggle_', '', $name)."',".$this->_options_for_javascript($js_options).')';
         } else {
-            return 'new Effect.' . ucwords($name) . "($element," . $this->_options_for_javascript($js_options) . ')';
+            return 'new Effect.'.ucwords($name)."($element,".$this->_options_for_javascript($js_options).')';
         }
     }
 
@@ -93,7 +93,7 @@ 
         //    }
 
         //if (isset($option['onUpdate'])) {
-        $options['onUpdate'] = 'function(){' . $this->remote_function($options) . '}';
+        $options['onUpdate'] = 'function(){'.$this->remote_function($options).'}';
         //}
 
         foreach ($options as $var => $val) {
@@ -106,7 +106,7 @@ 
 
         foreach ($arr as $var) {
             if (isset($options[$var])) {
-                $options[$var] = "'" . $options[$var] . "'";
+                $options[$var] = "'".$options[$var]."'";
             }
         }
 
@@ -118,7 +118,7 @@ 
             $options['only'] = $this->_array_or_string_for_javascript($options['only']);
         }
 
-        return "Sortable.create('$element_id'," . $this->_options_for_javascript($options) . ')';
+        return "Sortable.create('$element_id',".$this->_options_for_javascript($options).')';
     }
 
     /**
@@ -128,7 +128,7 @@ 
      */
     public function _dragable_element_js($element_id, $options)
     {
-        return 'new Draggable(\'' . $element_id . '\',' . $this->_options_for_javascript($options) . ')';
+        return 'new Draggable(\''.$element_id.'\','.$this->_options_for_javascript($options).')';
     }
 
     /**
@@ -146,7 +146,7 @@ 
         //if (isset($option['onDrop']))
 
         {
-            $options['onDrop'] = 'function(element){' . $this->remote_function($options) . '}';
+            $options['onDrop'] = 'function(element){'.$this->remote_function($options).'}';
         }
 
         if (is_array($options)) {
@@ -162,10 +162,10 @@ 
         }
 
         if (isset($options['hoverclass'])) {
-            $options['hoverclass'] = "'" . $options['hoverclass'] . "'";
+            $options['hoverclass'] = "'".$options['hoverclass']."'";
         }
 
-        return 'Droppables.add(\'' . $element_id . '\',' . $this->_options_for_javascript($options) . ')';
+        return 'Droppables.add(\''.$element_id.'\','.$this->_options_for_javascript($options).')';
     }
 
     /////////////////////////////////////////////////////////////////////////////////////
@@ -182,7 +182,7 @@ 
     {
         $function = 'new Ajax.InPlaceEditor(';
         $function .= "'$field_id', ";
-        $function .= "'" . $options['url'] . "'";
+        $function .= "'".$options['url']."'";
 
         $js_options = [];
         if (isset($options['cancel_text'])) {
@@ -204,10 +204,10 @@ 
             $js_options['size'] = $options['size'];
         }
         if (isset($options['external_control'])) {
-            $js_options['externalControl'] = "'" . $options['external_control'] . "'";
+            $js_options['externalControl'] = "'".$options['external_control']."'";
         }
         if (isset($options['load_text_url'])) {
-            $js_options['loadTextURL'] = "'" . $options['load_text_url'] . "'";
+            $js_options['loadTextURL'] = "'".$options['load_text_url']."'";
         }
         if (isset($options['options'])) {
             $js_options['ajaxOptions'] = $options['options'];
@@ -216,10 +216,10 @@ 
             $js_options['evalScripts'] = $options['script'];
         }
         if (isset($options['with'])) {
-            $js_options['callback'] = 'function(form) { return ' . $options['with'] . ' }';
+            $js_options['callback'] = 'function(form) { return '.$options['with'].' }';
         }
 
-        $function .= ', ' . $this->_options_for_javascript($js_options) . ' )';
+        $function .= ', '.$this->_options_for_javascript($js_options).' )';
         if ($tag) {
             return $this->tag($function);
         } else {
@@ -236,7 +236,7 @@ 
     public function in_place_editor_field($object, $tag_options = null, $in_place_editor_options = null)
     {
         $ret_val = '';
-        $ret_val .= '<span id="' . $object . '" class="in_place_editor_field">' . (isset($tag_options['value']) ? $tag_options['value'] : '') . '</span>';
+        $ret_val .= '<span id="'.$object.'" class="in_place_editor_field">'.(isset($tag_options['value']) ? $tag_options['value'] : '').'</span>';
         $ret_val .= $this->in_place_editor($object, $in_place_editor_options);
 
         return $ret_val;
@@ -249,23 +249,23 @@ 
      */
     public function auto_complete_field($field_id, $options)
     {
-        $function = "var $field_id" . '_auto_completer = new Ajax.Autocompleter(';
+        $function = "var $field_id".'_auto_completer = new Ajax.Autocompleter(';
         $function .= "'$field_id', ";
-        $function .= "'" . (isset($options['update']) ? $options['update'] : $field_id . '_auto_complete') . "', ";
-        $function .= "'" . $options['url'] . "'";
+        $function .= "'".(isset($options['update']) ? $options['update'] : $field_id.'_auto_complete')."', ";
+        $function .= "'".$options['url']."'";
 
         $js_options = [];
         if (isset($options['tokens'])) {
             $js_options['tokens'] = $this->javascript->_array_or_string_for_javascript($options['tokens']);
         }
         if (isset($options['with'])) {
-            $js_options['callback'] = 'function(element, value) { return ' . $options['with'] . ' }';
+            $js_options['callback'] = 'function(element, value) { return '.$options['with'].' }';
         }
         if (isset($options['indicator'])) {
-            $js_options['indicator'] = "'" . $options['indicator'] . "'";
+            $js_options['indicator'] = "'".$options['indicator']."'";
         }
         if (isset($options['select'])) {
-            $js_options['select'] = "'" . $options['select'] . "'";
+            $js_options['select'] = "'".$options['select']."'";
         }
 
         foreach (['on_show' => 'onShow', 'on_hide' => 'onHide', 'min_chars' => 'min_chars'] as $var => $val) {
@@ -274,7 +274,7 @@ 
             }
         }
 
-        $function .= ', ' . $this->_options_for_javascript($js_options) . ' )';
+        $function .= ', '.$this->_options_for_javascript($js_options).' )';
 
         return $this->tag($function);
     }
@@ -316,7 +316,7 @@ 
                                                       . '" ' : '')
                     . '>';
 
-        $ret_val .= '<div id="' . $object . '_auto_complete" class="auto_complete"></div>';
+        $ret_val .= '<div id="'.$object.'_auto_complete" class="auto_complete"></div>';
         $ret_val .= $this->auto_complete_field($object, $completion_options);
 
         return $ret_val;

include/projax/classes/Prototype.php

Spacing +23 added lines, -23 removed lines

@@ -63,7 +63,7 @@ 
     {
         $options['form'] = true;
 
-        return '<form action="' . $options['url'] . '" onsubmit="' . $this->remote_function($options) . '; return false;" method="' . (isset($options['method']) ? $options['method'] : 'post') . '"  >';
+        return '<form action="'.$options['url'].'" onsubmit="'.$this->remote_function($options).'; return false;" method="'.(isset($options['method']) ? $options['method'] : 'post').'"  >';
     }
 
     /**
@@ -112,7 +112,7 @@ 
     public function periodically_call_remote($options = null)
     {
         $frequency = isset($options['frequency']) ? $options['frequency'] : 10;
-        $code      = 'new PeriodicalExecuter(function() {' . $this->remote_function($options) . '},' . $frequency . ')';
+        $code      = 'new PeriodicalExecuter(function() {'.$this->remote_function($options).'},'.$frequency.')';
 
         return $code;
     }
@@ -128,22 +128,22 @@ 
         $update = '';
 
         if (isset($options['update']) && is_array($options['update'])) {
-            $update = isset($options['update']['success']) ? 'success: ' . $options['update']['success'] : '';
+            $update = isset($options['update']['success']) ? 'success: '.$options['update']['success'] : '';
             $update .= empty($update) ? '' : ',';
-            $update .= isset($options['update']['failure']) ? 'failure: ' . $options['update']['failure'] : '';
+            $update .= isset($options['update']['failure']) ? 'failure: '.$options['update']['failure'] : '';
         } else {
             $update .= isset($options['update']) ? $options['update'] : '';
         }
 
-        $ajax_function = empty($update) ? 'new Ajax.Request(' : 'new Ajax.Updater(\'' . $update . '\',';
+        $ajax_function = empty($update) ? 'new Ajax.Request(' : 'new Ajax.Updater(\''.$update.'\',';
 
-        $ajax_function .= "'" . $options['url'] . "'";
-        $ajax_function .= ',' . $javascript_options . ')';
+        $ajax_function .= "'".$options['url']."'";
+        $ajax_function .= ','.$javascript_options.')';
 
-        $ajax_function = isset($options['before']) ? $options['before'] . ';' . $ajax_function : $ajax_function;
-        $ajax_function = isset($options['after']) ? $ajax_function . ';' . $options['after'] : $ajax_function;
-        $ajax_function = isset($options['condition']) ? 'if (' . $options['condition'] . ') {' . $ajax_function . '}' : $ajax_function;
-        $ajax_function = isset($options['confirm']) ? 'if ( confirm(\'' . $options['confirm'] . '\' ) ) { ' . $ajax_function . ' } ' : $ajax_function;
+        $ajax_function = isset($options['before']) ? $options['before'].';'.$ajax_function : $ajax_function;
+        $ajax_function = isset($options['after']) ? $ajax_function.';'.$options['after'] : $ajax_function;
+        $ajax_function = isset($options['condition']) ? 'if ('.$options['condition'].') {'.$ajax_function.'}' : $ajax_function;
+        $ajax_function = isset($options['confirm']) ? 'if ( confirm(\''.$options['confirm'].'\' ) ) { '.$ajax_function.' } ' : $ajax_function;
 
         return $ajax_function;
     }
@@ -160,7 +160,7 @@ 
             $options['with'] = 'Form.serialize(this.form)';
         }
 
-        return '<input type="button" onclick="' . $this->remote_function($options) . '" name="' . $name . '" value ="' . $value . '">';
+        return '<input type="button" onclick="'.$this->remote_function($options).'" name="'.$name.'" value ="'.$value.'">';
     }
 
     /**
@@ -203,8 +203,8 @@ 
         $callbacks = [];
         foreach ($options as $callback => $code) {
             if (in_array($callback, $this->CALLBACKS)) {
-                $name             = 'on' . ucfirst($callback);
-                $callbacks[$name] = 'function(request){' . $code . '}';
+                $name             = 'on'.ucfirst($callback);
+                $callbacks[$name] = 'function(request){'.$code.'}';
             }
         }
 
@@ -220,7 +220,7 @@ 
     public function _build_observer($klass, $name, $options = null)
     {
         if (isset($options['with']) && false === strpos($options['with'], '=')) {
-            $options['with'] = '\'' . $options['with'] . '=\' + value';
+            $options['with'] = '\''.$options['with'].'=\' + value';
         } elseif (isset($options['with']) && isset($options['update'])) {
             $options['with'] = 'value';
         }
@@ -228,10 +228,10 @@ 
         $callback = $options['function'] ?: $this->remote_function($options);
 
         $javascript = "new $klass('$name', ";
-        $javascript .= isset($options['frequency']) ? $options['frequency'] . ', ' : '';
+        $javascript .= isset($options['frequency']) ? $options['frequency'].', ' : '';
         $javascript .= 'function (element,value) { ';
         $javascript .= $callback;
-        $javascript .= isset($options['on']) ? ', ' . $options['on'] : '';
+        $javascript .= isset($options['on']) ? ', '.$options['on'] : '';
         $javascript .= '})';
 
         return $javascript;
@@ -263,7 +263,7 @@ 
         }
 
         if (isset($options['position'])) {
-            $js_options['insertion'] = 'Insertion.' . ucfirst($options['position']);
+            $js_options['insertion'] = 'Insertion.'.ucfirst($options['position']);
         }
 
         $js_options['evalScripts'] = isset($options['script']) ? $options['script'] : 'true';
@@ -271,7 +271,7 @@ 
         if (isset($options['form'])) {
             $js_options['parameters'] = 'Form.serialize(this)';
         } elseif (isset($options['parameters'])) {
-            $js_options['parameters'] = 'Form.serialize(\'' . $options['submit'] . '\')';
+            $js_options['parameters'] = 'Form.serialize(\''.$options['submit'].'\')';
         } elseif (isset($options['with'])) {
             $js_options['parameters'] = $options['with'];
         }
@@ -298,7 +298,7 @@ 
      */
     public function ID($id, $extend = null)
     {
-        return "$('$id')" . (!empty($extend)) ? '.' . $extend . '()' : '';
+        return "$('$id')".(!empty($extend)) ? '.'.$extend.'()' : '';
     }
 
     /**
@@ -357,7 +357,7 @@ 
      */
     public function delay($seconds = 1, $script = '')
     {
-        return "setTimeout( function() { $script } , " . ($seconds * 1000) . ' )';
+        return "setTimeout( function() { $script } , ".($seconds * 1000).' )';
     }
 
     /**
@@ -379,7 +379,7 @@ 
     {
         $args = array_merge([$id], (is_array($options_for_render) ? $options_for_render : [$options_for_render]));
 
-        return $this->call('new Insertion.' . ucfirst($position), $args);
+        return $this->call('new Insertion.'.ucfirst($position), $args);
     }
 
     /**
@@ -443,7 +443,7 @@ 
      */
     public function select($pattern, $extend = null)
     {
-        return "$$('$pattern')" . (!empty($extend)) ? '.' . $extend : '';
+        return "$$('$pattern')".(!empty($extend)) ? '.'.$extend : '';
     }
 
     /**

include/projax/classes/Scriptaculous.php

Spacing +23 added lines, -23 removed lines

@@ -61,9 +61,9 @@ 
         }
 
         if (in_array($name, $this->TOGGLE_EFFECTS)) {
-            return "Effect.toggle($element,'" . str_replace('toggle_', '', $name) . "'," . $this->_options_for_javascript($js_options) . ')';
+            return "Effect.toggle($element,'".str_replace('toggle_', '', $name)."',".$this->_options_for_javascript($js_options).')';
         } else {
-            return 'new Effect.' . ucwords($name) . "($element," . $this->_options_for_javascript($js_options) . ')';
+            return 'new Effect.'.ucwords($name)."($element,".$this->_options_for_javascript($js_options).')';
         }
     }
 
@@ -96,7 +96,7 @@ 
 
         //if (isset($option['onUpdate']))
         {
-            $options['onUpdate'] = 'function(){' . $this->remote_function($options) . '}';
+            $options['onUpdate'] = 'function(){'.$this->remote_function($options).'}';
         }
 
         foreach ($options as $var => $val) {
@@ -109,7 +109,7 @@ 
 
         foreach ($arr as $var) {
             if (isset($options[$var])) {
-                $options[$var] = "'" . $options[$var] . "'";
+                $options[$var] = "'".$options[$var]."'";
             }
         }
 
@@ -121,7 +121,7 @@ 
             $options['only'] = $this->_array_or_string_for_javascript($options['only']);
         }
 
-        return "Sortable.create('$element_id'," . $this->_options_for_javascript($options) . ')';
+        return "Sortable.create('$element_id',".$this->_options_for_javascript($options).')';
     }
 
     /**
@@ -131,7 +131,7 @@ 
      */
     public function _dragable_element_js($element_id, $options)
     {
-        return 'new Draggable(\'' . $element_id . '\',' . $this->_options_for_javascript($options) . ')';
+        return 'new Draggable(\''.$element_id.'\','.$this->_options_for_javascript($options).')';
     }
 
     /**
@@ -149,7 +149,7 @@ 
 
         //if (isset($option['onDrop']))
         {
-            $options['onDrop'] = 'function(element){' . $this->remote_function($options) . '}';
+            $options['onDrop'] = 'function(element){'.$this->remote_function($options).'}';
         }
 
         if (is_array($options)) {
@@ -165,10 +165,10 @@ 
         }
 
         if (isset($options['hoverclass'])) {
-            $options['hoverclass'] = "'" . $options['hoverclass'] . "'";
+            $options['hoverclass'] = "'".$options['hoverclass']."'";
         }
 
-        return 'Droppables.add(\'' . $element_id . '\',' . $this->_options_for_javascript($options) . ')';
+        return 'Droppables.add(\''.$element_id.'\','.$this->_options_for_javascript($options).')';
     }
 
     /////////////////////////////////////////////////////////////////////////////////////
@@ -185,7 +185,7 @@ 
     {
         $function = 'new Ajax.InPlaceEditor(';
         $function .= "'$field_id', ";
-        $function .= "'" . $options['url'] . "'";
+        $function .= "'".$options['url']."'";
 
         $js_options = [];
         if (isset($options['cancel_text'])) {
@@ -207,10 +207,10 @@ 
             $js_options['size'] = $options['size'];
         }
         if (isset($options['external_control'])) {
-            $js_options['externalControl'] = "'" . $options['external_control'] . "'";
+            $js_options['externalControl'] = "'".$options['external_control']."'";
         }
         if (isset($options['load_text_url'])) {
-            $js_options['loadTextURL'] = "'" . $options['load_text_url'] . "'";
+            $js_options['loadTextURL'] = "'".$options['load_text_url']."'";
         }
         if (isset($options['options'])) {
             $js_options['ajaxOptions'] = $options['options'];
@@ -219,10 +219,10 @@ 
             $js_options['evalScripts'] = $options['script'];
         }
         if (isset($options['with'])) {
-            $js_options['callback'] = 'function(form) { return ' . $options['with'] . ' }';
+            $js_options['callback'] = 'function(form) { return '.$options['with'].' }';
         }
 
-        $function .= ', ' . $this->_options_for_javascript($js_options) . ' )';
+        $function .= ', '.$this->_options_for_javascript($js_options).' )';
         if ($tag) {
             return $this->tag($function);
         } else {
@@ -239,7 +239,7 @@ 
     public function in_place_editor_field($object, $tag_options = null, $in_place_editor_options = null)
     {
         $ret_val = '';
-        $ret_val .= '<span id="' . $object . '" class="in_place_editor_field">' . (isset($tag_options['value']) ? $tag_options['value'] : '') . '</span>';
+        $ret_val .= '<span id="'.$object.'" class="in_place_editor_field">'.(isset($tag_options['value']) ? $tag_options['value'] : '').'</span>';
         $ret_val .= $this->in_place_editor($object, $in_place_editor_options);
 
         return $ret_val;
@@ -252,23 +252,23 @@ 
      */
     public function auto_complete_field($field_id, $options)
     {
-        $function = "var $field_id" . '_auto_completer = new Ajax.Autocompleter(';
+        $function = "var $field_id".'_auto_completer = new Ajax.Autocompleter(';
         $function .= "'$field_id', ";
-        $function .= "'" . (isset($options['update']) ? $options['update'] : $field_id . '_auto_complete') . "', ";
-        $function .= "'" . $options['url'] . "'";
+        $function .= "'".(isset($options['update']) ? $options['update'] : $field_id.'_auto_complete')."', ";
+        $function .= "'".$options['url']."'";
 
         $js_options = [];
         if (isset($options['tokens'])) {
             $js_options['tokens'] = $this->javascript->_array_or_string_for_javascript($options['tokens']);
         }
         if (isset($options['with'])) {
-            $js_options['callback'] = 'function(element, value) { return ' . $options['with'] . ' }';
+            $js_options['callback'] = 'function(element, value) { return '.$options['with'].' }';
         }
         if (isset($options['indicator'])) {
-            $js_options['indicator'] = "'" . $options['indicator'] . "'";
+            $js_options['indicator'] = "'".$options['indicator']."'";
         }
         if (isset($options['select'])) {
-            $js_options['select'] = "'" . $options['select'] . "'";
+            $js_options['select'] = "'".$options['select']."'";
         }
 
         foreach (['on_show' => 'onShow', 'on_hide' => 'onHide', 'min_chars' => 'min_chars'] as $var => $val) {
@@ -277,7 +277,7 @@ 
             }
         }
 
-        $function .= ', ' . $this->_options_for_javascript($js_options) . ' )';
+        $function .= ', '.$this->_options_for_javascript($js_options).' )';
 
         return $this->tag($function);
     }
@@ -319,7 +319,7 @@ 
                                                       . '" ' : '')
                     . '>';
 
-        $ret_val .= '<div id="' . $object . '_auto_complete" class="auto_complete"></div>';
+        $ret_val .= '<div id="'.$object.'_auto_complete" class="auto_complete"></div>';
         $ret_val .= $this->auto_complete_field($object, $completion_options);
 
         return $ret_val;

include/functions.php

Spacing +76 added lines, -76 removed lines

@@ -11,7 +11,7 @@ 
 
 function smart_get_css_link($cssfile)
 {
-    $ret = '<link rel="stylesheet" type="text/css" href="' . $cssfile . '">';
+    $ret = '<link rel="stylesheet" type="text/css" href="'.$cssfile.'">';
 
     return $ret;
 }
@@ -102,14 +102,14 @@ 
         $seoMode = smart_getModuleModeSEO($moduleName);
         if ($seoMode === 'rewrite') {
             $seoModuleName = smart_getModuleNameForSEO($moduleName);
-            $ret           = XOOPS_URL . '/' . $seoModuleName . '/';
+            $ret           = XOOPS_URL.'/'.$seoModuleName.'/';
         } elseif ($seoMode === 'pathinfo') {
-            $ret = XOOPS_URL . '/modules/' . $moduleName . '/seo.php/' . $seoModuleName . '/';
+            $ret = XOOPS_URL.'/modules/'.$moduleName.'/seo.php/'.$seoModuleName.'/';
         } else {
-            $ret = XOOPS_URL . '/modules/' . $moduleName . '/';
+            $ret = XOOPS_URL.'/modules/'.$moduleName.'/';
         }
 
-        return '<a href="' . $ret . '">' . $smartModule->getVar('name') . '</a>';
+        return '<a href="'.$ret.'">'.$smartModule->getVar('name').'</a>';
     }
 }
 
@@ -172,11 +172,11 @@ 
     /**
      * include SmartObject admin language file
      */
-    $fileName = XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/' . $xoopsConfig['language'] . '/admin.php';
+    $fileName = XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->getVar('dirname').'/language/'.$xoopsConfig['language'].'/admin.php';
     if (file_exists($fileName)) {
         require_once $fileName;
     } else {
-        require_once XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/english/admin.php';
+        require_once XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->getVar('dirname').'/language/english/admin.php';
     } ?>
     <script type='text/javascript'>
         <!--
@@ -193,9 +193,9 @@ 
     /**
      * Include the admin language constants for the SmartObject Framework
      */
-    $admin_file = SMARTOBJECT_ROOT_PATH . 'language/' . $xoopsConfig['language'] . '/admin.php';
+    $admin_file = SMARTOBJECT_ROOT_PATH.'language/'.$xoopsConfig['language'].'/admin.php';
     if (!file_exists($admin_file)) {
-        $admin_file = SMARTOBJECT_ROOT_PATH . 'language/english/admin.php';
+        $admin_file = SMARTOBJECT_ROOT_PATH.'language/english/admin.php';
     }
     require_once $admin_file;
 }
@@ -215,7 +215,7 @@ 
     //Verifies that a MySQL table exists
     $xoopsDB  = XoopsDatabaseFactory::getDatabaseConnection();
     $realname = $xoopsDB->prefix($table);
-    $sql      = 'SHOW TABLES FROM ' . XOOPS_DB_NAME;
+    $sql      = 'SHOW TABLES FROM '.XOOPS_DB_NAME;
     $ret      = $xoopsDB->queryF($sql);
     while (list($m_table) = $xoopsDB->fetchRow($ret)) {
         if ($m_table == $realname) {
@@ -244,7 +244,7 @@ 
         $moduleName = smart_getCurrentModuleName();
     }
     $xoopsDB = XoopsDatabaseFactory::getDatabaseConnection();
-    $sql     = sprintf('SELECT metavalue FROM %s WHERE metakey=%s', $xoopsDB->prefix($moduleName . '_meta'), $xoopsDB->quoteString($key));
+    $sql     = sprintf('SELECT metavalue FROM %s WHERE metakey=%s', $xoopsDB->prefix($moduleName.'_meta'), $xoopsDB->quoteString($key));
     $ret     = $xoopsDB->query($sql);
     if (!$ret) {
         $value = false;
@@ -287,9 +287,9 @@ 
     $xoopsDB = XoopsDatabaseFactory::getDatabaseConnection();
     $ret     = smart_GetMeta($key, $moduleName);
     if ($ret === '0' || $ret > 0) {
-        $sql = sprintf('UPDATE %s SET metavalue = %s WHERE metakey = %s', $xoopsDB->prefix($moduleName . '_meta'), $xoopsDB->quoteString($value), $xoopsDB->quoteString($key));
+        $sql = sprintf('UPDATE %s SET metavalue = %s WHERE metakey = %s', $xoopsDB->prefix($moduleName.'_meta'), $xoopsDB->quoteString($value), $xoopsDB->quoteString($key));
     } else {
-        $sql = sprintf('INSERT INTO %s (metakey, metavalue) VALUES (%s, %s)', $xoopsDB->prefix($moduleName . '_meta'), $xoopsDB->quoteString($key), $xoopsDB->quoteString($value));
+        $sql = sprintf('INSERT INTO %s (metakey, metavalue) VALUES (%s, %s)', $xoopsDB->prefix($moduleName.'_meta'), $xoopsDB->quoteString($key), $xoopsDB->quoteString($value));
     }
     $ret = $xoopsDB->queryF($sql);
     if (!$ret) {
@@ -469,7 +469,7 @@ 
 {
     static $smartModules;
     if (isset($smartModules[$moduleName])) {
-        $ret =& $smartModules[$moduleName];
+        $ret = & $smartModules[$moduleName];
 
         return $ret;
     }
@@ -505,7 +505,7 @@ 
 {
     static $smartConfigs;
     if (isset($smartConfigs[$moduleName])) {
-        $ret =& $smartConfigs[$moduleName];
+        $ret = & $smartConfigs[$moduleName];
 
         return $ret;
     }
@@ -533,7 +533,7 @@ 
             return $ret;
         }
         $hModConfig                = xoops_getHandler('config');
-        $smartConfigs[$moduleName] =& $hModConfig->getConfigsByCat(0, $module->getVar('mid'));
+        $smartConfigs[$moduleName] = & $hModConfig->getConfigsByCat(0, $module->getVar('mid'));
     }
 
     return $smartConfigs[$moduleName];
@@ -559,7 +559,7 @@ 
 {
     $ret = '';
     foreach ($errors as $key => $value) {
-        $ret .= '<br> - ' . $value;
+        $ret .= '<br> - '.$value;
     }
 
     return $ret;
@@ -579,17 +579,17 @@ 
     if (!is_numeric($userid)) {
         return $userid;
     }
-    $userid = (int)$userid;
+    $userid = (int) $userid;
     if ($userid > 0) {
         if ($users == []) {
             //fetching users
             $memberHandler = xoops_getHandler('member');
-            $user          =& $memberHandler->getUser($userid);
+            $user          = & $memberHandler->getUser($userid);
         } else {
             if (!isset($users[$userid])) {
                 return $GLOBALS['xoopsConfig']['anonymous'];
             }
-            $user =& $users[$userid];
+            $user = & $users[$userid];
         }
         if (is_object($user)) {
             $ts        = MyTextSanitizer:: getInstance();
@@ -600,15 +600,15 @@ 
                 $fullname = $user->getVar('name');
             }
             if (!empty($fullname)) {
-                $linkeduser = "$fullname [<a href='" . XOOPS_URL . '/userinfo.php?uid=' . $userid . "'>" . $ts->htmlSpecialChars($username) . '</a>]';
+                $linkeduser = "$fullname [<a href='".XOOPS_URL.'/userinfo.php?uid='.$userid."'>".$ts->htmlSpecialChars($username).'</a>]';
             } else {
-                $linkeduser = "<a href='" . XOOPS_URL . '/userinfo.php?uid=' . $userid . "'>" . ucwords($ts->htmlSpecialChars($username)) . '</a>';
+                $linkeduser = "<a href='".XOOPS_URL.'/userinfo.php?uid='.$userid."'>".ucwords($ts->htmlSpecialChars($username)).'</a>';
             }
             // add contact info: email + PM
             if ($withContact) {
-                $linkeduser .= ' <a href="mailto:' . $user->getVar('email') . '"><img style="vertical-align: middle;" src="' . XOOPS_URL . '/images/icons/email.gif' . '" alt="' . _CO_SOBJECT_SEND_EMAIL . '" title="' . _CO_SOBJECT_SEND_EMAIL . '"></a>';
-                $js         = "javascript:openWithSelfMain('" . XOOPS_URL . '/pmlite.php?send2=1&to_userid=' . $userid . "', 'pmlite',450,370);";
-                $linkeduser .= ' <a href="' . $js . '"><img style="vertical-align: middle;" src="' . XOOPS_URL . '/images/icons/pm.gif' . '" alt="' . _CO_SOBJECT_SEND_PM . '" title="' . _CO_SOBJECT_SEND_PM . '"></a>';
+                $linkeduser .= ' <a href="mailto:'.$user->getVar('email').'"><img style="vertical-align: middle;" src="'.XOOPS_URL.'/images/icons/email.gif'.'" alt="'._CO_SOBJECT_SEND_EMAIL.'" title="'._CO_SOBJECT_SEND_EMAIL.'"></a>';
+                $js = "javascript:openWithSelfMain('".XOOPS_URL.'/pmlite.php?send2=1&to_userid='.$userid."', 'pmlite',450,370);";
+                $linkeduser .= ' <a href="'.$js.'"><img style="vertical-align: middle;" src="'.XOOPS_URL.'/images/icons/pm.gif'.'" alt="'._CO_SOBJECT_SEND_PM.'" title="'._CO_SOBJECT_SEND_PM.'"></a>';
             }
 
             return $linkeduser;
@@ -627,20 +627,20 @@ 
 function smart_adminMenu($currentoption = 0, $breadcrumb = '', $submenus = false, $currentsub = -1)
 {
     global $xoopsModule, $xoopsConfig;
-    require_once XOOPS_ROOT_PATH . '/class/template.php';
-    if (file_exists(XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/' . $xoopsConfig['language'] . '/modinfo.php')) {
-        require_once XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/' . $xoopsConfig['language'] . '/modinfo.php';
+    require_once XOOPS_ROOT_PATH.'/class/template.php';
+    if (file_exists(XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->getVar('dirname').'/language/'.$xoopsConfig['language'].'/modinfo.php')) {
+        require_once XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->getVar('dirname').'/language/'.$xoopsConfig['language'].'/modinfo.php';
     } else {
-        require_once XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/english/modinfo.php';
+        require_once XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->getVar('dirname').'/language/english/modinfo.php';
     }
-    if (file_exists(XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/' . $xoopsConfig['language'] . '/admin.php')) {
-        require_once XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/' . $xoopsConfig['language'] . '/admin.php';
+    if (file_exists(XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->getVar('dirname').'/language/'.$xoopsConfig['language'].'/admin.php')) {
+        require_once XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->getVar('dirname').'/language/'.$xoopsConfig['language'].'/admin.php';
     } else {
-        require_once XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/english/admin.php';
+        require_once XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->getVar('dirname').'/language/english/admin.php';
     }
     $headermenu  = [];
     $adminObject = [];
-    include XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/admin/menu.php';
+    include XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->getVar('dirname').'/admin/menu.php';
     $tpl = new XoopsTpl();
     $tpl->assign([
                      'headermenu'      => $headermenu,
@@ -663,11 +663,11 @@ 
 function smart_collapsableBar($id = '', $title = '', $dsc = '')
 {
     global $xoopsModule;
-    echo "<h3 style=\"color: #2F5376; font-weight: bold; font-size: 14px; margin: 6px 0 0 0; \"><a href='javascript:;' onclick=\"togglecollapse('" . $id . "'); toggleIcon('" . $id . "_icon')\";>";
-    echo "<img id='" . $id . "_icon' src=" . SMARTOBJECT_URL . "assets/images/close12.gif alt=''></a>&nbsp;" . $title . '</h3>';
-    echo "<div id='" . $id . "'>";
+    echo "<h3 style=\"color: #2F5376; font-weight: bold; font-size: 14px; margin: 6px 0 0 0; \"><a href='javascript:;' onclick=\"togglecollapse('".$id."'); toggleIcon('".$id."_icon')\";>";
+    echo "<img id='".$id."_icon' src=".SMARTOBJECT_URL."assets/images/close12.gif alt=''></a>&nbsp;".$title.'</h3>';
+    echo "<div id='".$id."'>";
     if ($dsc !== '') {
-        echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . $dsc . '</span>';
+        echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">".$dsc.'</span>';
     }
 }
 
@@ -681,11 +681,11 @@ 
     global $xoopsModule;
     $onClick = "ajaxtogglecollapse('$id')";
     //$onClick = "togglecollapse('$id'); toggleIcon('" . $id . "_icon')";
-    echo '<h3 style="border: 1px solid; color: #2F5376; font-weight: bold; font-size: 14px; margin: 6px 0 0 0; " onclick="' . $onClick . '">';
-    echo "<img id='" . $id . "_icon' src=" . SMARTOBJECT_URL . "assets/images/close12.gif alt=''></a>&nbsp;" . $title . '</h3>';
-    echo "<div id='" . $id . "'>";
+    echo '<h3 style="border: 1px solid; color: #2F5376; font-weight: bold; font-size: 14px; margin: 6px 0 0 0; " onclick="'.$onClick.'">';
+    echo "<img id='".$id."_icon' src=".SMARTOBJECT_URL."assets/images/close12.gif alt=''></a>&nbsp;".$title.'</h3>';
+    echo "<div id='".$id."'>";
     if ($dsc !== '') {
-        echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . $dsc . '</span>';
+        echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">".$dsc.'</span>';
     }
 }
 
@@ -715,13 +715,13 @@ 
 {
     $urls        = smart_getCurrentUrls();
     $path        = $urls['phpself'];
-    $cookie_name = $path . '_smart_collaps_' . $name;
+    $cookie_name = $path.'_smart_collaps_'.$name;
     $cookie_name = str_replace('.', '_', $cookie_name);
     $cookie      = smart_getCookieVar($cookie_name, '');
     if ($cookie === 'none') {
         echo '
                 <script type="text/javascript"><!--
-                togglecollapse("' . $name . '"); toggleIcon("' . $name . '_icon");
+                togglecollapse("' . $name.'"); toggleIcon("'.$name.'_icon");
                     //-->
                 </script>
                 ';
@@ -787,17 +787,17 @@ 
     $httphost    = $_SERVER['HTTP_HOST'];
     $querystring = $_SERVER['QUERY_STRING'];
     if ($querystring !== '') {
-        $querystring = '?' . $querystring;
+        $querystring = '?'.$querystring;
     }
-    $currenturl           = $http . $httphost . $phpself . $querystring;
+    $currenturl           = $http.$httphost.$phpself.$querystring;
     $urls                 = [];
     $urls['http']         = $http;
     $urls['httphost']     = $httphost;
     $urls['phpself']      = $phpself;
     $urls['querystring']  = $querystring;
-    $urls['full_phpself'] = $http . $httphost . $phpself;
+    $urls['full_phpself'] = $http.$httphost.$phpself;
     $urls['full']         = $currenturl;
-    $urls['isHomePage']   = (XOOPS_URL . '/index.php') == ($http . $httphost . $phpself);
+    $urls['isHomePage']   = (XOOPS_URL.'/index.php') == ($http.$httphost.$phpself);
 
     return $urls;
 }
@@ -874,13 +874,13 @@ 
 {
     global $xoopsConfig, $xoopsModule, $xoopsModuleConfig;
 
-    require_once XOOPS_ROOT_PATH . '/class/template.php';
+    require_once XOOPS_ROOT_PATH.'/class/template.php';
     $tpl = new XoopsTpl();
 
     $hModule      = xoops_getHandler('module');
-    $versioninfo  =& $hModule->get($xoopsModule->getVar('mid'));
-    $modfootertxt = 'Module ' . $versioninfo->getInfo('name') . ' - Version ' . $versioninfo->getInfo('version') . '';
-    $modfooter    = "<a href='" . $versioninfo->getInfo('support_site_url') . "' target='_blank'><img src='" . XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/assets/images/cssbutton.gif' title='" . $modfootertxt . "' alt='" . $modfootertxt . "'></a>";
+    $versioninfo  = & $hModule->get($xoopsModule->getVar('mid'));
+    $modfootertxt = 'Module '.$versioninfo->getInfo('name').' - Version '.$versioninfo->getInfo('version').'';
+    $modfooter    = "<a href='".$versioninfo->getInfo('support_site_url')."' target='_blank'><img src='".XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname')."/assets/images/cssbutton.gif' title='".$modfootertxt."' alt='".$modfootertxt."'></a>";
     $tpl->assign('modfooter', $modfooter);
 
     if (!defined('_AM_SOBJECT_XOOPS_PRO')) {
@@ -888,7 +888,7 @@ 
     }
     $smartobjectConfig = smart_getModuleConfig('smartobject');
     $tpl->assign('smartobject_enable_admin_footer', $smartobjectConfig['enable_admin_footer']);
-    $tpl->display(SMARTOBJECT_ROOT_PATH . 'templates/smartobject_admin_footer.tpl');
+    $tpl->display(SMARTOBJECT_ROOT_PATH.'templates/smartobject_admin_footer.tpl');
 }
 
 function smart_xoops_cp_footer()
@@ -915,7 +915,7 @@ 
  */
 function smart_addScript($src)
 {
-    echo '<script src="' . $src . '" type="text/javascript"></script>';
+    echo '<script src="'.$src.'" type="text/javascript"></script>';
 }
 
 /**
@@ -924,16 +924,16 @@ 
 function smart_addStyle($src)
 {
     if ($src === 'smartobject') {
-        $src = SMARTOBJECT_URL . 'assets/css/module.css';
+        $src = SMARTOBJECT_URL.'assets/css/module.css';
     }
     echo smart_get_css_link($src);
 }
 
 function smart_addAdminAjaxSupport()
 {
-    smart_addScript(SMARTOBJECT_URL . 'include/scriptaculous/lib/prototype.js');
-    smart_addScript(SMARTOBJECT_URL . 'include/scriptaculous/src/scriptaculous.js');
-    smart_addScript(SMARTOBJECT_URL . 'include/scriptaculous/src/smart.js');
+    smart_addScript(SMARTOBJECT_URL.'include/scriptaculous/lib/prototype.js');
+    smart_addScript(SMARTOBJECT_URL.'include/scriptaculous/src/scriptaculous.js');
+    smart_addScript(SMARTOBJECT_URL.'include/scriptaculous/src/smart.js');
 }
 
 /**
@@ -993,8 +993,8 @@ 
 function smart_htmlnumericentities($str)
 {
     //    return preg_replace('/[^!-%\x27-;=?-~ ]/e', '"&#".ord("$0").chr(59)', $str);
-    return preg_replace_callback('/[^!-%\x27-;=?-~ ]/', function ($m) {
-        return '&#' . ord($m[0]) . chr(59);
+    return preg_replace_callback('/[^!-%\x27-;=?-~ ]/', function($m) {
+        return '&#'.ord($m[0]).chr(59);
     }, $str);
 }
 
@@ -1008,16 +1008,16 @@ 
     static $handlers;
     $name = strtolower(trim($name));
     if (!isset($handlers[$name])) {
-        if (file_exists($hnd_file = XOOPS_ROOT_PATH . '/kernel/' . $name . '.php')) {
+        if (file_exists($hnd_file = XOOPS_ROOT_PATH.'/kernel/'.$name.'.php')) {
             require_once $hnd_file;
         }
-        $class = 'Xoops' . ucfirst($name) . 'Handler';
+        $class = 'Xoops'.ucfirst($name).'Handler';
         if (class_exists($class)) {
             $handlers[$name] = new $class($GLOBALS['xoopsDB'], 'xoops');
         }
     }
     if (!isset($handlers[$name]) && !$optional) {
-        trigger_error('Class <b>' . $class . '</b> does not exist<br>Handler Name: ' . $name, E_USER_ERROR);
+        trigger_error('Class <b>'.$class.'</b> does not exist<br>Handler Name: '.$name, E_USER_ERROR);
     }
     if (isset($handlers[$name])) {
         return $handlers[$name];
@@ -1097,9 +1097,9 @@ 
 {
     global $xoopsConfig;
 
-    $filename = XOOPS_ROOT_PATH . '/modules/' . $module . '/language/' . $xoopsConfig['language'] . '/' . $file . '.php';
+    $filename = XOOPS_ROOT_PATH.'/modules/'.$module.'/language/'.$xoopsConfig['language'].'/'.$file.'.php';
     if (!file_exists($filename)) {
-        $filename = XOOPS_ROOT_PATH . '/modules/' . $module . '/language/english/' . $file . '.php';
+        $filename = XOOPS_ROOT_PATH.'/modules/'.$module.'/language/english/'.$file.'.php';
     }
     if (file_exists($filename)) {
         require_once $filename;
@@ -1195,7 +1195,7 @@ 
 
     $text = preg_replace($search, $replace, $document);
 
-    preg_replace_callback('/&#(\d+);/', function ($matches) {
+    preg_replace_callback('/&#(\d+);/', function($matches) {
         return chr($matches[1]);
     }, $document);
 
@@ -1218,21 +1218,21 @@ 
         $str = $match[0];
         if (false !== strpos($str, ',')) {
             // A comma exists, that makes it easy, cos we assume it separates the decimal part.
-            $str = str_replace('.', '', $str);    // Erase thousand seps
-            $str = str_replace(',', '.', $str);    // Convert , to . for floatval command
+            $str = str_replace('.', '', $str); // Erase thousand seps
+            $str = str_replace(',', '.', $str); // Convert , to . for floatval command
 
-            return (float)$str;
+            return (float) $str;
         } else {
             // No comma exists, so we have to decide, how a single dot shall be treated
             if (preg_match("/^[0-9\-]*[\.]{1}[0-9-]+$/", $str) === true && $set['single_dot_as_decimal'] === true) {
                 // Treat single dot as decimal separator
-                return (float)$str;
+                return (float) $str;
             } else {
                 //echo "str: ".$str; echo "ret: ".str_replace('.', '', $str); echo "<br><br> ";
                 // Else, treat all dots as thousand seps
-                $str = str_replace('.', '', $str);    // Erase thousand seps
+                $str = str_replace('.', '', $str); // Erase thousand seps
 
-                return (float)$str;
+                return (float) $str;
             }
         }
     } else {
@@ -1264,7 +1264,7 @@ 
         $ret .= '.00';
     }
     if ($currencyObj) {
-        $ret = $ret . ' ' . $currencyObj->getCode();
+        $ret = $ret.' '.$currencyObj->getCode();
     }
 
     return $ret;
@@ -1291,7 +1291,7 @@ 
     }
     $ret = '';
     if ($moduleName) {
-        $ret = "<a href='" . XOOPS_URL . "/modules/$moduleName/admin/index.php'>" . _CO_SOBJECT_ADMIN_PAGE . '</a>';
+        $ret = "<a href='".XOOPS_URL."/modules/$moduleName/admin/index.php'>"._CO_SOBJECT_ADMIN_PAGE.'</a>';
     }
 
     return $ret;
@@ -1302,7 +1302,7 @@ 
  */
 function smart_getEditors()
 {
-    $filename = XOOPS_ROOT_PATH . '/class/xoopseditor/xoopseditor.php';
+    $filename = XOOPS_ROOT_PATH.'/class/xoopseditor/xoopseditor.php';
     if (!file_exists($filename)) {
         return false;
     }
@@ -1326,9 +1326,9 @@ 
 {
     $ret = [];
     foreach ($items as $item) {
-        $ret[] = $moduleName . '_' . $item;
+        $ret[] = $moduleName.'_'.$item;
     }
-    $ret[] = $moduleName . '_meta';
+    $ret[] = $moduleName.'_meta';
 
     return $ret;
 }

class/smartaddto.php

Spacing +6 added lines, -6 removed lines

@@ -21,13 +21,13 @@ 
      */
     public function __construct($layout = 0, $method = 1)
     {
-        $layout = (int)$layout;
+        $layout = (int) $layout;
         if ($layout < 0 || $layout > 3) {
             $layout = 0;
         }
         $this->_layout = $layout;
 
-        $method = (int)$method;
+        $method = (int) $method;
         if ($method < 0 || $method > 1) {
             $method = 1;
         }
@@ -42,12 +42,12 @@ 
     {
         global $xoTheme, $xoopsTpl;
 
-        $xoTheme->addStylesheet(SMARTOBJECT_URL . 'include/addto/addto.css');
+        $xoTheme->addStylesheet(SMARTOBJECT_URL.'include/addto/addto.css');
 
         $xoopsTpl->assign('smartobject_addto_method', $this->_method);
         $xoopsTpl->assign('smartobject_addto_layout', $this->_layout);
 
-        $xoopsTpl->assign('smartobject_addto_url', SMARTOBJECT_URL . 'include/addto/');
+        $xoopsTpl->assign('smartobject_addto_url', SMARTOBJECT_URL.'include/addto/');
 
         if ($fetchOnly) {
             return $xoopsTpl->fetch('db:smartobject_addto.tpl');
@@ -63,12 +63,12 @@ 
     {
         global $xoTheme;
 
-        $xoTheme->addStylesheet(SMARTOBJECT_URL . 'include/addto/addto.css');
+        $xoTheme->addStylesheet(SMARTOBJECT_URL.'include/addto/addto.css');
 
         $block                             = [];
         $block['smartobject_addto_method'] = $this->_method;
         $block['smartobject_addto_layout'] = $this->_layout;
-        $block['smartobject_addto_url']    = SMARTOBJECT_URL . 'include/addto/';
+        $block['smartobject_addto_url']    = SMARTOBJECT_URL.'include/addto/';
 
         return $block;
     }

class/basedurl.php

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
 
 // defined('XOOPS_ROOT_PATH') || exit('Restricted access.');
 
-require_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobject.php';
+require_once XOOPS_ROOT_PATH.'/modules/smartobject/class/smartobject.php';
 
 /**
  * Class SmartobjectBasedUrl

class/smartobjecttable.php

Spacing +43 added lines, -43 removed lines

@@ -184,7 +184,7 @@ 
      */
     public function addActionButton($op, $caption = false, $text = false)
     {
-        $action                 = [
+        $action = [
             'op'      => $op,
             'caption' => $caption,
             'text'    => $text
@@ -219,7 +219,7 @@ 
     {
         $current_urls               = smart_getCurrentUrls();
         $current_url                = $current_urls['full'];
-        $this->_printerFriendlyPage = $current_url . '&print';
+        $this->_printerFriendlyPage = $current_url.'&print';
     }
 
     /**
@@ -252,7 +252,7 @@ 
      */
     public function addDefaultIntroButton($caption)
     {
-        $this->addIntroButton($this->_objectHandler->_itemname, $this->_objectHandler->_page . '?op=mod', $caption);
+        $this->addIntroButton($this->_objectHandler->_itemname, $this->_objectHandler->_page.'?op=mod', $caption);
     }
 
     /**
@@ -277,9 +277,9 @@ 
     public function getDefaultSort()
     {
         if ($this->_sortsel) {
-            return smart_getCookieVar($_SERVER['PHP_SELF'] . '_' . $this->_id . '_sortsel', $this->_sortsel);
+            return smart_getCookieVar($_SERVER['PHP_SELF'].'_'.$this->_id.'_sortsel', $this->_sortsel);
         } else {
-            return smart_getCookieVar($_SERVER['PHP_SELF'] . '_' . $this->_id . '_sortsel', $this->_objectHandler->identifierName);
+            return smart_getCookieVar($_SERVER['PHP_SELF'].'_'.$this->_id.'_sortsel', $this->_objectHandler->identifierName);
         }
     }
 
@@ -297,9 +297,9 @@ 
     public function getDefaultOrder()
     {
         if ($this->_ordersel) {
-            return smart_getCookieVar($_SERVER['PHP_SELF'] . '_' . $this->_id . '_ordersel', $this->_ordersel);
+            return smart_getCookieVar($_SERVER['PHP_SELF'].'_'.$this->_id.'_ordersel', $this->_ordersel);
         } else {
-            return smart_getCookieVar($_SERVER['PHP_SELF'] . '_' . $this->_id . '_ordersel', 'ASC');
+            return smart_getCookieVar($_SERVER['PHP_SELF'].'_'.$this->_id.'_ordersel', 'ASC');
         }
     }
 
@@ -348,21 +348,21 @@ 
 
     public function setSortOrder()
     {
-        $this->_sortsel = isset($_GET[$this->_objectHandler->_itemname . '_' . 'sortsel']) ? $_GET[$this->_objectHandler->_itemname . '_' . 'sortsel'] : $this->getDefaultSort();
+        $this->_sortsel = isset($_GET[$this->_objectHandler->_itemname.'_'.'sortsel']) ? $_GET[$this->_objectHandler->_itemname.'_'.'sortsel'] : $this->getDefaultSort();
         //$this->_sortsel = isset($_POST['sortsel']) ? $_POST['sortsel']: $this->_sortsel;
-        smart_setCookieVar($_SERVER['PHP_SELF'] . '_' . $this->_id . '_sortsel', $this->_sortsel);
+        smart_setCookieVar($_SERVER['PHP_SELF'].'_'.$this->_id.'_sortsel', $this->_sortsel);
         $fieldsForSorting = $this->_tempObject->getFieldsForSorting($this->_sortsel);
 
         if (isset($this->_tempObject->vars[$this->_sortsel]['itemName'])
             && $this->_tempObject->vars[$this->_sortsel]['itemName']) {
-            $this->_criteria->setSort($this->_tempObject->vars[$this->_sortsel]['itemName'] . '.' . $this->_sortsel);
+            $this->_criteria->setSort($this->_tempObject->vars[$this->_sortsel]['itemName'].'.'.$this->_sortsel);
         } else {
-            $this->_criteria->setSort($this->_objectHandler->_itemname . '.' . $this->_sortsel);
+            $this->_criteria->setSort($this->_objectHandler->_itemname.'.'.$this->_sortsel);
         }
 
-        $this->_ordersel = isset($_GET[$this->_objectHandler->_itemname . '_' . 'ordersel']) ? $_GET[$this->_objectHandler->_itemname . '_' . 'ordersel'] : $this->getDefaultOrder();
+        $this->_ordersel = isset($_GET[$this->_objectHandler->_itemname.'_'.'ordersel']) ? $_GET[$this->_objectHandler->_itemname.'_'.'ordersel'] : $this->getDefaultOrder();
         //$this->_ordersel = isset($_POST['ordersel']) ? $_POST['ordersel']:$this->_ordersel;
-        smart_setCookieVar($_SERVER['PHP_SELF'] . '_' . $this->_id . '_ordersel', $this->_ordersel);
+        smart_setCookieVar($_SERVER['PHP_SELF'].'_'.$this->_id.'_ordersel', $this->_ordersel);
         $ordersArray = $this->getOrdersArray();
         $this->_criteria->setOrder($this->_ordersel);
     }
@@ -412,7 +412,7 @@ 
                         //$object->initiateCustomFields();
                     }
                     if ($column->_keyname === 'checked') {
-                        $value = '<input type ="checkbox" name="selected_smartobjects[]" value="' . $object->id() . '">';
+                        $value = '<input type ="checkbox" name="selected_smartobjects[]" value="'.$object->id().'">';
                     } elseif ($column->_customMethodForValue
                               && method_exists($object, $column->_customMethodForValue)) {
                         $method = $column->_customMethodForValue;
@@ -457,7 +457,7 @@ 
                     }
                 }
 
-                require_once SMARTOBJECT_ROOT_PATH . 'class/smartobjectcontroller.php';
+                require_once SMARTOBJECT_ROOT_PATH.'class/smartobjectcontroller.php';
                 $controller = new SmartObjectController($this->_objectHandler);
 
                 if ((!is_array($this->_actions)) || in_array('edit', $this->_actions)) {
@@ -497,9 +497,9 @@ 
     public function getDefaultFilter()
     {
         if ($this->_filtersel) {
-            return smart_getCookieVar($_SERVER['PHP_SELF'] . '_' . $this->_id . '_filtersel', $this->_filtersel);
+            return smart_getCookieVar($_SERVER['PHP_SELF'].'_'.$this->_id.'_filtersel', $this->_filtersel);
         } else {
-            return smart_getCookieVar($_SERVER['PHP_SELF'] . '_' . $this->_id . '_filtersel', 'default');
+            return smart_getCookieVar($_SERVER['PHP_SELF'].'_'.$this->_id.'_filtersel', 'default');
         }
     }
 
@@ -549,9 +549,9 @@ 
     public function getDefaultFilter2()
     {
         if ($this->_filtersel2) {
-            return smart_getCookieVar($_SERVER['PHP_SELF'] . '_filtersel2', $this->_filtersel2);
+            return smart_getCookieVar($_SERVER['PHP_SELF'].'_filtersel2', $this->_filtersel2);
         } else {
-            return smart_getCookieVar($_SERVER['PHP_SELF'] . '_filtersel2', 'default');
+            return smart_getCookieVar($_SERVER['PHP_SELF'].'_filtersel2', 'default');
         }
     }
 
@@ -679,7 +679,7 @@ 
      */
     public function render($fetchOnly = false, $debug = false)
     {
-        require_once XOOPS_ROOT_PATH . '/class/template.php';
+        require_once XOOPS_ROOT_PATH.'/class/template.php';
 
         $this->_tpl = new XoopsTpl();
 
@@ -690,24 +690,24 @@ 
          */
         $this->_tempObject = $this->_objectHandler->create();
 
-        $this->_criteria->setStart(isset($_GET['start' . $this->_objectHandler->keyName]) ? (int)$_GET['start' . $this->_objectHandler->keyName] : 0);
+        $this->_criteria->setStart(isset($_GET['start'.$this->_objectHandler->keyName]) ? (int) $_GET['start'.$this->_objectHandler->keyName] : 0);
 
         $this->setSortOrder();
 
         if (!$this->_isTree) {
-            $this->_limitsel = isset($_GET['limitsel']) ? $_GET['limitsel'] : smart_getCookieVar($_SERVER['PHP_SELF'] . '_limitsel', '15');
+            $this->_limitsel = isset($_GET['limitsel']) ? $_GET['limitsel'] : smart_getCookieVar($_SERVER['PHP_SELF'].'_limitsel', '15');
         } else {
             $this->_limitsel = 'all';
         }
 
         $this->_limitsel = isset($_POST['limitsel']) ? $_POST['limitsel'] : $this->_limitsel;
-        smart_setCookieVar($_SERVER['PHP_SELF'] . '_limitsel', $this->_limitsel);
+        smart_setCookieVar($_SERVER['PHP_SELF'].'_limitsel', $this->_limitsel);
         $limitsArray = $this->getLimitsArray();
         $this->_criteria->setLimit($this->_limitsel);
 
         $this->_filtersel = isset($_GET['filtersel']) ? $_GET['filtersel'] : $this->getDefaultFilter();
         $this->_filtersel = isset($_POST['filtersel']) ? $_POST['filtersel'] : $this->_filtersel;
-        smart_setCookieVar($_SERVER['PHP_SELF'] . '_' . $this->_id . '_filtersel', $this->_filtersel);
+        smart_setCookieVar($_SERVER['PHP_SELF'].'_'.$this->_id.'_filtersel', $this->_filtersel);
         $filtersArray = $this->getFiltersArray();
 
         if ($filtersArray) {
@@ -733,7 +733,7 @@ 
                     $filters2Array = $this->getFilters2Array();
                     $this->_tpl->assign('smartobject_optionssel_filters2Array', $filters2Array);
 
-                    smart_setCookieVar($_SERVER['PHP_SELF'] . '_filtersel2', $this->_filtersel2);
+                    smart_setCookieVar($_SERVER['PHP_SELF'].'_filtersel2', $this->_filtersel2);
                     if ($this->_filtersel2 !== 'default') {
                         $this->_criteria->add(new Criteria($this->_filtersel, $this->_filtersel2));
                     }
@@ -742,21 +742,21 @@ 
         }
         // Check if we have a quicksearch
 
-        if (isset($_POST['quicksearch_' . $this->_id]) && $_POST['quicksearch_' . $this->_id] != '') {
+        if (isset($_POST['quicksearch_'.$this->_id]) && $_POST['quicksearch_'.$this->_id] != '') {
             $quicksearch_criteria = new CriteriaCompo();
             if (is_array($this->_quickSearch['fields'])) {
                 foreach ($this->_quickSearch['fields'] as $v) {
-                    $quicksearch_criteria->add(new Criteria($v, '%' . $_POST['quicksearch_' . $this->_id] . '%', 'LIKE'), 'OR');
+                    $quicksearch_criteria->add(new Criteria($v, '%'.$_POST['quicksearch_'.$this->_id].'%', 'LIKE'), 'OR');
                 }
             } else {
-                $quicksearch_criteria->add(new Criteria($this->_quickSearch['fields'], '%' . $_POST['quicksearch_' . $this->_id] . '%', 'LIKE'));
+                $quicksearch_criteria->add(new Criteria($this->_quickSearch['fields'], '%'.$_POST['quicksearch_'.$this->_id].'%', 'LIKE'));
             }
             $this->_criteria->add($quicksearch_criteria);
         }
 
         $this->_objects = $this->fetchObjects($debug);
 
-        require_once XOOPS_ROOT_PATH . '/class/pagenav.php';
+        require_once XOOPS_ROOT_PATH.'/class/pagenav.php';
         if ($this->_criteria->getLimit() > 0) {
 
             /**
@@ -772,7 +772,7 @@ 
              */
             $params_of_the_options_sel = [];
 
-            $not_needed_params = ['sortsel', 'limitsel', 'ordersel', 'start' . $this->_objectHandler->keyName];
+            $not_needed_params = ['sortsel', 'limitsel', 'ordersel', 'start'.$this->_objectHandler->keyName];
             foreach ($_GET as $k => $v) {
                 if (!in_array($k, $not_needed_params)) {
                     $new_get_array[]             = "$k=$v";
@@ -783,12 +783,12 @@ 
             /**
              * Adding the new params of the pagenav
              */
-            $new_get_array[] = 'sortsel=' . $this->_sortsel;
-            $new_get_array[] = 'ordersel=' . $this->_ordersel;
-            $new_get_array[] = 'limitsel=' . $this->_limitsel;
+            $new_get_array[] = 'sortsel='.$this->_sortsel;
+            $new_get_array[] = 'ordersel='.$this->_ordersel;
+            $new_get_array[] = 'limitsel='.$this->_limitsel;
             $otherParams     = implode('&', $new_get_array);
 
-            $pagenav = new XoopsPageNav($this->_objectHandler->getCount($this->_criteria), $this->_criteria->getLimit(), $this->_criteria->getStart(), 'start' . $this->_objectHandler->keyName, $otherParams);
+            $pagenav = new XoopsPageNav($this->_objectHandler->getCount($this->_criteria), $this->_criteria->getLimit(), $this->_criteria->getStart(), 'start'.$this->_objectHandler->keyName, $otherParams);
             $this->_tpl->assign('smartobject_pagenav', $pagenav->renderNav());
         }
         $this->renderOptionSelection($limitsArray, $params_of_the_options_sel);
@@ -824,20 +824,20 @@ 
             $aColumn['align'] = $column->getAlign();
             $aColumn['key']   = $column->getKeyName();
             if ($column->_keyname === 'checked') {
-                $aColumn['caption'] = '<input type ="checkbox" id="checkall_smartobjects" name="checkall_smartobjects"' . ' value="checkall_smartobjects" onclick="smartobject_checkall(window.document.form_' . $this->_id . ', \'selected_smartobjects\');">';
+                $aColumn['caption'] = '<input type ="checkbox" id="checkall_smartobjects" name="checkall_smartobjects"'.' value="checkall_smartobjects" onclick="smartobject_checkall(window.document.form_'.$this->_id.', \'selected_smartobjects\');">';
             } elseif ($column->getCustomCaption()) {
                 $aColumn['caption'] = $column->getCustomCaption();
             } else {
                 $aColumn['caption'] = isset($this->_tempObject->vars[$column->getKeyName()]['form_caption']) ? $this->_tempObject->vars[$column->getKeyName()]['form_caption'] : $column->getKeyName();
             }
             // Are we doing a GET sort on this column ?
-            $getSort = (isset($_GET[$this->_objectHandler->_itemname . '_' . 'sortsel'])
-                        && $_GET[$this->_objectHandler->_itemname . '_' . 'sortsel'] == $column->getKeyName())
+            $getSort = (isset($_GET[$this->_objectHandler->_itemname.'_'.'sortsel'])
+                        && $_GET[$this->_objectHandler->_itemname.'_'.'sortsel'] == $column->getKeyName())
                        || ($this->_sortsel == $column->getKeyName());
-            $order   = isset($_GET[$this->_objectHandler->_itemname . '_' . 'ordersel']) ? $_GET[$this->_objectHandler->_itemname . '_' . 'ordersel'] : 'DESC';
+            $order   = isset($_GET[$this->_objectHandler->_itemname.'_'.'ordersel']) ? $_GET[$this->_objectHandler->_itemname.'_'.'ordersel'] : 'DESC';
 
-            if (isset($_REQUEST['quicksearch_' . $this->_id]) && $_REQUEST['quicksearch_' . $this->_id] != '') {
-                $qs_param = '&quicksearch_' . $this->_id . '=' . $_REQUEST['quicksearch_' . $this->_id];
+            if (isset($_REQUEST['quicksearch_'.$this->_id]) && $_REQUEST['quicksearch_'.$this->_id] != '') {
+                $qs_param = '&quicksearch_'.$this->_id.'='.$_REQUEST['quicksearch_'.$this->_id];
             }
             if (!$this->_enableColumnsSorting || $column->_keyname === 'checked' || !$column->isSortable()) {
                 $aColumn['caption'] = $aColumn['caption'];
@@ -864,7 +864,7 @@ 
                                       . $orderArray[$order]['image']
                                       . '" alt="ASC"></a>';
             } else {
-                $aColumn['caption'] = '<a href="' . $current_url . '?' . $this->_objectHandler->_itemname . '_' . 'sortsel=' . $column->getKeyName() . '&' . $this->_objectHandler->_itemname . '_' . 'ordersel=ASC' . $qs_param . '&' . $new_query_string . '">' . $aColumn['caption'] . '</a>';
+                $aColumn['caption'] = '<a href="'.$current_url.'?'.$this->_objectHandler->_itemname.'_'.'sortsel='.$column->getKeyName().'&'.$this->_objectHandler->_itemname.'_'.'ordersel=ASC'.$qs_param.'&'.$new_query_string.'">'.$aColumn['caption'].'</a>';
             }
             $aColumns[] = $aColumn;
         }
@@ -894,9 +894,9 @@ 
 
         $smartobjectTable_template = $this->_customTemplate ?: 'smartobject_smarttable_display.tpl';
         if ($fetchOnly) {
-            return $this->_tpl->fetch('db:' . $smartobjectTable_template);
+            return $this->_tpl->fetch('db:'.$smartobjectTable_template);
         } else {
-            $this->_tpl->display('db:' . $smartobjectTable_template);
+            $this->_tpl->display('db:'.$smartobjectTable_template);
         }
     }
 

class/smarthighlighter.php

Spacing +4 added lines, -4 removed lines

@@ -78,10 +78,10 @@ 
         if ($this->singlewords) {
             $keywords = explode(' ', $this->preg_keywords);
             foreach ($keywords as $keyword) {
-                $patterns[] = '/(?' . '>' . $keyword . '+)/si';
+                $patterns[] = '/(?'.'>'.$keyword.'+)/si';
             }
         } else {
-            $patterns[] = '/(?' . '>' . $this->preg_keywords . '+)/si';
+            $patterns[] = '/(?'.'>'.$this->preg_keywords.'+)/si';
         }
 
         $result = $replace_matches[0];
@@ -104,9 +104,9 @@ 
      */
     public function highlight($buffer)
     {
-        $buffer              = '>' . $buffer . '<';
+        $buffer              = '>'.$buffer.'<';
         $this->preg_keywords = preg_replace('/[^\w ]/si', '', $this->keywords);
-        $buffer              = preg_replace_callback("/(\>(((?" . ">[^><]+)|(?R))*)\<)/is", [&$this, 'replace'], $buffer);
+        $buffer              = preg_replace_callback("/(\>(((?".">[^><]+)|(?R))*)\<)/is", [&$this, 'replace'], $buffer);
         $buffer              = substr($buffer, 1, -1);
 
         return $buffer;

class/rating.php

Spacing +6 added lines, -6 removed lines

@@ -29,8 +29,8 @@ 
 
 // defined('XOOPS_ROOT_PATH') || exit('Restricted access.');
 
-require_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobject.php';
-require_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartplugins.php';
+require_once XOOPS_ROOT_PATH.'/modules/smartobject/class/smartobject.php';
+require_once XOOPS_ROOT_PATH.'/modules/smartobject/class/smartplugins.php';
 
 /**
  * Class SmartobjectRating
@@ -124,14 +124,14 @@ 
      */
     public function getItemValue()
     {
-        $moduleUrl      = XOOPS_URL . '/modules/' . $this->getVar('dirname', 'n') . '/';
+        $moduleUrl      = XOOPS_URL.'/modules/'.$this->getVar('dirname', 'n').'/';
         $plugin         = $this->getModulePlugin();
         $pluginItemInfo = $plugin->getItemInfo($this->getVar('item'));
         if (!$pluginItemInfo) {
             return '';
         }
         $itemPath = sprintf($pluginItemInfo['url'], $this->getVar('itemid'));
-        $ret      = '<a href="' . $moduleUrl . $itemPath . '">' . $pluginItemInfo['caption'] . '</a>';
+        $ret      = '<a href="'.$moduleUrl.$itemPath.'">'.$pluginItemInfo['caption'].'</a>';
 
         return $ret;
     }
@@ -174,7 +174,7 @@ 
     public function __construct(XoopsDatabase $db)
     {
         parent::__construct($db, 'rating', 'ratingid', 'rate', '', 'smartobject');
-        $this->generalSQL = 'SELECT * FROM ' . $this->table . ' AS ' . $this->_itemname . ' INNER JOIN ' . $this->db->prefix('users') . ' AS user ON ' . $this->_itemname . '.uid=user.uid';
+        $this->generalSQL = 'SELECT * FROM '.$this->table.' AS '.$this->_itemname.' INNER JOIN '.$this->db->prefix('users').' AS user ON '.$this->_itemname.'.uid=user.uid';
 
         $this->_rateOptions[1] = 1;
         $this->_rateOptions[2] = 2;
@@ -217,7 +217,7 @@ 
      */
     public function getRatingAverageByItemId($itemid, $dirname, $item)
     {
-        $sql    = 'SELECT AVG(rate), COUNT(ratingid) FROM ' . $this->table . " WHERE itemid=$itemid AND dirname='$dirname' AND item='$item' GROUP BY itemid";
+        $sql    = 'SELECT AVG(rate), COUNT(ratingid) FROM '.$this->table." WHERE itemid=$itemid AND dirname='$dirname' AND item='$item' GROUP BY itemid";
         $result = $this->db->query($sql);
         if (!$result) {
             return 0;