mambax7 / smartobject

class/form/elements/smartformimageelement.php

Spacing +10 added lines, -10 removed lines

@@ -27,23 +27,23 @@
         if ('' !== $object->getVar($key)
             && (0 === strpos($object->getVar($key), 'http')
                 || 0 === strpos($object->getVar($key), '{XOOPS_URL}'))) {
-            $this->addElement(new XoopsFormLabel('', "<img src='" . str_replace('{XOOPS_URL}', XOOPS_URL, $object->getVar($key)) . "' alt=''><br><br>"));
+            $this->addElement(new XoopsFormLabel('', "<img src='".str_replace('{XOOPS_URL}', XOOPS_URL, $object->getVar($key))."' alt=''><br><br>"));
         } elseif ('' !== $object->getVar($key)) {
-            $this->addElement(new XoopsFormLabel('', "<img src='" . $object_imageurl . $object->getVar($key) . "' alt=''><br><br>"));
+            $this->addElement(new XoopsFormLabel('', "<img src='".$object_imageurl.$object->getVar($key)."' alt=''><br><br>"));
         }
 
-        require_once SMARTOBJECT_ROOT_PATH . 'class/form/elements/smartformfileuploadelement.php';
+        require_once SMARTOBJECT_ROOT_PATH.'class/form/elements/smartformfileuploadelement.php';
         $this->addElement(new SmartFormFileUploadElement($object, $key));
 
-        $this->addElement(new XoopsFormLabel('<div style="height: 10px; padding-top: 8px; font-size: 80%;">' . _CO_SOBJECT_URL_FILE_DSC . '</div>', ''));
-        require_once SMARTOBJECT_ROOT_PATH . 'class/form/elements/smartformtextelement.php';
-        require_once SMARTOBJECT_ROOT_PATH . 'class/form/elements/smartformcheckelement.php';
+        $this->addElement(new XoopsFormLabel('<div style="height: 10px; padding-top: 8px; font-size: 80%;">'._CO_SOBJECT_URL_FILE_DSC.'</div>', ''));
+        require_once SMARTOBJECT_ROOT_PATH.'class/form/elements/smartformtextelement.php';
+        require_once SMARTOBJECT_ROOT_PATH.'class/form/elements/smartformcheckelement.php';
 
-        $this->addElement(new XoopsFormLabel('', '<br>' . _CO_SOBJECT_URL_FILE));
-        $this->addElement(new SmartFormTextElement($object, 'url_' . $key));
+        $this->addElement(new XoopsFormLabel('', '<br>'._CO_SOBJECT_URL_FILE));
+        $this->addElement(new SmartFormTextElement($object, 'url_'.$key));
         $this->addElement(new XoopsFormLabel('', '<br><br>'));
-        $delete_check = new SmartFormCheckElement('', 'delete_' . $key);
-        $delete_check->addOption(1, '<span style="color:red;">' . _CO_SOBJECT_DELETE . '</span>');
+        $delete_check = new SmartFormCheckElement('', 'delete_'.$key);
+        $delete_check->addOption(1, '<span style="color:red;">'._CO_SOBJECT_DELETE.'</span>');
         $this->addElement($delete_check);
     }
 }

class/form/elements/smartformrichfileelement.php

Spacing +13 added lines, -13 removed lines

@@ -22,28 +22,28 @@
         parent::__construct($form_caption, ' ');
         if ('' !== $object->getVar('url')) {
             $caption = '' !== $object->getVar('caption') ? $object->getVar('caption') : $object->getVar('url');
-            $this->addElement(new XoopsFormLabel('', _CO_SOBJECT_CURRENT_FILE . "<a href='" . str_replace('{XOOPS_URL}', XOOPS_URL, $object->getVar('url')) . "' target='_blank' >" . $caption . '</a><br><br>'));
+            $this->addElement(new XoopsFormLabel('', _CO_SOBJECT_CURRENT_FILE."<a href='".str_replace('{XOOPS_URL}', XOOPS_URL, $object->getVar('url'))."' target='_blank' >".$caption.'</a><br><br>'));
             //$this->addElement( new XoopsFormLabel( '', "<br><a href = '".SMARTOBJECT_URL."admin/file.php?op=del&fileid=".$object->id()."'>"._CO_SOBJECT_DELETE_FILE."</a>"));
         }
 
-        require_once SMARTOBJECT_ROOT_PATH . 'class/form/elements/smartformfileuploadelement.php';
+        require_once SMARTOBJECT_ROOT_PATH.'class/form/elements/smartformfileuploadelement.php';
         if ($object->isNew()) {
             $this->addElement(new SmartFormFileUploadElement($object, $key));
-            $this->addElement(new XoopsFormLabel('', '<br><br><small>' . _CO_SOBJECT_URL_FILE_DSC . '</small>'));
-            $this->addElement(new XoopsFormLabel('', '<br>' . _CO_SOBJECT_URL_FILE));
-            $this->addElement(new SmartFormTextElement($object, 'url_' . $key));
+            $this->addElement(new XoopsFormLabel('', '<br><br><small>'._CO_SOBJECT_URL_FILE_DSC.'</small>'));
+            $this->addElement(new XoopsFormLabel('', '<br>'._CO_SOBJECT_URL_FILE));
+            $this->addElement(new SmartFormTextElement($object, 'url_'.$key));
         }
-        $this->addElement(new XoopsFormLabel('', '<br>' . _CO_SOBJECT_CAPTION));
-        $this->addElement(new SmartFormTextElement($object, 'caption_' . $key));
-        $this->addElement(new XoopsFormLabel('', '<br>' . _CO_SOBJECT_DESC . '<br>'));
-        $this->addElement(new XoopsFormTextArea('', 'desc_' . $key, $object->getVar('description')));
+        $this->addElement(new XoopsFormLabel('', '<br>'._CO_SOBJECT_CAPTION));
+        $this->addElement(new SmartFormTextElement($object, 'caption_'.$key));
+        $this->addElement(new XoopsFormLabel('', '<br>'._CO_SOBJECT_DESC.'<br>'));
+        $this->addElement(new XoopsFormTextArea('', 'desc_'.$key, $object->getVar('description')));
 
         if (!$object->isNew()) {
-            $this->addElement(new XoopsFormLabel('', '<br>' . _CO_SOBJECT_CHANGE_FILE));
+            $this->addElement(new XoopsFormLabel('', '<br>'._CO_SOBJECT_CHANGE_FILE));
             $this->addElement(new SmartFormFileUploadElement($object, $key));
-            $this->addElement(new XoopsFormLabel('', '<br><br><small>' . _CO_SOBJECT_URL_FILE_DSC . '</small>'));
-            $this->addElement(new XoopsFormLabel('', '<br>' . _CO_SOBJECT_URL_FILE));
-            $this->addElement(new SmartFormTextElement($object, 'url_' . $key));
+            $this->addElement(new XoopsFormLabel('', '<br><br><small>'._CO_SOBJECT_URL_FILE_DSC.'</small>'));
+            $this->addElement(new XoopsFormLabel('', '<br>'._CO_SOBJECT_URL_FILE));
+            $this->addElement(new SmartFormTextElement($object, 'url_'.$key));
         }
     }
 }

class/form/elements/smartformcheckelement.php

Spacing +4 added lines, -4 removed lines

@@ -18,15 +18,15 @@ 
     {
         $ret = '';
         if (count($this->getOptions()) > 1 && '[]' !== substr($this->getName(), -2, 2)) {
-            $newname = $this->getName() . '[]';
+            $newname = $this->getName().'[]';
             $this->setName($newname);
         }
         foreach ($this->getOptions() as $value => $name) {
-            $ret .= "<input type='checkbox' name='" . $this->getName() . "' value='" . $value . "'";
+            $ret .= "<input type='checkbox' name='".$this->getName()."' value='".$value."'";
             if (count($this->getValue()) > 0 && in_array($value, $this->getValue())) {
                 $ret .= ' checked';
             }
-            $ret .= $this->getExtra() . '>' . $name . '<br>';
+            $ret .= $this->getExtra().'>'.$name.'<br>';
         }
 
         return $ret;
@@ -50,7 +50,7 @@ 
             if (hasSelections === false) {
                 window.alert(\"{$eltmsg}\"); myform['{$eltname}[]'][0].focus(); return false; }\n";
         } else {
-            $js .= "for (var i = 0; i < myform['" . $eltname . "'].length; i++) {
+            $js .= "for (var i = 0; i < myform['".$eltname."'].length; i++) {
                 if (myform['{$eltname}'][i].checked) {
                     hasSelections = true;
                 }

class/form/smartobjectform.php

Spacing +52 added lines, -52 removed lines

@@ -15,9 +15,9 @@ 
 /**
  * Including the XoopsFormLoader classes
  */
-require_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
-require_once SMARTOBJECT_ROOT_PATH . 'class/form/elements/smartformsection.php';
-require_once SMARTOBJECT_ROOT_PATH . 'class/form/elements/smartformsectionclose.php';
+require_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
+require_once SMARTOBJECT_ROOT_PATH.'class/form/elements/smartformsection.php';
+require_once SMARTOBJECT_ROOT_PATH.'class/form/elements/smartformsectionclose.php';
 
 /**
  * SmartForm base class
@@ -60,7 +60,7 @@ 
         $cancel_js_action = false,
         $captcha = false
     ) {
-        $this->targetObject           =& $target;
+        $this->targetObject           = & $target;
         $this->form_fields            = $form_fields;
         $this->_cancel_js_action      = $cancel_js_action;
         $this->_captcha               = $captcha;
@@ -88,7 +88,7 @@ 
 
     public function addCaptcha()
     {
-        require_once SMARTOBJECT_ROOT_PATH . 'include/captcha/formcaptcha.php';
+        require_once SMARTOBJECT_ROOT_PATH.'include/captcha/formcaptcha.php';
         $this->addElement(new XoopsFormCaptcha(), true);
     }
 
@@ -99,7 +99,7 @@ 
      */
     public function addCustomButton($name, $caption, $onclick = false)
     {
-        $custom_button_array    = [
+        $custom_button_array = [
             'name'    => $name,
             'caption' => $caption,
             'onclick' => $onclick
@@ -120,7 +120,7 @@ 
         if ($key) {
             if ($this->targetObject->vars[$key]['readonly']) {
                 $formElement->setExtra('disabled="disabled"');
-                $formElement->setName($key . '-readonly');
+                $formElement->setName($key.'-readonly');
                 // Since this element is disable, we still want to pass it's value in the form
                 $hidden = new XoopsFormHidden($key, $this->targetObject->vars[$key]['value']);
                 $this->addElement($hidden);
@@ -131,7 +131,7 @@ 
                 $this->addElement($hidden);
                 $otherExtra      = isset($var['form_extra']) ? $var['form_extra'] : '';
                 $onchangedString = "this.form.elements.changedField.value='$key'; this.form.elements.op.value='changedField'; submit()";
-                $formElement->setExtra('onchange="' . $onchangedString . '"' . ' ' . $otherExtra);
+                $formElement->setExtra('onchange="'.$onchangedString.'"'.' '.$otherExtra);
             } else {
                 if (isset($var['form_extra'])) {
                     $formElement->setExtra($var['form_extra']);
@@ -298,8 +298,8 @@ 
             asort($group_list);
             foreach ($permissions as $permission) {
                 if ($this->targetObject->isNew()) {
-                    if (isset($smartModuleConfig['def_perm_' . $permission['perm_name']])) {
-                        $groups_value = $smartModuleConfig['def_perm_' . $permission['perm_name']];
+                    if (isset($smartModuleConfig['def_perm_'.$permission['perm_name']])) {
+                        $groups_value = $smartModuleConfig['def_perm_'.$permission['perm_name']];
                     }
                 } else {
                     $groups_value = $this->targetObject->getGroupPerm($permission['perm_name']);
@@ -331,7 +331,7 @@ 
         } else {
             $butt_create = new XoopsFormButton('', 'modify_button', $submit_button_caption, 'submit');
         }
-        $butt_create->setExtra('onclick="this.form.elements.op.value=\'' . $form_name . '\'"');
+        $butt_create->setExtra('onclick="this.form.elements.op.value=\''.$form_name.'\'"');
         $button_tray->addElement($butt_create);
 
         //creating custom buttons
@@ -339,7 +339,7 @@ 
             foreach ($this->_custom_button as $custom_button) {
                 $butt_custom = new XoopsFormButton('', $custom_button['name'], $custom_button['caption'], 'submit');
                 if ($custom_button['onclick']) {
-                    $butt_custom->setExtra('onclick="' . $custom_button['onclick'] . '"');
+                    $butt_custom->setExtra('onclick="'.$custom_button['onclick'].'"');
                 }
                 $button_tray->addElement($butt_custom);
                 unset($butt_custom);
@@ -349,7 +349,7 @@ 
         // creating the "cancel" button
         $butt_cancel = new XoopsFormButton('', 'cancel_button', _CO_SOBJECT_CANCEL, 'button');
         if ($this->_cancel_js_action) {
-            $butt_cancel->setExtra('onclick="' . $this->_cancel_js_action . '"');
+            $butt_cancel->setExtra('onclick="'.$this->_cancel_js_action.'"');
         } else {
             $butt_cancel->setExtra('onclick="history.go(-1)"');
         }
@@ -367,7 +367,7 @@ 
     {
         switch ($controlName) {
             case 'check':
-                require_once SMARTOBJECT_ROOT_PATH . 'class/form/elements/smartformcheckelement.php';
+                require_once SMARTOBJECT_ROOT_PATH.'class/form/elements/smartformcheckelement.php';
                 $control    = $this->targetObject->getControl($key);
                 $controlObj = new SmartFormCheckElement($this->targetObject->vars[$key]['form_caption'], $key, $this->targetObject->getVar($key));
                 $controlObj->addOptionArray($control['options']);
@@ -434,38 +434,38 @@ 
                 break;
 
             case 'urllink':
-                require_once SMARTOBJECT_ROOT_PATH . 'class/form/elements/smartformurllinkelement.php';
+                require_once SMARTOBJECT_ROOT_PATH.'class/form/elements/smartformurllinkelement.php';
 
                 return new SmartFormUrlLinkElement($this->targetObject->vars[$key]['form_caption'], $key, $this->targetObject->getUrlLinkObj($key));
                 break;
 
             case 'richfile':
-                require_once SMARTOBJECT_ROOT_PATH . 'class/form/elements/smartformrichfileelement.php';
+                require_once SMARTOBJECT_ROOT_PATH.'class/form/elements/smartformrichfileelement.php';
 
                 return new SmartFormRichFileElement($this->targetObject->vars[$key]['form_caption'], $key, $this->targetObject->getFileObj($key));
                 break;
             case 'section':
-                require_once SMARTOBJECT_ROOT_PATH . 'class/form/elements/smartformsection.php';
+                require_once SMARTOBJECT_ROOT_PATH.'class/form/elements/smartformsection.php';
 
                 return new SmartFormSection($key, $this->targetObject->vars[$key]['form_caption']);
                 break;
 
             default:
-                $classname = 'SmartForm' . ucfirst($controlName) . 'Element';
+                $classname = 'SmartForm'.ucfirst($controlName).'Element';
                 if (!class_exists($classname)) {
-                    if (file_exists(SMARTOBJECT_ROOT_PATH . 'class/form/elements/' . strtolower($classname) . '.php')) {
-                        require_once SMARTOBJECT_ROOT_PATH . 'class/form/elements/' . strtolower($classname) . '.php';
+                    if (file_exists(SMARTOBJECT_ROOT_PATH.'class/form/elements/'.strtolower($classname).'.php')) {
+                        require_once SMARTOBJECT_ROOT_PATH.'class/form/elements/'.strtolower($classname).'.php';
                     } else {
                         // perhaps this is a control created by the module
                         $moduleName             = $this->targetObject->handler->_moduleName;
-                        $moduleFormElementsPath = $this->targetObject->handler->_modulePath . 'class/form/elements/';
-                        $classname              = ucfirst($moduleName) . ucfirst($controlName) . 'Element';
-                        $classFileName          = strtolower($classname) . '.php';
+                        $moduleFormElementsPath = $this->targetObject->handler->_modulePath.'class/form/elements/';
+                        $classname              = ucfirst($moduleName).ucfirst($controlName).'Element';
+                        $classFileName          = strtolower($classname).'.php';
 
-                        if (file_exists($moduleFormElementsPath . $classFileName)) {
-                            require_once $moduleFormElementsPath . $classFileName;
+                        if (file_exists($moduleFormElementsPath.$classFileName)) {
+                            require_once $moduleFormElementsPath.$classFileName;
                         } else {
-                            trigger_error($classname . ' Not found', E_USER_WARNING);
+                            trigger_error($classname.' Not found', E_USER_WARNING);
 
                             return new XoopsFormLabel(); //Empty object
                         }
@@ -534,7 +534,7 @@ 
         $editor_configs['height'] = '400px';
 
         $dhtml            = true;
-        $xoopseditorclass = XOOPS_ROOT_PATH . '/class/xoopsform/formeditor.php';
+        $xoopseditorclass = XOOPS_ROOT_PATH.'/class/xoopsform/formeditor.php';
 
         if (file_exists($xoopseditorclass)) {
             require_once $xoopseditorclass;
@@ -544,8 +544,8 @@ 
 
                 case 'tiny':
                     if (!$xoops22) {
-                        if (is_readable(XOOPS_ROOT_PATH . '/class/xoopseditor/tinyeditor/formtinytextarea.php')) {
-                            require_once XOOPS_ROOT_PATH . '/class/xoopseditor/tinyeditor/formtinytextarea.php';
+                        if (is_readable(XOOPS_ROOT_PATH.'/class/xoopseditor/tinyeditor/formtinytextarea.php')) {
+                            require_once XOOPS_ROOT_PATH.'/class/xoopseditor/tinyeditor/formtinytextarea.php';
                             $editor = new XoopsFormTinyTextArea([
                                                                     'caption' => $caption,
                                                                     'name'    => $name,
@@ -575,8 +575,8 @@ 
 
                 case 'fckeditor':
                     if (!$xoops22) {
-                        if (is_readable(XOOPS_ROOT_PATH . '/class/xoopseditor/fckeditor/formfckeditor.php')) {
-                            require_once XOOPS_ROOT_PATH . '/class/xoopseditor/fckeditor/formfckeditor.php';
+                        if (is_readable(XOOPS_ROOT_PATH.'/class/xoopseditor/fckeditor/formfckeditor.php')) {
+                            require_once XOOPS_ROOT_PATH.'/class/xoopseditor/fckeditor/formfckeditor.php';
                             $editor = new XoopsFormFckeditor([
                                                                  'caption' => $caption,
                                                                  'name'    => $name,
@@ -598,8 +598,8 @@ 
 
                 case 'inbetween':
                     if (!$xoops22) {
-                        if (is_readable(XOOPS_ROOT_PATH . '/class/xoopseditor/inbetween/forminbetweentextarea.php')) {
-                            require_once XOOPS_ROOT_PATH . '/class/xoopseditor/inbetween/forminbetweentextarea.php';
+                        if (is_readable(XOOPS_ROOT_PATH.'/class/xoopseditor/inbetween/forminbetweentextarea.php')) {
+                            require_once XOOPS_ROOT_PATH.'/class/xoopseditor/inbetween/forminbetweentextarea.php';
                             $editor = new XoopsFormInbetweenTextArea([
                                                                          'caption' => $caption,
                                                                          'name'    => $name,
@@ -621,8 +621,8 @@ 
 
                 case 'koivi':
                     if (!$xoops22) {
-                        if (is_readable(XOOPS_ROOT_PATH . '/class/wysiwyg/formwysiwygtextarea.php')) {
-                            require_once XOOPS_ROOT_PATH . '/class/wysiwyg/formwysiwygtextarea.php';
+                        if (is_readable(XOOPS_ROOT_PATH.'/class/wysiwyg/formwysiwygtextarea.php')) {
+                            require_once XOOPS_ROOT_PATH.'/class/wysiwyg/formwysiwygtextarea.php';
                             $editor = new XoopsFormWysiwygTextArea($caption, $name, $value, '100%', '400px');
                         } else {
                             if ($dhtml) {
@@ -638,8 +638,8 @@ 
 
                 case 'spaw':
                     if (!$xoops22) {
-                        if (is_readable(XOOPS_ROOT_PATH . '/class/spaw/formspaw.php')) {
-                            require_once XOOPS_ROOT_PATH . '/class/spaw/formspaw.php';
+                        if (is_readable(XOOPS_ROOT_PATH.'/class/spaw/formspaw.php')) {
+                            require_once XOOPS_ROOT_PATH.'/class/spaw/formspaw.php';
                             $editor = new XoopsFormSpaw($caption, $name, $value);
                         }
                     } else {
@@ -649,8 +649,8 @@ 
 
                 case 'htmlarea':
                     if (!$xoops22) {
-                        if (is_readable(XOOPS_ROOT_PATH . '/class/htmlarea/formhtmlarea.php')) {
-                            require_once XOOPS_ROOT_PATH . '/class/htmlarea/formhtmlarea.php';
+                        if (is_readable(XOOPS_ROOT_PATH.'/class/htmlarea/formhtmlarea.php')) {
+                            require_once XOOPS_ROOT_PATH.'/class/htmlarea/formhtmlarea.php';
                             $editor = new XoopsFormHtmlarea($caption, $name, $value);
                         }
                     } else {
@@ -686,10 +686,10 @@ 
         $size         = $multiple ? 5 : 1;
         $theme_select = new XoopsFormSelect($var['form_caption'], $key, $this->targetObject->getVar($key), $size, $multiple);
 
-        $handle  = opendir(XOOPS_THEME_PATH . '/');
+        $handle  = opendir(XOOPS_THEME_PATH.'/');
         $dirlist = [];
         while (false !== ($file = readdir($handle))) {
-            if (is_dir(XOOPS_THEME_PATH . '/' . $file) && !preg_match("/^[.]{1,2}$/", $file)
+            if (is_dir(XOOPS_THEME_PATH.'/'.$file) && !preg_match("/^[.]{1,2}$/", $file)
                 && 'cvs' !== strtolower($file)) {
                 $dirlist[$file] = $file;
             }
@@ -711,7 +711,7 @@ 
     {
         foreach ($this->_elements as $eleObj) {
             if ($eleObj->getName() == $keyname) {
-                $ret =& $eleObj;
+                $ret = & $eleObj;
                 break;
             }
         }
@@ -728,9 +728,9 @@ 
     {
         $required = $this->getRequired();
         $ret      = "
-            <form name='" . $this->getName() . "' id='" . $this->getName() . "' action='" . $this->getAction() . "' method='" . $this->getMethod() . "' onsubmit='return xoopsFormValidate_" . $this->getName() . "(this);'" . $this->getExtra() . ">
+            <form name='" . $this->getName()."' id='".$this->getName()."' action='".$this->getAction()."' method='".$this->getMethod()."' onsubmit='return xoopsFormValidate_".$this->getName()."(this);'".$this->getExtra().">
             <table width='100%' class='outer' cellspacing='1'>
-            <tr><th colspan='2'>" . $this->getTitle() . '</th></tr>
+            <tr><th colspan='2'>" . $this->getTitle().'</th></tr>
         ';
         $hidden   = '';
         $class    = 'even';
@@ -739,11 +739,11 @@ 
                 $ret .= $ele;
             } elseif (!$ele->isHidden()) {
                 //$class = ( $class == 'even' ) ? 'odd': 'even';
-                $ret .= "<tr id='" . $ele->getName() . "' valign='top' align='left'><td class='head'>" . $ele->getCaption();
+                $ret .= "<tr id='".$ele->getName()."' valign='top' align='left'><td class='head'>".$ele->getCaption();
                 if ('' !== $ele->getDescription()) {
-                    $ret .= '<br><br><span style="font-weight: normal;">' . $ele->getDescription() . '</span>';
+                    $ret .= '<br><br><span style="font-weight: normal;">'.$ele->getDescription().'</span>';
                 }
-                $ret .= "</td><td class='$class'>" . $ele->render() . "</td></tr>\n";
+                $ret .= "</td><td class='$class'>".$ele->render()."</td></tr>\n";
             } else {
                 $hidden .= $ele->render();
             }
@@ -789,7 +789,7 @@ 
             'name'       => $this->getName(),
             'action'     => $this->getAction(),
             'method'     => $this->getMethod(),
-            'extra'      => 'onsubmit="return xoopsFormValidate_' . $this->getName() . '(this);"' . $this->getExtra(),
+            'extra'      => 'onsubmit="return xoopsFormValidate_'.$this->getName().'(this);"'.$this->getExtra(),
             'javascript' => $js,
             'elements'   => $elements
         ]);
@@ -807,7 +807,7 @@ 
         }
         $myts     = MyTextSanitizer::getInstance();
         $formname = $this->getName();
-        $js       .= "function xoopsFormValidate_{$formname}(myform) {";
+        $js .= "function xoopsFormValidate_{$formname}(myform) {";
         // First, output code to check required elements
         $elements = $this->getRequired();
         foreach ($elements as $elt) {
@@ -858,15 +858,15 @@ 
                         window.alert(\"{$eltmsg}\"); myform['{$eltname}'][0].focus(); return false; }\n";
                 }
             } else {
-                $js .= "if ( myform.{$eltname}.value == \"\" ) " . "{ window.alert(\"{$eltmsg}\"); myform.{$eltname}.focus(); return false; }\n";
+                $js .= "if ( myform.{$eltname}.value == \"\" ) "."{ window.alert(\"{$eltmsg}\"); myform.{$eltname}.focus(); return false; }\n";
             }
         }
         // Now, handle custom validation code
-        $elements =& $this->getElements(true);
+        $elements = & $this->getElements(true);
         foreach ($elements as $elt) {
             if (method_exists($elt, 'renderValidationJS') && 'xoopsformcheckbox' !== strtolower(get_class($elt))) {
                 if ($eltjs = $elt->renderValidationJS()) {
-                    $js .= $eltjs . "\n";
+                    $js .= $eltjs."\n";
                 }
             }
         }

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 ('checked' === $column->_keyname) {
-                        $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 ('default' !== $this->_filtersel2) {
                         $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 ('checked' === $column->_keyname) {
-                $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 || 'checked' === $column->_keyname || !$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/smartobject.php

Spacing +19 added lines, -19 removed lines

@@ -12,9 +12,9 @@ 
 
 // defined('XOOPS_ROOT_PATH') || exit('Restricted access.');
 
-require_once XOOPS_ROOT_PATH . '/modules/smartobject/include/common.php';
+require_once XOOPS_ROOT_PATH.'/modules/smartobject/include/common.php';
 
-require_once SMARTOBJECT_ROOT_PATH . 'class/smartobjectcontroller.php';
+require_once SMARTOBJECT_ROOT_PATH.'class/smartobjectcontroller.php';
 
 if (!defined('XOBJ_DTYPE_SIMPLE_ARRAY')) {
     define('XOBJ_DTYPE_SIMPLE_ARRAY', 101);
@@ -113,7 +113,7 @@ 
      */
     public function closeSection($section_name)
     {
-        $this->initVar('close_section_' . $section_name, XOBJ_DTYPE_FORM_SECTION_CLOSE, '', false, null, '', false, '', '', false, false, true);
+        $this->initVar('close_section_'.$section_name, XOBJ_DTYPE_FORM_SECTION_CLOSE, '', false, null, '', false, '', '', false, false, true);
     }
 
     /**
@@ -151,13 +151,13 @@ 
         }
         parent::initVar($key, $data_type, $value, $required, $maxlength, $options);
         if ($this->handler && (!$form_caption || '' === $form_caption)) {
-            $dyn_form_caption = strtoupper('_CO_' . $this->handler->_moduleName . '_' . $this->handler->_itemname . '_' . $key);
+            $dyn_form_caption = strtoupper('_CO_'.$this->handler->_moduleName.'_'.$this->handler->_itemname.'_'.$key);
             if (defined($dyn_form_caption)) {
                 $form_caption = constant($dyn_form_caption);
             }
         }
         if ($this->handler && (!$form_dsc || '' === $form_dsc)) {
-            $dyn_form_dsc = strtoupper('_CO_' . $this->handler->_moduleName . '_' . $this->handler->_itemname . '_' . $key . '_DSC');
+            $dyn_form_dsc = strtoupper('_CO_'.$this->handler->_moduleName.'_'.$this->handler->_itemname.'_'.$key.'_DSC');
             if (defined($dyn_form_dsc)) {
                 $form_dsc = constant($dyn_form_dsc);
             }
@@ -441,7 +441,7 @@ 
         $cancel_js_action = false,
         $captcha = false
     ) {
-        require_once SMARTOBJECT_ROOT_PATH . 'class/form/smartobjectform.php';
+        require_once SMARTOBJECT_ROOT_PATH.'class/form/smartobjectform.php';
         $form = new SmartobjectForm($this, $form_name, $form_caption, $form_action, null, $submit_button_caption, $cancel_js_action, $captcha);
 
         return $form;
@@ -453,7 +453,7 @@ 
     public function toArray()
     {
         $ret  = [];
-        $vars =& $this->getVars();
+        $vars = & $this->getVars();
         foreach ($vars as $key => $var) {
             $value     = $this->getVar($key);
             $ret[$key] = $value;
@@ -471,7 +471,7 @@ 
         }
 
         // Hightlighting searched words
-        require_once SMARTOBJECT_ROOT_PATH . 'class/smarthighlighter.php';
+        require_once SMARTOBJECT_ROOT_PATH.'class/smarthighlighter.php';
         $highlight = smart_getConfig('module_search_highlighter', false, true);
 
         if ($highlight && isset($_GET['keywords'])) {
@@ -502,7 +502,7 @@ 
             }
         } else {
             if ($prefix) {
-                $err_str = '[' . $prefix . '] ' . $err_str;
+                $err_str = '['.$prefix.'] '.$err_str;
             }
             parent::setErrors($err_str);
         }
@@ -830,8 +830,8 @@ 
                             $this->setErrors(sprintf(_XOBJ_ERR_REQUIRED, $k));
                             continue 2;
                         }
-                        if (isset($v['maxlength']) && strlen($cleanv) > (int)$v['maxlength']) {
-                            $this->setErrors(sprintf(_XOBJ_ERR_SHORTERTHAN, $k, (int)$v['maxlength']));
+                        if (isset($v['maxlength']) && strlen($cleanv) > (int) $v['maxlength']) {
+                            $this->setErrors(sprintf(_XOBJ_ERR_SHORTERTHAN, $k, (int) $v['maxlength']));
                             continue 2;
                         }
                         if (!$v['not_gpc']) {
@@ -860,7 +860,7 @@ 
                         break;
                     case XOBJ_DTYPE_INT:
                     case XOBJ_DTYPE_TIME_ONLY:
-                        $cleanv = (int)$cleanv;
+                        $cleanv = (int) $cleanv;
                         break;
 
                     case XOBJ_DTYPE_CURRENCY:
@@ -891,10 +891,10 @@ 
                             continue 2;
                         }
                         if ('' !== $cleanv && !preg_match("/^http[s]*:\/\//i", $cleanv)) {
-                            $cleanv = 'http://' . $cleanv;
+                            $cleanv = 'http://'.$cleanv;
                         }
                         if (!$v['not_gpc']) {
-                            $cleanv =& $ts->stripSlashesGPC($cleanv);
+                            $cleanv = & $ts->stripSlashesGPC($cleanv);
                         }
                         break;
                     case XOBJ_DTYPE_SIMPLE_ARRAY:
@@ -906,7 +906,7 @@ 
                     case XOBJ_DTYPE_STIME:
                     case XOBJ_DTYPE_MTIME:
                     case XOBJ_DTYPE_LTIME:
-                        $cleanv = !is_string($cleanv) ? (int)$cleanv : strtotime($cleanv);
+                        $cleanv = !is_string($cleanv) ? (int) $cleanv : strtotime($cleanv);
                         if (!($cleanv > 0)) {
                             $cleanv = strtotime($cleanv);
                         }
@@ -915,7 +915,7 @@ 
                         break;
                 }
             }
-            $this->cleanVars[$k] =& $cleanv;
+            $this->cleanVars[$k] = & $cleanv;
             unset($cleanv);
         }
         if (count($this->_errors) > 0) {
@@ -1140,10 +1140,10 @@ 
                 }
                 break;
             case XOBJ_DTYPE_SIMPLE_ARRAY:
-                $ret =& explode('|', $ret);
+                $ret = & explode('|', $ret);
                 break;
             case XOBJ_DTYPE_ARRAY:
-                $ret =& unserialize($ret);
+                $ret = & unserialize($ret);
                 break;
             case XOBJ_DTYPE_SOURCE:
                 switch (strtolower($format)) {
@@ -1301,7 +1301,7 @@ 
         $actions = [],
         $headerAsRow = true
     ) {
-        require_once SMARTOBJECT_ROOT_PATH . 'class/smartobjectsingleview.php';
+        require_once SMARTOBJECT_ROOT_PATH.'class/smartobjectsingleview.php';
         $singleview = new SmartObjectSingleView($this, $userSide, $actions, $headerAsRow);
         // add all fields mark as displayOnSingleView except the keyid
         foreach ($this->vars as $key => $var) {

class/smartobjectabout.php

Spacing +6 added lines, -6 removed lines

@@ -49,11 +49,11 @@ 
     {
         global $xoopsModule, $xoopsConfig;
 
-        $fileName = XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/' . $xoopsConfig['language'] . '/modinfo.php';
+        $fileName = XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->getVar('dirname').'/language/'.$xoopsConfig['language'].'/modinfo.php';
         if (file_exists($fileName)) {
             require_once $fileName;
         } 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';
         }
         $this->_aboutTitle = $aboutTitle;
 
@@ -105,7 +105,7 @@ 
 
         //smart_adminMenu(-1, $this->_aboutTitle . " " . $versioninfo->getInfo('name'));
 
-        require_once XOOPS_ROOT_PATH . '/class/template.php';
+        require_once XOOPS_ROOT_PATH.'/class/template.php';
 
         // ---
         // 2012-01-01 PHP 5.3: Assigning the return value of new by reference is now deprecated.
@@ -113,7 +113,7 @@ 
         $this->_tpl = new XoopsTpl();
         // ---
 
-        $this->_tpl->assign('module_url', XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/');
+        $this->_tpl->assign('module_url', XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/');
         $this->_tpl->assign('module_image', $versioninfo->getInfo('image'));
         $this->_tpl->assign('module_name', $versioninfo->getInfo('name'));
         $this->_tpl->assign('module_version', $versioninfo->getInfo('version'));
@@ -121,7 +121,7 @@ 
 
         // Left headings...
         if ('' !== $versioninfo->getInfo('author_realname')) {
-            $author_name = $versioninfo->getInfo('author') . ' (' . $versioninfo->getInfo('author_realname') . ')';
+            $author_name = $versioninfo->getInfo('author').' ('.$versioninfo->getInfo('author_realname').')';
         } else {
             $author_name = $versioninfo->getInfo('author');
         }
@@ -166,7 +166,7 @@ 
 
         // For changelog thanks to 3Dev
         global $xoopsModule;
-        $filename = XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/changelog.txt';
+        $filename = XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->getVar('dirname').'/changelog.txt';
         if (is_file($filename)) {
             $filesize = filesize($filename);
             $handle   = fopen($filename, 'r');

class/smartexport.php

Spacing +10 added lines, -10 removed lines

@@ -236,7 +236,7 @@ 
             }
         } while (false);
         if ($needQuote) {
-            $val = '"' . $val . '"';
+            $val = '"'.$val.'"';
         }
 
         return $val;
@@ -250,10 +250,10 @@ 
             case 'csv':
                 $separator      = isset($this->options['separator']) ? $this->options['separator'] : ';';
                 $firstRow       = implode($separator, $this->data['columnsHeaders']);
-                $exportFileData .= $firstRow . "\r\n";
+                $exportFileData .= $firstRow."\r\n";
 
                 foreach ($this->data['rows'] as $cols) {
-                    $exportFileData .= $this->arrayToCsvString($cols, $separator) . "\r\n";
+                    $exportFileData .= $this->arrayToCsvString($cols, $separator)."\r\n";
                 }
                 break;
         }
@@ -278,19 +278,19 @@ 
     public function saveCsv($content)
     {
         if (!$this->filepath) {
-            $this->filepath = XOOPS_UPLOAD_PATH . '/';
+            $this->filepath = XOOPS_UPLOAD_PATH.'/';
         }
         if (!$this->filename) {
             $this->filename .= time();
             $this->filename .= '.csv';
         }
 
-        $fullFileName = $this->filepath . $this->filename;
+        $fullFileName = $this->filepath.$this->filename;
 
         if (!$handle = fopen($fullFileName, 'a+')) {
-            trigger_error('Unable to open ' . $fullFileName, E_USER_WARNING);
+            trigger_error('Unable to open '.$fullFileName, E_USER_WARNING);
         } elseif (false === fwrite($handle, $content)) {
-            trigger_error('Unable to write in ' . $fullFileName, E_USER_WARNING);
+            trigger_error('Unable to write in '.$fullFileName, E_USER_WARNING);
         } else {
             $mimeType  = 'text/csv';
             $file      = strrev($this->filename);
@@ -300,7 +300,7 @@ 
             } else {
                 $file_name = $temp_name;
             }
-            $fullFileName = $this->filepath . stripslashes(trim($this->filename));
+            $fullFileName = $this->filepath.stripslashes(trim($this->filename));
 
             if (ini_get('zlib.output_compression')) {
                 ini_set('zlib.output_compression', 'Off');
@@ -311,10 +311,10 @@ 
             header('Cache-Control: private', false);
             header('Content-Transfer-Encoding: binary');
             if (isset($mimeType)) {
-                header('Content-Type: ' . $mimeType);
+                header('Content-Type: '.$mimeType);
             }
 
-            header('Content-Disposition: attachment; filename=' . $file_name);
+            header('Content-Disposition: attachment; filename='.$file_name);
 
             if (isset($mimeType) && false !== strpos($mimeType, 'text/')) {
                 $fp = fopen($fullFileName, 'r');

class/adsense.php

Spacing +13 added lines, -13 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 SmartobjectAdsense
@@ -111,23 +111,23 @@ 
     {
         global $smartobjectAdsenseHandler;
         if ('' !== $this->getVar('style', 'n')) {
-            $ret = '<div style="' . $this->getVar('style', 'n') . '">';
+            $ret = '<div style="'.$this->getVar('style', 'n').'">';
         } else {
             $ret = '<div>';
         }
 
         $ret .= '<script type="text/javascript"><!--
-google_ad_client = "' . $this->getVar('client_id', 'n') . '";
-google_ad_width = ' . $smartobjectAdsenseHandler->adFormats[$this->getVar('format', 'n')]['width'] . ';
-google_ad_height = ' . $smartobjectAdsenseHandler->adFormats[$this->getVar('format', 'n')]['height'] . ';
-google_ad_format = "' . $this->getVar('format', 'n') . '";
+google_ad_client = "' . $this->getVar('client_id', 'n').'";
+google_ad_width = ' . $smartobjectAdsenseHandler->adFormats[$this->getVar('format', 'n')]['width'].';
+google_ad_height = ' . $smartobjectAdsenseHandler->adFormats[$this->getVar('format', 'n')]['height'].';
+google_ad_format = "' . $this->getVar('format', 'n').'";
 google_ad_type = "text";
 google_ad_channel ="";
-google_color_border = "' . $this->getVar('border_color', 'n') . '";
-google_color_bg = "' . $this->getVar('background_color', 'n') . '";
-google_color_link = "' . $this->getVar('link_color', 'n') . '";
-google_color_url = "' . $this->getVar('url_color', 'n') . '";
-google_color_text = "' . $this->getVar('text_color', 'n') . '";
+google_color_border = "' . $this->getVar('border_color', 'n').'";
+google_color_bg = "' . $this->getVar('background_color', 'n').'";
+google_color_link = "' . $this->getVar('link_color', 'n').'";
+google_color_url = "' . $this->getVar('url_color', 'n').'";
+google_color_text = "' . $this->getVar('text_color', 'n').'";
 //--></script>
 <script type="text/javascript"
   src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
@@ -142,7 +142,7 @@ 
      */
     public function getXoopsCode()
     {
-        $ret = '[adsense]' . $this->getVar('tag', 'n') . '[/adsense]';
+        $ret = '[adsense]'.$this->getVar('tag', 'n').'[/adsense]';
 
         return $ret;
     }
@@ -263,7 +263,7 @@ 
      */
     public function getCloneLink()
     {
-        $ret = '<a href="' . SMARTOBJECT_URL . 'admin/adsense.php?op=clone&adsenseid=' . $this->getVar('adsenseid') . '"><img src="' . SMARTOBJECT_IMAGES_ACTIONS_URL . 'editcopy.png" alt="' . _CO_SOBJECT_ADSENSE_CLONE . '" title="' . _CO_SOBJECT_ADSENSE_CLONE . '"></a>';
+        $ret = '<a href="'.SMARTOBJECT_URL.'admin/adsense.php?op=clone&adsenseid='.$this->getVar('adsenseid').'"><img src="'.SMARTOBJECT_IMAGES_ACTIONS_URL.'editcopy.png" alt="'._CO_SOBJECT_ADSENSE_CLONE.'" title="'._CO_SOBJECT_ADSENSE_CLONE.'"></a>';
 
         return $ret;
     }