XOOPS / XoopsCore25

htdocs/modules/system/class/fineavataruploadhandler.php

Spacing +4 added lines, -4 removed lines

@@ -51,9 +51,9 @@ 
     protected function storeUploadedFile($target, $mimeType, $uuid)
     {
         $pathParts = pathinfo($this->getName());
-        $avatarName = uniqid('savt') . '.' . strtolower($pathParts['extension']);
-        $avatarNicename = str_replace(array('_','-'), ' ', $pathParts['filename']);
-        $avatarPath = XOOPS_ROOT_PATH . '/uploads/avatars/' . $avatarName;
+        $avatarName = uniqid('savt').'.'.strtolower($pathParts['extension']);
+        $avatarNicename = str_replace(array('_', '-'), ' ', $pathParts['filename']);
+        $avatarPath = XOOPS_ROOT_PATH.'/uploads/avatars/'.$avatarName;
 
         if (false === move_uploaded_file($_FILES[$this->inputName]['tmp_name'], $avatarPath)) {
             return false;
@@ -62,7 +62,7 @@ 
         $avt_handler = xoops_getHandler('avatar');
         $avatar = $avt_handler->create();
         
-        $avatar->setVar('avatar_file', 'avatars/' . $avatarName);
+        $avatar->setVar('avatar_file', 'avatars/'.$avatarName);
         $avatar->setVar('avatar_name', $avatarNicename);
         $avatar->setVar('avatar_mimetype', $mimeType);
         $avatar->setVar('avatar_created', time());

htdocs/modules/system/class/userrank.php

Spacing +4 added lines, -4 removed lines

@@ -65,16 +65,16 @@
         $form->addElement(new XoopsFormText(_AM_SYSTEM_USERRANK_MAXPOST, 'rank_max', 10, 10, $this->getVar('rank_max')));
 
         $imgtray_img     = new XoopsFormElementTray(_AM_SYSTEM_USERRANK_IMAGE, '<br>');
-        $imgpath_img     = sprintf(_AM_SYSTEM_USERRANK_IMAGE_PATH, XOOPS_UPLOAD_PATH . '/ranks/');
+        $imgpath_img     = sprintf(_AM_SYSTEM_USERRANK_IMAGE_PATH, XOOPS_UPLOAD_PATH.'/ranks/');
         $imageselect_img = new XoopsFormSelect($imgpath_img, 'rank_image', $blank_img);
-        $image_array_img = XoopsLists::getImgListAsArray(XOOPS_UPLOAD_PATH . '/ranks');
+        $image_array_img = XoopsLists::getImgListAsArray(XOOPS_UPLOAD_PATH.'/ranks');
         $imageselect_img->addOption("$blank_img", $blank_img);
         foreach ($image_array_img as $image_img) {
             $imageselect_img->addOption("$image_img", $image_img);
         }
-        $imageselect_img->setExtra("onchange='showImgSelected(\"xo-ranks-img\", \"rank_image\", \"ranks\", \"\", \"" . XOOPS_UPLOAD_URL . "\")'");
+        $imageselect_img->setExtra("onchange='showImgSelected(\"xo-ranks-img\", \"rank_image\", \"ranks\", \"\", \"".XOOPS_UPLOAD_URL."\")'");
         $imgtray_img->addElement($imageselect_img, false);
-        $imgtray_img->addElement(new XoopsFormLabel('', "<br><img src='" . XOOPS_UPLOAD_URL . '/ranks/' . $blank_img . "' name='image_img' id='xo-ranks-img' alt='' />"));
+        $imgtray_img->addElement(new XoopsFormLabel('', "<br><img src='".XOOPS_UPLOAD_URL.'/ranks/'.$blank_img."' name='image_img' id='xo-ranks-img' alt='' />"));
 
         $fileseltray_img = new XoopsFormElementTray('<br>', '<br><br>');
         $fileseltray_img->addElement(new XoopsFormFile(_AM_SYSTEM_USERRANK_UPLOAD, 'rank_image', 500000), false);

htdocs/modules/system/class/block.php

Indentation +26 added lines, -26 removed lines

@@ -84,17 +84,17 @@ 
         // Side position
         $side_select = new XoopsFormSelect(_AM_SYSTEM_BLOCKS_TYPE, 'side', $this->getVar('side'));
         $side_select->addOptionArray(array(
-                                         0  => _AM_SYSTEM_BLOCKS_SBLEFT,
-                                         1  => _AM_SYSTEM_BLOCKS_SBRIGHT,
-                                         3  => _AM_SYSTEM_BLOCKS_CBLEFT,
-                                         4  => _AM_SYSTEM_BLOCKS_CBRIGHT,
-                                         5  => _AM_SYSTEM_BLOCKS_CBCENTER,
-                                         7  => _AM_SYSTEM_BLOCKS_CBBOTTOMLEFT,
-                                         8  => _AM_SYSTEM_BLOCKS_CBBOTTOMRIGHT,
-                                         9  => _AM_SYSTEM_BLOCKS_CBBOTTOM,
-                                         10 => _AM_SYSTEM_BLOCKS_CBFOOTERLEFT,
-                                         11 => _AM_SYSTEM_BLOCKS_CBFOOTERRIGHT,
-                                         12 => _AM_SYSTEM_BLOCKS_CBFOOTERCENTER));
+                                            0  => _AM_SYSTEM_BLOCKS_SBLEFT,
+                                            1  => _AM_SYSTEM_BLOCKS_SBRIGHT,
+                                            3  => _AM_SYSTEM_BLOCKS_CBLEFT,
+                                            4  => _AM_SYSTEM_BLOCKS_CBRIGHT,
+                                            5  => _AM_SYSTEM_BLOCKS_CBCENTER,
+                                            7  => _AM_SYSTEM_BLOCKS_CBBOTTOMLEFT,
+                                            8  => _AM_SYSTEM_BLOCKS_CBBOTTOMRIGHT,
+                                            9  => _AM_SYSTEM_BLOCKS_CBBOTTOM,
+                                            10 => _AM_SYSTEM_BLOCKS_CBFOOTERLEFT,
+                                            11 => _AM_SYSTEM_BLOCKS_CBFOOTERRIGHT,
+                                            12 => _AM_SYSTEM_BLOCKS_CBFOOTERCENTER));
 
         $form->addElement($side_select);
         // Order
@@ -128,10 +128,10 @@ 
             if (in_array($editor_configs['editor'], array('dhtmltextarea', 'textarea'))) {
                 $ctype_select = new XoopsFormSelect(_AM_SYSTEM_BLOCKS_CTYPE, 'c_type', $this->getVar('c_type'));
                 $ctype_select->addOptionArray(array(
-                                                  'H' => _AM_SYSTEM_BLOCKS_HTML,
-                                                  'P' => _AM_SYSTEM_BLOCKS_PHP,
-                                                  'S' => _AM_SYSTEM_BLOCKS_AFWSMILE,
-                                                  'T' => _AM_SYSTEM_BLOCKS_AFNOSMILE));
+                                                    'H' => _AM_SYSTEM_BLOCKS_HTML,
+                                                    'P' => _AM_SYSTEM_BLOCKS_PHP,
+                                                    'S' => _AM_SYSTEM_BLOCKS_AFWSMILE,
+                                                    'T' => _AM_SYSTEM_BLOCKS_AFNOSMILE));
                 $form->addElement($ctype_select);
             } else {
                 $form->addElement(new XoopsFormHidden('c_type', 'H'));
@@ -158,17 +158,17 @@ 
         }
         $cache_select = new XoopsFormSelect(_AM_SYSTEM_BLOCKS_BCACHETIME, 'bcachetime', $this->getVar('bcachetime'));
         $cache_select->addOptionArray(array(
-                                          '0'       => _NOCACHE,
-                                          '30'      => sprintf(_SECONDS, 30),
-                                          '60'      => _MINUTE,
-                                          '300'     => sprintf(_MINUTES, 5),
-                                          '1800'    => sprintf(_MINUTES, 30),
-                                          '3600'    => _HOUR,
-                                          '18000'   => sprintf(_HOURS, 5),
-                                          '86400'   => _DAY,
-                                          '259200'  => sprintf(_DAYS, 3),
-                                          '604800'  => _WEEK,
-                                          '2592000' => _MONTH));
+                                            '0'       => _NOCACHE,
+                                            '30'      => sprintf(_SECONDS, 30),
+                                            '60'      => _MINUTE,
+                                            '300'     => sprintf(_MINUTES, 5),
+                                            '1800'    => sprintf(_MINUTES, 30),
+                                            '3600'    => _HOUR,
+                                            '18000'   => sprintf(_HOURS, 5),
+                                            '86400'   => _DAY,
+                                            '259200'  => sprintf(_DAYS, 3),
+                                            '604800'  => _WEEK,
+                                            '2592000' => _MONTH));
         $form->addElement($cache_select);
         // Groups
         $form->addElement(new XoopsFormSelectGroup(_AM_SYSTEM_BLOCKS_GROUP, 'groups', true, $groups, 5, true));

Spacing +42 added lines, -42 removed lines

@@ -15,7 +15,7 @@ 
  */
 // defined('XOOPS_ROOT_PATH') || exit('XOOPS root path not defined');
 
-require_once XOOPS_ROOT_PATH . '/kernel/block.php';
+require_once XOOPS_ROOT_PATH.'/kernel/block.php';
 
 /**
  * System Block
@@ -141,11 +141,11 @@ 
                 $tplfile_handler = xoops_getHandler('tplfile');
                 $btemplate       = $tplfile_handler->find($GLOBALS['xoopsConfig']['template_set'], 'block', $this->getVar('bid'));
                 if (count($btemplate) > 0) {
-                    $form->addElement(new XoopsFormLabel(_AM_SYSTEM_BLOCKS_CONTENT, '<a href="' . XOOPS_URL . '/modules/system/admin.php?fct=tplsets&amp;op=edittpl&amp;id=' . $btemplate[0]->getVar('tpl_id') . '">' . _AM_SYSTEM_BLOCKS_EDITTPL . '</a>'));
+                    $form->addElement(new XoopsFormLabel(_AM_SYSTEM_BLOCKS_CONTENT, '<a href="'.XOOPS_URL.'/modules/system/admin.php?fct=tplsets&amp;op=edittpl&amp;id='.$btemplate[0]->getVar('tpl_id').'">'._AM_SYSTEM_BLOCKS_EDITTPL.'</a>'));
                 } else {
                     $btemplate2 = $tplfile_handler->find('default', 'block', $this->getVar('bid'));
                     if (count($btemplate2) > 0) {
-                        $form->addElement(new XoopsFormLabel(_AM_SYSTEM_BLOCKS_CONTENT, '<a href="' . XOOPS_URL . '/modules/system/admin.php?fct=tplsets&amp;op=edittpl&amp;id=' . $btemplate2[0]->getVar('tpl_id') . '" rel="external">' . _AM_SYSTEM_BLOCKS_EDITTPL . '</a>'));
+                        $form->addElement(new XoopsFormLabel(_AM_SYSTEM_BLOCKS_CONTENT, '<a href="'.XOOPS_URL.'/modules/system/admin.php?fct=tplsets&amp;op=edittpl&amp;id='.$btemplate2[0]->getVar('tpl_id').'" rel="external">'._AM_SYSTEM_BLOCKS_EDITTPL.'</a>'));
                     }
                 }
             }
@@ -210,13 +210,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) {
@@ -260,22 +260,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);
                 }
@@ -338,9 +338,9 @@ 
     {
         $ret   = array();
         $limit = $start = 0;
-        $sql   = 'SELECT DISTINCT(b.bid), b.* FROM ' . $this->db->prefix('newblocks') . ' b LEFT JOIN ' . $this->db->prefix('block_module_link') . ' l ON b.bid=l.block_id';
+        $sql   = 'SELECT DISTINCT(b.bid), b.* FROM '.$this->db->prefix('newblocks').' b LEFT JOIN '.$this->db->prefix('block_module_link').' l ON b.bid=l.block_id';
         if (isset($criteria) && is_subclass_of($criteria, 'CriteriaElement')) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
             $limit = $criteria->getLimit();
             $start = $criteria->getStart();
         }
@@ -404,20 +404,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) {
@@ -427,9 +427,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";
@@ -459,12 +459,12 @@ 
     public function getBlockByPerm($groupid)
     {
         if (isset($groupid)) {
-            $sql = 'SELECT DISTINCT gperm_itemid FROM ' . $this->db->prefix('group_permission') . " WHERE gperm_name = 'block_read' AND gperm_modid = 1";
+            $sql = 'SELECT DISTINCT gperm_itemid FROM '.$this->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   = $this->db->query($sql);
@@ -498,12 +498,12 @@ 
         $db       = $GLOBALS['xoopsDB'];
         $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);
@@ -515,14 +515,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';
             }
@@ -535,13 +535,13 @@ 
             }
         }
         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);
-            $ret[$myrow['bid']] =& $block;
+            $ret[$myrow['bid']] = & $block;
             unset($block);
         }
 
@@ -562,13 +562,13 @@ 
         $db   = $GLOBALS['xoopsDB'];
         $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))) {
@@ -577,14 +577,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';
                 }
@@ -596,12 +596,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/modules/system/class/breadcrumb.php

Spacing +9 added lines, -9 removed lines

@@ -80,32 +80,32 @@
                 }
             }
             // Call template
-            if (file_exists(XOOPS_ROOT_PATH . '/modules/system/language/' . $GLOBALS['xoopsConfig']['language'] . '/help/' . $this->_directory . '.html')) {
-                $GLOBALS['xoopsTpl']->assign('help_content', XOOPS_ROOT_PATH . '/modules/system/language/' . $GLOBALS['xoopsConfig']['language'] . '/help/' . $this->_directory . '.html');
+            if (file_exists(XOOPS_ROOT_PATH.'/modules/system/language/'.$GLOBALS['xoopsConfig']['language'].'/help/'.$this->_directory.'.html')) {
+                $GLOBALS['xoopsTpl']->assign('help_content', XOOPS_ROOT_PATH.'/modules/system/language/'.$GLOBALS['xoopsConfig']['language'].'/help/'.$this->_directory.'.html');
             } else {
-                if (file_exists(XOOPS_ROOT_PATH . '/modules/system/language/english/help/' . $this->_directory . '.html')) {
-                    $GLOBALS['xoopsTpl']->assign('help_content', XOOPS_ROOT_PATH . '/modules/system/language/english/help/' . $this->_directory . '.html');
+                if (file_exists(XOOPS_ROOT_PATH.'/modules/system/language/english/help/'.$this->_directory.'.html')) {
+                    $GLOBALS['xoopsTpl']->assign('help_content', XOOPS_ROOT_PATH.'/modules/system/language/english/help/'.$this->_directory.'.html');
                 } else {
                     $GLOBALS['xoopsTpl']->assign('load_error', 1);
                 }
             }
         } else {
-            $out = $menu = '<style type="text/css" media="screen">@import ' . XOOPS_URL . '/modules/system/css/menu.css;</style>';
+            $out = $menu = '<style type="text/css" media="screen">@import '.XOOPS_URL.'/modules/system/css/menu.css;</style>';
             $out .= '<ul id="xo-breadcrumb">';
             foreach ($this->_bread as $menu) {
                 if ($menu['home']) {
-                    $out .= '<li><a href="' . $menu['link'] . '" title="' . $menu['title'] . '"><img src="images/home.png" alt="' . $menu['title'] . '" class="home" /></a></li>';
+                    $out .= '<li><a href="'.$menu['link'].'" title="'.$menu['title'].'"><img src="images/home.png" alt="'.$menu['title'].'" class="home" /></a></li>';
                 } else {
                     if ($menu['link'] != '') {
-                        $out .= '<li><a href="' . $menu['link'] . '" title="' . $menu['title'] . '">' . $menu['title'] . '</a></li>';
+                        $out .= '<li><a href="'.$menu['link'].'" title="'.$menu['title'].'">'.$menu['title'].'</a></li>';
                     } else {
-                        $out .= '<li>' . $menu['title'] . '</li>';
+                        $out .= '<li>'.$menu['title'].'</li>';
                     }
                 }
             }
             $out .= '</ul>';
             if ($this->_tips) {
-                $out .= '<div class="tips">' . $this->_tips . '</div>';
+                $out .= '<div class="tips">'.$this->_tips.'</div>';
             }
             echo $out;
         }

htdocs/modules/system/class/gui.php

Indentation +3 added lines, -3 removed lines

@@ -70,9 +70,9 @@
 
         $adminThemeFactory = new xos_opal_AdminThemeFactory();
         $this->xoTheme     =& $adminThemeFactory->createInstance(array(
-                                                                     'folderName'      => $this->foldername,
-                                                                     'themesPath'      => 'modules/system/themes',
-                                                                     'contentTemplate' => @$GLOBALS['xoopsOption']['template_main']));
+                                                                        'folderName'      => $this->foldername,
+                                                                        'themesPath'      => 'modules/system/themes',
+                                                                        'contentTemplate' => @$GLOBALS['xoopsOption']['template_main']));
 
         $this->xoTheme->loadLocalization('admin');
         $this->template =& $this->xoTheme->template;

Spacing +23 added lines, -23 removed lines

@@ -51,34 +51,34 @@ 
         $xoopsLogger->startTime('XOOPS output init');
 
         if (!headers_sent()) {
-            header('Content-Type:text/html; charset=' . _CHARSET);
+            header('Content-Type:text/html; charset='._CHARSET);
             header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
-            header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
+            header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
             header('Cache-Control: no-store, no-cache, must-revalidate');
             header('Cache-Control: post-check=0, pre-check=0', false);
             header('Pragma: no-cache');
         }
 
-        require_once XOOPS_ROOT_PATH . '/class/template.php';
-        require_once XOOPS_ROOT_PATH . '/class/theme.php';
+        require_once XOOPS_ROOT_PATH.'/class/template.php';
+        require_once XOOPS_ROOT_PATH.'/class/theme.php';
 
         if (@$GLOBALS['xoopsOption']['template_main']) {
             if (false === strpos($GLOBALS['xoopsOption']['template_main'], ':')) {
-                $GLOBALS['xoopsOption']['template_main'] = 'db:' . $GLOBALS['xoopsOption']['template_main'];
+                $GLOBALS['xoopsOption']['template_main'] = 'db:'.$GLOBALS['xoopsOption']['template_main'];
             }
         }
 
         $adminThemeFactory = new xos_opal_AdminThemeFactory();
-        $this->xoTheme     =& $adminThemeFactory->createInstance(array(
+        $this->xoTheme     = & $adminThemeFactory->createInstance(array(
                                                                      'folderName'      => $this->foldername,
                                                                      'themesPath'      => 'modules/system/themes',
                                                                      'contentTemplate' => @$GLOBALS['xoopsOption']['template_main']));
 
         $this->xoTheme->loadLocalization('admin');
-        $this->template =& $this->xoTheme->template;
+        $this->template = & $this->xoTheme->template;
 
-        $GLOBALS['xoTheme']  =& $this->xoTheme;
-        $GLOBALS['adminTpl'] =& $this->xoTheme->template;
+        $GLOBALS['xoTheme']  = & $this->xoTheme;
+        $GLOBALS['adminTpl'] = & $this->xoTheme->template;
 
         $xoopsLogger->stopTime('XOOPS output init');
         $xoopsLogger->startTime('Module display');
@@ -90,7 +90,7 @@ 
             $xoopsModule->loadAdminMenu();
 
             foreach (array_keys($xoopsModule->adminmenu) as $item) {
-                $sys_menu[$item]['link'] = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/' . $xoopsModule->adminmenu[$item]['link'];
+                $sys_menu[$item]['link'] = XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/'.$xoopsModule->adminmenu[$item]['link'];
                 $GLOBALS['xoopsTpl']->append_by_ref('sys_menu', $sys_menu);
                 unset($sys_menu);
             }
@@ -98,21 +98,21 @@ 
         // Module adminmenu
         if (isset($xoopsModule) && $xoopsModule->getVar('dirname') !== 'system') {
             if ($xoopsModule->getInfo('system_menu')) {
-                $GLOBALS['xoTheme']->addStylesheet(XOOPS_URL . '/modules/system/css/menu.css');
+                $GLOBALS['xoTheme']->addStylesheet(XOOPS_URL.'/modules/system/css/menu.css');
 
                 $xoopsModule->loadAdminMenu();
                 // Get menu tab handler
                 /* @var $menu_handler SystemMenuHandler */
                 $menu_handler = xoops_getModuleHandler('menu', 'system');
                 // Define top navigation
-                $menu_handler->addMenuTop(XOOPS_URL . '/modules/system/admin.php?fct=preferences&op=showmod&mod=' . $xoopsModule->getVar('mid', 'e'), _AM_SYSTEM_PREF);
-                $menu_handler->addMenuTop(XOOPS_URL . '/modules/system/admin.php?fct=modulesadmin&op=update&module=' . $xoopsModule->getVar('dirname', 'e'), _AM_SYSTEM_UPDATE);
-                $menu_handler->addMenuTop(XOOPS_URL . '/modules/system/admin.php?fct=blocksadmin&op=list&filter=1&selgen=' . $xoopsModule->getVar('mid', 'e') . '&selmod=-2&selgrp=-1&selvis=-1', _AM_SYSTEM_BLOCKS);
-                $menu_handler->addMenuTop(XOOPS_URL . '/modules/system/admin.php?fct=tplsets&op=listtpl&tplset=default&moddir=' . $xoopsModule->getVar('dirname', 'e'), _AM_SYSTEM_TPLSETS);
-                $menu_handler->addMenuTop(XOOPS_URL . '/modules/system/admin.php?module=' . $xoopsModule->getVar('mid', 'e') . '&status=0&limit=10&fct=comments', _AM_SYSTEM_COMMENTS);
-                $menu_handler->addMenuTop(XOOPS_URL . '/modules/system/admin.php?fct=modulesadmin&op=uninstall&module=' . $xoopsModule->getVar('dirname', 'e'), _AM_SYSTEM_UNINSTALL);
-
-                $menu_handler->addMenuTop(XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'e') . '/', _AM_SYSTEM_GOTOMODULE);
+                $menu_handler->addMenuTop(XOOPS_URL.'/modules/system/admin.php?fct=preferences&op=showmod&mod='.$xoopsModule->getVar('mid', 'e'), _AM_SYSTEM_PREF);
+                $menu_handler->addMenuTop(XOOPS_URL.'/modules/system/admin.php?fct=modulesadmin&op=update&module='.$xoopsModule->getVar('dirname', 'e'), _AM_SYSTEM_UPDATE);
+                $menu_handler->addMenuTop(XOOPS_URL.'/modules/system/admin.php?fct=blocksadmin&op=list&filter=1&selgen='.$xoopsModule->getVar('mid', 'e').'&selmod=-2&selgrp=-1&selvis=-1', _AM_SYSTEM_BLOCKS);
+                $menu_handler->addMenuTop(XOOPS_URL.'/modules/system/admin.php?fct=tplsets&op=listtpl&tplset=default&moddir='.$xoopsModule->getVar('dirname', 'e'), _AM_SYSTEM_TPLSETS);
+                $menu_handler->addMenuTop(XOOPS_URL.'/modules/system/admin.php?module='.$xoopsModule->getVar('mid', 'e').'&status=0&limit=10&fct=comments', _AM_SYSTEM_COMMENTS);
+                $menu_handler->addMenuTop(XOOPS_URL.'/modules/system/admin.php?fct=modulesadmin&op=uninstall&module='.$xoopsModule->getVar('dirname', 'e'), _AM_SYSTEM_UNINSTALL);
+
+                $menu_handler->addMenuTop(XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname', 'e').'/', _AM_SYSTEM_GOTOMODULE);
                 // Define main tab navigation
                 $i       = 0;
                 $current = $i;
@@ -124,10 +124,10 @@ 
                     ++$i;
                 }
                 if ($xoopsModule->getInfo('help')) {
-                    if (stripos($_SERVER['REQUEST_URI'], 'admin/' . $xoopsModule->getInfo('help')) !== false) {
+                    if (stripos($_SERVER['REQUEST_URI'], 'admin/'.$xoopsModule->getInfo('help')) !== false) {
                         $current = $i;
                     }
-                    $menu_handler->addMenuTabs('../system/help.php?mid=' . $xoopsModule->getVar('mid', 's') . '&' . $xoopsModule->getInfo('help'), _AM_SYSTEM_HELP);
+                    $menu_handler->addMenuTabs('../system/help.php?mid='.$xoopsModule->getVar('mid', 's').'&'.$xoopsModule->getInfo('help'), _AM_SYSTEM_HELP);
                 }
 
                 // Display navigation tabs
@@ -144,7 +144,7 @@ 
         $xoopsLogger->stopTime('Module display');
 
         if (!headers_sent()) {
-            header('Content-Type:text/html; charset=' . _CHARSET);
+            header('Content-Type:text/html; charset='._CHARSET);
             header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
             header('Cache-Control: private, no-cache');
             header('Pragma: no-cache');
@@ -158,7 +158,7 @@ 
         if (isset($GLOBALS['xoopsOption']['template_main']) && $GLOBALS['xoopsOption']['template_main'] != $xoTheme->contentTemplate) {
             trigger_error("xoopsOption['template_main'] should be defined before call xoops_cp_header function", E_USER_WARNING);
             if (false === strpos($GLOBALS['xoopsOption']['template_main'], ':')) {
-                $xoTheme->contentTemplate = 'db:' . $GLOBALS['xoopsOption']['template_main'];
+                $xoTheme->contentTemplate = 'db:'.$GLOBALS['xoopsOption']['template_main'];
             } else {
                 $xoTheme->contentTemplate = $GLOBALS['xoopsOption']['template_main'];
             }

htdocs/modules/system/class/cookie.php

Indentation +4 added lines, -4 removed lines

@@ -163,10 +163,10 @@
      * @param bool   $httponly
      */
     public static function set($key, $value, $expire = 0,            /* Default expire time (session, 1 week = 604800) */
-                               $path = '',             /* Default path */
-                               $domain = '',           /* Default domain */
-                               $secure = false,        /* Does this cookie need a secure HTTPS connection? */
-                               $httponly = true        /* Can non-HTTP services access this cookie (IE: javascript)? */
+                                $path = '',             /* Default path */
+                                $domain = '',           /* Default domain */
+                                $secure = false,        /* Does this cookie need a secure HTTPS connection? */
+                                $httponly = true        /* Can non-HTTP services access this cookie (IE: javascript)? */
     ) {
         // Make sure they aren't trying to set a reserved word
         if (!in_array($key, self::$_reserved)) {

Spacing +7 added lines, -7 removed lines

@@ -56,7 +56,7 @@ 
                 list($k, $v) = each($key);
 
                 // Set string representation
-                $key = $k . '[' . $v . ']';
+                $key = $k.'['.$v.']';
 
                 // Set expiration time to -1hr (will cause browser deletion)
                 setcookie($key, false, time() - 3600);
@@ -67,7 +67,7 @@ 
             elseif (is_array($_COOKIE[$key])) {
                 foreach ($_COOKIE[$key] as $k => $v) {
                     // Set string representation
-                    $cookie = $key . '[' . $k . ']';
+                    $cookie = $key.'['.$k.']';
 
                     // Set expiration time to -1hr (will cause browser deletion)
                     setcookie($cookie, false, time() - 3600);
@@ -162,10 +162,10 @@ 
      * @param bool   $secure
      * @param bool   $httponly
      */
-    public static function set($key, $value, $expire = 0,            /* Default expire time (session, 1 week = 604800) */
-                               $path = '',             /* Default path */
-                               $domain = '',           /* Default domain */
-                               $secure = false,        /* Does this cookie need a secure HTTPS connection? */
+    public static function set($key, $value, $expire = 0, /* Default expire time (session, 1 week = 604800) */
+                               $path = '', /* Default path */
+                               $domain = '', /* Default domain */
+                               $secure = false, /* Does this cookie need a secure HTTPS connection? */
                                $httponly = true        /* Can non-HTTP services access this cookie (IE: javascript)? */
     ) {
         // Make sure they aren't trying to set a reserved word
@@ -198,7 +198,7 @@ 
                 list($k, $v) = each($key);
 
                 // Set string representation
-                $key = $k . '[' . $v . ']';
+                $key = $k.'['.$v.']';
             }
         } // Converting from string to array
         elseif (!is_array($key)) {

htdocs/modules/system/class/group.php

Spacing +8 added lines, -8 removed lines

@@ -17,7 +17,7 @@ 
 
 // defined('XOOPS_ROOT_PATH') || exit('XOOPS root path not defined');
 
-include_once XOOPS_ROOT_PATH . '/kernel/group.php';
+include_once XOOPS_ROOT_PATH.'/kernel/group.php';
 
 /**
  * System Group
@@ -68,7 +68,7 @@ 
         }
         xoops_load('XoopsFormLoader');
         xoops_load('XoopsLists');
-        include_once XOOPS_ROOT_PATH . '/modules/system/constants.php';
+        include_once XOOPS_ROOT_PATH.'/modules/system/constants.php';
 
         $title = $this->isNew() ? sprintf(_AM_SYSTEM_GROUPS_ADD) : sprintf(_AM_SYSTEM_GROUPS_EDIT);
         $form  = new XoopsThemeForm($title, 'groupform', $action, 'post', true);
@@ -87,12 +87,12 @@ 
 
         $s_cat_checkbox          = new XoopsFormCheckBox('', 'system_catids', $s_cat_value);
         $s_cat_checkbox->columns = 6;
-        $admin_dir               = XOOPS_ROOT_PATH . '/modules/system/admin/';
+        $admin_dir               = XOOPS_ROOT_PATH.'/modules/system/admin/';
         $dirlist                 = XoopsLists::getDirListAsArray($admin_dir);
         foreach ($dirlist as $file) {
-            include XOOPS_ROOT_PATH . '/modules/system/admin/' . $file . '/xoops_version.php';
+            include XOOPS_ROOT_PATH.'/modules/system/admin/'.$file.'/xoops_version.php';
             if (!empty($modversion['category'])) {
-                if (xoops_getModuleOption('active_' . $file, 'system') == 1) {
+                if (xoops_getModuleOption('active_'.$file, 'system') == 1) {
                     $s_cat_checkbox->addOption($modversion['category'], $modversion['name']);
                 }
             }
@@ -141,7 +141,7 @@ 
         $module_list[0] = _AM_SYSTEM_GROUPS_CUSTOMBLOCK;
         /* @var $block_handler XoopsBlockHandler */
         $block_handler = xoops_getHandler('block');
-        $blocks_obj    = $block_handler->getObjects(new Criteria('mid', "('" . implode("', '", array_keys($module_list)) . "')", 'IN'), true);
+        $blocks_obj    = $block_handler->getObjects(new Criteria('mid', "('".implode("', '", array_keys($module_list))."')", 'IN'), true);
 
         $blocks_module = array();
         foreach (array_keys($blocks_obj) as $bid) {
@@ -159,9 +159,9 @@ 
         foreach (array_keys($blocks_module) as $mid) {
             $new_blocks_array = array();
             foreach ($blocks_module[$mid] as $key => $value) {
-                $new_blocks_array[$key] = "<a href='" . XOOPS_URL . "/modules/system/admin.php?fct=blocksadmin&amp;op=edit&amp;bid={$key}' title='ID: {$key}' rel='external'>{$value}</a>";
+                $new_blocks_array[$key] = "<a href='".XOOPS_URL."/modules/system/admin.php?fct=blocksadmin&amp;op=edit&amp;bid={$key}' title='ID: {$key}' rel='external'>{$value}</a>";
             }
-            $r_block_checkbox          = new XoopsFormCheckBox('<strong>' . $module_list[$mid] . '</strong><br>', 'read_bids[]', $r_block_value);
+            $r_block_checkbox          = new XoopsFormCheckBox('<strong>'.$module_list[$mid].'</strong><br>', 'read_bids[]', $r_block_value);
             $r_block_checkbox->columns = 5;
             $r_block_checkbox->addOptionArray($new_blocks_array);
             $r_block_tray->addElement($r_block_checkbox);

htdocs/modules/system/class/users.php

Spacing +6 added lines, -6 removed lines

@@ -15,7 +15,7 @@ 
  */
 // defined('XOOPS_ROOT_PATH') || exit('XOOPS root path not defined');
 
-include_once XOOPS_ROOT_PATH . '/kernel/user.php';
+include_once XOOPS_ROOT_PATH.'/kernel/user.php';
 
 /**
  * System Users
@@ -52,11 +52,11 @@ 
         $form->setExtra('enctype="multipart/form-data"');
         $form->addElement(new XoopsFormText(_IMAGENAME, 'avatar_name', 50, 255, $this->getVar('avatar_name', 'e')), true);
 
-        $maxpixel = '<div class="small basic italic">' . _US_MAXPIXEL . '&nbsp;:&nbsp;' . $xoopsConfigUser['avatar_width'] . ' x ' . $xoopsConfigUser['avatar_height'] . '</div>';
-        $maxsize  = '<div class="small basic italic">' . _US_MAXIMGSZ . '&nbsp;:&nbsp;' . $xoopsConfigUser['avatar_maxsize'] . '</div>';
+        $maxpixel = '<div class="small basic italic">'._US_MAXPIXEL.'&nbsp;:&nbsp;'.$xoopsConfigUser['avatar_width'].' x '.$xoopsConfigUser['avatar_height'].'</div>';
+        $maxsize  = '<div class="small basic italic">'._US_MAXIMGSZ.'&nbsp;:&nbsp;'.$xoopsConfigUser['avatar_maxsize'].'</div>';
 
         $uploadirectory_img = '';
-        $imgtray_img        = new XoopsFormElementTray(_IMAGEFILE . '<br><br>' . $maxpixel . $maxsize, '<br>');
+        $imgtray_img        = new XoopsFormElementTray(_IMAGEFILE.'<br><br>'.$maxpixel.$maxsize, '<br>');
         $imageselect_img    = new XoopsFormSelect(sprintf(_AM_SYSTEM_AVATAR_USE_FILE, XOOPS_UPLOAD_PATH), 'avatar_file', $blank_img);
         $image_array_img    = XoopsLists::getImgListAsArray(XOOPS_UPLOAD_PATH);
         $imageselect_img->addOption("$blank_img", $blank_img);
@@ -66,9 +66,9 @@ 
                 $imageselect_img->addOption("$image_img", $image_img);
             }
         }
-        $imageselect_img->setExtra("onchange='showImgSelected(\"image_img\", \"avatar_file\", \"" . $uploadirectory_img . "\", \"\", \"" . XOOPS_UPLOAD_URL . "\")'");
+        $imageselect_img->setExtra("onchange='showImgSelected(\"image_img\", \"avatar_file\", \"".$uploadirectory_img."\", \"\", \"".XOOPS_UPLOAD_URL."\")'");
         $imgtray_img->addElement($imageselect_img, false);
-        $imgtray_img->addElement(new XoopsFormLabel('', "<br><img src='" . XOOPS_UPLOAD_URL . '/' . $blank_img . "' name='image_img' id='image_img' alt='' />"));
+        $imgtray_img->addElement(new XoopsFormLabel('', "<br><img src='".XOOPS_UPLOAD_URL.'/'.$blank_img."' name='image_img' id='image_img' alt='' />"));
         $fileseltray_img = new XoopsFormElementTray('<br>', '<br><br>');
         $fileseltray_img->addElement(new XoopsFormFile(_AM_SYSTEM_AVATAR_UPLOAD, 'avatar_file', 500000), false);
         $imgtray_img->addElement($fileseltray_img);

htdocs/modules/system/class/fineimuploadhandler.php

Spacing +5 added lines, -5 removed lines

@@ -56,9 +56,9 @@ 
 
         $pathParts = pathinfo($this->getName());
 
-        $imageName = uniqid('img') . '.' . strtolower($pathParts['extension']);
-        $imageNicename = str_replace(array('_','-'), ' ', $pathParts['filename']);
-        $imagePath = XOOPS_ROOT_PATH . '/uploads/images/' . $imageName;
+        $imageName = uniqid('img').'.'.strtolower($pathParts['extension']);
+        $imageNicename = str_replace(array('_', '-'), ' ', $pathParts['filename']);
+        $imagePath = XOOPS_ROOT_PATH.'/uploads/images/'.$imageName;
 
         $fbinary = null;
         if ($imgcat->getVar('imgcat_storetype') === 'db') {
@@ -74,7 +74,7 @@ 
         $image = $imageHandler->create();
 
         $image->setVar('image_nicename', $imageNicename);
-        $image->setVar('image_mimetype',  $mimeType);
+        $image->setVar('image_mimetype', $mimeType);
         $image->setVar('image_created', time());
         $image->setVar('image_display', 1);
         $image->setVar('image_weight', 0);
@@ -82,7 +82,7 @@ 
         if ($imgcat->getVar('imgcat_storetype') === 'db') {
             $image->setVar('image_body', $fbinary, true);
         } else {
-            $image->setVar('image_name', 'images/' . $imageName);
+            $image->setVar('image_name', 'images/'.$imageName);
         }
         if (!$imageHandler->insert($image)) {
             return array(