XOOPS / XoopsCore25

htdocs/modules/profile/class/profile.php

Spacing +11 added lines, -11 removed lines

@@ -235,9 +235,9 @@ 
             $field->setVar('field_options', array());
         }
         if ($this->insertField($field)) {
-            $msg = '&nbsp;&nbsp;Field <strong>' . $vars['name'] . '</strong> added to the database';
+            $msg = '&nbsp;&nbsp;Field <strong>'.$vars['name'].'</strong> added to the database';
         } else {
-            $msg = '&nbsp;&nbsp;<span class="red">ERROR: Could not insert field <strong>' . $vars['name'] . '</strong> into the database. ' . implode(' ', $field->getErrors()) . $this->db->error() . '</span>';
+            $msg = '&nbsp;&nbsp;<span class="red">ERROR: Could not insert field <strong>'.$vars['name'].'</strong> into the database. '.implode(' ', $field->getErrors()).$this->db->error().'</span>';
         }
         unset($field);
 
@@ -295,32 +295,32 @@ 
         $searchvars_profile = array_diff($searchvars, $uservars);
         $sv                 = array('u.uid, u.uname, u.email, u.user_viewemail');
         if (!empty($searchvars_user)) {
-            $sv[0] .= ',u.' . implode(', u.', $searchvars_user);
+            $sv[0] .= ',u.'.implode(', u.', $searchvars_user);
         }
         if (!empty($searchvars_profile)) {
-            $sv[] = 'p.' . implode(', p.', $searchvars_profile);
+            $sv[] = 'p.'.implode(', p.', $searchvars_profile);
         }
 
-        $sql_select = 'SELECT ' . (empty($searchvars) ? 'u.*, p.*' : implode(', ', $sv));
-        $sql_from   = ' FROM ' . $this->db->prefix('users') . ' AS u LEFT JOIN ' . $this->table . ' AS p ON u.uid=p.profile_id' . (empty($groups) ? '' : ' LEFT JOIN ' . $this->db->prefix('groups_users_link') . ' AS g ON u.uid=g.uid');
+        $sql_select = 'SELECT '.(empty($searchvars) ? 'u.*, p.*' : implode(', ', $sv));
+        $sql_from   = ' FROM '.$this->db->prefix('users').' AS u LEFT JOIN '.$this->table.' AS p ON u.uid=p.profile_id'.(empty($groups) ? '' : ' LEFT JOIN '.$this->db->prefix('groups_users_link').' AS g ON u.uid=g.uid');
         $sql_clause = ' WHERE 1=1';
         $sql_order  = '';
 
         $limit = $start = 0;
         if (isset($criteria) && is_subclass_of($criteria, 'CriteriaElement')) {
-            $sql_clause .= ' AND ' . $criteria->render();
+            $sql_clause .= ' AND '.$criteria->render();
             if ($criteria->getSort() !== '') {
-                $sql_order = ' ORDER BY ' . $criteria->getSort() . ' ' . $criteria->getOrder();
+                $sql_order = ' ORDER BY '.$criteria->getSort().' '.$criteria->getOrder();
             }
             $limit = $criteria->getLimit();
             $start = $criteria->getStart();
         }
 
         if (!empty($groups)) {
-            $sql_clause .= ' AND g.groupid IN (' . implode(', ', $groups) . ')';
+            $sql_clause .= ' AND g.groupid IN ('.implode(', ', $groups).')';
         }
 
-        $sql_users = $sql_select . $sql_from . $sql_clause . $sql_order;
+        $sql_users = $sql_select.$sql_from.$sql_clause.$sql_order;
         $result    = $this->db->query($sql_users, $limit, $start);
 
         if (!$result) {
@@ -347,7 +347,7 @@ 
 
         $count = count($users);
         if ((!empty($limit) && $count >= $limit) || !empty($start)) {
-            $sql_count = 'SELECT COUNT(*)' . $sql_from . $sql_clause;
+            $sql_count = 'SELECT COUNT(*)'.$sql_from.$sql_clause;
             $result    = $this->db->query($sql_count);
             list($count) = $this->db->fetchRow($result);
         }

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/include/findusers.php

Indentation +16 added lines, -16 removed lines

@@ -352,14 +352,14 @@ 
 
             $mailok_radio = new XoopsFormRadio(_MA_USER_SHOWMAILOK, 'user_mailok', empty($_POST['user_mailok']) ? 'both' : $_POST['user_mailok']);
             $mailok_radio->addOptionArray(array(
-                                              'mailok' => _MA_USER_MAILOK,
-                                              'mailng' => _MA_USER_MAILNG,
-                                              'both' => _MA_USER_BOTH));
+                                                'mailok' => _MA_USER_MAILOK,
+                                                'mailng' => _MA_USER_MAILNG,
+                                                'both' => _MA_USER_BOTH));
             $avatar_radio = new XoopsFormRadio(_MA_USER_HASAVATAR, 'user_avatar', empty($_POST['user_avatar']) ? 'both' : $_POST['user_avatar']);
             $avatar_radio->addOptionArray(array(
-                                              'y' => _YES,
-                                              'n' => _NO,
-                                              'both' => _MA_USER_BOTH));
+                                                'y' => _YES,
+                                                'n' => _NO,
+                                                'both' => _MA_USER_BOTH));
 
             $level_radio = new XoopsFormRadio(_MA_USER_LEVEL, 'level', @$_POST['level']);
             $levels      = array(
@@ -391,8 +391,8 @@ 
             $form->addElement($rank_select);
         } else {
             foreach (array(
-                         'uname',
-                         'email') as $var) {
+                            'uname',
+                            'email') as $var) {
                 $title      = $items_match[$var];
                 $text       = new XoopsFormText('', $var, 30, 100, @$_POST[$var]);
                 $match      = new XoopsFormSelectMatchOption('', "{$var}_match", @$_POST["{$var}_match"]);
@@ -406,14 +406,14 @@ 
 
         $sort_select = new XoopsFormSelect(_MA_USER_SORT, 'user_sort', @$_POST['user_sort']);
         $sort_select->addOptionArray(array(
-                                         'uname' => _MA_USER_UNAME,
-                                         'last_login' => _MA_USER_LASTLOGIN,
-                                         'user_regdate' => _MA_USER_REGDATE,
-                                         'posts' => _MA_USER_POSTS));
+                                            'uname' => _MA_USER_UNAME,
+                                            'last_login' => _MA_USER_LASTLOGIN,
+                                            'user_regdate' => _MA_USER_REGDATE,
+                                            'posts' => _MA_USER_POSTS));
         $order_select = new XoopsFormSelect(_MA_USER_ORDER, 'user_order', @$_POST['user_order']);
         $order_select->addOptionArray(array(
-                                          'ASC' => _MA_USER_ASC,
-                                          'DESC' => _MA_USER_DESC));
+                                            'ASC' => _MA_USER_ASC,
+                                            'DESC' => _MA_USER_DESC));
 
         $form->addElement($sort_select);
         $form->addElement($order_select);
@@ -479,8 +479,8 @@ 
             $criteria->add(new Criteria('user_occ', '%' . $myts->addSlashes(trim($_POST['user_occ'])) . '%', 'LIKE'));
         }
         foreach (array(
-                     'last_login',
-                     'user_regdate') as $var) {
+                        'last_login',
+                        'user_regdate') as $var) {
             if (!empty($_POST["{$var}_more"]) && is_numeric($_POST["{$var}_more"])) {
                 $time = time() - (60 * 60 * 24 * (int)trim($_POST["{$var}_more"]));
                 if ($time > 0) {

Spacing +75 added lines, -75 removed lines

@@ -17,7 +17,7 @@ 
  */
 /* @var  $xoopsUser XoopsUser */
 
-include_once dirname(__DIR__) . '/mainfile.php';
+include_once dirname(__DIR__).'/mainfile.php';
 
 xoops_header(false);
 
@@ -36,8 +36,8 @@ 
 
 $token         = isset($_REQUEST['token']) ? $_REQUEST['token'] : '';
 $name_form     = 'memberslist';
-$name_userid   = 'uid' . (!empty($_REQUEST['multiple']) ? '[]' : '');
-$name_username = 'uname' . (!empty($_REQUEST['multiple']) ? '[]' : '');
+$name_userid   = 'uid'.(!empty($_REQUEST['multiple']) ? '[]' : '');
+$name_username = 'uname'.(!empty($_REQUEST['multiple']) ? '[]' : '');
 
 xoops_loadLanguage('findusers');
 
@@ -104,7 +104,7 @@ 
     public function get($id = 0)
     {
         $object = $this->create(false);
-        $sql    = 'SELECT * FROM ' . $this->db->prefix('ranks') . ' WHERE rank_id = ' . $this->db->quoteString($id);
+        $sql    = 'SELECT * FROM '.$this->db->prefix('ranks').' WHERE rank_id = '.$this->db->quoteString($id);
         if (!$result = $this->db->query($sql)) {
             $ret = null;
 
@@ -132,11 +132,11 @@ 
             $criteria = new CriteriaCompo();
         }
 
-        $sql = 'SELECT rank_id, rank_title FROM ' . $this->db->prefix('ranks');
+        $sql = 'SELECT rank_id, rank_title FROM '.$this->db->prefix('ranks');
         if (isset($criteria) && is_subclass_of($criteria, 'CriteriaElement')) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
             if ($criteria->getSort() != '') {
-                $sql .= ' ORDER BY ' . $criteria->getSort() . ' ' . $criteria->getOrder();
+                $sql .= ' ORDER BY '.$criteria->getSort().' '.$criteria->getOrder();
             }
             $limit = $criteria->getLimit();
             $start = $criteria->getStart();
@@ -227,14 +227,14 @@ 
         }
         $groups = array_filter($groups);
         if (empty($groups)) {
-            $sql = '    SELECT COUNT(DISTINCT u.uid) FROM ' . $this->db->prefix('users') . ' AS u' . '    WHERE 1=1';
+            $sql = '    SELECT COUNT(DISTINCT u.uid) FROM '.$this->db->prefix('users').' AS u'.'    WHERE 1=1';
         } else {
-            $sql = '    SELECT COUNT(DISTINCT u.uid) FROM ' . $this->db->prefix('users') . ' AS u' . '    LEFT JOIN ' . $this->db->prefix('groups_users_link') . ' AS g ON g.uid = u.uid' . '    WHERE g.groupid IN (' . implode(', ', array_map('intval', $groups)) . ')';
+            $sql = '    SELECT COUNT(DISTINCT u.uid) FROM '.$this->db->prefix('users').' AS u'.'    LEFT JOIN '.$this->db->prefix('groups_users_link').' AS g ON g.uid = u.uid'.'    WHERE g.groupid IN ('.implode(', ', array_map('intval', $groups)).')';
         }
         if (isset($criteria) && is_subclass_of($criteria, 'CriteriaElement')) {
             // Use the direct renderer, assuming no `uid` in criteria
             if ($render = $criteria->render()) {
-                $sql .= ' AND ' . $render;
+                $sql .= ' AND '.$render;
             }
         }
         $result = $this->db->query($sql);
@@ -260,16 +260,16 @@ 
         $limit  = null;
         $start  = null;
         if (empty($groups)) {
-            $sql = '    SELECT u.* FROM ' . $this->db->prefix('users') . ' AS u' . '    WHERE 1=1';
+            $sql = '    SELECT u.* FROM '.$this->db->prefix('users').' AS u'.'    WHERE 1=1';
         } else {
-            $sql = '    SELECT u.* FROM ' . $this->db->prefix('users') . ' AS u' . '    LEFT JOIN ' . $this->db->prefix('groups_users_link') . ' AS g ON g.uid = u.uid' . '    WHERE g.groupid IN (' . implode(', ', array_map('intval', $groups)) . ')';
+            $sql = '    SELECT u.* FROM '.$this->db->prefix('users').' AS u'.'    LEFT JOIN '.$this->db->prefix('groups_users_link').' AS g ON g.uid = u.uid'.'    WHERE g.groupid IN ('.implode(', ', array_map('intval', $groups)).')';
         }
         if (isset($criteria) && is_subclass_of($criteria, 'CriteriaElement')) {
             if ($render = $criteria->render()) {
-                $sql .= ' AND ' . $render;
+                $sql .= ' AND '.$render;
             }
             if ($sort = $criteria->getSort()) {
-                $sql .= ' ORDER BY ' . $sort . ' ' . $criteria->getOrder();
+                $sql .= ' ORDER BY '.$sort.' '.$criteria->getOrder();
                 $orderSet = true;
             }
             $limit = $criteria->getLimit();
@@ -428,16 +428,16 @@ 
     $acttotal   = $user_handler->getCount(new Criteria('level', 0, '>'));
     $inacttotal = $user_handler->getCount(new Criteria('level', 0, '<='));
     echo '</html><body>';
-    echo "<h2 style='text-align:left;'>" . _MA_USER_FINDUS . ' - ' . $modes[$mode] . '</h2>';
+    echo "<h2 style='text-align:left;'>"._MA_USER_FINDUS.' - '.$modes[$mode].'</h2>';
     $modes_switch = array();
     foreach ($modes as $_mode => $title) {
         if ($mode == $_mode) {
             continue;
         }
-        $modes_switch[] = "<a href='findusers.php?target=" . htmlspecialchars(@$_REQUEST['target'], ENT_QUOTES) . '&amp;multiple=' . htmlspecialchars(@$_REQUEST['multiple'], ENT_QUOTES) . '&amp;token=' . htmlspecialchars($token, ENT_QUOTES) . "&amp;mode={$_mode}'>{$title}</a>";
+        $modes_switch[] = "<a href='findusers.php?target=".htmlspecialchars(@$_REQUEST['target'], ENT_QUOTES).'&amp;multiple='.htmlspecialchars(@$_REQUEST['multiple'], ENT_QUOTES).'&amp;token='.htmlspecialchars($token, ENT_QUOTES)."&amp;mode={$_mode}'>{$title}</a>";
     }
-    echo '<h4>' . implode(' | ', $modes_switch) . '</h4>';
-    echo '(' . sprintf(_MA_USER_ACTUS, "<span style='color:#ff0000;'>$acttotal</span>") . ' ' . sprintf(_MA_USER_INACTUS, "<span style='color:#ff0000;'>$inacttotal</span>") . ')';
+    echo '<h4>'.implode(' | ', $modes_switch).'</h4>';
+    echo '('.sprintf(_MA_USER_ACTUS, "<span style='color:#ff0000;'>$acttotal</span>").' '.sprintf(_MA_USER_INACTUS, "<span style='color:#ff0000;'>$inacttotal</span>").')';
     $form->display();
 } else {
     $myts  = MyTextSanitizer::getInstance();
@@ -451,32 +451,32 @@ 
                 $value = str_replace('_', "\\\_", $myts->addSlashes(trim($_POST[$var])));
                 switch ($match) {
                     case XOOPS_MATCH_START:
-                        $criteria->add(new Criteria($var, $value . '%', 'LIKE'));
+                        $criteria->add(new Criteria($var, $value.'%', 'LIKE'));
                         break;
                     case XOOPS_MATCH_END:
-                        $criteria->add(new Criteria($var, '%' . $value, 'LIKE'));
+                        $criteria->add(new Criteria($var, '%'.$value, 'LIKE'));
                         break;
                     case XOOPS_MATCH_EQUAL:
                         $criteria->add(new Criteria($var, $value));
                         break;
                     case XOOPS_MATCH_CONTAIN:
-                        $criteria->add(new Criteria($var, '%' . $value . '%', 'LIKE'));
+                        $criteria->add(new Criteria($var, '%'.$value.'%', 'LIKE'));
                         break;
                 }
             }
         }
         if (!empty($_POST['url'])) {
             $url = formatURL(trim($_POST['url']));
-            $criteria->add(new Criteria('url', $url . '%', 'LIKE'));
+            $criteria->add(new Criteria('url', $url.'%', 'LIKE'));
         }
         if (!empty($_POST['user_from'])) {
-            $criteria->add(new Criteria('user_from', '%' . $myts->addSlashes(trim($_POST['user_from'])) . '%', 'LIKE'));
+            $criteria->add(new Criteria('user_from', '%'.$myts->addSlashes(trim($_POST['user_from'])).'%', 'LIKE'));
         }
         if (!empty($_POST['user_intrest'])) {
-            $criteria->add(new Criteria('user_intrest', '%' . $myts->addSlashes(trim($_POST['user_intrest'])) . '%', 'LIKE'));
+            $criteria->add(new Criteria('user_intrest', '%'.$myts->addSlashes(trim($_POST['user_intrest'])).'%', 'LIKE'));
         }
         if (!empty($_POST['user_occ'])) {
-            $criteria->add(new Criteria('user_occ', '%' . $myts->addSlashes(trim($_POST['user_occ'])) . '%', 'LIKE'));
+            $criteria->add(new Criteria('user_occ', '%'.$myts->addSlashes(trim($_POST['user_occ'])).'%', 'LIKE'));
         }
         foreach (array(
                      'last_login',
@@ -519,7 +519,7 @@ 
                 1 => 1,
                 2 => 0,
                 3 => -1);
-            $level       = isset($level_value[(int)$_POST['level']]) ? $level_value[(int)$_POST['level']] : 1;
+            $level = isset($level_value[(int)$_POST['level']]) ? $level_value[(int)$_POST['level']] : 1;
             $criteria->add(new Criteria('level', $level));
         }
         if (!empty($_POST['rank'])) {
@@ -555,21 +555,21 @@ 
     } else {
         $query = trim($_POST['query']);
         // Query with alias
-        if (preg_match("/select[\s]+.*[\s]+from[\s]+(" . $xoopsDB->prefix('users') . "[\s]+as[\s]+(\S+).*)/i", $query, $matches)) {
+        if (preg_match("/select[\s]+.*[\s]+from[\s]+(".$xoopsDB->prefix('users')."[\s]+as[\s]+(\S+).*)/i", $query, $matches)) {
             $alias    = $matches[2];
             $subquery = $matches[1];
 
             // Query without alias
-        } elseif (preg_match("/select[\s]+.*[\s]+from[\s]+(" . $xoopsDB->prefix('users') . "\b.*)/i", $query, $matches)) {
+        } elseif (preg_match("/select[\s]+.*[\s]+from[\s]+(".$xoopsDB->prefix('users')."\b.*)/i", $query, $matches)) {
             $alias    = '';
             $subquery = $matches[1];
 
             // Invalid query
         } else {
-            $query    = 'SELECT * FROM ' . $xoopsDB->prefix('users');
+            $query    = 'SELECT * FROM '.$xoopsDB->prefix('users');
             $subquery = $xoopsDB->prefix('users');
         }
-        $sql_count = 'SELECT COUNT(DISTINCT ' . (empty($alias) ? '' : $alias . '.') . 'uid) FROM ' . $subquery;
+        $sql_count = 'SELECT COUNT(DISTINCT '.(empty($alias) ? '' : $alias.'.').'uid) FROM '.$subquery;
         $result    = $xoopsDB->query($sql_count);
         list($total) = $xoopsDB->FetchRow($result);
         $result     = $xoopsDB->query($query, $limit, $start);
@@ -584,15 +584,15 @@ 
 
     echo $js_adduser = '
         <script type="text/javascript">
-        var multiple=' . (int)$_REQUEST['multiple'] . ';
+        var multiple=' . (int)$_REQUEST['multiple'].';
         function addusers()
         {
             var sel_str = "";
             var num = 0;
-            var mForm = document.forms["' . $name_form . '"];
+            var mForm = document.forms["' . $name_form.'"];
             for (var i=0;i!=mForm.elements.length;i++) {
                 var id=mForm.elements[i];
-                if ( ( (multiple > 0 && id.type == "checkbox") || (multiple == 0 && id.type == "radio") ) && (id.checked == true) && ( id.name == "' . $name_userid . '" ) ) {
+                if ( ( (multiple > 0 && id.type == "checkbox") || (multiple == 0 && id.type == "radio") ) && (id.checked == true) && ( id.name == "' . $name_userid.'" ) ) {
                     var name = mForm.elements[++i];
                     var len = id.value.length + name.value.length;
                     sel_str += len + ":" + id.value + ":" + name.value;
@@ -600,12 +600,12 @@ 
                 }
             }
             if (num == 0) {
-                alert("' . _MA_USER_NOUSERSELECTED . '");
+                alert("' . _MA_USER_NOUSERSELECTED.'");
                 return false;
             }
             sel_str = num + ":" + sel_str;
             window.opener.addusers(sel_str);
-            alert("' . _MA_USER_USERADDED . '");
+            alert("' . _MA_USER_USERADDED.'");
             if (multiple == 0) {
                 window.close();
                 window.opener.focus();
@@ -616,16 +616,16 @@ 
     ';
 
     echo '</html><body>';
-    echo "<a href='findusers.php?target=" . htmlspecialchars(@$_POST['target'], ENT_QUOTES) . '&amp;multiple=' . (int)(@$_POST['multiple']) . '&amp;token=' . htmlspecialchars($token, ENT_QUOTES) . "'>" . _MA_USER_FINDUS . "</a>&nbsp;<span style='font-weight:bold;'>&raquo;</span>&nbsp;" . _MA_USER_RESULTS . '<br><br>';
+    echo "<a href='findusers.php?target=".htmlspecialchars(@$_POST['target'], ENT_QUOTES).'&amp;multiple='.(int)(@$_POST['multiple']).'&amp;token='.htmlspecialchars($token, ENT_QUOTES)."'>"._MA_USER_FINDUS."</a>&nbsp;<span style='font-weight:bold;'>&raquo;</span>&nbsp;"._MA_USER_RESULTS.'<br><br>';
     if (empty($start) && empty($foundusers)) {
-        echo '<h4>' . _MA_USER_NOFOUND, '</h4>';
+        echo '<h4>'._MA_USER_NOFOUND, '</h4>';
         $hiddenform = "<form name='findnext' action='findusers.php' method='post'>";
         foreach ($_POST as $k => $v) {
             if ($k === 'XOOPS_TOKEN_REQUEST') {
                 // regenerate token value
-                $hiddenform .= $GLOBALS['xoopsSecurity']->getTokenHTML() . "\n";
+                $hiddenform .= $GLOBALS['xoopsSecurity']->getTokenHTML()."\n";
             } else {
-                $hiddenform .= "<input type='hidden' name='" . htmlspecialchars($k, ENT_QUOTES) . "' value='" . htmlspecialchars($myts->stripSlashesGPC($v), ENT_QUOTES) . "' />\n";
+                $hiddenform .= "<input type='hidden' name='".htmlspecialchars($k, ENT_QUOTES)."' value='".htmlspecialchars($myts->stripSlashesGPC($v), ENT_QUOTES)."' />\n";
             }
         }
         if (!isset($_POST['limit'])) {
@@ -634,15 +634,15 @@ 
         if (!isset($_POST['start'])) {
             $hiddenform .= "<input type='hidden' name='start' value='{$start}' />\n";
         }
-        $hiddenform .= "<input type='hidden' name='token' value='" . htmlspecialchars($token, ENT_QUOTES) . "' />\n";
+        $hiddenform .= "<input type='hidden' name='token' value='".htmlspecialchars($token, ENT_QUOTES)."' />\n";
         $hiddenform .= '</form>';
 
-        echo '<div>' . $hiddenform;
-        echo "<a href='#' onclick='document.findnext.start.value=0;document.findnext.user_submit.value=0;document.findnext.submit();'>" . _MA_USER_SEARCHAGAIN . "</a>\n";
+        echo '<div>'.$hiddenform;
+        echo "<a href='#' onclick='document.findnext.start.value=0;document.findnext.user_submit.value=0;document.findnext.submit();'>"._MA_USER_SEARCHAGAIN."</a>\n";
         echo '</div>';
     } elseif ($start < $total) {
         if (!empty($total)) {
-            echo sprintf(_MA_USER_USERSFOUND, $total) . '<br>';
+            echo sprintf(_MA_USER_USERSFOUND, $total).'<br>';
         }
         if (!empty($foundusers)) {
             echo "<form action='findusers.php' method='post' name='{$name_form}' id='{$name_form}'>
@@ -653,11 +653,11 @@ 
                 echo "<input type='checkbox' name='memberslist_checkall' id='memberslist_checkall' onclick='xoopsCheckAll(\"{$name_form}\", \"memberslist_checkall\");' />";
             }
             echo "</th>
-            <th align='center'>" . _MA_USER_UNAME . "</th>
-            <th align='center'>" . _MA_USER_REALNAME . "</th>
-            <th align='center'>" . _MA_USER_REGDATE . "</th>
-            <th align='center'>" . _MA_USER_LASTLOGIN . "</th>
-            <th align='center'>" . _MA_USER_POSTS . '</th>
+            <th align='center'>" . _MA_USER_UNAME."</th>
+            <th align='center'>" . _MA_USER_REALNAME."</th>
+            <th align='center'>" . _MA_USER_REGDATE."</th>
+            <th align='center'>" . _MA_USER_LASTLOGIN."</th>
+            <th align='center'>" . _MA_USER_POSTS.'</th>
             </tr>';
             $ucount = 0;
             foreach (array_keys($foundusers) as $j) {
@@ -670,33 +670,33 @@ 
                 echo "<tr class='$class'>
                     <td align='center'>";
                 if (!empty($_POST['multiple'])) {
-                    echo "<input type='checkbox' name='{$name_userid}' id='{$name_userid}' value='" . $foundusers[$j]->getVar('uid') . "' />";
-                    echo "<input type='hidden' name='{$name_username}' id='{$name_username}' value='" . $foundusers[$j]->getVar('uname') . "' />";
+                    echo "<input type='checkbox' name='{$name_userid}' id='{$name_userid}' value='".$foundusers[$j]->getVar('uid')."' />";
+                    echo "<input type='hidden' name='{$name_username}' id='{$name_username}' value='".$foundusers[$j]->getVar('uname')."' />";
                 } else {
-                    echo "<input type='radio' name='{$name_userid}' id='{$name_userid}' value='" . $foundusers[$j]->getVar('uid') . "' />";
-                    echo "<input type='hidden' name='{$name_username}' id='{$name_username}' value='" . $foundusers[$j]->getVar('uname') . "' />";
+                    echo "<input type='radio' name='{$name_userid}' id='{$name_userid}' value='".$foundusers[$j]->getVar('uid')."' />";
+                    echo "<input type='hidden' name='{$name_username}' id='{$name_username}' value='".$foundusers[$j]->getVar('uname')."' />";
                 }
                 echo "</td>
-                    <td><a href='" . XOOPS_URL . '/userinfo.php?uid=' . $foundusers[$j]->getVar('uid') . "' target='_blank'>" . $foundusers[$j]->getVar('uname') . '</a></td>
-                    <td>' . $fuser_name . "</td>
-                    <td align='center'>" . ($foundusers[$j]->getVar('user_regdate') ? date('Y-m-d', $foundusers[$j]->getVar('user_regdate')) : '') . "</td>
-                    <td align='center'>" . ($foundusers[$j]->getVar('last_login') ? date('Y-m-d H:i', $foundusers[$j]->getVar('last_login')) : '') . "</td>
-                    <td align='center'>" . $foundusers[$j]->getVar('posts') . '</td>';
+                    <td><a href='" . XOOPS_URL.'/userinfo.php?uid='.$foundusers[$j]->getVar('uid')."' target='_blank'>".$foundusers[$j]->getVar('uname').'</a></td>
+                    <td>' . $fuser_name."</td>
+                    <td align='center'>" . ($foundusers[$j]->getVar('user_regdate') ? date('Y-m-d', $foundusers[$j]->getVar('user_regdate')) : '')."</td>
+                    <td align='center'>" . ($foundusers[$j]->getVar('last_login') ? date('Y-m-d H:i', $foundusers[$j]->getVar('last_login')) : '')."</td>
+                    <td align='center'>" . $foundusers[$j]->getVar('posts').'</td>';
                 echo "</tr>\n";
             }
             echo "<tr class='foot'><td colspan='6'>";
 
             // placeholder for external applications
             if (empty($_POST['target'])) {
-                echo "<select name='fct'><option value='users'>" . _DELETE . "</option><option value='mailusers'>" . _MA_USER_SENDMAIL . '</option>';
+                echo "<select name='fct'><option value='users'>"._DELETE."</option><option value='mailusers'>"._MA_USER_SENDMAIL.'</option>';
                 echo '</select>&nbsp;';
-                echo $GLOBALS['xoopsSecurity']->getTokenHTML() . "<input type='submit' value='" . _SUBMIT . "' />";
+                echo $GLOBALS['xoopsSecurity']->getTokenHTML()."<input type='submit' value='"._SUBMIT."' />";
 
                 // Add selected users
             } else {
-                echo "<input type='button' value='" . _MA_USER_ADD_SELECTED . "' onclick='addusers();' />";
+                echo "<input type='button' value='"._MA_USER_ADD_SELECTED."' onclick='addusers();' />";
             }
-            echo "<input type='hidden' name='token' value='" . htmlspecialchars($token, ENT_QUOTES) . "' />\n";
+            echo "<input type='hidden' name='token' value='".htmlspecialchars($token, ENT_QUOTES)."' />\n";
             echo "</td></tr></table></form>\n";
         }
 
@@ -704,31 +704,31 @@ 
         foreach ($_POST as $k => $v) {
             if ($k === 'XOOPS_TOKEN_REQUEST') {
                 // regenerate token value
-                $hiddenform .= $GLOBALS['xoopsSecurity']->getTokenHTML() . "\n";
+                $hiddenform .= $GLOBALS['xoopsSecurity']->getTokenHTML()."\n";
             } else {
-                $hiddenform .= "<input type='hidden' name='" . htmlspecialchars($k, ENT_QUOTES) . "' value='" . htmlspecialchars($myts->stripSlashesGPC($v), ENT_QUOTES) . "' />\n";
+                $hiddenform .= "<input type='hidden' name='".htmlspecialchars($k, ENT_QUOTES)."' value='".htmlspecialchars($myts->stripSlashesGPC($v), ENT_QUOTES)."' />\n";
             }
         }
         if (!isset($_POST['limit'])) {
-            $hiddenform .= "<input type='hidden' name='limit' value='" . $limit . "' />\n";
+            $hiddenform .= "<input type='hidden' name='limit' value='".$limit."' />\n";
         }
         if (!isset($_POST['start'])) {
-            $hiddenform .= "<input type='hidden' name='start' value='" . $start . "' />\n";
+            $hiddenform .= "<input type='hidden' name='start' value='".$start."' />\n";
         }
-        $hiddenform .= "<input type='hidden' name='token' value='" . htmlspecialchars($token, ENT_QUOTES) . "' />\n";
+        $hiddenform .= "<input type='hidden' name='token' value='".htmlspecialchars($token, ENT_QUOTES)."' />\n";
         if (!isset($total) || ($totalpages = ceil($total / $limit)) > 1) {
             $prev = $start - $limit;
             if ($start - $limit >= 0) {
-                $hiddenform .= "<a href='#0' onclick='document.findnext.start.value=" . $prev . ";document.findnext.submit();'>" . _MA_USER_PREVIOUS . "</a>&nbsp;\n";
+                $hiddenform .= "<a href='#0' onclick='document.findnext.start.value=".$prev.";document.findnext.submit();'>"._MA_USER_PREVIOUS."</a>&nbsp;\n";
             }
             $counter     = 1;
             $currentpage = ($start + $limit) / $limit;
             if (!isset($total)) {
                 while ($counter <= $currentpage) {
                     if ($counter == $currentpage) {
-                        $hiddenform .= '<strong>' . $counter . '</strong> ';
+                        $hiddenform .= '<strong>'.$counter.'</strong> ';
                     } elseif (($counter > $currentpage - 4 && $counter < $currentpage + 4) || $counter == 1) {
-                        $hiddenform .= "<a href='#" . $counter . "' onclick='document.findnext.start.value=" . ($counter - 1) * $limit . ";document.findnext.submit();'>" . $counter . '</a> ';
+                        $hiddenform .= "<a href='#".$counter."' onclick='document.findnext.start.value=".($counter - 1) * $limit.";document.findnext.submit();'>".$counter.'</a> ';
                         if ($counter == 1 && $currentpage > 5) {
                             $hiddenform .= '... ';
                         }
@@ -738,12 +738,12 @@ 
             } else {
                 while ($counter <= $totalpages) {
                     if ($counter == $currentpage) {
-                        $hiddenform .= '<strong>' . $counter . '</strong> ';
+                        $hiddenform .= '<strong>'.$counter.'</strong> ';
                     } elseif (($counter > $currentpage - 4 && $counter < $currentpage + 4) || $counter == 1 || $counter == $totalpages) {
                         if ($counter == $totalpages && $currentpage < $totalpages - 4) {
                             $hiddenform .= '... ';
                         }
-                        $hiddenform .= "<a href='#" . $counter . "' onclick='document.findnext.start.value=" . ($counter - 1) * $limit . ";document.findnext.submit();'>" . $counter . '</a> ';
+                        $hiddenform .= "<a href='#".$counter."' onclick='document.findnext.start.value=".($counter - 1) * $limit.";document.findnext.submit();'>".$counter.'</a> ';
                         if ($counter == 1 && $currentpage > 5) {
                             $hiddenform .= '... ';
                         }
@@ -754,16 +754,16 @@ 
 
             $next = $start + $limit;
             if ((isset($total) && $total > $next) || (!isset($total) && count($foundusers) >= $limit)) {
-                $hiddenform .= "&nbsp;<a href='#" . $total . "' onclick='document.findnext.start.value=" . $next . ";document.findnext.submit();'>" . _MA_USER_NEXT . "</a>\n";
+                $hiddenform .= "&nbsp;<a href='#".$total."' onclick='document.findnext.start.value=".$next.";document.findnext.submit();'>"._MA_USER_NEXT."</a>\n";
             }
         }
         $hiddenform .= '</form>';
 
-        echo '<div>' . $hiddenform;
+        echo '<div>'.$hiddenform;
         if (isset($total)) {
-            echo '<br>' . sprintf(_MA_USER_USERSFOUND, $total) . '&nbsp;';
+            echo '<br>'.sprintf(_MA_USER_USERSFOUND, $total).'&nbsp;';
         }
-        echo "<a href='#' onclick='document.findnext.start.value=0;document.findnext.user_submit.value=0;document.findnext.submit();'>" . _MA_USER_SEARCHAGAIN . "</a>\n";
+        echo "<a href='#' onclick='document.findnext.start.value=0;document.findnext.user_submit.value=0;document.findnext.submit();'>"._MA_USER_SEARCHAGAIN."</a>\n";
         echo '</div>';
     }
 }

htdocs/class/model/read.php

Spacing +10 added lines, -10 removed lines

@@ -42,7 +42,7 @@ 
             if (!in_array($this->handler->keyName, $fields)) {
                 $fields[] = $this->handler->keyName;
             }
-            $select = '`' . implode('`, `', $fields) . '`';
+            $select = '`'.implode('`, `', $fields).'`';
         } else {
             $select = '*';
         }
@@ -50,12 +50,12 @@ 
         $start = null;
         $sql   = "SELECT {$select} FROM `{$this->handler->table}`";
         if (isset($criteria) && is_subclass_of($criteria, 'CriteriaElement')) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
             if ($groupby = $criteria->getGroupby()) {
                 $sql .= $groupby;
             }
             if ($sort = $criteria->getSort()) {
-                $sql .= " ORDER BY {$sort} " . $criteria->getOrder();
+                $sql .= " ORDER BY {$sort} ".$criteria->getOrder();
                 $orderSet = true;
             }
             $limit = $criteria->getLimit();
@@ -105,7 +105,7 @@ 
      */
     public function &getObjects(CriteriaElement $criteria = null, $id_as_key = false, $as_object = true)
     {
-        $objects =& $this->getAll($criteria, null, $as_object, $id_as_key);
+        $objects = & $this->getAll($criteria, null, $as_object, $id_as_key);
 
         return $objects;
     }
@@ -131,9 +131,9 @@ 
         }
         $sql .= " FROM `{$this->handler->table}`";
         if (isset($criteria) && is_subclass_of($criteria, 'CriteriaElement')) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
             if ($sort = $criteria->getSort()) {
-                $sql .= ' ORDER BY ' . $sort . ' ' . $criteria->getOrder();
+                $sql .= ' ORDER BY '.$sort.' '.$criteria->getOrder();
             }
             $limit = $criteria->getLimit();
             $start = $criteria->getStart();
@@ -164,7 +164,7 @@ 
         $sql   = "SELECT `{$this->handler->keyName}` FROM `{$this->handler->table}`";
         $limit = $start = null;
         if (isset($criteria) && is_subclass_of($criteria, 'CriteriaElement')) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
             $limit = $criteria->getLimit();
             $start = $criteria->getStart();
         }
@@ -192,7 +192,7 @@ 
      */
     public function &getByLimit($limit = 0, $start = 0, CriteriaElement $criteria = null, $fields = null, $asObject = true)
     {
-        $GLOBALS['xoopsLogger']->addDeprecated(__CLASS__ . '::' . __FUNCTION__ . '() is deprecated, please use getAll instead.');
+        $GLOBALS['xoopsLogger']->addDeprecated(__CLASS__.'::'.__FUNCTION__.'() is deprecated, please use getAll instead.');
         if (isset($criteria) && is_subclass_of($criteria, 'CriteriaElement')) {
             $criteria->setLimit($limit);
             $criteria->setStart($start);
@@ -216,7 +216,7 @@ 
      */
     public function convertResultSet($result, $id_as_key = false, $as_object = true)
     {
-        $GLOBALS['xoopsLogger']->addDeprecated(__CLASS__ . '::' . __FUNCTION__ . '() is deprecated.');
+        $GLOBALS['xoopsLogger']->addDeprecated(__CLASS__.'::'.__FUNCTION__.'() is deprecated.');
         $ret = array();
         while (false !== ($myrow = $this->handler->db->fetchArray($result))) {
             $obj = $this->handler->create(false);
@@ -234,7 +234,7 @@ 
                 }
             } else {
                 if ($as_object) {
-                    $ret[$myrow[$this->handler->keyName]] =& $obj;
+                    $ret[$myrow[$this->handler->keyName]] = & $obj;
                 } else {
                     $row  = array();
                     $vars = $obj->getVars();

htdocs/class/model/stats.php

Spacing +3 added lines, -3 removed lines

@@ -40,12 +40,12 @@ 
         if (isset($criteria) && is_subclass_of($criteria, 'CriteriaElement')) {
             if ($criteria->groupby != '') {
                 $groupby = true;
-                $field   = $criteria->groupby . ', ';
+                $field   = $criteria->groupby.', ';
             }
         }
         $sql = "SELECT {$field} COUNT(*) FROM `{$this->handler->table}`";
         if (isset($criteria) && is_subclass_of($criteria, 'CriteriaElement')) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
             $sql .= $criteria->getGroupby();
         }
         $result = $this->handler->db->query($sql);
@@ -87,7 +87,7 @@ 
                 $groupby_key = $groupby;
             }
         }
-        $sql = "SELECT {$groupby_key}, COUNT(*) AS count" . " FROM `{$this->handler->table}`" . " {$sql_where}" . " GROUP BY {$groupby_key}";
+        $sql = "SELECT {$groupby_key}, COUNT(*) AS count"." FROM `{$this->handler->table}`"." {$sql_where}"." GROUP BY {$groupby_key}";
         if (!$result = $this->handler->db->query($sql, $limit, $start)) {
             return $ret;
         }

htdocs/class/model/write.php

Spacing +16 added lines, -16 removed lines

@@ -179,7 +179,7 @@ 
                         continue 2;
                     }
                     if ($cleanv != '' && !preg_match("/^http[s]*:\/\//i", $cleanv)) {
-                        $cleanv = XOOPS_PROT . $cleanv;
+                        $cleanv = XOOPS_PROT.$cleanv;
                     }
                     if (!$v['not_gpc']) {
                         $cleanv = $ts->stripSlashesGPC($cleanv);
@@ -193,7 +193,7 @@ 
                         continue 2;
                     }
                     if ($cleanv != '' && !preg_match("/^http[s]*:\/\//i", $cleanv)) {
-                        $cleanv = XOOPS_PROT . $cleanv;
+                        $cleanv = XOOPS_PROT.$cleanv;
                     }
                     if (!$v['not_gpc']) {
                         $cleanv = $ts->stripSlashesGPC($cleanv);
@@ -231,7 +231,7 @@ 
                         $cleanv[$key] = str_replace('\\"', '"', addslashes($cleanv[$key]));
                     }
                     // TODO: Not encoding safe, should try base64_encode -- phppp
-                    $cleanv = "'" . serialize(array_walk($cleanv, 'xoops_aw_encode')) . "'";
+                    $cleanv = "'".serialize(array_walk($cleanv, 'xoops_aw_encode'))."'";
                     break;
 
                 case XOBJ_DTYPE_ARRAY:
@@ -273,25 +273,25 @@ 
     public function insert(&$object, $force = true)
     {
         if (!$object->isDirty()) {
-            trigger_error("Data entry is not inserted - the object '" . get_class($object) . "' is not dirty", E_USER_NOTICE);
+            trigger_error("Data entry is not inserted - the object '".get_class($object)."' is not dirty", E_USER_NOTICE);
 
             return $object->getVar($this->handler->keyName);
         }
         if (!$this->cleanVars($object)) {
-            trigger_error("Insert failed in method 'cleanVars' of object '" . get_class($object) . "'", E_USER_WARNING);
+            trigger_error("Insert failed in method 'cleanVars' of object '".get_class($object)."'", E_USER_WARNING);
 
             return $object->getVar($this->handler->keyName);
         }
         $queryFunc = empty($force) ? 'query' : 'queryF';
 
         if ($object->isNew()) {
-            $sql = 'INSERT INTO `' . $this->handler->table . '`';
+            $sql = 'INSERT INTO `'.$this->handler->table.'`';
             if (!empty($object->cleanVars)) {
                 $keys = array_keys($object->cleanVars);
                 $vals = array_values($object->cleanVars);
-                $sql .= ' (`' . implode('`, `', $keys) . '`) VALUES (' . implode(',', $vals) . ')';
+                $sql .= ' (`'.implode('`, `', $keys).'`) VALUES ('.implode(',', $vals).')';
             } else {
-                trigger_error("Data entry is not inserted - no variable is changed in object of '" . get_class($object) . "'", E_USER_NOTICE);
+                trigger_error("Data entry is not inserted - no variable is changed in object of '".get_class($object)."'", E_USER_NOTICE);
 
                 return $object->getVar($this->handler->keyName);
             }
@@ -306,7 +306,7 @@ 
             foreach ($object->cleanVars as $k => $v) {
                 $keys[] = " `{$k}` = {$v}";
             }
-            $sql = 'UPDATE `' . $this->handler->table . '` SET ' . implode(',', $keys) . ' WHERE `' . $this->handler->keyName . '` = ' . $this->handler->db->quote($object->getVar($this->handler->keyName));
+            $sql = 'UPDATE `'.$this->handler->table.'` SET '.implode(',', $keys).' WHERE `'.$this->handler->keyName.'` = '.$this->handler->db->quote($object->getVar($this->handler->keyName));
             if (!$result = $this->handler->db->{$queryFunc}($sql)) {
                 return false;
             }
@@ -328,13 +328,13 @@ 
             $clause = array();
             $thishandlerkeyNameCount = count($this->handler->keyName);
             for ($i = 0; $i < $thishandlerkeyNameCount; ++$i) {
-                $clause[] = '`' . $this->handler->keyName[$i] . '` = ' . $this->handler->db->quote($object->getVar($this->handler->keyName[$i]));
+                $clause[] = '`'.$this->handler->keyName[$i].'` = '.$this->handler->db->quote($object->getVar($this->handler->keyName[$i]));
             }
             $whereclause = implode(' AND ', $clause);
         } else {
-            $whereclause = '`' . $this->handler->keyName . '` = ' . $this->handler->db->quote($object->getVar($this->handler->keyName));
+            $whereclause = '`'.$this->handler->keyName.'` = '.$this->handler->db->quote($object->getVar($this->handler->keyName));
         }
-        $sql       = 'DELETE FROM `' . $this->handler->table . '` WHERE ' . $whereclause;
+        $sql       = 'DELETE FROM `'.$this->handler->table.'` WHERE '.$whereclause;
         $queryFunc = empty($force) ? 'query' : 'queryF';
         $result    = $this->handler->db->{$queryFunc}($sql);
 
@@ -362,10 +362,10 @@ 
             return $num;
         }
         $queryFunc = empty($force) ? 'query' : 'queryF';
-        $sql       = 'DELETE FROM ' . $this->handler->table;
+        $sql       = 'DELETE FROM '.$this->handler->table;
         if (!empty($criteria)) {
             if (is_subclass_of($criteria, 'CriteriaElement')) {
-                $sql .= ' ' . $criteria->renderWhere();
+                $sql .= ' '.$criteria->renderWhere();
             } else {
                 return false;
             }
@@ -396,9 +396,9 @@ 
         } else {
             $set_clause .= $this->handler->db->quote($fieldvalue);
         }
-        $sql = 'UPDATE `' . $this->handler->table . '` SET ' . $set_clause;
+        $sql = 'UPDATE `'.$this->handler->table.'` SET '.$set_clause;
         if (isset($criteria) && is_subclass_of($criteria, 'CriteriaElement')) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
         }
         $queryFunc = empty($force) ? 'query' : 'queryF';
         $result    = $this->handler->db->{$queryFunc}($sql);

htdocs/class/model/joint.php

Spacing +14 added lines, -14 removed lines

@@ -80,8 +80,8 @@ 
         }
 
         if (is_array($fields) && count($fields)) {
-            if (!in_array('o.' . $this->handler->keyName, $fields)) {
-                $fields[] = 'o.' . $this->handler->keyName;
+            if (!in_array('o.'.$this->handler->keyName, $fields)) {
+                $fields[] = 'o.'.$this->handler->keyName;
             }
             $select = implode(',', $fields);
         } else {
@@ -90,11 +90,11 @@ 
         $limit = null;
         $start = null;
         // $field_object = empty($field_object) ? $field_link : $field_object;
-        $sql = " SELECT {$select}" . " FROM {$this->handler->table} AS o" . " LEFT JOIN {$this->handler->table_link} AS l ON o.{$this->handler->field_object} = l.{$this->handler->field_link}";
+        $sql = " SELECT {$select}"." FROM {$this->handler->table} AS o"." LEFT JOIN {$this->handler->table_link} AS l ON o.{$this->handler->field_object} = l.{$this->handler->field_link}";
         if (isset($criteria) && is_subclass_of($criteria, 'CriteriaElement')) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
             if ($sort = $criteria->getSort()) {
-                $sql .= " ORDER BY {$sort} " . $criteria->getOrder();
+                $sql .= " ORDER BY {$sort} ".$criteria->getOrder();
                 $orderSet = true;
             }
             $limit = $criteria->getLimit();
@@ -136,9 +136,9 @@ 
             return null;
         }
 
-        $sql = " SELECT COUNT(DISTINCT o.{$this->handler->keyName}) AS count" . " FROM {$this->handler->table} AS o" . " LEFT JOIN {$this->handler->table_link} AS l ON o.{$this->handler->field_object} = l.{$this->handler->field_link}";
+        $sql = " SELECT COUNT(DISTINCT o.{$this->handler->keyName}) AS count"." FROM {$this->handler->table} AS o"." LEFT JOIN {$this->handler->table_link} AS l ON o.{$this->handler->field_object} = l.{$this->handler->field_link}";
         if (isset($criteria) && is_subclass_of($criteria, 'CriteriaElement')) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
         }
         if (!$result = $this->handler->db->query($sql)) {
             return false;
@@ -159,9 +159,9 @@ 
         if (!$this->validateLinks()) {
             return null;
         }
-        $sql = " SELECT l.{$this->handler->field_link}, COUNT(*)" . " FROM {$this->handler->table} AS o" . " LEFT JOIN {$this->handler->table_link} AS l ON o.{$this->handler->field_object} = l.{$this->handler->field_link}";
+        $sql = " SELECT l.{$this->handler->field_link}, COUNT(*)"." FROM {$this->handler->table} AS o"." LEFT JOIN {$this->handler->table_link} AS l ON o.{$this->handler->field_object} = l.{$this->handler->field_link}";
         if (isset($criteria) && is_subclass_of($criteria, 'CriteriaElement')) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
         }
         $sql .= " GROUP BY l.{$this->handler->field_link}";
         if (!$result = $this->handler->db->query($sql)) {
@@ -189,11 +189,11 @@ 
         }
         $set = array();
         foreach ($data as $key => $val) {
-            $set[] = "o.{$key}=" . $this->handler->db->quoteString($val);
+            $set[] = "o.{$key}=".$this->handler->db->quoteString($val);
         }
-        $sql = " UPDATE {$this->handler->table} AS o" . ' SET ' . implode(', ', $set) . " LEFT JOIN {$this->handler->table_link} AS l ON o.{$this->handler->field_object} = l.{$this->handler->field_link}";
+        $sql = " UPDATE {$this->handler->table} AS o".' SET '.implode(', ', $set)." LEFT JOIN {$this->handler->table_link} AS l ON o.{$this->handler->field_object} = l.{$this->handler->field_link}";
         if (isset($criteria) && is_subclass_of($criteria, 'CriteriaElement')) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
         }
 
         return $this->handler->db->query($sql);
@@ -210,9 +210,9 @@ 
         if (!$this->validateLinks()) {
             return null;
         }
-        $sql = "DELETE FROM {$this->handler->table} AS o " . " LEFT JOIN {$this->handler->table_link} AS l ON o.{$this->handler->field_object} = l.{$this->handler->field_link}";
+        $sql = "DELETE FROM {$this->handler->table} AS o "." LEFT JOIN {$this->handler->table_link} AS l ON o.{$this->handler->field_object} = l.{$this->handler->field_link}";
         if (isset($criteria) && is_subclass_of($criteria, 'CriteriaElement')) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
         }
 
         return $this->handler->db->query($sql);

htdocs/class/xoopsform/form.php

Spacing +11 added lines, -11 removed lines

@@ -167,7 +167,7 @@ 
                     @$var['func'] = $this->getArrayID($value, $key, $var['func'], $hashinfo);
                 }
 
-                @$this->_objid = md5($var['name'] . ':' . $var['func'] . ':' . $var['value']);
+                @$this->_objid = md5($var['name'].':'.$var['func'].':'.$var['value']);
 
                 return $this->_objid;
                 break;
@@ -186,7 +186,7 @@ 
                     @$var['func'] = $this->getArrayID($value, $key, $var['func'], $hashinfo);
                 }
 
-                @$this->_objid = sha1($var['name'] . ':' . $var['func'] . ':' . $var['value']);
+                @$this->_objid = sha1($var['name'].':'.$var['func'].':'.$var['value']);
 
                 return $this->_objid;
 
@@ -207,10 +207,10 @@ 
             case 'md5':
                 if (is_array($value)) {
                     foreach ($value as $keyb => $valueb) {
-                        @$ret = md5($ret . ':' . $this->getArrayID($valueb, $keyb, $ret, $hashinfo));
+                        @$ret = md5($ret.':'.$this->getArrayID($valueb, $keyb, $ret, $hashinfo));
                     }
                 } else {
-                    @$ret = md5($ret . ':' . $key . ':' . $value);
+                    @$ret = md5($ret.':'.$key.':'.$value);
                 }
 
                 return $ret;
@@ -218,10 +218,10 @@ 
             default:
                 if (is_array($value)) {
                     foreach ($value as $keyb => $valueb) {
-                        @$ret = sha1($ret . ':' . $this->getArrayID($valueb, $keyb, $ret, $hashinfo));
+                        @$ret = sha1($ret.':'.$this->getArrayID($valueb, $keyb, $ret, $hashinfo));
                     }
                 } else {
-                    @$ret = sha1($ret . ':' . $key . ':' . $value);
+                    @$ret = sha1($ret.':'.$key.':'.$value);
                 }
 
                 return $ret;
@@ -372,7 +372,7 @@ 
      */
     public function &getElementByName($name)
     {
-        $elements =& $this->getElements(true);
+        $elements = & $this->getElements(true);
         $count    = count($elements);
         for ($i = 0; $i < $count; ++$i) {
             if ($name == $elements[$i]->getName(false)) {
@@ -488,7 +488,7 @@ 
      */
     public function &getExtra()
     {
-        $extra = empty($this->_extra) ? '' : ' ' . implode(' ', $this->_extra);
+        $extra = empty($this->_extra) ? '' : ' '.implode(' ', $this->_extra);
 
         return $extra;
     }
@@ -576,7 +576,7 @@ 
         }
         $formname = $this->getName();
         $js .= "function xoopsFormValidate_{$formname}() { var myform = window.document.{$formname}; ";
-        $elements =& $this->getElements(true);
+        $elements = & $this->getElements(true);
         foreach ($elements as $elt) {
             if (method_exists($elt, 'renderValidationJS')) {
                 $js .= $elt->renderValidationJS();
@@ -601,7 +601,7 @@ 
         $i        = -1;
         $elements = array();
         if (count($this->getRequired()) > 0) {
-            $this->_elements[] = "<tr class='foot'><td colspan='2'>* = " . _REQUIRED . '</td></tr>';
+            $this->_elements[] = "<tr class='foot'><td colspan='2'>* = "._REQUIRED.'</td></tr>';
         }
         foreach ($this->getElements() as $ele) {
             ++$i;
@@ -627,7 +627,7 @@ 
             'name'       => $this->getName(),
             'action'     => $this->getAction(),
             'method'     => $this->getMethod(),
-            'extra'      => 'onsubmit="return xoopsFormValidate_' . $this->getName() . '();"' . $this->getExtra(),
+            'extra'      => 'onsubmit="return xoopsFormValidate_'.$this->getName().'();"'.$this->getExtra(),
             'javascript' => $js,
             'elements'   => $elements,
             'rendered'   => $this->render(),

htdocs/class/xml/saxparser.php

Spacing +2 added lines, -2 removed lines

@@ -260,7 +260,7 @@ 
      */
     public function handleCharacterData($parser, $data)
     {
-        $tagHandler =& $this->tagHandlers[$this->getCurrentTag()];
+        $tagHandler = & $this->tagHandlers[$this->getCurrentTag()];
         if (isset($tagHandler) && is_subclass_of($tagHandler, 'XmlTagHandler')) {
             $tagHandler->handleCharacterData($this, $data);
         } else {
@@ -386,7 +386,7 @@ 
             $ret = '';
             if (count($this->errors) > 0) {
                 foreach ($this->errors as $error) {
-                    $ret .= $error . '<br>';
+                    $ret .= $error.'<br>';
                 }
             }