mambax7 / XoopsCore25

htdocs/class/downloader.php

Spacing +3 added lines, -3 removed lines

@@ -55,14 +55,14 @@
         if (function_exists('mb_http_output')) {
             mb_http_output('pass');
         }
-        header('Content-Type: ' . $this->mimetype);
+        header('Content-Type: '.$this->mimetype);
         if (preg_match("/MSIE (\d\.\d{1,2})/", $_SERVER['HTTP_USER_AGENT'])) {
-            header('Content-Disposition: attachment; filename="' . $filename . '"');
+            header('Content-Disposition: attachment; filename="'.$filename.'"');
             header('Expires: 0');
             header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
             header('Pragma: public');
         } else {
-            header('Content-Disposition: attachment; filename="' . $filename . '"');
+            header('Content-Disposition: attachment; filename="'.$filename.'"');
             header('Expires: 0');
             header('Pragma: no-cache');
         }

htdocs/class/preload.php

Spacing +3 added lines, -3 removed lines

@@ -84,7 +84,7 @@ 
         if ($modules_list = XoopsCache::read('system_modules_active')) {
             $i = 0;
             foreach ($modules_list as $module) {
-                if (is_dir($dir = XOOPS_ROOT_PATH . "/modules/{$module}/preloads/")) {
+                if (is_dir($dir = XOOPS_ROOT_PATH."/modules/{$module}/preloads/")) {
                     $file_list = XoopsLists::getFileListAsArray($dir);
                     foreach ($file_list as $file) {
                         if (preg_match('/(\.php)$/i', $file)) {
@@ -107,8 +107,8 @@ 
     public function setEvents()
     {
         foreach ($this->_preloads as $preload) {
-            include_once XOOPS_ROOT_PATH . '/modules/' . $preload['module'] . '/preloads/' . $preload['file'] . '.php';
-            $class_name = ucfirst($preload['module']) . ucfirst($preload['file']) . 'Preload';
+            include_once XOOPS_ROOT_PATH.'/modules/'.$preload['module'].'/preloads/'.$preload['file'].'.php';
+            $class_name = ucfirst($preload['module']).ucfirst($preload['file']).'Preload';
             if (!class_exists($class_name)) {
                 continue;
             }

htdocs/class/mimetypes.inc.php

Spacing +1 added lines, -1 removed lines

@@ -19,4 +19,4 @@
 
 $GLOBALS['xoopsLogger']->addDeprecated("'/class/mimetypes.inc.php' is deprecated, use '/include/mimetypes.inc.php' directly.");
 
-return include XOOPS_ROOT_PATH . '/include/mimetypes.inc.php';
+return include XOOPS_ROOT_PATH.'/include/mimetypes.inc.php';

htdocs/class/xoopsload.php

Spacing +68 added lines, -68 removed lines

@@ -108,13 +108,13 @@ 
             }
 
             return true;
-        } elseif (file_exists($file = XOOPS_ROOT_PATH . '/class/' . $name . '.php')) {
+        } elseif (file_exists($file = XOOPS_ROOT_PATH.'/class/'.$name.'.php')) {
             include_once $file;
-            $class = 'Xoops' . ucfirst($name);
+            $class = 'Xoops'.ucfirst($name);
             if (class_exists($class)) {
                 return $class;
             } else {
-                trigger_error('Class ' . $name . ' not found in file ' . __FILE__ . ' at line ' . __LINE__, E_USER_WARNING);
+                trigger_error('Class '.$name.' not found in file '.__FILE__.' at line '.__LINE__, E_USER_WARNING);
             }
         }
 
@@ -130,13 +130,13 @@ 
      */
     public static function loadFramework($name)
     {
-        if (!file_exists($file = XOOPS_ROOT_PATH . '/Frameworks/' . $name . '/xoops' . $name . '.php')) {
-            trigger_error('File ' . str_replace(XOOPS_ROOT_PATH, '', $file) . ' not found in file ' . __FILE__ . ' at line ' . __LINE__, E_USER_WARNING);
+        if (!file_exists($file = XOOPS_ROOT_PATH.'/Frameworks/'.$name.'/xoops'.$name.'.php')) {
+            trigger_error('File '.str_replace(XOOPS_ROOT_PATH, '', $file).' not found in file '.__FILE__.' at line '.__LINE__, E_USER_WARNING);
 
             return false;
         }
         include_once $file;
-        $class = 'Xoops' . ucfirst($name);
+        $class = 'Xoops'.ucfirst($name);
         if (class_exists($class)) {
             return $class;
         }
@@ -156,9 +156,9 @@ 
         if (empty($dirname)) {
             return false;
         }
-        if (file_exists($file = XOOPS_ROOT_PATH . '/modules/' . $dirname . '/class/' . $name . '.php')) {
+        if (file_exists($file = XOOPS_ROOT_PATH.'/modules/'.$dirname.'/class/'.$name.'.php')) {
             include_once $file;
-            if (class_exists(ucfirst($dirname) . ucfirst($name))) {
+            if (class_exists(ucfirst($dirname).ucfirst($name))) {
                 return true;
             }
         }
@@ -174,64 +174,64 @@ 
     public static function loadCoreConfig()
     {
         return $configs = array(
-            'xoopsuserutility'           => XOOPS_ROOT_PATH . '/class/userutility.php',
-            'xoopsmediauploader'         => XOOPS_ROOT_PATH . '/class/uploader.php',
-            'xoopsutility'               => XOOPS_ROOT_PATH . '/class/utility/xoopsutility.php',
-            'xoopscaptcha'               => XOOPS_ROOT_PATH . '/class/captcha/xoopscaptcha.php',
-            'xoopscache'                 => XOOPS_ROOT_PATH . '/class/cache/xoopscache.php',
-            'xoopsfile'                  => XOOPS_ROOT_PATH . '/class/file/xoopsfile.php',
-            'xoopsmodelfactory'          => XOOPS_ROOT_PATH . '/class/model/xoopsmodel.php',
-            'xoopscalendar'              => XOOPS_ROOT_PATH . '/class/calendar/xoopscalendar.php',
-            'xoopskernel'                => XOOPS_ROOT_PATH . '/class/xoopskernel.php',
-            'xoopssecurity'              => XOOPS_ROOT_PATH . '/class/xoopssecurity.php',
-            'xoopslogger'                => XOOPS_ROOT_PATH . '/class/logger/xoopslogger.php',
-            'xoopspagenav'               => XOOPS_ROOT_PATH . '/class/pagenav.php',
-            'xoopslists'                 => XOOPS_ROOT_PATH . '/class/xoopslists.php',
-            'xoopslocal'                 => XOOPS_ROOT_PATH . '/include/xoopslocal.php',
-            'xoopslocalabstract'         => XOOPS_ROOT_PATH . '/class/xoopslocal.php',
-            'xoopseditor'                => XOOPS_ROOT_PATH . '/class/xoopseditor/xoopseditor.php',
-            'xoopseditorhandler'         => XOOPS_ROOT_PATH . '/class/xoopseditor/xoopseditor.php',
-            'xoopsformloader'            => XOOPS_ROOT_PATH . '/class/xoopsformloader.php',
-            'xoopsformelement'           => XOOPS_ROOT_PATH . '/class/xoopsform/formelement.php',
-            'xoopsform'                  => XOOPS_ROOT_PATH . '/class/xoopsform/form.php',
-            'xoopsformlabel'             => XOOPS_ROOT_PATH . '/class/xoopsform/formlabel.php',
-            'xoopsformselect'            => XOOPS_ROOT_PATH . '/class/xoopsform/formselect.php',
-            'xoopsformpassword'          => XOOPS_ROOT_PATH . '/class/xoopsform/formpassword.php',
-            'xoopsformbutton'            => XOOPS_ROOT_PATH . '/class/xoopsform/formbutton.php',
-            'xoopsformbuttontray'        => XOOPS_ROOT_PATH . '/class/xoopsform/formbuttontray.php',
-            'xoopsformcheckbox'          => XOOPS_ROOT_PATH . '/class/xoopsform/formcheckbox.php',
-            'xoopsformselectcheckgroup'  => XOOPS_ROOT_PATH . '/class/xoopsform/formselectcheckgroup.php',
-            'xoopsformhidden'            => XOOPS_ROOT_PATH . '/class/xoopsform/formhidden.php',
-            'xoopsformfile'              => XOOPS_ROOT_PATH . '/class/xoopsform/formfile.php',
-            'xoopsformradio'             => XOOPS_ROOT_PATH . '/class/xoopsform/formradio.php',
-            'xoopsformradioyn'           => XOOPS_ROOT_PATH . '/class/xoopsform/formradioyn.php',
-            'xoopsformselectcountry'     => XOOPS_ROOT_PATH . '/class/xoopsform/formselectcountry.php',
-            'xoopsformselecttimezone'    => XOOPS_ROOT_PATH . '/class/xoopsform/formselecttimezone.php',
-            'xoopsformselectlang'        => XOOPS_ROOT_PATH . '/class/xoopsform/formselectlang.php',
-            'xoopsformselectgroup'       => XOOPS_ROOT_PATH . '/class/xoopsform/formselectgroup.php',
-            'xoopsformselectuser'        => XOOPS_ROOT_PATH . '/class/xoopsform/formselectuser.php',
-            'xoopsformselecttheme'       => XOOPS_ROOT_PATH . '/class/xoopsform/formselecttheme.php',
-            'xoopsformselectmatchoption' => XOOPS_ROOT_PATH . '/class/xoopsform/formselectmatchoption.php',
-            'xoopsformtext'              => XOOPS_ROOT_PATH . '/class/xoopsform/formtext.php',
-            'xoopsformtextarea'          => XOOPS_ROOT_PATH . '/class/xoopsform/formtextarea.php',
-            'xoopsformdhtmltextarea'     => XOOPS_ROOT_PATH . '/class/xoopsform/formdhtmltextarea.php',
-            'xoopsformelementtray'       => XOOPS_ROOT_PATH . '/class/xoopsform/formelementtray.php',
-            'xoopsthemeform'             => XOOPS_ROOT_PATH . '/class/xoopsform/themeform.php',
-            'xoopssimpleform'            => XOOPS_ROOT_PATH . '/class/xoopsform/simpleform.php',
-            'xoopsformtextdateselect'    => XOOPS_ROOT_PATH . '/class/xoopsform/formtextdateselect.php',
-            'xoopsformdatetime'          => XOOPS_ROOT_PATH . '/class/xoopsform/formdatetime.php',
-            'xoopsformhiddentoken'       => XOOPS_ROOT_PATH . '/class/xoopsform/formhiddentoken.php',
-            'xoopsformcolorpicker'       => XOOPS_ROOT_PATH . '/class/xoopsform/formcolorpicker.php',
-            'xoopsformcaptcha'           => XOOPS_ROOT_PATH . '/class/xoopsform/formcaptcha.php',
-            'xoopsformeditor'            => XOOPS_ROOT_PATH . '/class/xoopsform/formeditor.php',
-            'xoopsformselecteditor'      => XOOPS_ROOT_PATH . '/class/xoopsform/formselecteditor.php',
-            'xoopsformcalendar'          => XOOPS_ROOT_PATH . '/class/xoopsform/formcalendar.php',
-            'xoopsformrenderer'          => XOOPS_ROOT_PATH . '/class/xoopsform/renderer/XoopsFormRenderer.php',
-            'xoopsformrendererinterface' => XOOPS_ROOT_PATH . '/class/xoopsform/renderer/XoopsFormRendererInterface.php',
-            'xoopsformrendererlegacy'    => XOOPS_ROOT_PATH . '/class/xoopsform/renderer/XoopsFormRendererLegacy.php',
-            'xoopsformrendererbootstrap3'=> XOOPS_ROOT_PATH . '/class/xoopsform/renderer/XoopsFormRendererBootstrap3.php',
-            'xoopsfilterinput'           => XOOPS_ROOT_PATH . '/class/xoopsfilterinput.php',
-            'xoopsrequest'               => XOOPS_ROOT_PATH . '/class/xoopsrequest.php');
+            'xoopsuserutility'           => XOOPS_ROOT_PATH.'/class/userutility.php',
+            'xoopsmediauploader'         => XOOPS_ROOT_PATH.'/class/uploader.php',
+            'xoopsutility'               => XOOPS_ROOT_PATH.'/class/utility/xoopsutility.php',
+            'xoopscaptcha'               => XOOPS_ROOT_PATH.'/class/captcha/xoopscaptcha.php',
+            'xoopscache'                 => XOOPS_ROOT_PATH.'/class/cache/xoopscache.php',
+            'xoopsfile'                  => XOOPS_ROOT_PATH.'/class/file/xoopsfile.php',
+            'xoopsmodelfactory'          => XOOPS_ROOT_PATH.'/class/model/xoopsmodel.php',
+            'xoopscalendar'              => XOOPS_ROOT_PATH.'/class/calendar/xoopscalendar.php',
+            'xoopskernel'                => XOOPS_ROOT_PATH.'/class/xoopskernel.php',
+            'xoopssecurity'              => XOOPS_ROOT_PATH.'/class/xoopssecurity.php',
+            'xoopslogger'                => XOOPS_ROOT_PATH.'/class/logger/xoopslogger.php',
+            'xoopspagenav'               => XOOPS_ROOT_PATH.'/class/pagenav.php',
+            'xoopslists'                 => XOOPS_ROOT_PATH.'/class/xoopslists.php',
+            'xoopslocal'                 => XOOPS_ROOT_PATH.'/include/xoopslocal.php',
+            'xoopslocalabstract'         => XOOPS_ROOT_PATH.'/class/xoopslocal.php',
+            'xoopseditor'                => XOOPS_ROOT_PATH.'/class/xoopseditor/xoopseditor.php',
+            'xoopseditorhandler'         => XOOPS_ROOT_PATH.'/class/xoopseditor/xoopseditor.php',
+            'xoopsformloader'            => XOOPS_ROOT_PATH.'/class/xoopsformloader.php',
+            'xoopsformelement'           => XOOPS_ROOT_PATH.'/class/xoopsform/formelement.php',
+            'xoopsform'                  => XOOPS_ROOT_PATH.'/class/xoopsform/form.php',
+            'xoopsformlabel'             => XOOPS_ROOT_PATH.'/class/xoopsform/formlabel.php',
+            'xoopsformselect'            => XOOPS_ROOT_PATH.'/class/xoopsform/formselect.php',
+            'xoopsformpassword'          => XOOPS_ROOT_PATH.'/class/xoopsform/formpassword.php',
+            'xoopsformbutton'            => XOOPS_ROOT_PATH.'/class/xoopsform/formbutton.php',
+            'xoopsformbuttontray'        => XOOPS_ROOT_PATH.'/class/xoopsform/formbuttontray.php',
+            'xoopsformcheckbox'          => XOOPS_ROOT_PATH.'/class/xoopsform/formcheckbox.php',
+            'xoopsformselectcheckgroup'  => XOOPS_ROOT_PATH.'/class/xoopsform/formselectcheckgroup.php',
+            'xoopsformhidden'            => XOOPS_ROOT_PATH.'/class/xoopsform/formhidden.php',
+            'xoopsformfile'              => XOOPS_ROOT_PATH.'/class/xoopsform/formfile.php',
+            'xoopsformradio'             => XOOPS_ROOT_PATH.'/class/xoopsform/formradio.php',
+            'xoopsformradioyn'           => XOOPS_ROOT_PATH.'/class/xoopsform/formradioyn.php',
+            'xoopsformselectcountry'     => XOOPS_ROOT_PATH.'/class/xoopsform/formselectcountry.php',
+            'xoopsformselecttimezone'    => XOOPS_ROOT_PATH.'/class/xoopsform/formselecttimezone.php',
+            'xoopsformselectlang'        => XOOPS_ROOT_PATH.'/class/xoopsform/formselectlang.php',
+            'xoopsformselectgroup'       => XOOPS_ROOT_PATH.'/class/xoopsform/formselectgroup.php',
+            'xoopsformselectuser'        => XOOPS_ROOT_PATH.'/class/xoopsform/formselectuser.php',
+            'xoopsformselecttheme'       => XOOPS_ROOT_PATH.'/class/xoopsform/formselecttheme.php',
+            'xoopsformselectmatchoption' => XOOPS_ROOT_PATH.'/class/xoopsform/formselectmatchoption.php',
+            'xoopsformtext'              => XOOPS_ROOT_PATH.'/class/xoopsform/formtext.php',
+            'xoopsformtextarea'          => XOOPS_ROOT_PATH.'/class/xoopsform/formtextarea.php',
+            'xoopsformdhtmltextarea'     => XOOPS_ROOT_PATH.'/class/xoopsform/formdhtmltextarea.php',
+            'xoopsformelementtray'       => XOOPS_ROOT_PATH.'/class/xoopsform/formelementtray.php',
+            'xoopsthemeform'             => XOOPS_ROOT_PATH.'/class/xoopsform/themeform.php',
+            'xoopssimpleform'            => XOOPS_ROOT_PATH.'/class/xoopsform/simpleform.php',
+            'xoopsformtextdateselect'    => XOOPS_ROOT_PATH.'/class/xoopsform/formtextdateselect.php',
+            'xoopsformdatetime'          => XOOPS_ROOT_PATH.'/class/xoopsform/formdatetime.php',
+            'xoopsformhiddentoken'       => XOOPS_ROOT_PATH.'/class/xoopsform/formhiddentoken.php',
+            'xoopsformcolorpicker'       => XOOPS_ROOT_PATH.'/class/xoopsform/formcolorpicker.php',
+            'xoopsformcaptcha'           => XOOPS_ROOT_PATH.'/class/xoopsform/formcaptcha.php',
+            'xoopsformeditor'            => XOOPS_ROOT_PATH.'/class/xoopsform/formeditor.php',
+            'xoopsformselecteditor'      => XOOPS_ROOT_PATH.'/class/xoopsform/formselecteditor.php',
+            'xoopsformcalendar'          => XOOPS_ROOT_PATH.'/class/xoopsform/formcalendar.php',
+            'xoopsformrenderer'          => XOOPS_ROOT_PATH.'/class/xoopsform/renderer/XoopsFormRenderer.php',
+            'xoopsformrendererinterface' => XOOPS_ROOT_PATH.'/class/xoopsform/renderer/XoopsFormRendererInterface.php',
+            'xoopsformrendererlegacy'    => XOOPS_ROOT_PATH.'/class/xoopsform/renderer/XoopsFormRendererLegacy.php',
+            'xoopsformrendererbootstrap3'=> XOOPS_ROOT_PATH.'/class/xoopsform/renderer/XoopsFormRendererBootstrap3.php',
+            'xoopsfilterinput'           => XOOPS_ROOT_PATH.'/class/xoopsfilterinput.php',
+            'xoopsrequest'               => XOOPS_ROOT_PATH.'/class/xoopsrequest.php');
     }
 
     /**
@@ -253,7 +253,7 @@ 
             } else {
                 return false;
             }
-            if (file_exists($file = XOOPS_ROOT_PATH . '/modules/' . $dirname . '/include/autoload.php')) {
+            if (file_exists($file = XOOPS_ROOT_PATH.'/modules/'.$dirname.'/include/autoload.php')) {
                 if (!$configs = include $file) {
                     return false;
                 }
@@ -269,4 +269,4 @@ 
 /**
  * XMF libraries
  */
-include_once XOOPS_ROOT_PATH . '/class/libraries/vendor/autoload.php';
+include_once XOOPS_ROOT_PATH.'/class/libraries/vendor/autoload.php';

htdocs/class/xoopstree.php

Spacing +20 added lines, -20 removed lines

@@ -46,7 +46,7 @@ 
      */
     public function __construct($table_name, $id_name, $pid_name)
     {
-        $GLOBALS['xoopsLogger']->addDeprecated("Class '" . __CLASS__ . "' is deprecated, check 'XoopsObjectTree' in tree.php");
+        $GLOBALS['xoopsLogger']->addDeprecated("Class '".__CLASS__."' is deprecated, check 'XoopsObjectTree' in tree.php");
         $this->db = XoopsDatabaseFactory::getDatabaseConnection();
         $this->table = $table_name;
         $this->id    = $id_name;
@@ -64,7 +64,7 @@ 
     {
         $sel_id = (int)$sel_id;
         $arr    = array();
-        $sql    = 'SELECT * FROM ' . $this->table . ' WHERE ' . $this->pid . '=' . $sel_id . '';
+        $sql    = 'SELECT * FROM '.$this->table.' WHERE '.$this->pid.'='.$sel_id.'';
         if ($order != '') {
             $sql .= " ORDER BY $order";
         }
@@ -90,7 +90,7 @@ 
     {
         $sel_id  = (int)$sel_id;
         $idarray = array();
-        $result  = $this->db->query('SELECT ' . $this->id . ' FROM ' . $this->table . ' WHERE ' . $this->pid . '=' . $sel_id . '');
+        $result  = $this->db->query('SELECT '.$this->id.' FROM '.$this->table.' WHERE '.$this->pid.'='.$sel_id.'');
         $count   = $this->db->getRowsNum($result);
         if ($count == 0) {
             return $idarray;
@@ -113,7 +113,7 @@ 
     public function getAllChildId($sel_id, $order = '', $idarray = array())
     {
         $sel_id = (int)$sel_id;
-        $sql    = 'SELECT ' . $this->id . ' FROM ' . $this->table . ' WHERE ' . $this->pid . '=' . $sel_id . '';
+        $sql    = 'SELECT '.$this->id.' FROM '.$this->table.' WHERE '.$this->pid.'='.$sel_id.'';
         if ($order != '') {
             $sql .= " ORDER BY $order";
         }
@@ -141,7 +141,7 @@ 
     public function getAllParentId($sel_id, $order = '', $idarray = array())
     {
         $sel_id = (int)$sel_id;
-        $sql    = 'SELECT ' . $this->pid . ' FROM ' . $this->table . ' WHERE ' . $this->id . '=' . $sel_id . '';
+        $sql    = 'SELECT '.$this->pid.' FROM '.$this->table.' WHERE '.$this->id.'='.$sel_id.'';
         if ($order != '') {
             $sql .= " ORDER BY $order";
         }
@@ -168,14 +168,14 @@ 
     public function getPathFromId($sel_id, $title, $path = '')
     {
         $sel_id = (int)$sel_id;
-        $result = $this->db->query('SELECT ' . $this->pid . ', ' . $title . ' FROM ' . $this->table . ' WHERE ' . $this->id . "=$sel_id");
+        $result = $this->db->query('SELECT '.$this->pid.', '.$title.' FROM '.$this->table.' WHERE '.$this->id."=$sel_id");
         if ($this->db->getRowsNum($result) == 0) {
             return $path;
         }
         list($parentid, $name) = $this->db->fetchRow($result);
         $myts = MyTextSanitizer::getInstance();
         $name = $myts->htmlspecialchars($name);
-        $path = '/' . $name . $path . '';
+        $path = '/'.$name.$path.'';
         if ($parentid == 0) {
             return $path;
         }
@@ -201,12 +201,12 @@ 
             $sel_name = $this->id;
         }
         $myts = MyTextSanitizer::getInstance();
-        echo "<select name='" . $sel_name . "'";
+        echo "<select name='".$sel_name."'";
         if ($onchange != '') {
-            echo " onchange='" . $onchange . "'";
+            echo " onchange='".$onchange."'";
         }
         echo ">\n";
-        $sql = 'SELECT ' . $this->id . ', ' . $title . ' FROM ' . $this->table . ' WHERE ' . $this->pid . '=0';
+        $sql = 'SELECT '.$this->id.', '.$title.' FROM '.$this->table.' WHERE '.$this->pid.'=0';
         if ($order != '') {
             $sql .= " ORDER BY $order";
         }
@@ -224,11 +224,11 @@ 
             $arr = $this->getChildTreeArray($catid, $order);
             foreach ($arr as $option) {
                 $option['prefix'] = str_replace('.', '--', $option['prefix']);
-                $catpath          = $option['prefix'] . '&nbsp;' . $myts->htmlspecialchars($option[$title]);
+                $catpath          = $option['prefix'].'&nbsp;'.$myts->htmlspecialchars($option[$title]);
                 if ($option[$this->id] == $preset_id) {
                     $sel = " selected";
                 }
-                echo "<option value='" . $option[$this->id] . "'$sel>$catpath</option>\n";
+                echo "<option value='".$option[$this->id]."'$sel>$catpath</option>\n";
                 $sel = '';
             }
         }
@@ -246,9 +246,9 @@ 
      */
     public function getNicePathFromId($sel_id, $title, $funcURL, $path = '')
     {
-        $path   = !empty($path) ? '&nbsp;:&nbsp;' . $path : $path;
+        $path   = !empty($path) ? '&nbsp;:&nbsp;'.$path : $path;
         $sel_id = (int)$sel_id;
-        $sql    = 'SELECT ' . $this->pid . ', ' . $title . ' FROM ' . $this->table . ' WHERE ' . $this->id . "=$sel_id";
+        $sql    = 'SELECT '.$this->pid.', '.$title.' FROM '.$this->table.' WHERE '.$this->id."=$sel_id";
         $result = $this->db->query($sql);
         if ($this->db->getRowsNum($result) == 0) {
             return $path;
@@ -256,7 +256,7 @@ 
         list($parentid, $name) = $this->db->fetchRow($result);
         $myts = MyTextSanitizer::getInstance();
         $name = $myts->htmlspecialchars($name);
-        $path = "<a href='" . $funcURL . '&amp;' . $this->id . '=' . $sel_id . "'>" . $name . '</a>' . $path . '';
+        $path = "<a href='".$funcURL.'&amp;'.$this->id.'='.$sel_id."'>".$name.'</a>'.$path.'';
         if ($parentid == 0) {
             return $path;
         }
@@ -276,12 +276,12 @@ 
     public function getIdPathFromId($sel_id, $path = '')
     {
         $sel_id = (int)$sel_id;
-        $result = $this->db->query('SELECT ' . $this->pid . ' FROM ' . $this->table . ' WHERE ' . $this->id . "=$sel_id");
+        $result = $this->db->query('SELECT '.$this->pid.' FROM '.$this->table.' WHERE '.$this->id."=$sel_id");
         if ($this->db->getRowsNum($result) == 0) {
             return $path;
         }
         list($parentid) = $this->db->fetchRow($result);
-        $path = '/' . $sel_id . $path . '';
+        $path = '/'.$sel_id.$path.'';
         if ($parentid == 0) {
             return $path;
         }
@@ -302,7 +302,7 @@ 
     public function getAllChild($sel_id = 0, $order = '', $parray = array())
     {
         $sel_id = (int)$sel_id;
-        $sql    = 'SELECT * FROM ' . $this->table . ' WHERE ' . $this->pid . '=' . $sel_id . '';
+        $sql    = 'SELECT * FROM '.$this->table.' WHERE '.$this->pid.'='.$sel_id.'';
         if ($order != '') {
             $sql .= " ORDER BY $order";
         }
@@ -331,7 +331,7 @@ 
     public function getChildTreeArray($sel_id = 0, $order = '', $parray = array(), $r_prefix = '')
     {
         $sel_id = (int)$sel_id;
-        $sql    = 'SELECT * FROM ' . $this->table . ' WHERE ' . $this->pid . '=' . $sel_id . '';
+        $sql    = 'SELECT * FROM '.$this->table.' WHERE '.$this->pid.'='.$sel_id.'';
         if ($order != '') {
             $sql .= " ORDER BY $order";
         }
@@ -341,7 +341,7 @@ 
             return $parray;
         }
         while (false !== ($row = $this->db->fetchArray($result))) {
-            $row['prefix'] = $r_prefix . '.';
+            $row['prefix'] = $r_prefix.'.';
             $parray[]      = $row;
             $parray        = $this->getChildTreeArray($row[$this->id], $order, $parray, $row['prefix']);
         }

htdocs/class/xoopsblock.php

Spacing +51 added lines, -51 removed lines

@@ -82,7 +82,7 @@ 
     public function load($id)
     {
         $id  = (int)$id;
-        $sql = 'SELECT * FROM ' . $this->db->prefix('newblocks') . ' WHERE bid = ' . $id;
+        $sql = 'SELECT * FROM '.$this->db->prefix('newblocks').' WHERE bid = '.$id;
         $arr = $this->db->fetchArray($this->db->query($sql));
         $this->assignVars($arr);
     }
@@ -101,15 +101,15 @@ 
             ${$k} = $v;
         }
         if (empty($bid)) {
-            $bid = $this->db->genId($this->db->prefix('newblocks') . '_bid_seq');
+            $bid = $this->db->genId($this->db->prefix('newblocks').'_bid_seq');
             $sql = sprintf('INSERT INTO %s (bid, mid, func_num, options, name, title, content, side, weight, visible, block_type, c_type, isactive, dirname, func_file, show_func, edit_func, template, bcachetime, last_modified) VALUES (%u, %u, %u, %s, %s, %s, %s, %u, %u, %u, %s, %s, %u, %s, %s, %s, %s, %s, %u, %u)', $this->db->prefix('newblocks'), $bid, $mid, $func_num, $this->db->quoteString($options), $this->db->quoteString($name), $this->db->quoteString($title), $this->db->quoteString($content), $side, $weight, $visible, $this->db->quoteString($block_type), $this->db->quoteString($c_type), 1, $this->db->quoteString($dirname), $this->db->quoteString($func_file), $this->db->quoteString($show_func), $this->db->quoteString($edit_func), $this->db->quoteString($template), $bcachetime, time());
         } else {
-            $sql = 'UPDATE ' . $this->db->prefix('newblocks') . ' SET options=' . $this->db->quoteString($options);
+            $sql = 'UPDATE '.$this->db->prefix('newblocks').' SET options='.$this->db->quoteString($options);
             // a custom block needs its own name
             if ($this->isCustom() /* in_array( $block_type , array( 'C' , 'E' ) ) */) {
-                $sql .= ', name=' . $this->db->quoteString($name);
+                $sql .= ', name='.$this->db->quoteString($name);
             }
-            $sql .= ', isactive=' . $isactive . ', title=' . $this->db->quoteString($title) . ', content=' . $this->db->quoteString($content) . ', side=' . $side . ', weight=' . $weight . ', visible=' . $visible . ', c_type=' . $this->db->quoteString($c_type) . ', template=' . $this->db->quoteString($template) . ', bcachetime=' . $bcachetime . ', last_modified=' . time() . ' WHERE bid=' . $bid;
+            $sql .= ', isactive='.$isactive.', title='.$this->db->quoteString($title).', content='.$this->db->quoteString($content).', side='.$side.', weight='.$weight.', visible='.$visible.', c_type='.$this->db->quoteString($c_type).', template='.$this->db->quoteString($template).', bcachetime='.$bcachetime.', last_modified='.time().' WHERE bid='.$bid;
         }
         if (!$this->db->query($sql)) {
             $this->setErrors('Could not save block data into database');
@@ -160,22 +160,22 @@ 
                 // S : use text sanitizater (smilies enabled)
                 // T : use text sanitizater (smilies disabled)
                 if ($c_type === 'H') {
-                    return str_replace('{X_SITEURL}', XOOPS_URL . '/', $this->getVar('content', 'n'));
+                    return str_replace('{X_SITEURL}', XOOPS_URL.'/', $this->getVar('content', 'n'));
                 } elseif ($c_type === 'P') {
                     ob_start();
                     echo eval($this->getVar('content', 'n'));
                     $content = ob_get_contents();
                     ob_end_clean();
 
-                    return str_replace('{X_SITEURL}', XOOPS_URL . '/', $content);
+                    return str_replace('{X_SITEURL}', XOOPS_URL.'/', $content);
                 } elseif ($c_type === 'S') {
                     $myts    = MyTextSanitizer::getInstance();
-                    $content = str_replace('{X_SITEURL}', XOOPS_URL . '/', $this->getVar('content', 'n'));
+                    $content = str_replace('{X_SITEURL}', XOOPS_URL.'/', $this->getVar('content', 'n'));
 
                     return $myts->displayTarea($content, 1, 1);
                 } else {
                     $myts    = MyTextSanitizer::getInstance();
-                    $content = str_replace('{X_SITEURL}', XOOPS_URL . '/', $this->getVar('content', 'n'));
+                    $content = str_replace('{X_SITEURL}', XOOPS_URL.'/', $this->getVar('content', 'n'));
 
                     return $myts->displayTarea($content, 1, 0);
                 }
@@ -204,7 +204,7 @@ 
             if (!$show_func) {
                 return false;
             }
-            if (!file_exists($func_file = $GLOBALS['xoops']->path('modules/' . $this->getVar('dirname') . '/blocks/' . $this->getVar('func_file')))) {
+            if (!file_exists($func_file = $GLOBALS['xoops']->path('modules/'.$this->getVar('dirname').'/blocks/'.$this->getVar('func_file')))) {
                 return false;
             }
             // must get lang files b4 including the file
@@ -250,9 +250,9 @@ 
     public function buildContent($position, $content = '', $contentdb = '')
     {
         if ($position == 0) {
-            $ret = $contentdb . $content;
+            $ret = $contentdb.$content;
         } elseif ($position == 1) {
-            $ret = $content . $contentdb;
+            $ret = $content.$contentdb;
         }
 
         return $ret;
@@ -300,13 +300,13 @@ 
             if (!$edit_func) {
                 return false;
             }
-            if (file_exists($GLOBALS['xoops']->path('modules/' . $this->getVar('dirname') . '/blocks/' . $this->getVar('func_file')))) {
-                if (file_exists($file = $GLOBALS['xoops']->path('modules/' . $this->getVar('dirname') . '/language/' . $xoopsConfig['language'] . '/blocks.php'))) {
+            if (file_exists($GLOBALS['xoops']->path('modules/'.$this->getVar('dirname').'/blocks/'.$this->getVar('func_file')))) {
+                if (file_exists($file = $GLOBALS['xoops']->path('modules/'.$this->getVar('dirname').'/language/'.$xoopsConfig['language'].'/blocks.php'))) {
                     include_once $file;
-                } elseif (file_exists($file = $GLOBALS['xoops']->path('modules/' . $this->getVar('dirname') . '/language/english/blocks.php'))) {
+                } elseif (file_exists($file = $GLOBALS['xoops']->path('modules/'.$this->getVar('dirname').'/language/english/blocks.php'))) {
                     include_once $file;
                 }
-                include_once $GLOBALS['xoops']->path('modules/' . $this->getVar('dirname') . '/blocks/' . $this->getVar('func_file'));
+                include_once $GLOBALS['xoops']->path('modules/'.$this->getVar('dirname').'/blocks/'.$this->getVar('func_file'));
                 $options   = explode('|', $this->getVar('options'));
                 $edit_form = $edit_func($options);
                 if (!$edit_form) {
@@ -346,20 +346,20 @@ 
         if (!$asobject) {
             $sql = 'SELECT b.bid ';
         }
-        $sql .= 'FROM ' . $db->prefix('newblocks') . ' b LEFT JOIN ' . $db->prefix('group_permission') . " l ON l.gperm_itemid=b.bid WHERE gperm_name = 'block_read' AND gperm_modid = 1";
+        $sql .= 'FROM '.$db->prefix('newblocks').' b LEFT JOIN '.$db->prefix('group_permission')." l ON l.gperm_itemid=b.bid WHERE gperm_name = 'block_read' AND gperm_modid = 1";
         if (is_array($groupid)) {
-            $sql .= ' AND (l.gperm_groupid=' . $groupid[0] . '';
+            $sql .= ' AND (l.gperm_groupid='.$groupid[0].'';
             $size = count($groupid);
             if ($size > 1) {
                 for ($i = 1; $i < $size; ++$i) {
-                    $sql .= ' OR l.gperm_groupid=' . $groupid[$i] . '';
+                    $sql .= ' OR l.gperm_groupid='.$groupid[$i].'';
                 }
             }
             $sql .= ')';
         } else {
-            $sql .= ' AND l.gperm_groupid=' . $groupid . '';
+            $sql .= ' AND l.gperm_groupid='.$groupid.'';
         }
-        $sql .= ' AND b.isactive=' . $isactive;
+        $sql .= ' AND b.isactive='.$isactive;
         if (isset($side)) {
             // get both sides in sidebox? (some themes need this)
             if ($side == XOOPS_SIDEBLOCK_BOTH) {
@@ -369,9 +369,9 @@ 
             } elseif ($side == XOOPS_FOOTERBLOCK_ALL) {
                 $side = '(b.side=10 OR b.side=11 OR b.side=12 )';
             } else {
-                $side = 'b.side=' . $side;
+                $side = 'b.side='.$side;
             }
-            $sql .= ' AND ' . $side;
+            $sql .= ' AND '.$side;
         }
         if (isset($visible)) {
             $sql .= " AND b.visible=$visible";
@@ -407,7 +407,7 @@ 
     {
         $db          = XoopsDatabaseFactory::getDatabaseConnection();
         $ret         = array();
-        $where_query = ' WHERE isactive=' . $isactive;
+        $where_query = ' WHERE isactive='.$isactive;
         if (isset($side)) {
             // get both sides in sidebox? (some themes need this)
             if ($side == XOOPS_SIDEBLOCK_BOTH) {
@@ -417,24 +417,24 @@ 
             } elseif ($side == XOOPS_FOOTERBLOCK_ALL) {
                 $side = '(side=10 OR side=11 OR side=12)';
             } else {
-                $side = 'side=' . $side;
+                $side = 'side='.$side;
             }
-            $where_query .= ' AND ' . $side;
+            $where_query .= ' AND '.$side;
         }
         if (isset($visible)) {
-            $where_query .= ' AND visible=.' . $visible;
+            $where_query .= ' AND visible=.'.$visible;
         }
-        $where_query .= ' ORDER BY ' . $orderby;
+        $where_query .= ' ORDER BY '.$orderby;
         switch ($rettype) {
             case 'object':
-                $sql    = 'SELECT * FROM ' . $db->prefix('newblocks') . '' . $where_query;
+                $sql    = 'SELECT * FROM '.$db->prefix('newblocks').''.$where_query;
                 $result = $db->query($sql);
                 while (false !== ($myrow = $db->fetchArray($result))) {
                     $ret[] = new XoopsBlock($myrow);
                 }
                 break;
             case 'list':
-                $sql    = 'SELECT * FROM ' . $db->prefix('newblocks') . '' . $where_query;
+                $sql    = 'SELECT * FROM '.$db->prefix('newblocks').''.$where_query;
                 $result = $db->query($sql);
                 while (false !== ($myrow = $db->fetchArray($result))) {
                     $block                      = new XoopsBlock($myrow);
@@ -444,7 +444,7 @@ 
                 }
                 break;
             case 'id':
-                $sql    = 'SELECT bid FROM ' . $db->prefix('newblocks') . '' . $where_query;
+                $sql    = 'SELECT bid FROM '.$db->prefix('newblocks').''.$where_query;
                 $result = $db->query($sql);
                 while (false !== ($myrow = $db->fetchArray($result))) {
                     $ret[] = $myrow['bid'];
@@ -468,9 +468,9 @@ 
         $moduleid = (int)$moduleid;
         $db       = XoopsDatabaseFactory::getDatabaseConnection();
         if ($asobject == true) {
-            $sql = $sql = 'SELECT * FROM ' . $db->prefix('newblocks') . ' WHERE mid=' . $moduleid;
+            $sql = $sql = 'SELECT * FROM '.$db->prefix('newblocks').' WHERE mid='.$moduleid;
         } else {
-            $sql = 'SELECT bid FROM ' . $db->prefix('newblocks') . ' WHERE mid=' . $moduleid;
+            $sql = 'SELECT bid FROM '.$db->prefix('newblocks').' WHERE mid='.$moduleid;
         }
         $result = $db->query($sql);
         $ret    = array();
@@ -502,12 +502,12 @@ 
         $db       = XoopsDatabaseFactory::getDatabaseConnection();
         $ret      = array();
         if (isset($groupid)) {
-            $sql = 'SELECT DISTINCT gperm_itemid FROM ' . $db->prefix('group_permission') . " WHERE gperm_name = 'block_read' AND gperm_modid = 1";
+            $sql = 'SELECT DISTINCT gperm_itemid FROM '.$db->prefix('group_permission')." WHERE gperm_name = 'block_read' AND gperm_modid = 1";
             if (is_array($groupid)) {
-                $sql .= ' AND gperm_groupid IN (' . implode(',', $groupid) . ')';
+                $sql .= ' AND gperm_groupid IN ('.implode(',', $groupid).')';
             } else {
                 if ((int)$groupid > 0) {
-                    $sql .= ' AND gperm_groupid=' . (int)$groupid;
+                    $sql .= ' AND gperm_groupid='.(int)$groupid;
                 }
             }
             $result   = $db->query($sql);
@@ -519,14 +519,14 @@ 
                 return $blockids;
             }
         }
-        $sql = 'SELECT b.* FROM ' . $db->prefix('newblocks') . ' b, ' . $db->prefix('block_module_link') . ' m WHERE m.block_id=b.bid';
-        $sql .= ' AND b.isactive=' . $isactive;
+        $sql = 'SELECT b.* FROM '.$db->prefix('newblocks').' b, '.$db->prefix('block_module_link').' m WHERE m.block_id=b.bid';
+        $sql .= ' AND b.isactive='.$isactive;
         if (isset($visible)) {
-            $sql .= ' AND b.visible=' . (int)$visible;
+            $sql .= ' AND b.visible='.(int)$visible;
         }
         if (!isset($module_id)) {
         } elseif (!empty($module_id)) {
-            $sql .= ' AND m.module_id IN (0,' . (int)$module_id;
+            $sql .= ' AND m.module_id IN (0,'.(int)$module_id;
             if ($toponlyblock) {
                 $sql .= ',-1';
             }
@@ -539,9 +539,9 @@ 
             }
         }
         if (!empty($blockids)) {
-            $sql .= ' AND b.bid IN (' . implode(',', $blockids) . ')';
+            $sql .= ' AND b.bid IN ('.implode(',', $blockids).')';
         }
-        $sql .= ' ORDER BY ' . $orderby;
+        $sql .= ' ORDER BY '.$orderby;
         $result = $db->query($sql);
         while (false !== ($myrow = $db->fetchArray($result))) {
             $block              = new XoopsBlock($myrow);
@@ -567,13 +567,13 @@ 
         $db   = XoopsDatabaseFactory::getDatabaseConnection();
         $ret  = array();
         $bids = array();
-        $sql  = 'SELECT DISTINCT(bid) from ' . $db->prefix('newblocks');
+        $sql  = 'SELECT DISTINCT(bid) from '.$db->prefix('newblocks');
         if ($result = $db->query($sql)) {
             while (false !== ($myrow = $db->fetchArray($result))) {
                 $bids[] = $myrow['bid'];
             }
         }
-        $sql     = 'SELECT DISTINCT(p.gperm_itemid) from ' . $db->prefix('group_permission') . ' p, ' . $db->prefix('groups') . " g WHERE g.groupid=p.gperm_groupid AND p.gperm_name='block_read'";
+        $sql     = 'SELECT DISTINCT(p.gperm_itemid) from '.$db->prefix('group_permission').' p, '.$db->prefix('groups')." g WHERE g.groupid=p.gperm_groupid AND p.gperm_name='block_read'";
         $grouped = array();
         if ($result = $db->query($sql)) {
             while (false !== ($myrow = $db->fetchArray($result))) {
@@ -582,14 +582,14 @@ 
         }
         $non_grouped = array_diff($bids, $grouped);
         if (!empty($non_grouped)) {
-            $sql = 'SELECT b.* FROM ' . $db->prefix('newblocks') . ' b, ' . $db->prefix('block_module_link') . ' m WHERE m.block_id=b.bid';
-            $sql .= ' AND b.isactive=' . (int)$isactive;
+            $sql = 'SELECT b.* FROM '.$db->prefix('newblocks').' b, '.$db->prefix('block_module_link').' m WHERE m.block_id=b.bid';
+            $sql .= ' AND b.isactive='.(int)$isactive;
             if (isset($visible)) {
-                $sql .= ' AND b.visible=' . (int)$visible;
+                $sql .= ' AND b.visible='.(int)$visible;
             }
             if (!isset($module_id)) {
             } elseif (!empty($module_id)) {
-                $sql .= ' AND m.module_id IN (0,' . (int)$module_id;
+                $sql .= ' AND m.module_id IN (0,'.(int)$module_id;
                 if ($toponlyblock) {
                     $sql .= ',-1';
                 }
@@ -601,12 +601,12 @@ 
                     $sql .= ' AND m.module_id=0';
                 }
             }
-            $sql .= ' AND b.bid IN (' . implode(',', $non_grouped) . ')';
-            $sql .= ' ORDER BY ' . $orderby;
+            $sql .= ' AND b.bid IN ('.implode(',', $non_grouped).')';
+            $sql .= ' ORDER BY '.$orderby;
             $result = $db->query($sql);
             while (false !== ($myrow = $db->fetchArray($result))) {
                 $block              = new XoopsBlock($myrow);
-                $ret[$myrow['bid']] =& $block;
+                $ret[$myrow['bid']] = & $block;
                 unset($block);
             }
         }

htdocs/class/logger_render.php

Spacing +1 added lines, -1 removed lines

@@ -29,4 +29,4 @@
  * Load the new XoopsLogger class
  **/
 include_once $GLOBALS['xoops']->path('class/logger/render.php');
-trigger_error('Instance of ' . __FILE__ . ' file is deprecated, check in class/logger/render.php');
+trigger_error('Instance of '.__FILE__.' file is deprecated, check in class/logger/render.php');

htdocs/class/xoopstopic.php

Spacing +5 added lines, -5 removed lines

@@ -21,7 +21,7 @@ 
 
 $GLOBALS['xoopsLogger']->addDeprecated("'/class/xoopstopic.php' is deprecated since XOOPS 2.5.4, please create your own class instead.");
 
-include_once XOOPS_ROOT_PATH . '/class/xoopstree.php';
+include_once XOOPS_ROOT_PATH.'/class/xoopstree.php';
 
 /**
  * Class XoopsTopic
@@ -84,7 +84,7 @@ 
     public function getTopic($topicid)
     {
         $topicid = (int)$topicid;
-        $sql     = 'SELECT * FROM ' . $this->table . ' WHERE topic_id=' . $topicid . '';
+        $sql     = 'SELECT * FROM '.$this->table.' WHERE topic_id='.$topicid.'';
         $array   = $this->db->fetchArray($this->db->query($sql));
         $this->makeTopic($array);
     }
@@ -126,7 +126,7 @@ 
             $this->topic_pid = 0;
         }
         if (empty($this->topic_id)) {
-            $this->topic_id = $this->db->genId($this->table . '_topic_id_seq');
+            $this->topic_id = $this->db->genId($this->table.'_topic_id_seq');
             $sql            = sprintf("INSERT INTO %s (topic_id, topic_pid, topic_imgurl, topic_title) VALUES (%u, %u, '%s', '%s')", $this->table, $this->topic_id, $this->topic_pid, $imgurl, $title);
         } else {
             $sql = sprintf("UPDATE %s SET topic_pid = %u, topic_imgurl = '%s', topic_title = '%s' WHERE topic_id = %u", $this->table, $this->topic_pid, $imgurl, $title, $this->topic_id);
@@ -376,7 +376,7 @@ 
      */
     public function getTopicsList()
     {
-        $result = $this->db->query('SELECT topic_id, topic_pid, topic_title FROM ' . $this->table);
+        $result = $this->db->query('SELECT topic_id, topic_pid, topic_title FROM '.$this->table);
         $ret    = array();
         $myts   = MyTextSanitizer::getInstance();
         while (false !== ($myrow = $this->db->fetchArray($result))) {
@@ -394,7 +394,7 @@ 
      */
     public function topicExists($pid, $title)
     {
-        $sql = 'SELECT COUNT(*) from ' . $this->table . ' WHERE topic_pid = ' . (int)$pid . " AND topic_title = '" . trim($title) . "'";
+        $sql = 'SELECT COUNT(*) from '.$this->table.' WHERE topic_pid = '.(int)$pid." AND topic_title = '".trim($title)."'";
         $rs  = $this->db->query($sql);
         list($count) = $this->db->fetchRow($rs);
         if ($count > 0) {

htdocs/class/module.errorhandler.php

Spacing +4 added lines, -4 removed lines

@@ -96,14 +96,14 @@
         if (!in_array($e_code, $errorno)) {
             $e_code = '9999';
         }
-        include_once XOOPS_ROOT_PATH . '/header.php';
-        echo '<div><strong>' . $xoopsConfig['sitename'] . ' Error</strong><br><br>';
+        include_once XOOPS_ROOT_PATH.'/header.php';
+        echo '<div><strong>'.$xoopsConfig['sitename'].' Error</strong><br><br>';
 
         echo "Error Code: $e_code<br><br><br>";
         echo "<strong>ERROR:</strong> $errmsg[$e_code]<br><br><br>";
-        echo '[ <a href=\'javascript:history.go(-' . $pages . ')\'>Go Back</a> ]</div>';
+        echo '[ <a href=\'javascript:history.go(-'.$pages.')\'>Go Back</a> ]</div>';
 
-        include_once XOOPS_ROOT_PATH . '/footer.php';
+        include_once XOOPS_ROOT_PATH.'/footer.php';
         exit();
     }
 }