XOOPS / XoopsCore25

htdocs/modules/system/admin/users/users.php

Indentation +3 added lines, -3 removed lines

@@ -151,9 +151,9 @@
     // RMV-NOTIFY
     $notify_method_select = new XoopsFormSelect(_NOT_NOTIFYMETHOD, 'notify_method', $notify_method_value);
     $notify_method_select->addOptionArray(array(
-                                              XOOPS_NOTIFICATION_METHOD_DISABLE => _NOT_METHOD_DISABLE,
-                                              XOOPS_NOTIFICATION_METHOD_PM      => _NOT_METHOD_PM,
-                                              XOOPS_NOTIFICATION_METHOD_EMAIL   => _NOT_METHOD_EMAIL));
+                                                XOOPS_NOTIFICATION_METHOD_DISABLE => _NOT_METHOD_DISABLE,
+                                                XOOPS_NOTIFICATION_METHOD_PM      => _NOT_METHOD_PM,
+                                                XOOPS_NOTIFICATION_METHOD_EMAIL   => _NOT_METHOD_EMAIL));
     $form->addElement($notify_method_select);
     $notify_mode_select = new XoopsFormSelect(_NOT_NOTIFYMODE, 'notify_mode', $notify_mode_value);
     $notify_mode_select->addOptionArray(array(

Spacing +11 added lines, -11 removed lines

@@ -30,8 +30,8 @@ 
 /*********************************************************/
 /* Users Functions                                       */
 /*********************************************************/
-include_once XOOPS_ROOT_PATH . '/class/xoopslists.php';
-include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+include_once XOOPS_ROOT_PATH.'/class/xoopslists.php';
+include_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
 
 //Display form add or edit
 //true = add and false = edit
@@ -45,8 +45,8 @@ 
     $uid = system_CleanVars($_REQUEST, 'uid', 0);
 
     //RMV-NOTIFY
-    include_once XOOPS_ROOT_PATH . '/language/' . $xoopsConfig['language'] . '/notification.php';
-    include_once XOOPS_ROOT_PATH . '/include/notification_constants.php';
+    include_once XOOPS_ROOT_PATH.'/language/'.$xoopsConfig['language'].'/notification.php';
+    include_once XOOPS_ROOT_PATH.'/include/notification_constants.php';
 
     if ($add_or_edit === true) {
         //Add user
@@ -108,7 +108,7 @@ 
             $bio_value           = $user->getVar('bio', 'E');
             $rank_value          = $user->rank(false);
             $mailok_value        = $user->getVar('user_mailok', 'E');
-            $form_title          = _AM_SYSTEM_USERS_UPDATEUSER . ': ' . $user->getVar('uname');
+            $form_title          = _AM_SYSTEM_USERS_UPDATEUSER.': '.$user->getVar('uname');
             $form_isedit         = true;
             $groups              = array_values($user->getGroups());
         }
@@ -191,7 +191,7 @@ 
     } else {
         //add each user groups
         foreach ($groups as $key => $group) {
-            $group_select[] = new XoopsFormHidden('groups[' . $key . ']', $group);
+            $group_select[] = new XoopsFormHidden('groups['.$key.']', $group);
         }
     }
     foreach ($group_select as $group) {
@@ -217,8 +217,8 @@ 
 {
     global $xoopsDB;
 
-    include_once XOOPS_ROOT_PATH . '/include/comment_constants.php';
-    include_once XOOPS_ROOT_PATH . '/kernel/module.php';
+    include_once XOOPS_ROOT_PATH.'/include/comment_constants.php';
+    include_once XOOPS_ROOT_PATH.'/kernel/module.php';
 
     $tables = array();
     // Count comments (approved only: com_status == XOOPS_COMMENT_ACTIVE)
@@ -241,21 +241,21 @@ 
                 if (!empty($table['criteria'])) {
                     $criteria->add($table['criteria']);
                 }
-                $sql = 'SELECT COUNT(*) AS total FROM ' . $xoopsDB->prefix($table['table_name']) . ' ' . $criteria->renderWhere();
+                $sql = 'SELECT COUNT(*) AS total FROM '.$xoopsDB->prefix($table['table_name']).' '.$criteria->renderWhere();
                 if ($result = $xoopsDB->query($sql)) {
                     if ($row = $xoopsDB->fetchArray($result)) {
                         $total_posts += $row['total'];
                     }
                 }
             }
-            $sql = 'UPDATE ' . $xoopsDB->prefix('users') . " SET posts = '" . $total_posts . "' WHERE uid = '" . $uid . "'";
+            $sql = 'UPDATE '.$xoopsDB->prefix('users')." SET posts = '".$total_posts."' WHERE uid = '".$uid."'";
             if (!$result = $xoopsDB->queryF($sql)) {
                 redirect_header('admin.php?fct=users', 1, _AM_SYSTEM_USERS_CNUUSER);
             }
             break;
 
         case 'all users':
-            $sql = 'SELECT uid FROM ' . $xoopsDB->prefix('users') . '';
+            $sql = 'SELECT uid FROM '.$xoopsDB->prefix('users').'';
             if (!$result = $xoopsDB->query($sql)) {
                 redirect_header('admin.php?fct=users', 1, sprintf(_AM_SYSTEM_USERS_CNGUSERID, $uid));
             }

htdocs/modules/system/admin/users/jquery.php

Switch Indentation +32 added lines, -32 removed lines

@@ -36,43 +36,43 @@
 switch ($op) {
 
     // Display post
-    case 'display_post':
-        global $xoopsDB;
+        case 'display_post':
+            global $xoopsDB;
 
-        $GLOBALS['xoopsLogger']->activated = false;
+            $GLOBALS['xoopsLogger']->activated = false;
 
-        include_once XOOPS_ROOT_PATH . '/include/comment_constants.php';
-        include_once XOOPS_ROOT_PATH . '/kernel/module.php';
-        include_once XOOPS_ROOT_PATH . '/modules/system/include/functions.php';
+            include_once XOOPS_ROOT_PATH . '/include/comment_constants.php';
+            include_once XOOPS_ROOT_PATH . '/kernel/module.php';
+            include_once XOOPS_ROOT_PATH . '/modules/system/include/functions.php';
 
-        $tables = array();
-        // Count comments (approved only: com_status == XOOPS_COMMENT_ACTIVE)
-        $tables[] = array('table_name' => 'xoopscomments', 'uid_column' => 'com_uid', 'criteria' => new Criteria('com_status', XOOPS_COMMENT_ACTIVE));
-        // Count forum posts
-        if (XoopsModule::getByDirname('newbb')) {
-            $tables[] = array('table_name' => 'bb_posts', 'uid_column' => 'uid');
-        }
-        $uid         = system_CleanVars($_REQUEST, 'uid', 'int');
-        $total_posts = 0;
-        foreach ($tables as $table) {
-            $criteria = new CriteriaCompo();
-            $criteria->add(new Criteria($table['uid_column'], $uid));
-            if (!empty($table['criteria'])) {
-                $criteria->add($table['criteria']);
+            $tables = array();
+            // Count comments (approved only: com_status == XOOPS_COMMENT_ACTIVE)
+            $tables[] = array('table_name' => 'xoopscomments', 'uid_column' => 'com_uid', 'criteria' => new Criteria('com_status', XOOPS_COMMENT_ACTIVE));
+            // Count forum posts
+            if (XoopsModule::getByDirname('newbb')) {
+                $tables[] = array('table_name' => 'bb_posts', 'uid_column' => 'uid');
             }
-            $sql = 'SELECT COUNT(*) AS total FROM ' . $xoopsDB->prefix($table['table_name']) . ' ' . $criteria->renderWhere();
-            if ($result = $xoopsDB->query($sql)) {
-                if ($row = $xoopsDB->fetchArray($result)) {
-                    $total_posts += $row['total'];
+            $uid         = system_CleanVars($_REQUEST, 'uid', 'int');
+            $total_posts = 0;
+            foreach ($tables as $table) {
+                $criteria = new CriteriaCompo();
+                $criteria->add(new Criteria($table['uid_column'], $uid));
+                if (!empty($table['criteria'])) {
+                    $criteria->add($table['criteria']);
+                }
+                $sql = 'SELECT COUNT(*) AS total FROM ' . $xoopsDB->prefix($table['table_name']) . ' ' . $criteria->renderWhere();
+                if ($result = $xoopsDB->query($sql)) {
+                    if ($row = $xoopsDB->fetchArray($result)) {
+                        $total_posts += $row['total'];
+                    }
                 }
             }
-        }
 
-        $sql = 'UPDATE ' . $xoopsDB->prefix('users') . " SET posts = '" . $total_posts . "' WHERE uid = '" . $uid . "'";
-        if (!$result = $xoopsDB->queryF($sql)) {
-            redirect_header('admin.php?fct=users', 1, _AM_SYSTEM_USERS_CNUUSER);
-        } else {
-            echo $total_posts;
-        }
-        break;
+            $sql = 'UPDATE ' . $xoopsDB->prefix('users') . " SET posts = '" . $total_posts . "' WHERE uid = '" . $uid . "'";
+            if (!$result = $xoopsDB->queryF($sql)) {
+                redirect_header('admin.php?fct=users', 1, _AM_SYSTEM_USERS_CNUUSER);
+            } else {
+                echo $total_posts;
+            }
+            break;
 }

Spacing +7 added lines, -7 removed lines

@@ -18,8 +18,8 @@ 
 /* @var  $xoopsUser XoopsUser */
 /* @var $xoopsModule XoopsModule */
 
-require dirname(dirname(dirname(dirname(__DIR__)))) . '/mainfile.php';
-require XOOPS_ROOT_PATH . '/header.php';
+require dirname(dirname(dirname(dirname(__DIR__)))).'/mainfile.php';
+require XOOPS_ROOT_PATH.'/header.php';
 
 // defined('XOOPS_ROOT_PATH') || exit('XOOPS root path not defined');
 
@@ -41,9 +41,9 @@ 
 
         $GLOBALS['xoopsLogger']->activated = false;
 
-        include_once XOOPS_ROOT_PATH . '/include/comment_constants.php';
-        include_once XOOPS_ROOT_PATH . '/kernel/module.php';
-        include_once XOOPS_ROOT_PATH . '/modules/system/include/functions.php';
+        include_once XOOPS_ROOT_PATH.'/include/comment_constants.php';
+        include_once XOOPS_ROOT_PATH.'/kernel/module.php';
+        include_once XOOPS_ROOT_PATH.'/modules/system/include/functions.php';
 
         $tables = array();
         // Count comments (approved only: com_status == XOOPS_COMMENT_ACTIVE)
@@ -60,7 +60,7 @@ 
             if (!empty($table['criteria'])) {
                 $criteria->add($table['criteria']);
             }
-            $sql = 'SELECT COUNT(*) AS total FROM ' . $xoopsDB->prefix($table['table_name']) . ' ' . $criteria->renderWhere();
+            $sql = 'SELECT COUNT(*) AS total FROM '.$xoopsDB->prefix($table['table_name']).' '.$criteria->renderWhere();
             if ($result = $xoopsDB->query($sql)) {
                 if ($row = $xoopsDB->fetchArray($result)) {
                     $total_posts += $row['total'];
@@ -68,7 +68,7 @@ 
             }
         }
 
-        $sql = 'UPDATE ' . $xoopsDB->prefix('users') . " SET posts = '" . $total_posts . "' WHERE uid = '" . $uid . "'";
+        $sql = 'UPDATE '.$xoopsDB->prefix('users')." SET posts = '".$total_posts."' WHERE uid = '".$uid."'";
         if (!$result = $xoopsDB->queryF($sql)) {
             redirect_header('admin.php?fct=users', 1, _AM_SYSTEM_USERS_CNUUSER);
         } else {

htdocs/modules/system/admin/users/main.php

Indentation +11 added lines, -11 removed lines

@@ -92,9 +92,9 @@ 
             $xoBreadCrumb->addLink(_AM_SYSTEM_USERS_NAV_DELETE_USER);
             $xoBreadCrumb->render();
             xoops_confirm(array(
-                              'ok'  => 1,
-                              'uid' => $uid,
-                              'op'  => 'users_delete'), $_SERVER['REQUEST_URI'], sprintf(_AM_SYSTEM_USERS_FORM_SURE_DEL, $user->getVar('uname')));
+                                'ok'  => 1,
+                                'uid' => $uid,
+                                'op'  => 'users_delete'), $_SERVER['REQUEST_URI'], sprintf(_AM_SYSTEM_USERS_FORM_SURE_DEL, $user->getVar('uname')));
         }
         break;
 
@@ -404,9 +404,9 @@ 
             $posts_less   = new XoopsFormText(_AM_SYSTEM_USERS_POSTSLESS, 'user_posts_less', 10, 5);
             $mailok_radio = new XoopsFormRadio(_AM_SYSTEM_USERS_SHOWMAILOK, 'user_mailok', 'both');
             $mailok_radio->addOptionArray(array(
-                                              'mailok' => _AM_SYSTEM_USERS_MAILOK,
-                                              'mailng' => _AM_SYSTEM_USERS_MAILNG,
-                                              'both' => _AM_SYSTEM_USERS_BOTH));
+                                                'mailok' => _AM_SYSTEM_USERS_MAILOK,
+                                                'mailng' => _AM_SYSTEM_USERS_MAILNG,
+                                                'both' => _AM_SYSTEM_USERS_BOTH));
             $type_radio = new XoopsFormRadio(_AM_SYSTEM_USERS_SHOWTYPE, 'user_type', 'actv');
             $type_radio->addOptionArray(array(
                                             'actv' => _AM_SYSTEM_USERS_ACTIVE,
@@ -414,11 +414,11 @@ 
                                             'both' => _AM_SYSTEM_USERS_BOTH));
             $sort_select = new XoopsFormSelect(_AM_SYSTEM_USERS_SORT, 'user_sort');
             $sort_select->addOptionArray(array(
-                                             'uname' => _AM_SYSTEM_USERS_UNAME,
-                                             'email' => _AM_SYSTEM_USERS_EMAIL,
-                                             'last_login' => _AM_SYSTEM_USERS_LASTLOGIN,
-                                             'user_regdate' => _AM_SYSTEM_USERS_REGDATE,
-                                             'posts' => _AM_SYSTEM_USERS_POSTS));
+                                                'uname' => _AM_SYSTEM_USERS_UNAME,
+                                                'email' => _AM_SYSTEM_USERS_EMAIL,
+                                                'last_login' => _AM_SYSTEM_USERS_LASTLOGIN,
+                                                'user_regdate' => _AM_SYSTEM_USERS_REGDATE,
+                                                'posts' => _AM_SYSTEM_USERS_POSTS));
             $order_select = new XoopsFormSelect(_AM_SYSTEM_USERS_ORDER, 'user_order');
             $order_select->addOptionArray(array('ASC' => _AM_SYSTEM_USERS_ASC, 'DESC' => _AM_SYSTEM_USERS_DESC));
             $limit_text    = new XoopsFormText(_AM_SYSTEM_USERS_LIMIT, 'user_limit', 6, 2, 20);

Spacing +101 added lines, -101 removed lines

@@ -24,7 +24,7 @@ 
     exit(_NOPERM);
 }
 
-include_once XOOPS_ROOT_PATH . '/modules/system/admin/users/users.php';
+include_once XOOPS_ROOT_PATH.'/modules/system/admin/users/users.php';
 // Get Action type
 $op = system_CleanVars($_REQUEST, 'op', 'default', 'string');
 /* @var $member_handler XoopsMemberHandler */
@@ -36,8 +36,8 @@ 
 
 $myts = MyTextSanitizer::getInstance();
 // Define Stylesheet
-$xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/admin.css');
-$xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/ui/' . xoops_getModuleOption('jquery_theme', 'system') . '/ui.all.css');
+$xoTheme->addStylesheet(XOOPS_URL.'/modules/system/css/admin.css');
+$xoTheme->addStylesheet(XOOPS_URL.'/modules/system/css/ui/'.xoops_getModuleOption('jquery_theme', 'system').'/ui.all.css');
 // Define scripts
 $xoTheme->addScript('modules/system/js/admin.js');
 // Define Breadcrumb and tips
@@ -49,7 +49,7 @@ 
     // Edit user
     case 'users_edit':
         // Assign Breadcrumb menu
-        $xoBreadCrumb->addHelp(system_adminVersion('users', 'help') . '#edit');
+        $xoBreadCrumb->addHelp(system_adminVersion('users', 'help').'#edit');
         $xoBreadCrumb->addLink(_AM_SYSTEM_USERS_NAV_EDIT_USER);
         $xoBreadCrumb->render();
         form_user(false, $uid);
@@ -58,7 +58,7 @@ 
     // Add user
     case 'users_add':
         // Assign Breadcrumb menu
-        $xoBreadCrumb->addHelp(system_adminVersion('users', 'help') . '#add');
+        $xoBreadCrumb->addHelp(system_adminVersion('users', 'help').'#add');
         $xoBreadCrumb->addLink(_AM_SYSTEM_USERS_NAV_ADD_USER);
         $xoBreadCrumb->render();
         form_user(true);
@@ -88,7 +88,7 @@ 
             }
         } else {
             //Assign Breadcrumb menu
-            $xoBreadCrumb->addHelp(system_adminVersion('users', 'help') . '#delete');
+            $xoBreadCrumb->addHelp(system_adminVersion('users', 'help').'#delete');
             $xoBreadCrumb->addLink(_AM_SYSTEM_USERS_NAV_DELETE_USER);
             $xoBreadCrumb->render();
             xoops_confirm(array(
@@ -189,7 +189,7 @@ 
                     if ($_REQUEST['password'] != $_REQUEST['pass2']) {
                         xoops_cp_header();
                         echo '
-                        <strong>' . _AM_SYSTEM_USERS_STNPDNM . '</strong>';
+                        <strong>' . _AM_SYSTEM_USERS_STNPDNM.'</strong>';
                         xoops_cp_footer();
                         exit();
                     }
@@ -233,7 +233,7 @@ 
                 $member_handler = xoops_getHandler('member');
                 // make sure the username doesnt exist yet
                 if ($member_handler->getUserCount(new Criteria('uname', $myts->addSlashes($_REQUEST['username']))) > 0) {
-                    $adduser_errormsg = 'User name ' . htmlspecialchars($_REQUEST['username']) . ' already exists';
+                    $adduser_errormsg = 'User name '.htmlspecialchars($_REQUEST['username']).' already exists';
                 } else {
                     $newuser = $member_handler->createUser();
                     if (isset($user_viewemail)) {
@@ -257,7 +257,7 @@ 
                     if ($_REQUEST['pass2'] !== '') {
                         if ($_REQUEST['password'] != $_REQUEST['pass2']) {
                             xoops_cp_header();
-                            echo '<strong>' . _AM_SYSTEM_USERS_STNPDNM . '</strong>';
+                            echo '<strong>'._AM_SYSTEM_USERS_STNPDNM.'</strong>';
                             xoops_cp_footer();
                             exit();
                         }
@@ -286,7 +286,7 @@ 
                             }
                         }
                         if (!empty($groups_failed)) {
-                            $group_names      = $member_handler->getGroupList(new Criteria('groupid', '(' . implode(', ', $groups_failed) . ')', 'IN'));
+                            $group_names      = $member_handler->getGroupList(new Criteria('groupid', '('.implode(', ', $groups_failed).')', 'IN'));
                             $adduser_errormsg = sprintf(_AM_SYSTEM_USERS_CNRNU2, implode(', ', $group_names));
                         } else {
                             xoops_load('XoopsUserUtility');
@@ -352,7 +352,7 @@ 
             $group_select->addOption('', '--------------');
             foreach (array_keys($group_arr) as $i) {
                 if ($group_arr[$i]->getVar('groupid') != XOOPS_GROUP_ANONYMOUS) {
-                    $group_select->addOption('' . $group_arr[$i]->getVar('groupid') . '', '' . $group_arr[$i]->getVar('name') . '');
+                    $group_select->addOption(''.$group_arr[$i]->getVar('groupid').'', ''.$group_arr[$i]->getVar('name').'');
                 }
             }
 
@@ -473,158 +473,158 @@ 
                 $match = (!empty($_REQUEST['user_uname_match'])) ? (int)$_REQUEST['user_uname_match'] : XOOPS_MATCH_START;
                 switch ($match) {
                     case XOOPS_MATCH_START:
-                        $criteria->add(new Criteria('uname', $myts->addSlashes(trim($_REQUEST['user_uname'])) . '%', 'LIKE'));
+                        $criteria->add(new Criteria('uname', $myts->addSlashes(trim($_REQUEST['user_uname'])).'%', 'LIKE'));
                         break;
                     case XOOPS_MATCH_END:
-                        $criteria->add(new Criteria('uname', '%' . $myts->addSlashes(trim($_REQUEST['user_uname'])), 'LIKE'));
+                        $criteria->add(new Criteria('uname', '%'.$myts->addSlashes(trim($_REQUEST['user_uname'])), 'LIKE'));
                         break;
                     case XOOPS_MATCH_EQUAL:
                         $criteria->add(new Criteria('uname', $myts->addSlashes(trim($_REQUEST['user_uname']))));
                         break;
                     case XOOPS_MATCH_CONTAIN:
-                        $criteria->add(new Criteria('uname', '%' . $myts->addSlashes(trim($_REQUEST['user_uname'])) . '%', 'LIKE'));
+                        $criteria->add(new Criteria('uname', '%'.$myts->addSlashes(trim($_REQUEST['user_uname'])).'%', 'LIKE'));
                         break;
                 }
-                $requete_pagenav .= '&amp;user_uname=' . htmlspecialchars($_REQUEST['user_uname']) . '&amp;user_uname_match=' . htmlspecialchars($_REQUEST['user_uname_match']);
-                $requete_search .= 'uname : ' . $_REQUEST['user_uname'] . ' et user_uname_match=' . $_REQUEST['user_uname_match'] . '<br>';
+                $requete_pagenav .= '&amp;user_uname='.htmlspecialchars($_REQUEST['user_uname']).'&amp;user_uname_match='.htmlspecialchars($_REQUEST['user_uname_match']);
+                $requete_search .= 'uname : '.$_REQUEST['user_uname'].' et user_uname_match='.$_REQUEST['user_uname_match'].'<br>';
             }
             if (!empty($_REQUEST['user_name'])) {
                 $match = (!empty($_REQUEST['user_name_match'])) ? (int)$_REQUEST['user_name_match'] : XOOPS_MATCH_START;
                 switch ($match) {
                     case XOOPS_MATCH_START:
-                        $criteria->add(new Criteria('name', $myts->addSlashes(trim($_REQUEST['user_name'])) . '%', 'LIKE'));
+                        $criteria->add(new Criteria('name', $myts->addSlashes(trim($_REQUEST['user_name'])).'%', 'LIKE'));
                         break;
                     case XOOPS_MATCH_END:
-                        $criteria->add(new Criteria('name', '%' . $myts->addSlashes(trim($_REQUEST['user_name'])), 'LIKE'));
+                        $criteria->add(new Criteria('name', '%'.$myts->addSlashes(trim($_REQUEST['user_name'])), 'LIKE'));
                         break;
                     case XOOPS_MATCH_EQUAL:
                         $criteria->add(new Criteria('name', $myts->addSlashes(trim($_REQUEST['user_name']))));
                         break;
                     case XOOPS_MATCH_CONTAIN:
-                        $criteria->add(new Criteria('name', '%' . $myts->addSlashes(trim($_POST['user_name'])) . '%', 'LIKE'));
+                        $criteria->add(new Criteria('name', '%'.$myts->addSlashes(trim($_POST['user_name'])).'%', 'LIKE'));
                         break;
                 }
-                $requete_pagenav .= '&amp;user_name=' . htmlspecialchars($_REQUEST['user_name']) . '&amp;user_name_match=' . htmlspecialchars($_REQUEST['user_name_match']);
-                $requete_search .= 'name : ' . $_REQUEST['user_name'] . ' et user_name_match=' . $_REQUEST['user_name_match'] . '<br>';
+                $requete_pagenav .= '&amp;user_name='.htmlspecialchars($_REQUEST['user_name']).'&amp;user_name_match='.htmlspecialchars($_REQUEST['user_name_match']);
+                $requete_search .= 'name : '.$_REQUEST['user_name'].' et user_name_match='.$_REQUEST['user_name_match'].'<br>';
             }
             if (!empty($_REQUEST['user_email'])) {
                 $match = (!empty($_REQUEST['user_email_match'])) ? (int)$_REQUEST['user_email_match'] : XOOPS_MATCH_START;
                 switch ($match) {
                     case XOOPS_MATCH_START:
-                        $criteria->add(new Criteria('email', $myts->addSlashes(trim($_REQUEST['user_email'])) . '%', 'LIKE'));
+                        $criteria->add(new Criteria('email', $myts->addSlashes(trim($_REQUEST['user_email'])).'%', 'LIKE'));
                         break;
                     case XOOPS_MATCH_END:
-                        $criteria->add(new Criteria('email', '%' . $myts->addSlashes(trim($_REQUEST['user_email'])), 'LIKE'));
+                        $criteria->add(new Criteria('email', '%'.$myts->addSlashes(trim($_REQUEST['user_email'])), 'LIKE'));
                         break;
                     case XOOPS_MATCH_EQUAL:
                         $criteria->add(new Criteria('email', $myts->addSlashes(trim($_REQUEST['user_email']))));
                         break;
                     case XOOPS_MATCH_CONTAIN:
-                        $criteria->add(new Criteria('email', '%' . $myts->addSlashes(trim($_REQUEST['user_email'])) . '%', 'LIKE'));
+                        $criteria->add(new Criteria('email', '%'.$myts->addSlashes(trim($_REQUEST['user_email'])).'%', 'LIKE'));
                         break;
                 }
-                $requete_pagenav .= '&amp;user_email=' . htmlspecialchars($_REQUEST['user_email']) . '&amp;user_email_match=' . htmlspecialchars($_REQUEST['user_email_match']);
-                $requete_search .= 'email : ' . $_REQUEST['user_email'] . ' et user_email_match=' . $_REQUEST['user_email_match'] . '<br>';
+                $requete_pagenav .= '&amp;user_email='.htmlspecialchars($_REQUEST['user_email']).'&amp;user_email_match='.htmlspecialchars($_REQUEST['user_email_match']);
+                $requete_search .= 'email : '.$_REQUEST['user_email'].' et user_email_match='.$_REQUEST['user_email_match'].'<br>';
             }
             if (!empty($_REQUEST['user_url'])) {
                 $url = formatURL(trim($_REQUEST['user_url']));
-                $criteria->add(new Criteria('url', '%' . $myts->addSlashes($url) . '%', 'LIKE'));
-                $requete_pagenav .= '&amp;user_url=' . htmlspecialchars($_REQUEST['user_url']);
-                $requete_search .= 'url : ' . $_REQUEST['user_url'] . '<br>';
+                $criteria->add(new Criteria('url', '%'.$myts->addSlashes($url).'%', 'LIKE'));
+                $requete_pagenav .= '&amp;user_url='.htmlspecialchars($_REQUEST['user_url']);
+                $requete_search .= 'url : '.$_REQUEST['user_url'].'<br>';
             }
             if (!empty($_REQUEST['user_icq'])) {
                 $match = (!empty($_REQUEST['user_icq_match'])) ? (int)$_REQUEST['user_icq_match'] : XOOPS_MATCH_START;
                 switch ($match) {
                     case XOOPS_MATCH_START:
-                        $criteria->add(new Criteria('user_icq', $myts->addSlashes(trim($_REQUEST['user_icq'])) . '%', 'LIKE'));
+                        $criteria->add(new Criteria('user_icq', $myts->addSlashes(trim($_REQUEST['user_icq'])).'%', 'LIKE'));
                         break;
                     case XOOPS_MATCH_END:
-                        $criteria->add(new Criteria('user_icq', '%' . $myts->addSlashes(trim($_REQUEST['user_icq'])), 'LIKE'));
+                        $criteria->add(new Criteria('user_icq', '%'.$myts->addSlashes(trim($_REQUEST['user_icq'])), 'LIKE'));
                         break;
                     case XOOPS_MATCH_EQUAL:
                         $criteria->add(new Criteria('user_icq', $myts->addSlashes(trim($_REQUEST['user_icq']))));
                         break;
                     case XOOPS_MATCH_CONTAIN:
-                        $criteria->add(new Criteria('user_icq', '%' . $myts->addSlashes(trim($_REQUEST['user_icq'])) . '%', 'LIKE'));
+                        $criteria->add(new Criteria('user_icq', '%'.$myts->addSlashes(trim($_REQUEST['user_icq'])).'%', 'LIKE'));
                         break;
                 }
-                $requete_pagenav .= '&amp;user_icq=' . htmlspecialchars($_REQUEST['user_icq']) . '&amp;user_icq_match=' . htmlspecialchars($_REQUEST['user_icq_match']);
-                $requete_search .= 'icq : ' . $_REQUEST['user_icq'] . ' et user_icq_match=' . $_REQUEST['user_icq_match'] . '<br>';
+                $requete_pagenav .= '&amp;user_icq='.htmlspecialchars($_REQUEST['user_icq']).'&amp;user_icq_match='.htmlspecialchars($_REQUEST['user_icq_match']);
+                $requete_search .= 'icq : '.$_REQUEST['user_icq'].' et user_icq_match='.$_REQUEST['user_icq_match'].'<br>';
             }
             if (!empty($_REQUEST['user_aim'])) {
                 $match = (!empty($_REQUEST['user_aim_match'])) ? (int)$_REQUEST['user_aim_match'] : XOOPS_MATCH_START;
                 switch ($match) {
                     case XOOPS_MATCH_START:
-                        $criteria->add(new Criteria('user_aim', $myts->addSlashes(trim($_REQUEST['user_aim'])) . '%', 'LIKE'));
+                        $criteria->add(new Criteria('user_aim', $myts->addSlashes(trim($_REQUEST['user_aim'])).'%', 'LIKE'));
                         break;
                     case XOOPS_MATCH_END:
-                        $criteria->add(new Criteria('user_aim', '%' . $myts->addSlashes(trim($_REQUEST['user_aim'])), 'LIKE'));
+                        $criteria->add(new Criteria('user_aim', '%'.$myts->addSlashes(trim($_REQUEST['user_aim'])), 'LIKE'));
                         break;
                     case XOOPS_MATCH_EQUAL:
                         $criteria->add(new Criteria('user_aim', $myts->addSlashes(trim($_REQUEST['user_aim']))));
                         break;
                     case XOOPS_MATCH_CONTAIN:
-                        $criteria->add(new Criteria('user_aim', '%' . $myts->addSlashes(trim($_REQUEST['user_aim'])) . '%', 'LIKE'));
+                        $criteria->add(new Criteria('user_aim', '%'.$myts->addSlashes(trim($_REQUEST['user_aim'])).'%', 'LIKE'));
                         break;
                 }
-                $requete_pagenav .= '&amp;user_aim=' . htmlspecialchars($_REQUEST['user_aim']) . '&amp;user_aim_match=' . htmlspecialchars($_REQUEST['user_aim_match']);
-                $requete_search .= 'aim : ' . $_REQUEST['user_aim'] . ' et user_aim_match=' . $_REQUEST['user_aim_match'] . '<br>';
+                $requete_pagenav .= '&amp;user_aim='.htmlspecialchars($_REQUEST['user_aim']).'&amp;user_aim_match='.htmlspecialchars($_REQUEST['user_aim_match']);
+                $requete_search .= 'aim : '.$_REQUEST['user_aim'].' et user_aim_match='.$_REQUEST['user_aim_match'].'<br>';
             }
             if (!empty($_REQUEST['user_yim'])) {
                 $match = (!empty($_REQUEST['user_yim_match'])) ? (int)$_REQUEST['user_yim_match'] : XOOPS_MATCH_START;
                 switch ($match) {
                     case XOOPS_MATCH_START:
-                        $criteria->add(new Criteria('user_yim', $myts->addSlashes(trim($_REQUEST['user_yim'])) . '%', 'LIKE'));
+                        $criteria->add(new Criteria('user_yim', $myts->addSlashes(trim($_REQUEST['user_yim'])).'%', 'LIKE'));
                         break;
                     case XOOPS_MATCH_END:
-                        $criteria->add(new Criteria('user_yim', '%' . $myts->addSlashes(trim($_REQUEST['user_yim'])), 'LIKE'));
+                        $criteria->add(new Criteria('user_yim', '%'.$myts->addSlashes(trim($_REQUEST['user_yim'])), 'LIKE'));
                         break;
                     case XOOPS_MATCH_EQUAL:
                         $criteria->add(new Criteria('user_yim', $myts->addSlashes(trim($_REQUEST['user_yim']))));
                         break;
                     case XOOPS_MATCH_CONTAIN:
-                        $criteria->add(new Criteria('user_yim', '%' . $myts->addSlashes(trim($_REQUEST['user_yim'])) . '%', 'LIKE'));
+                        $criteria->add(new Criteria('user_yim', '%'.$myts->addSlashes(trim($_REQUEST['user_yim'])).'%', 'LIKE'));
                         break;
                 }
-                $requete_pagenav .= '&amp;user_yim=' . htmlspecialchars($_REQUEST['user_yim']) . '&amp;user_yim_match=' . htmlspecialchars($_REQUEST['user_yim_match']);
-                $requete_search .= 'yim : ' . $_REQUEST['user_yim'] . ' et user_yim_match=' . $_REQUEST['user_yim_match'] . '<br>';
+                $requete_pagenav .= '&amp;user_yim='.htmlspecialchars($_REQUEST['user_yim']).'&amp;user_yim_match='.htmlspecialchars($_REQUEST['user_yim_match']);
+                $requete_search .= 'yim : '.$_REQUEST['user_yim'].' et user_yim_match='.$_REQUEST['user_yim_match'].'<br>';
             }
             if (!empty($_REQUEST['user_msnm'])) {
                 $match = (!empty($_REQUEST['user_msnm_match'])) ? (int)$_REQUEST['user_msnm_match'] : XOOPS_MATCH_START;
                 switch ($match) {
                     case XOOPS_MATCH_START:
-                        $criteria->add(new Criteria('user_msnm', $myts->addSlashes(trim($_REQUEST['user_msnm'])) . '%', 'LIKE'));
+                        $criteria->add(new Criteria('user_msnm', $myts->addSlashes(trim($_REQUEST['user_msnm'])).'%', 'LIKE'));
                         break;
                     case XOOPS_MATCH_END:
-                        $criteria->add(new Criteria('user_msnm', '%' . $myts->addSlashes(trim($_REQUEST['user_msnm'])), 'LIKE'));
+                        $criteria->add(new Criteria('user_msnm', '%'.$myts->addSlashes(trim($_REQUEST['user_msnm'])), 'LIKE'));
                         break;
                     case XOOPS_MATCH_EQUAL:
                         $criteria->add(new Criteria('user_msnm', $myts->addSlashes(trim($_REQUEST['user_msnm']))));
                         break;
                     case XOOPS_MATCH_CONTAIN:
-                        $criteria->add(new Criteria('user_msnm', '%' . $myts->addSlashes(trim($_REQUEST['user_msnm'])) . '%', 'LIKE'));
+                        $criteria->add(new Criteria('user_msnm', '%'.$myts->addSlashes(trim($_REQUEST['user_msnm'])).'%', 'LIKE'));
                         break;
                 }
-                $requete_pagenav .= '&amp;user_msnm=' . htmlspecialchars($_REQUEST['user_msnm']) . '&amp;user_msnm_match=' . htmlspecialchars($_REQUEST['user_msnm_match']);
-                $requete_search .= 'msn : ' . $_REQUEST['user_msnm'] . ' et user_msnm_match=' . $_REQUEST['user_msnm_match'] . '<br>';
+                $requete_pagenav .= '&amp;user_msnm='.htmlspecialchars($_REQUEST['user_msnm']).'&amp;user_msnm_match='.htmlspecialchars($_REQUEST['user_msnm_match']);
+                $requete_search .= 'msn : '.$_REQUEST['user_msnm'].' et user_msnm_match='.$_REQUEST['user_msnm_match'].'<br>';
             }
 
             if (!empty($_REQUEST['user_from'])) {
-                $criteria->add(new Criteria('user_from', '%' . $myts->addSlashes(trim($_REQUEST['user_from'])) . '%', 'LIKE'));
-                $requete_pagenav .= '&amp;user_from=' . htmlspecialchars($_REQUEST['user_from']);
-                $requete_search .= 'from : ' . $_REQUEST['user_from'] . '<br>';
+                $criteria->add(new Criteria('user_from', '%'.$myts->addSlashes(trim($_REQUEST['user_from'])).'%', 'LIKE'));
+                $requete_pagenav .= '&amp;user_from='.htmlspecialchars($_REQUEST['user_from']);
+                $requete_search .= 'from : '.$_REQUEST['user_from'].'<br>';
             }
 
             if (!empty($_REQUEST['user_intrest'])) {
-                $criteria->add(new Criteria('user_intrest', '%' . $myts->addSlashes(trim($_REQUEST['user_intrest'])) . '%', 'LIKE'));
-                $requete_pagenav .= '&amp;user_intrest=' . htmlspecialchars($_REQUEST['user_intrest']);
-                $requete_search .= 'interet : ' . $_REQUEST['user_intrest'] . '<br>';
+                $criteria->add(new Criteria('user_intrest', '%'.$myts->addSlashes(trim($_REQUEST['user_intrest'])).'%', 'LIKE'));
+                $requete_pagenav .= '&amp;user_intrest='.htmlspecialchars($_REQUEST['user_intrest']);
+                $requete_search .= 'interet : '.$_REQUEST['user_intrest'].'<br>';
             }
 
             if (!empty($_REQUEST['user_occ'])) {
-                $criteria->add(new Criteria('user_occ', '%' . $myts->addSlashes(trim($_REQUEST['user_occ'])) . '%', 'LIKE'));
-                $requete_pagenav .= '&amp;user_occ=' . htmlspecialchars($_REQUEST['user_occ']);
-                $requete_search .= 'location : ' . $_REQUEST['user_occ'] . '<br>';
+                $criteria->add(new Criteria('user_occ', '%'.$myts->addSlashes(trim($_REQUEST['user_occ'])).'%', 'LIKE'));
+                $requete_pagenav .= '&amp;user_occ='.htmlspecialchars($_REQUEST['user_occ']);
+                $requete_search .= 'location : '.$_REQUEST['user_occ'].'<br>';
             }
 
             if (!empty($_REQUEST['user_lastlog_more']) && is_numeric($_REQUEST['user_lastlog_more'])) {
@@ -633,8 +633,8 @@ 
                 if ($time > 0) {
                     $criteria->add(new Criteria('last_login', $time, '<'));
                 }
-                $requete_pagenav .= '&amp;user_lastlog_more=' . htmlspecialchars($_REQUEST['user_lastlog_more']);
-                $requete_search .= 'derniere connexion apres : ' . $_REQUEST['user_lastlog_more'] . '<br>';
+                $requete_pagenav .= '&amp;user_lastlog_more='.htmlspecialchars($_REQUEST['user_lastlog_more']);
+                $requete_search .= 'derniere connexion apres : '.$_REQUEST['user_lastlog_more'].'<br>';
             }
 
             if (!empty($_REQUEST['user_lastlog_less']) && is_numeric($_REQUEST['user_lastlog_less'])) {
@@ -643,8 +643,8 @@ 
                 if ($time > 0) {
                     $criteria->add(new Criteria('last_login', $time, '>'));
                 }
-                $requete_pagenav .= '&amp;user_lastlog_less=' . htmlspecialchars($_REQUEST['user_lastlog_less']);
-                $requete_search .= 'derniere connexion avant : ' . $_REQUEST['user_lastlog_less'] . '<br>';
+                $requete_pagenav .= '&amp;user_lastlog_less='.htmlspecialchars($_REQUEST['user_lastlog_less']);
+                $requete_search .= 'derniere connexion avant : '.$_REQUEST['user_lastlog_less'].'<br>';
             }
 
             if (!empty($_REQUEST['user_reg_more']) && is_numeric($_REQUEST['user_reg_more'])) {
@@ -653,8 +653,8 @@ 
                 if ($time > 0) {
                     $criteria->add(new Criteria('user_regdate', $time, '<'));
                 }
-                $requete_pagenav .= '&amp;user_regdate=' . htmlspecialchars($_REQUEST['user_regdate']);
-                $requete_search .= 'enregistre apres : ' . $_REQUEST['user_reg_more'] . '<br>';
+                $requete_pagenav .= '&amp;user_regdate='.htmlspecialchars($_REQUEST['user_regdate']);
+                $requete_search .= 'enregistre apres : '.$_REQUEST['user_reg_more'].'<br>';
             }
 
             if (!empty($_REQUEST['user_reg_less']) && is_numeric($_REQUEST['user_reg_less'])) {
@@ -663,20 +663,20 @@ 
                 if ($time > 0) {
                     $criteria->add(new Criteria('user_regdate', $time, '>'));
                 }
-                $requete_pagenav .= '&amp;user_reg_less=' . htmlspecialchars($_REQUEST['user_reg_less']);
-                $requete_search .= 'enregistre avant : ' . $_REQUEST['user_reg_less'] . '<br>';
+                $requete_pagenav .= '&amp;user_reg_less='.htmlspecialchars($_REQUEST['user_reg_less']);
+                $requete_search .= 'enregistre avant : '.$_REQUEST['user_reg_less'].'<br>';
             }
 
             if (!empty($_REQUEST['user_posts_more']) && is_numeric($_REQUEST['user_posts_more'])) {
                 $criteria->add(new Criteria('posts', (int)$_REQUEST['user_posts_more'], '>'));
-                $requete_pagenav .= '&amp;user_posts_more=' . htmlspecialchars($_REQUEST['user_posts_more']);
-                $requete_search .= 'posts plus de : ' . $_REQUEST['user_posts_more'] . '<br>';
+                $requete_pagenav .= '&amp;user_posts_more='.htmlspecialchars($_REQUEST['user_posts_more']);
+                $requete_search .= 'posts plus de : '.$_REQUEST['user_posts_more'].'<br>';
             }
 
             if (!empty($_REQUEST['user_posts_less']) && is_numeric($_REQUEST['user_posts_less'])) {
                 $criteria->add(new Criteria('posts', (int)$_REQUEST['user_posts_less'], '<'));
-                $requete_pagenav .= '&amp;user_posts_less=' . htmlspecialchars($_REQUEST['user_posts_less']);
-                $requete_search .= 'post moins de : ' . $_REQUEST['user_posts_less'] . '<br>';
+                $requete_pagenav .= '&amp;user_posts_less='.htmlspecialchars($_REQUEST['user_posts_less']);
+                $requete_search .= 'post moins de : '.$_REQUEST['user_posts_less'].'<br>';
             }
 
             if (isset($_REQUEST['user_mailok'])) {
@@ -687,8 +687,8 @@ 
                 } else {
                     $criteria->add(new Criteria('user_mailok', 0, '>='));
                 }
-                $requete_pagenav .= '&amp;user_mailok=' . htmlspecialchars($_REQUEST['user_mailok']);
-                $requete_search .= 'accept email : ' . $_REQUEST['user_mailok'] . '<br>';
+                $requete_pagenav .= '&amp;user_mailok='.htmlspecialchars($_REQUEST['user_mailok']);
+                $requete_search .= 'accept email : '.$_REQUEST['user_mailok'].'<br>';
             }
 
             if (isset($_REQUEST['user_type']) && !empty($_REQUEST['user_type'])) {
@@ -701,7 +701,7 @@ 
                     $user_type = 'actv';
                     $requete_search .= 'actif ou inactif : actif<br>';
                 }
-                $requete_pagenav .= '&amp;user_type=' . htmlspecialchars($_REQUEST['user_type']);
+                $requete_pagenav .= '&amp;user_type='.htmlspecialchars($_REQUEST['user_type']);
             } else {
                 $criteria->add(new Criteria('level', 0, '>='));
                 $user_type = '';
@@ -712,32 +712,32 @@ 
             $validsort = array('uname', 'email', 'last_login', 'user_regdate', 'posts');
             if (isset($_REQUEST['user_sort'])) {
                 $sort = (!in_array($_REQUEST['user_sort'], $validsort)) ? 'user_regdate' : $_REQUEST['user_sort'];
-                $requete_pagenav .= '&amp;user_sort=' . htmlspecialchars($_REQUEST['user_sort']);
-                $requete_search .= 'order by : ' . $sort . '<br>';
+                $requete_pagenav .= '&amp;user_sort='.htmlspecialchars($_REQUEST['user_sort']);
+                $requete_search .= 'order by : '.$sort.'<br>';
             } else {
                 $sort = 'user_regdate';
                 $requete_pagenav .= '&amp;user_sort=user_regdate';
-                $requete_search .= 'order by : ' . $sort . '<br>';
+                $requete_search .= 'order by : '.$sort.'<br>';
             }
 
             $order = 'DESC';
             if (isset($_REQUEST['user_order']) && $_REQUEST['user_order'] === 'ASC') {
                 $requete_pagenav .= '&amp;user_order=ASC';
-                $requete_search .= 'tris : ' . $order . '<br>';
+                $requete_search .= 'tris : '.$order.'<br>';
             } else {
                 //$order = "ASC";
                 $requete_pagenav .= '&amp;user_order=DESC';
-                $requete_search .= 'tris : ' . $order . '<br>';
+                $requete_search .= 'tris : '.$order.'<br>';
             }
 
             $user_limit = xoops_getModuleOption('users_pager', 'system');
             if (isset($_REQUEST['user_limit'])) {
                 $user_limit = $_REQUEST['user_limit'];
-                $requete_pagenav .= '&amp;user_limit=' . htmlspecialchars($_REQUEST['user_limit']);
-                $requete_search .= 'limit : ' . $user_limit . '<br>';
+                $requete_pagenav .= '&amp;user_limit='.htmlspecialchars($_REQUEST['user_limit']);
+                $requete_search .= 'limit : '.$user_limit.'<br>';
             } else {
-                $requete_pagenav .= '&amp;user_limit=' . xoops_getModuleOption('users_pager', 'system');
-                $requete_search .= 'limit : ' . $user_limit . '<br>';
+                $requete_pagenav .= '&amp;user_limit='.xoops_getModuleOption('users_pager', 'system');
+                $requete_search .= 'limit : '.$user_limit.'<br>';
             }
 
             $start = (!empty($_REQUEST['start'])) ? (int)$_REQUEST['start'] : 0;
@@ -745,14 +745,14 @@ 
             if (isset($_REQUEST['selgroups'])) {
                 if ($_REQUEST['selgroups'] != 0) {
                     if (count($_REQUEST['selgroups']) == 1) {
-                        $groups = array( 0 => (int) $_REQUEST['selgroups']);
+                        $groups = array(0 => (int)$_REQUEST['selgroups']);
                     } else {
                         $groups = array_map('intval', $_REQUEST['selgroups']);
                     }
                 } else {
                     $groups = array();
                 }
-                $requete_pagenav .= '&amp;selgroups=' . htmlspecialchars($_REQUEST['selgroups']);
+                $requete_pagenav .= '&amp;selgroups='.htmlspecialchars($_REQUEST['selgroups']);
             } else {
                 $groups = array();
             }
@@ -766,7 +766,7 @@ 
                 $users_count = $member_handler->getUserCountByGroupLink($groups, $criteria);
             }
             if ($start < $users_count) {
-                echo sprintf(_AM_SYSTEM_USERS_USERSFOUND, $users_count) . '<br>';
+                echo sprintf(_AM_SYSTEM_USERS_USERSFOUND, $users_count).'<br>';
                 $criteria->setSort($sort);
                 $criteria->setOrder($order);
                 $criteria->setLimit($user_limit);
@@ -787,32 +787,32 @@ 
 
             $user_uname = (!isset($_REQUEST['user_uname'])) ? '' : $_REQUEST['user_uname'];
             //Form tris
-            $form          = '<form action="admin.php?fct=users" method="post">
-                    ' . _AM_SYSTEM_USERS_SEARCH_USER . '<input type="text" name="user_uname" value="' . $myts->htmlSpecialChars($user_uname) . '" size="15">
+            $form = '<form action="admin.php?fct=users" method="post">
+                    ' . _AM_SYSTEM_USERS_SEARCH_USER.'<input type="text" name="user_uname" value="'.$myts->htmlSpecialChars($user_uname).'" size="15">
                     <select name="selgroups">
-                        <option value="" selected>' . _AM_SYSTEM_USERS_ALLGROUP . '</option>';
+                        <option value="" selected>' . _AM_SYSTEM_USERS_ALLGROUP.'</option>';
             /* @var $group_handler XoopsGroupHandler */
             $group_handler = xoops_getHandler('group');
             $group_arr     = $group_handler->getObjects();
             foreach (array_keys($group_arr) as $i) {
                 if ($group_arr[$i]->getVar('groupid') != XOOPS_GROUP_ANONYMOUS) {
-                    $form .= '<option value="' . $group_arr[$i]->getVar('groupid') . '"  ' . ($selgroups == $group_arr[$i]->getVar('groupid') ? ' selected' : '') . '>' . $group_arr[$i]->getVar('name') . '</option>';
+                    $form .= '<option value="'.$group_arr[$i]->getVar('groupid').'"  '.($selgroups == $group_arr[$i]->getVar('groupid') ? ' selected' : '').'>'.$group_arr[$i]->getVar('name').'</option>';
                 }
             }
             $form .= '</select>&nbsp;
                 <select name="user_type">
-                    <option value="" ' . ($user_type === '' ? ' selected' : '') . '>' . _AM_SYSTEM_USERS_ALLUSER . '</option>
-                    <option value="actv" ' . ($user_type === 'actv' ? ' selected' : '') . '>' . _AM_SYSTEM_USERS_ACTIVEUSER . '</option>
-                    <option value="inactv" ' . ($user_type === 'inactv' ? ' selected' : '') . '>' . _AM_SYSTEM_USERS_INACTIVEUSER . '</option>
+                    <option value="" ' . ($user_type === '' ? ' selected' : '').'>'._AM_SYSTEM_USERS_ALLUSER.'</option>
+                    <option value="actv" ' . ($user_type === 'actv' ? ' selected' : '').'>'._AM_SYSTEM_USERS_ACTIVEUSER.'</option>
+                    <option value="inactv" ' . ($user_type === 'inactv' ? ' selected' : '').'>'._AM_SYSTEM_USERS_INACTIVEUSER.'</option>
                 </select>&nbsp;
                 <select name="user_limit">
-                    <option value="20" ' . ($user_limit == 20 ? ' selected' : '') . '>20</option>
-                    <option value="50" ' . ($user_limit == 50 ? ' selected' : '') . '>50</option>
-                    <option value="100" ' . ($user_limit == 100 ? ' selected' : '') . '>100</option>
+                    <option value="20" ' . ($user_limit == 20 ? ' selected' : '').'>20</option>
+                    <option value="50" ' . ($user_limit == 50 ? ' selected' : '').'>50</option>
+                    <option value="100" ' . ($user_limit == 100 ? ' selected' : '').'>100</option>
                 </select>&nbsp;
                 <input type="hidden" name="user_uname_match" value="XOOPS_MATCH_START" />
-                <input type="submit" value="' . _AM_SYSTEM_USERS_SEARCH . '" name="speed_search">&nbsp;
-                <input type="submit" value="' . _AM_SYSTEM_USERS_ADVANCED_SEARCH . '" name="complet_search"></form>
+                <input type="submit" value="' . _AM_SYSTEM_USERS_SEARCH.'" name="speed_search">&nbsp;
+                <input type="submit" value="' . _AM_SYSTEM_USERS_ADVANCED_SEARCH.'" name="complet_search"></form>
                 ';
 
             //select groupe
@@ -822,7 +822,7 @@ 
             $group_arr     = $group_handler->getObjects();
             foreach (array_keys($group_arr) as $i) {
                 if ($group_arr[$i]->getVar('groupid') != XOOPS_GROUP_ANONYMOUS) {
-                    $form_select_groups .= '<option value="' . $group_arr[$i]->getVar('groupid') . '"  ' . ($selgroups == $group_arr[$i]->getVar('groupid') ? ' selected' : '') . '>' . $group_arr[$i]->getVar('name') . '</option>';
+                    $form_select_groups .= '<option value="'.$group_arr[$i]->getVar('groupid').'"  '.($selgroups == $group_arr[$i]->getVar('groupid') ? ' selected' : '').'>'.$group_arr[$i]->getVar('name').'</option>';
                 }
             }
             $form_select_groups .= '</select><input type="hidden" name="op" value="users_add_delete_group">';
@@ -855,7 +855,7 @@ 
                     $users['uname']       = $users_arr[$i]->getVar('uname');
                     $users['email']       = $users_arr[$i]->getVar('email');
                     $users['url']         = $users_arr[$i]->getVar('url');
-                    $users['user_avatar'] = ($users_arr[$i]->getVar('user_avatar') === 'blank.gif') ? system_AdminIcons('anonymous.png') : XOOPS_URL . '/uploads/' . $users_arr[$i]->getVar('user_avatar');
+                    $users['user_avatar'] = ($users_arr[$i]->getVar('user_avatar') === 'blank.gif') ? system_AdminIcons('anonymous.png') : XOOPS_URL.'/uploads/'.$users_arr[$i]->getVar('user_avatar');
                     $users['reg_date']    = formatTimestamp($users_arr[$i]->getVar('user_regdate'), 'm');
                     if ($users_arr[$i]->getVar('last_login') > 0) {
                         $users['last_login'] = formatTimestamp($users_arr[$i]->getVar('last_login'), 'm');
@@ -879,8 +879,8 @@ 
             }
 
             if ($users_count > $user_limit) {
-                include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
-                $nav = new XoopsPageNav($users_count, $user_limit, $start, 'start', 'fct=users&amp;op=default' . $requete_pagenav);
+                include_once XOOPS_ROOT_PATH.'/class/pagenav.php';
+                $nav = new XoopsPageNav($users_count, $user_limit, $start, 'start', 'fct=users&amp;op=default'.$requete_pagenav);
                 $xoopsTpl->assign('nav', $nav->renderNav());
             }
         }

htdocs/modules/system/admin/modulesadmin/modulesadmin.php

Spacing +186 added lines, -186 removed lines

@@ -32,7 +32,7 @@ 
 {
     global $xoopsUser, $xoopsConfig;
     $dirname        = trim($dirname);
-    $db             =& $GLOBALS['xoopsDB'];
+    $db             = & $GLOBALS['xoopsDB'];
     $reservedTables = array(
         'avatar',
         'avatar_users_link',
@@ -81,19 +81,19 @@ 
         $msgs  = array();
 
         $msgs[] = '<div id="xo-module-log"><div class="header">';
-        $msgs[] = $errs[] = '<h4>' . _AM_SYSTEM_MODULES_INSTALLING . $module->getInfo('name', 's') . '</h4>';
+        $msgs[] = $errs[] = '<h4>'._AM_SYSTEM_MODULES_INSTALLING.$module->getInfo('name', 's').'</h4>';
         if ($module->getInfo('image') !== false && trim($module->getInfo('image')) != '') {
-            $msgs[] = '<a href="' . XOOPS_URL . '/modules/' . $module->getInfo('dirname', 'e') . '/' . $module->getInfo('adminindex') . '"><img src="' . XOOPS_URL . '/modules/' . $dirname . '/' . trim($module->getInfo('image')) . '" alt="" /></a>';
+            $msgs[] = '<a href="'.XOOPS_URL.'/modules/'.$module->getInfo('dirname', 'e').'/'.$module->getInfo('adminindex').'"><img src="'.XOOPS_URL.'/modules/'.$dirname.'/'.trim($module->getInfo('image')).'" alt="" /></a>';
         }
-        $msgs[] = '<strong>' . _VERSION . ':</strong> ' . $module->getInfo('version') . '&nbsp;' . $module->getInfo('module_status');
+        $msgs[] = '<strong>'._VERSION.':</strong> '.$module->getInfo('version').'&nbsp;'.$module->getInfo('module_status');
         if ($module->getInfo('author') !== false && trim($module->getInfo('author')) != '') {
-            $msgs[] = '<strong>' . _AUTHOR . ':</strong> ' . htmlspecialchars(trim($module->getInfo('author')));
+            $msgs[] = '<strong>'._AUTHOR.':</strong> '.htmlspecialchars(trim($module->getInfo('author')));
         }
         $msgs[] = '</div><div class="logger">';
         // Load module specific install script if any
         $install_script = $module->getInfo('onInstall');
         if ($install_script && trim($install_script) != '') {
-            include_once XOOPS_ROOT_PATH . '/modules/' . $dirname . '/' . trim($install_script);
+            include_once XOOPS_ROOT_PATH.'/modules/'.$dirname.'/'.trim($install_script);
         }
         $func = "xoops_module_pre_install_{$dirname}";
         // If pre install function is defined, execute
@@ -101,10 +101,10 @@ 
             $result = $func($module);
             if (!$result) {
                 $error  = true;
-                $errs[] = '<p>' . sprintf(_AM_SYSTEM_MODULES_FAILED_EXECUTE, $func) . '</p>';
+                $errs[] = '<p>'.sprintf(_AM_SYSTEM_MODULES_FAILED_EXECUTE, $func).'</p>';
                 $errs   = array_merge($errs, $module->getErrors());
             } else {
-                $msgs[] = '<p>' . sprintf(_AM_SYSTEM_MODULES_FAILED_SUCESS, "<strong>{$func}</strong>") . '</p>';
+                $msgs[] = '<p>'.sprintf(_AM_SYSTEM_MODULES_FAILED_SUCESS, "<strong>{$func}</strong>").'</p>';
                 $msgs += $module->getErrors();
             }
         }
@@ -112,13 +112,13 @@ 
         if ($error === false) {
             $sqlfile = $module->getInfo('sqlfile');
             if (is_array($sqlfile) && !empty($sqlfile[XOOPS_DB_TYPE])) {
-                $sql_file_path = XOOPS_ROOT_PATH . '/modules/' . $dirname . '/' . $sqlfile[XOOPS_DB_TYPE];
+                $sql_file_path = XOOPS_ROOT_PATH.'/modules/'.$dirname.'/'.$sqlfile[XOOPS_DB_TYPE];
                 if (!file_exists($sql_file_path)) {
-                    $errs[] = '<p>' . sprintf(_AM_SYSTEM_MODULES_SQL_NOT_FOUND, "<strong>{$sql_file_path}</strong>");
+                    $errs[] = '<p>'.sprintf(_AM_SYSTEM_MODULES_SQL_NOT_FOUND, "<strong>{$sql_file_path}</strong>");
                     $error  = true;
                 } else {
-                    $msgs[] = '<p>' . sprintf(_AM_SYSTEM_MODULES_SQL_FOUND, "<strong>{$sql_file_path}</strong>") . '<br  />' . _AM_SYSTEM_MODULES_CREATE_TABLES;
-                    include_once XOOPS_ROOT_PATH . '/class/database/sqlutility.php';
+                    $msgs[] = '<p>'.sprintf(_AM_SYSTEM_MODULES_SQL_FOUND, "<strong>{$sql_file_path}</strong>").'<br  />'._AM_SYSTEM_MODULES_CREATE_TABLES;
+                    include_once XOOPS_ROOT_PATH.'/class/database/sqlutility.php';
                     $sql_query = fread(fopen($sql_file_path, 'r'), filesize($sql_file_path));
                     $sql_query = trim($sql_query);
                     SqlUtility::splitMySqlFile($pieces, $sql_query);
@@ -128,7 +128,7 @@ 
                         // [4] contains unprefixed table name
                         $prefixed_query = SqlUtility::prefixQuery($piece, $db->prefix());
                         if (!$prefixed_query) {
-                            $errs[] = '<p>' . sprintf(_AM_SYSTEM_MODULES_SQL_NOT_VALID, '<strong>' . $piece . '</strong>');
+                            $errs[] = '<p>'.sprintf(_AM_SYSTEM_MODULES_SQL_NOT_VALID, '<strong>'.$piece.'</strong>');
                             $error  = true;
                             break;
                         }
@@ -141,15 +141,15 @@ 
                                 break;
                             } else {
                                 if (!in_array($prefixed_query[4], $created_tables)) {
-                                    $msgs[]           = '&nbsp;&nbsp;' . sprintf(_AM_SYSTEM_MODULES_TABLE_CREATED, '<strong>' . $db->prefix($prefixed_query[4]) . '</strong>');
+                                    $msgs[]           = '&nbsp;&nbsp;'.sprintf(_AM_SYSTEM_MODULES_TABLE_CREATED, '<strong>'.$db->prefix($prefixed_query[4]).'</strong>');
                                     $created_tables[] = $prefixed_query[4];
                                 } else {
-                                    $msgs[] = '&nbsp;&nbsp;' . sprintf(_AM_SYSTEM_MODULES_INSERT_DATA, '<strong>' . $db->prefix($prefixed_query[4]) . '</strong>');
+                                    $msgs[] = '&nbsp;&nbsp;'.sprintf(_AM_SYSTEM_MODULES_INSERT_DATA, '<strong>'.$db->prefix($prefixed_query[4]).'</strong>');
                                 }
                             }
                         } else {
                             // the table name is reserved, so halt the installation
-                            $errs[] = '&nbsp;&nbsp;' . sprintf(_AM_SYSTEM_MODULES_TABLE_RESERVED, '<strong>' . $prefixed_query[4] . '</strong>');
+                            $errs[] = '&nbsp;&nbsp;'.sprintf(_AM_SYSTEM_MODULES_TABLE_RESERVED, '<strong>'.$prefixed_query[4].'</strong>');
                             $error  = true;
                             break;
                         }
@@ -157,7 +157,7 @@ 
                     // if there was an error, delete the tables created so far, so the next installation will not fail
                     if ($error === true) {
                         foreach ($created_tables as $ct) {
-                            $db->query('DROP TABLE ' . $db->prefix($ct));
+                            $db->query('DROP TABLE '.$db->prefix($ct));
                         }
                     }
                 }
@@ -166,13 +166,13 @@ 
         // if no error, save the module info and blocks info associated with it
         if ($error === false) {
             if (!$module_handler->insert($module)) {
-                $errs[] = '<p>' . sprintf(_AM_SYSTEM_MODULES_INSERT_DATA_FAILD, '<strong>' . $module->getVar('name') . '</strong>');
+                $errs[] = '<p>'.sprintf(_AM_SYSTEM_MODULES_INSERT_DATA_FAILD, '<strong>'.$module->getVar('name').'</strong>');
                 foreach ($created_tables as $ct) {
-                    $db->query('DROP TABLE ' . $db->prefix($ct));
+                    $db->query('DROP TABLE '.$db->prefix($ct));
                 }
-                $ret = '<p>' . sprintf(_AM_SYSTEM_MODULES_FAILINS, '<strong>' . $module->name() . '</strong>') . '&nbsp;' . _AM_SYSTEM_MODULES_ERRORSC . '<br>';
+                $ret = '<p>'.sprintf(_AM_SYSTEM_MODULES_FAILINS, '<strong>'.$module->name().'</strong>').'&nbsp;'._AM_SYSTEM_MODULES_ERRORSC.'<br>';
                 foreach ($errs as $err) {
-                    $ret .= ' - ' . $err . '<br>';
+                    $ret .= ' - '.$err.'<br>';
                 }
                 $ret .= '</p>';
                 unset($module, $created_tables, $errs, $msgs);
@@ -181,7 +181,7 @@ 
             } else {
                 $newmid = $module->getVar('mid');
                 unset($created_tables);
-                $msgs[]          = '<p>' . _AM_SYSTEM_MODULES_INSERT_DATA_DONE . sprintf(_AM_SYSTEM_MODULES_MODULEID, '<strong>' . $newmid . '</strong>');
+                $msgs[]          = '<p>'._AM_SYSTEM_MODULES_INSERT_DATA_DONE.sprintf(_AM_SYSTEM_MODULES_MODULEID, '<strong>'.$newmid.'</strong>');
                 $tplfile_handler = xoops_getHandler('tplfile');
                 $templates       = $module->getInfo('templates');
                 if ($templates !== false) {
@@ -189,7 +189,7 @@ 
                     foreach ($templates as $tpl) {
                         $tplfile = $tplfile_handler->create();
                         $type    = (isset($tpl['type']) ? $tpl['type'] : 'module');
-                        $tpldata =&  xoops_module_gettemplate($dirname, $tpl['file'], $type);
+                        $tpldata = &  xoops_module_gettemplate($dirname, $tpl['file'], $type);
                         $tplfile->setVar('tpl_source', $tpldata, true);
                         $tplfile->setVar('tpl_refid', $newmid);
 
@@ -201,22 +201,22 @@ 
                         $tplfile->setVar('tpl_lastimported', time());
                         $tplfile->setVar('tpl_type', $type);
                         if (!$tplfile_handler->insert($tplfile)) {
-                            $msgs[] = '&nbsp;&nbsp;<span style="color:#ff0000;">' . sprintf(_AM_SYSTEM_MODULES_TEMPLATE_ADD_ERROR, '<strong>' . $tpl['file'] . '</strong>') . '</span>';
+                            $msgs[] = '&nbsp;&nbsp;<span style="color:#ff0000;">'.sprintf(_AM_SYSTEM_MODULES_TEMPLATE_ADD_ERROR, '<strong>'.$tpl['file'].'</strong>').'</span>';
                         } else {
                             $newtplid = $tplfile->getVar('tpl_id');
-                            $msgs[]   = '&nbsp;&nbsp;' . sprintf(_AM_SYSTEM_MODULES_TEMPLATE_ADD_DATA, '<strong>' . $tpl['file'] . '</strong>') . '(ID: <strong>' . $newtplid . '</strong>)';
+                            $msgs[]   = '&nbsp;&nbsp;'.sprintf(_AM_SYSTEM_MODULES_TEMPLATE_ADD_DATA, '<strong>'.$tpl['file'].'</strong>').'(ID: <strong>'.$newtplid.'</strong>)';
                             // generate compiled file
-                            include_once XOOPS_ROOT_PATH . '/class/template.php';
+                            include_once XOOPS_ROOT_PATH.'/class/template.php';
                             if (!xoops_template_touch($newtplid)) {
-                                $msgs[] = '&nbsp;&nbsp;<span style="color:#ff0000;">' . sprintf(_AM_SYSTEM_MODULES_TEMPLATE_COMPILED_FAILED, '<strong>' . $tpl['file'] . '</strong>') . '</span>';
+                                $msgs[] = '&nbsp;&nbsp;<span style="color:#ff0000;">'.sprintf(_AM_SYSTEM_MODULES_TEMPLATE_COMPILED_FAILED, '<strong>'.$tpl['file'].'</strong>').'</span>';
                             } else {
-                                $msgs[] = '&nbsp;&nbsp;' . sprintf(_AM_SYSTEM_MODULES_TEMPLATE_COMPILED, '<strong>' . $tpl['file'] . '</strong>');
+                                $msgs[] = '&nbsp;&nbsp;'.sprintf(_AM_SYSTEM_MODULES_TEMPLATE_COMPILED, '<strong>'.$tpl['file'].'</strong>');
                             }
                         }
                         unset($tplfile, $tpldata);
                     }
                 }
-                include_once XOOPS_ROOT_PATH . '/class/template.php';
+                include_once XOOPS_ROOT_PATH.'/class/template.php';
                 xoops_template_clear_module_cache($newmid);
                 $blocks = $module->getInfo('blocks');
                 if ($blocks !== false) {
@@ -230,11 +230,11 @@ 
                         if (!empty($block['options'])) {
                             $options = trim($block['options']);
                         }
-                        $newbid    = $db->genId($db->prefix('newblocks') . '_bid_seq');
+                        $newbid    = $db->genId($db->prefix('newblocks').'_bid_seq');
                         $edit_func = isset($block['edit_func']) ? trim($block['edit_func']) : '';
                         $template  = '';
                         if (isset($block['template']) && trim($block['template']) != '') {
-                            $content =& xoops_module_gettemplate($dirname, $block['template'], 'blocks');
+                            $content = & xoops_module_gettemplate($dirname, $block['template'], 'blocks');
                         }
                         if (empty($content)) {
                             $content = '';
@@ -242,15 +242,15 @@ 
                             $template = trim($block['template']);
                         }
                         $block_name = addslashes(trim($block['name']));
-                        $sql        = 'INSERT INTO ' . $db->prefix('newblocks') . " (bid, mid, func_num, options, name, title, content, side, weight, visible, block_type, c_type, isactive, dirname, func_file, show_func, edit_func, template, bcachetime, last_modified) VALUES ($newbid, $newmid, " . (int)$blockkey . ", '$options', '" . $block_name . "','" . $block_name . "', '', 0, 0, 0, 'M', 'H', 1, '" . addslashes($dirname) . "', '" . addslashes(trim($block['file'])) . "', '" . addslashes(trim($block['show_func'])) . "', '" . addslashes($edit_func) . "', '" . $template . "', 0, " . time() . ')';
+                        $sql        = 'INSERT INTO '.$db->prefix('newblocks')." (bid, mid, func_num, options, name, title, content, side, weight, visible, block_type, c_type, isactive, dirname, func_file, show_func, edit_func, template, bcachetime, last_modified) VALUES ($newbid, $newmid, ".(int)$blockkey.", '$options', '".$block_name."','".$block_name."', '', 0, 0, 0, 'M', 'H', 1, '".addslashes($dirname)."', '".addslashes(trim($block['file']))."', '".addslashes(trim($block['show_func']))."', '".addslashes($edit_func)."', '".$template."', 0, ".time().')';
                         if (!$db->query($sql)) {
-                            $msgs[] = '&nbsp;&nbsp;<span style="color:#ff0000;">' . sprintf(_AM_SYSTEM_MODULES_BLOCK_ADD_ERROR, '<strong>' . $block['name'] . '</strong>') . sprintf(_AM_SYSTEM_MODULES_BLOCK_ADD_ERROR_DATABASE, '<strong>' . $db->error() . '</strong>') . '</span>';
+                            $msgs[] = '&nbsp;&nbsp;<span style="color:#ff0000;">'.sprintf(_AM_SYSTEM_MODULES_BLOCK_ADD_ERROR, '<strong>'.$block['name'].'</strong>').sprintf(_AM_SYSTEM_MODULES_BLOCK_ADD_ERROR_DATABASE, '<strong>'.$db->error().'</strong>').'</span>';
                         } else {
                             if (empty($newbid)) {
                                 $newbid = $db->getInsertId();
                             }
-                            $msgs[] = '&nbsp;&nbsp;' . sprintf(_AM_SYSTEM_MODULES_BLOCK_ADD, '<strong>' . $block['name'] . '</strong>') . sprintf(_AM_SYSTEM_MODULES_BLOCK_ID, '<strong>' . $newbid . '</strong>');
-                            $sql    = 'INSERT INTO ' . $db->prefix('block_module_link') . ' (block_id, module_id) VALUES (' . $newbid . ', -1)';
+                            $msgs[] = '&nbsp;&nbsp;'.sprintf(_AM_SYSTEM_MODULES_BLOCK_ADD, '<strong>'.$block['name'].'</strong>').sprintf(_AM_SYSTEM_MODULES_BLOCK_ID, '<strong>'.$newbid.'</strong>');
+                            $sql    = 'INSERT INTO '.$db->prefix('block_module_link').' (block_id, module_id) VALUES ('.$newbid.', -1)';
                             $db->query($sql);
                             if ($template != '') {
                                 $tplfile = $tplfile_handler->create();
@@ -264,16 +264,16 @@ 
                                 $tplfile->setVar('tpl_lastimported', 0);
                                 $tplfile->setVar('tpl_lastmodified', time());
                                 if (!$tplfile_handler->insert($tplfile)) {
-                                    $msgs[] = '&nbsp;&nbsp;<span style="color:#ff0000;">' . sprintf(_AM_SYSTEM_MODULES_TEMPLATE_ADD_ERROR, '<strong>' . $block['template'] . '</strong>') . '</span>';
+                                    $msgs[] = '&nbsp;&nbsp;<span style="color:#ff0000;">'.sprintf(_AM_SYSTEM_MODULES_TEMPLATE_ADD_ERROR, '<strong>'.$block['template'].'</strong>').'</span>';
                                 } else {
                                     $newtplid = $tplfile->getVar('tpl_id');
-                                    $msgs[]   = '&nbsp;&nbsp;' . sprintf(_AM_SYSTEM_MODULES_TEMPLATE_ADD_DATA, '<strong>' . $block['template'] . '</strong>') . ' (ID: <strong>' . $newtplid . '</strong>)';
+                                    $msgs[]   = '&nbsp;&nbsp;'.sprintf(_AM_SYSTEM_MODULES_TEMPLATE_ADD_DATA, '<strong>'.$block['template'].'</strong>').' (ID: <strong>'.$newtplid.'</strong>)';
                                     // generate compiled file
-                                    include_once XOOPS_ROOT_PATH . '/class/template.php';
+                                    include_once XOOPS_ROOT_PATH.'/class/template.php';
                                     if (!xoops_template_touch($newtplid)) {
-                                        $msgs[] = '&nbsp;&nbsp;<span style="color:#ff0000;">' . sprintf(_AM_SYSTEM_MODULES_TEMPLATE_COMPILED_FAILED, '<strong>' . $block['template'] . '</strong>') . '</span>';
+                                        $msgs[] = '&nbsp;&nbsp;<span style="color:#ff0000;">'.sprintf(_AM_SYSTEM_MODULES_TEMPLATE_COMPILED_FAILED, '<strong>'.$block['template'].'</strong>').'</span>';
                                     } else {
-                                        $msgs[] = '&nbsp;&nbsp;' . sprintf(_AM_SYSTEM_MODULES_TEMPLATE_COMPILED, '<strong>' . $block['template'] . '</strong>');
+                                        $msgs[] = '&nbsp;&nbsp;'.sprintf(_AM_SYSTEM_MODULES_TEMPLATE_COMPILED, '<strong>'.$block['template'].'</strong>');
                                     }
                                 }
                                 unset($tplfile);
@@ -286,7 +286,7 @@ 
                 $configs = $module->getInfo('config');
                 if ($configs !== false) {
                     if ($module->getVar('hascomments') != 0) {
-                        include_once XOOPS_ROOT_PATH . '/include/comment_constants.php';
+                        include_once XOOPS_ROOT_PATH.'/include/comment_constants.php';
                         $configs[] = array(
                             'name'        => 'com_rule',
                             'title'       => '_CM_COMRULES',
@@ -310,7 +310,7 @@ 
                 } else {
                     if ($module->getVar('hascomments') != 0) {
                         $configs = array();
-                        include_once XOOPS_ROOT_PATH . '/include/comment_constants.php';
+                        include_once XOOPS_ROOT_PATH.'/include/comment_constants.php';
                         $configs[] = array(
                             'name'        => 'com_rule',
                             'title'       => '_CM_COMRULES',
@@ -338,8 +338,8 @@ 
                         $configs = array();
                     }
                     // Main notification options
-                    include_once XOOPS_ROOT_PATH . '/include/notification_constants.php';
-                    include_once XOOPS_ROOT_PATH . '/include/notification_functions.php';
+                    include_once XOOPS_ROOT_PATH.'/include/notification_constants.php';
+                    include_once XOOPS_ROOT_PATH.'/include/notification_functions.php';
                     $options                             = array();
                     $options['_NOT_CONFIG_DISABLE']      = XOOPS_NOTIFICATION_DISABLE;
                     $options['_NOT_CONFIG_ENABLEBLOCK']  = XOOPS_NOTIFICATION_ENABLEBLOCK;
@@ -357,15 +357,15 @@ 
                     // Event-specific notification options
                     // FIXME: doesn't work when update module... can't read back the array of options properly...  " changing to &quot;
                     $options    = array();
-                    $categories =& notificationCategoryInfo('', $module->getVar('mid'));
+                    $categories = & notificationCategoryInfo('', $module->getVar('mid'));
                     foreach ($categories as $category) {
-                        $events =& notificationEvents($category['name'], false, $module->getVar('mid'));
+                        $events = & notificationEvents($category['name'], false, $module->getVar('mid'));
                         foreach ($events as $event) {
                             if (!empty($event['invisible'])) {
                                 continue;
                             }
-                            $option_name           = $category['title'] . ' : ' . $event['title'];
-                            $option_value          = $category['name'] . '-' . $event['name'];
+                            $option_name           = $category['title'].' : '.$event['title'];
+                            $option_value          = $category['name'].'-'.$event['name'];
                             $options[$option_name] = $option_value;
                         }
                         unset($events);
@@ -404,15 +404,15 @@ 
                                 $confop->setVar('confop_name', $key, true);
                                 $confop->setVar('confop_value', $value, true);
                                 $confobj->setConfOptions($confop);
-                                $confop_msgs .= '<br>&nbsp;&nbsp;&nbsp;&nbsp; ' . _AM_SYSTEM_MODULES_CONFIG_ADD . _AM_SYSTEM_MODULES_NAME . ' <strong>' . (defined($key) ? constant($key) : $key) . '</strong> ' . _AM_SYSTEM_MODULES_VALUE . ' <strong>' . $value . '</strong> ';
+                                $confop_msgs .= '<br>&nbsp;&nbsp;&nbsp;&nbsp; '._AM_SYSTEM_MODULES_CONFIG_ADD._AM_SYSTEM_MODULES_NAME.' <strong>'.(defined($key) ? constant($key) : $key).'</strong> '._AM_SYSTEM_MODULES_VALUE.' <strong>'.$value.'</strong> ';
                                 unset($confop);
                             }
                         }
                         ++$order;
                         if ($config_handler->insertConfig($confobj) != false) {
-                            $msgs[] = '&nbsp;&nbsp;' . sprintf(_AM_SYSTEM_MODULES_CONFIG_DATA_ADD, '<strong>' . $config['name'] . '</strong>') . $confop_msgs;
+                            $msgs[] = '&nbsp;&nbsp;'.sprintf(_AM_SYSTEM_MODULES_CONFIG_DATA_ADD, '<strong>'.$config['name'].'</strong>').$confop_msgs;
                         } else {
-                            $msgs[] = '&nbsp;&nbsp;<span style="color:#ff0000;">' . sprintf(_AM_SYSTEM_MODULES_CONFIG_DATA_ADD_ERROR, '<strong>' . $config['name'] . '</strong>') . '</span>';
+                            $msgs[] = '&nbsp;&nbsp;<span style="color:#ff0000;">'.sprintf(_AM_SYSTEM_MODULES_CONFIG_DATA_ADD_ERROR, '<strong>'.$config['name'].'</strong>').'</span>';
                         }
                         unset($confobj);
                     }
@@ -437,9 +437,9 @@ 
                     $mperm->setVar('gperm_name', 'module_admin');
                     $mperm->setVar('gperm_modid', 1);
                     if (!$gperm_handler->insert($mperm)) {
-                        $msgs[] = '&nbsp;&nbsp;<span style="color:#ff0000;">' . sprintf(_AM_SYSTEM_MODULES_ACCESS_ADMIN_ADD_ERROR, '<strong>' . $mygroup . '</strong>') . '</span>';
+                        $msgs[] = '&nbsp;&nbsp;<span style="color:#ff0000;">'.sprintf(_AM_SYSTEM_MODULES_ACCESS_ADMIN_ADD_ERROR, '<strong>'.$mygroup.'</strong>').'</span>';
                     } else {
-                        $msgs[] = '&nbsp;&nbsp;' . sprintf(_AM_SYSTEM_MODULES_ACCESS_ADMIN_ADD, '<strong>' . $mygroup . '</strong>');
+                        $msgs[] = '&nbsp;&nbsp;'.sprintf(_AM_SYSTEM_MODULES_ACCESS_ADMIN_ADD, '<strong>'.$mygroup.'</strong>');
                     }
                     unset($mperm);
                 }
@@ -449,9 +449,9 @@ 
                 $mperm->setVar('gperm_name', 'module_read');
                 $mperm->setVar('gperm_modid', 1);
                 if (!$gperm_handler->insert($mperm)) {
-                    $msgs[] = '&nbsp;&nbsp;<span style="color:#ff0000;">' . sprintf(_AM_SYSTEM_MODULES_ACCESS_USER_ADD_ERROR, '<strong>' . $mygroup . '</strong>') . '</span>';
+                    $msgs[] = '&nbsp;&nbsp;<span style="color:#ff0000;">'.sprintf(_AM_SYSTEM_MODULES_ACCESS_USER_ADD_ERROR, '<strong>'.$mygroup.'</strong>').'</span>';
                 } else {
-                    $msgs[] = '&nbsp;&nbsp;' . sprintf(_AM_SYSTEM_MODULES_ACCESS_USER_ADD_ERROR, '<strong>' . $mygroup . '</strong>');
+                    $msgs[] = '&nbsp;&nbsp;'.sprintf(_AM_SYSTEM_MODULES_ACCESS_USER_ADD_ERROR, '<strong>'.$mygroup.'</strong>');
                 }
                 unset($mperm);
                 foreach ($blocks as $blc) {
@@ -462,9 +462,9 @@ 
                     $bperm->setVar('gperm_name', 'block_read');
                     $bperm->setVar('gperm_modid', 1);
                     if (!$gperm_handler->insert($bperm)) {
-                        $msgs[] = '&nbsp;&nbsp;<span style="color:#ff0000;">' . _AM_SYSTEM_MODULES_BLOCK_ACCESS_ERROR . ' Block ID: <strong>' . $blc . '</strong> Group ID: <strong>' . $mygroup . '</strong></span>';
+                        $msgs[] = '&nbsp;&nbsp;<span style="color:#ff0000;">'._AM_SYSTEM_MODULES_BLOCK_ACCESS_ERROR.' Block ID: <strong>'.$blc.'</strong> Group ID: <strong>'.$mygroup.'</strong></span>';
                     } else {
-                        $msgs[] = '&nbsp;&nbsp;' . _AM_SYSTEM_MODULES_BLOCK_ACCESS . sprintf(_AM_SYSTEM_MODULES_BLOCK_ID, '<strong>' . $blc . '</strong>') . sprintf(_AM_SYSTEM_MODULES_GROUP_ID, '<strong>' . $mygroup . '</strong>');
+                        $msgs[] = '&nbsp;&nbsp;'._AM_SYSTEM_MODULES_BLOCK_ACCESS.sprintf(_AM_SYSTEM_MODULES_BLOCK_ID, '<strong>'.$blc.'</strong>').sprintf(_AM_SYSTEM_MODULES_GROUP_ID, '<strong>'.$mygroup.'</strong>');
                     }
                     unset($bperm);
                 }
@@ -475,32 +475,32 @@ 
             $func = "xoops_module_install_{$dirname}";
             if (function_exists($func)) {
                 if (!$lastmsg = $func($module)) {
-                    $msgs[] = '<p>' . sprintf(_AM_SYSTEM_MODULES_FAILED_EXECUTE, $func) . '</p>';
+                    $msgs[] = '<p>'.sprintf(_AM_SYSTEM_MODULES_FAILED_EXECUTE, $func).'</p>';
                 } else {
-                    $msgs[] = '<p>' . sprintf(_AM_SYSTEM_MODULES_FAILED_SUCESS, "<strong>{$func}</strong>") . '</p>';
+                    $msgs[] = '<p>'.sprintf(_AM_SYSTEM_MODULES_FAILED_SUCESS, "<strong>{$func}</strong>").'</p>';
                     if (is_string($lastmsg)) {
                         $msgs[] = $lastmsg;
                     }
                 }
             }
 
-            $msgs[] = sprintf(_AM_SYSTEM_MODULES_OKINS, '<strong>' . $module->getVar('name', 's') . '</strong>');
+            $msgs[] = sprintf(_AM_SYSTEM_MODULES_OKINS, '<strong>'.$module->getVar('name', 's').'</strong>');
             $msgs[] = '</div></div>';
 
             $blocks = $module->getInfo('blocks');
             $redDevider = '<span class="red bold">  |  </span>';
-            $msgs[] = '<div class="noininstall center"><a href="admin.php?fct=modulesadmin">' . _AM_SYSTEM_MODULES_BTOMADMIN . '</a> |
-                        <a href="admin.php?fct=modulesadmin&op=installlist">' . _AM_SYSTEM_MODULES_TOINSTALL . '</a> | ';
-            $msgs[] = '<br><span class="red bold">' . _AM_SYSTEM_MODULES_MODULE . ' ' . $module->getInfo('name') . ': </span></div>';
+            $msgs[] = '<div class="noininstall center"><a href="admin.php?fct=modulesadmin">'._AM_SYSTEM_MODULES_BTOMADMIN.'</a> |
+                        <a href="admin.php?fct=modulesadmin&op=installlist">' . _AM_SYSTEM_MODULES_TOINSTALL.'</a> | ';
+            $msgs[] = '<br><span class="red bold">'._AM_SYSTEM_MODULES_MODULE.' '.$module->getInfo('name').': </span></div>';
             if ($blocks !== false) {
-                $msgs[] = '<div class="noininstall center"><a href="admin.php?fct=blocksadmin&op=list&filter=1&selgen=' . $newmid . '&selmod=-2&selgrp=-1&selvis=-1&filsave=1">' . _AM_SYSTEM_BLOCKS . '</a></div>';
+                $msgs[] = '<div class="noininstall center"><a href="admin.php?fct=blocksadmin&op=list&filter=1&selgen='.$newmid.'&selmod=-2&selgrp=-1&selvis=-1&filsave=1">'._AM_SYSTEM_BLOCKS.'</a></div>';
             }
-            $msgs[] = '<div class="noininstall center"><a href="admin.php?fct=preferences&op=showmod&mod=' . $newmid . '">' . _AM_SYSTEM_PREF . '</a>';
-            $msgs[] = '<a href="' . XOOPS_URL . '/modules/' . $module->getInfo('dirname', 'e') . '/' . $module->getInfo('adminindex') . '">' . _AM_SYSTEM_MODULES_ADMIN . '</a>';
+            $msgs[] = '<div class="noininstall center"><a href="admin.php?fct=preferences&op=showmod&mod='.$newmid.'">'._AM_SYSTEM_PREF.'</a>';
+            $msgs[] = '<a href="'.XOOPS_URL.'/modules/'.$module->getInfo('dirname', 'e').'/'.$module->getInfo('adminindex').'">'._AM_SYSTEM_MODULES_ADMIN.'</a>';
 
-            $testdataDirectory = XOOPS_ROOT_PATH . '/modules/' . $module->getInfo('dirname', 'e') . '/testdata';
+            $testdataDirectory = XOOPS_ROOT_PATH.'/modules/'.$module->getInfo('dirname', 'e').'/testdata';
             if (file_exists($testdataDirectory)) {
-                $msgs[] = '<a href="' . XOOPS_URL . '/modules/' . $module->getInfo('dirname', 'e') . '/testdata/index.php?op=load' . '">' . _AM_SYSTEM_MODULES_INSTALL_TESTDATA . '</a></div>';
+                $msgs[] = '<a href="'.XOOPS_URL.'/modules/'.$module->getInfo('dirname', 'e').'/testdata/index.php?op=load'.'">'._AM_SYSTEM_MODULES_INSTALL_TESTDATA.'</a></div>';
             } else {
                 $msgs[] = '</div>';
             }
@@ -510,13 +510,13 @@ 
 
             return $ret;
         } else {
-            $ret = '<p>' . sprintf(_AM_SYSTEM_MODULES_FAILINS, '<strong>' . $dirname . '</strong>') . '&nbsp;' . _AM_SYSTEM_MODULES_ERRORSC . '<br>' . implode('<br>', $errs) . '</p>';
+            $ret = '<p>'.sprintf(_AM_SYSTEM_MODULES_FAILINS, '<strong>'.$dirname.'</strong>').'&nbsp;'._AM_SYSTEM_MODULES_ERRORSC.'<br>'.implode('<br>', $errs).'</p>';
             unset($msgs, $errs);
 
             return $ret;
         }
     } else {
-        return '<p>' . sprintf(_AM_SYSTEM_MODULES_FAILINS, '<strong>' . $dirname . '</strong>') . '&nbsp;' . _AM_SYSTEM_MODULES_ERRORSC . '<br>&nbsp;&nbsp;' . sprintf(_AM_SYSTEM_MODULES_ALEXISTS, $dirname) . '</p>';
+        return '<p>'.sprintf(_AM_SYSTEM_MODULES_FAILINS, '<strong>'.$dirname.'</strong>').'&nbsp;'._AM_SYSTEM_MODULES_ERRORSC.'<br>&nbsp;&nbsp;'.sprintf(_AM_SYSTEM_MODULES_ALEXISTS, $dirname).'</p>';
     }
 }
 
@@ -534,10 +534,10 @@ 
     switch ($type) {
         case 'blocks':
         case 'admin':
-            $path = XOOPS_ROOT_PATH . '/modules/' . $dirname . '/templates/' . $type . '/' . $template;
+            $path = XOOPS_ROOT_PATH.'/modules/'.$dirname.'/templates/'.$type.'/'.$template;
             break;
         default:
-            $path = XOOPS_ROOT_PATH . '/modules/' . $dirname . '/templates/' . $template;
+            $path = XOOPS_ROOT_PATH.'/modules/'.$dirname.'/templates/'.$template;
             break;
     }
     if (!file_exists($path)) {
@@ -603,28 +603,28 @@ 
     /* @var $module_handler XoopsModuleHandler */
     $module_handler = xoops_getHandler('module');
     $module         = $module_handler->getByDirname($dirname);
-    include_once XOOPS_ROOT_PATH . '/class/template.php';
+    include_once XOOPS_ROOT_PATH.'/class/template.php';
     xoops_template_clear_module_cache($module->getVar('mid'));
     if ($module->getVar('dirname') === 'system') {
-        return '<p>' . sprintf(_AM_SYSTEM_MODULES_FAILUNINS, '<strong>' . $module->getVar('name') . '</strong>') . '&nbsp;' . _AM_SYSTEM_MODULES_ERRORSC . '<br> - ' . _AM_SYSTEM_MODULES_SYSNO . '</p>';
+        return '<p>'.sprintf(_AM_SYSTEM_MODULES_FAILUNINS, '<strong>'.$module->getVar('name').'</strong>').'&nbsp;'._AM_SYSTEM_MODULES_ERRORSC.'<br> - '._AM_SYSTEM_MODULES_SYSNO.'</p>';
     } elseif ($module->getVar('dirname') == $xoopsConfig['startpage']) {
-        return '<p>' . sprintf(_AM_SYSTEM_MODULES_FAILUNINS, '<strong>' . $module->getVar('name') . '</strong>') . '&nbsp;' . _AM_SYSTEM_MODULES_ERRORSC . '<br> - ' . _AM_SYSTEM_MODULES_STRTNO . '</p>';
+        return '<p>'.sprintf(_AM_SYSTEM_MODULES_FAILUNINS, '<strong>'.$module->getVar('name').'</strong>').'&nbsp;'._AM_SYSTEM_MODULES_ERRORSC.'<br> - '._AM_SYSTEM_MODULES_STRTNO.'</p>';
     } else {
         $msgs   = array();
         $msgs[] = '<div id="xo-module-log"><div class="header">';
-        $msgs[] = $errs[] = '<h4>' . _AM_SYSTEM_MODULES_UNINSTALL . $module->getInfo('name', 's') . '</h4>';
+        $msgs[] = $errs[] = '<h4>'._AM_SYSTEM_MODULES_UNINSTALL.$module->getInfo('name', 's').'</h4>';
         if ($module->getInfo('image') !== false && trim($module->getInfo('image')) != '') {
-            $msgs[] = '<img src="' . XOOPS_URL . '/modules/' . $dirname . '/' . trim($module->getInfo('image')) . '" alt="" />';
+            $msgs[] = '<img src="'.XOOPS_URL.'/modules/'.$dirname.'/'.trim($module->getInfo('image')).'" alt="" />';
         }
-        $msgs[] = '<strong>' . _VERSION . ':</strong> ' . $module->getInfo('version') . '&nbsp;' . $module->getInfo('module_status');
+        $msgs[] = '<strong>'._VERSION.':</strong> '.$module->getInfo('version').'&nbsp;'.$module->getInfo('module_status');
         if ($module->getInfo('author') !== false && trim($module->getInfo('author')) != '') {
-            $msgs[] = '<strong>' . _AUTHOR . ':</strong> ' . htmlspecialchars(trim($module->getInfo('author')));
+            $msgs[] = '<strong>'._AUTHOR.':</strong> '.htmlspecialchars(trim($module->getInfo('author')));
         }
         $msgs[] = '</div><div class="logger">';
         // Load module specific install script if any
         $uninstall_script = $module->getInfo('onUninstall');
         if ($uninstall_script && trim($uninstall_script) != '') {
-            include_once XOOPS_ROOT_PATH . '/modules/' . $dirname . '/' . trim($uninstall_script);
+            include_once XOOPS_ROOT_PATH.'/modules/'.$dirname.'/'.trim($uninstall_script);
         }
         $func = "xoops_module_pre_uninstall_{$dirname}";
         // If pre uninstall function is defined, execute
@@ -634,16 +634,16 @@ 
                 $errs   = $module->getErrors();
                 $errs[] = sprintf(_AM_SYSTEM_MODULES_FAILED_EXECUTE, $func);
 
-                return '<p>' . sprintf(_AM_SYSTEM_MODULES_FAILUNINS, '<strong>' . $module->getVar('name') . '</strong>') . '&nbsp;' . _AM_SYSTEM_MODULES_ERRORSC . '<br>' . implode('<br>', $errs) . '</p>';
+                return '<p>'.sprintf(_AM_SYSTEM_MODULES_FAILUNINS, '<strong>'.$module->getVar('name').'</strong>').'&nbsp;'._AM_SYSTEM_MODULES_ERRORSC.'<br>'.implode('<br>', $errs).'</p>';
             } else {
                 $prevErrs = $module->getErrors();
-                array_unshift($prevErrs, '<p>' . sprintf(_AM_SYSTEM_MODULES_FAILED_SUCESS, "<strong>{$func}</strong>") . '</p>');
+                array_unshift($prevErrs, '<p>'.sprintf(_AM_SYSTEM_MODULES_FAILED_SUCESS, "<strong>{$func}</strong>").'</p>');
                 $msgs = array_merge($msgs, $prevErrs);
             }
         }
 
         if (false === $module_handler->delete($module)) {
-            $msgs[] = '&nbsp;&nbsp;<span style="color:#ff0000;">' . sprintf(_AM_SYSTEM_MODULES_DELETE_ERROR, $module->getVar('name')) . '</span>';
+            $msgs[] = '&nbsp;&nbsp;<span style="color:#ff0000;">'.sprintf(_AM_SYSTEM_MODULES_DELETE_ERROR, $module->getVar('name')).'</span>';
         } else {
 
             // delete template files
@@ -654,9 +654,9 @@ 
                 $msgs[] = _AM_SYSTEM_MODULES_TEMPLATES_DELETE;
                 for ($i = 0; $i < $tcount; ++$i) {
                     if (false === $tplfile_handler->delete($templates[$i])) {
-                        $msgs[] = '&nbsp;&nbsp;<span style="color:#ff0000;">' . sprintf(_AM_SYSTEM_MODULES_TEMPLATE_DELETE_DATA_FAILD, $templates[$i]->getVar('tpl_file')) . sprintf(_AM_SYSTEM_MODULES_TEMPLATE_ID, '<strong>' . $templates[$i]->getVar('tpl_id') . '</strong>') . '</span>';
+                        $msgs[] = '&nbsp;&nbsp;<span style="color:#ff0000;">'.sprintf(_AM_SYSTEM_MODULES_TEMPLATE_DELETE_DATA_FAILD, $templates[$i]->getVar('tpl_file')).sprintf(_AM_SYSTEM_MODULES_TEMPLATE_ID, '<strong>'.$templates[$i]->getVar('tpl_id').'</strong>').'</span>';
                     } else {
-                        $msgs[] = '&nbsp;&nbsp;' . sprintf(_AM_SYSTEM_MODULES_TEMPLATE_DELETE_DATA, '<strong>' . $templates[$i]->getVar('tpl_file') . '</strong>') . sprintf(_AM_SYSTEM_MODULES_TEMPLATE_ID, '<strong>' . $templates[$i]->getVar('tpl_id') . '</strong>');
+                        $msgs[] = '&nbsp;&nbsp;'.sprintf(_AM_SYSTEM_MODULES_TEMPLATE_DELETE_DATA, '<strong>'.$templates[$i]->getVar('tpl_file').'</strong>').sprintf(_AM_SYSTEM_MODULES_TEMPLATE_ID, '<strong>'.$templates[$i]->getVar('tpl_id').'</strong>');
                     }
                 }
             }
@@ -669,9 +669,9 @@ 
                 $msgs[] = _AM_SYSTEM_MODULES_BLOCKS_DELETE;
                 for ($i = 0; $i < $bcount; ++$i) {
                     if (false === $block_arr[$i]->delete()) {
-                        $msgs[] = '&nbsp;&nbsp;<span style="color:#ff0000;">' . sprintf(_AM_SYSTEM_MODULES_BLOCK_DELETE_ERROR, '<strong>' . $block_arr[$i]->getVar('name') . '</strong>') . sprintf(_AM_SYSTEM_MODULES_BLOCK_ID, '<strong>' . $block_arr[$i]->getVar('bid') . '</strong>') . '</span>';
+                        $msgs[] = '&nbsp;&nbsp;<span style="color:#ff0000;">'.sprintf(_AM_SYSTEM_MODULES_BLOCK_DELETE_ERROR, '<strong>'.$block_arr[$i]->getVar('name').'</strong>').sprintf(_AM_SYSTEM_MODULES_BLOCK_ID, '<strong>'.$block_arr[$i]->getVar('bid').'</strong>').'</span>';
                     } else {
-                        $msgs[] = '&nbsp;&nbsp;' . sprintf(_AM_SYSTEM_MODULES_BLOCK_DELETE, '<strong>' . $block_arr[$i]->getVar('name') . '</strong>') . sprintf(_AM_SYSTEM_MODULES_BLOCK_ID, '<strong>' . $block_arr[$i]->getVar('bid') . '</strong>');
+                        $msgs[] = '&nbsp;&nbsp;'.sprintf(_AM_SYSTEM_MODULES_BLOCK_DELETE, '<strong>'.$block_arr[$i]->getVar('name').'</strong>').sprintf(_AM_SYSTEM_MODULES_BLOCK_ID, '<strong>'.$block_arr[$i]->getVar('bid').'</strong>');
                     }
                     if ($block_arr[$i]->getVar('template') != '') {
                         $templates = $tplfile_handler->find(null, 'block', $block_arr[$i]->getVar('bid'));
@@ -679,9 +679,9 @@ 
                         if ($btcount > 0) {
                             for ($j = 0; $j < $btcount; ++$j) {
                                 if (!$tplfile_handler->delete($templates[$j])) {
-                                    $msgs[] = '&nbsp;&nbsp;<span style="color:#ff0000;">' . sprintf(_AM_SYSTEM_MODULES_BLOCK_DELETE_TEMPLATE_ERROR, $templates[$j]->getVar('tpl_file')) . sprintf(_AM_SYSTEM_MODULES_TEMPLATE_ID, '<strong>' . $templates[$j]->getVar('tpl_id') . '</strong>') . '</span>';
+                                    $msgs[] = '&nbsp;&nbsp;<span style="color:#ff0000;">'.sprintf(_AM_SYSTEM_MODULES_BLOCK_DELETE_TEMPLATE_ERROR, $templates[$j]->getVar('tpl_file')).sprintf(_AM_SYSTEM_MODULES_TEMPLATE_ID, '<strong>'.$templates[$j]->getVar('tpl_id').'</strong>').'</span>';
                                 } else {
-                                    $msgs[] = '&nbsp;&nbsp;' . sprintf(_AM_SYSTEM_MODULES_BLOCK_DELETE_DATA, '<strong>' . $templates[$j]->getVar('tpl_file') . '</strong>') . sprintf(_AM_SYSTEM_MODULES_TEMPLATE_ID, '<strong>' . $templates[$j]->getVar('tpl_id') . '</strong>');
+                                    $msgs[] = '&nbsp;&nbsp;'.sprintf(_AM_SYSTEM_MODULES_BLOCK_DELETE_DATA, '<strong>'.$templates[$j]->getVar('tpl_file').'</strong>').sprintf(_AM_SYSTEM_MODULES_TEMPLATE_ID, '<strong>'.$templates[$j]->getVar('tpl_id').'</strong>');
                                 }
                             }
                         }
@@ -697,14 +697,14 @@ 
                 foreach ($modtables as $table) {
                     // prevent deletion of reserved core tables!
                     if (!in_array($table, $reservedTables)) {
-                        $sql = 'DROP TABLE ' . $db->prefix($table);
+                        $sql = 'DROP TABLE '.$db->prefix($table);
                         if (!$db->query($sql)) {
-                            $msgs[] = '&nbsp;&nbsp;<span style="color:#ff0000;">' . sprintf(_AM_SYSTEM_MODULES_TABLE_DROPPED_ERROR, '<strong>' . $db->prefix($table) . '</strong>') . '</span>';
+                            $msgs[] = '&nbsp;&nbsp;<span style="color:#ff0000;">'.sprintf(_AM_SYSTEM_MODULES_TABLE_DROPPED_ERROR, '<strong>'.$db->prefix($table).'</strong>').'</span>';
                         } else {
-                            $msgs[] = '&nbsp;&nbsp;' . sprintf(_AM_SYSTEM_MODULES_TABLE_DROPPED, '<strong>' . $db->prefix($table) . '</strong>');
+                            $msgs[] = '&nbsp;&nbsp;'.sprintf(_AM_SYSTEM_MODULES_TABLE_DROPPED, '<strong>'.$db->prefix($table).'</strong>');
                         }
                     } else {
-                        $msgs[] = '&nbsp;&nbsp;<span style="color:#ff0000;">' . sprintf(_AM_SYSTEM_MODULES_TABLE_DROPPED_FAILDED, '<strong>' . $db->prefix($table) . '</strong>') . '</span>';
+                        $msgs[] = '&nbsp;&nbsp;<span style="color:#ff0000;">'.sprintf(_AM_SYSTEM_MODULES_TABLE_DROPPED_FAILDED, '<strong>'.$db->prefix($table).'</strong>').'</span>';
                     }
                 }
             }
@@ -714,9 +714,9 @@ 
                 $msgs[]          = _AM_SYSTEM_MODULES_COMMENTS_DELETE;
                 $comment_handler = xoops_getHandler('comment');
                 if (false === $comment_handler->deleteByModule($module->getVar('mid'))) {
-                    $msgs[] = '&nbsp;&nbsp;<span style="color:#ff0000;">' . _AM_SYSTEM_MODULES_COMMENTS_DELETE_ERROR . '</span>';
+                    $msgs[] = '&nbsp;&nbsp;<span style="color:#ff0000;">'._AM_SYSTEM_MODULES_COMMENTS_DELETE_ERROR.'</span>';
                 } else {
-                    $msgs[] = '&nbsp;&nbsp;' . _AM_SYSTEM_MODULES_COMMENTS_DELETED;
+                    $msgs[] = '&nbsp;&nbsp;'._AM_SYSTEM_MODULES_COMMENTS_DELETED;
                 }
             }
 
@@ -725,18 +725,18 @@ 
             if ($module->getVar('hasnotification') != 0) {
                 $msgs[] = _AM_SYSTEM_MODULES_NOTIFICATIONS_DELETE;
                 if (false === xoops_notification_deletebymodule($module->getVar('mid'))) {
-                    $msgs[] = '&nbsp;&nbsp;<span style="color:#ff0000;">' . _AM_SYSTEM_MODULES_NOTIFICATIONS_DELETE_ERROR . '</span>';
+                    $msgs[] = '&nbsp;&nbsp;<span style="color:#ff0000;">'._AM_SYSTEM_MODULES_NOTIFICATIONS_DELETE_ERROR.'</span>';
                 } else {
-                    $msgs[] = '&nbsp;&nbsp;' . _AM_SYSTEM_MODULES_NOTIFICATIONS_DELETED;
+                    $msgs[] = '&nbsp;&nbsp;'._AM_SYSTEM_MODULES_NOTIFICATIONS_DELETED;
                 }
             }
 
             // delete permissions if any
             $gperm_handler = xoops_getHandler('groupperm');
             if (false === $gperm_handler->deleteByModule($module->getVar('mid'))) {
-                $msgs[] = '&nbsp;&nbsp;<span style="color:#ff0000;">' . _AM_SYSTEM_MODULES_GROUP_PERMS_DELETE_ERROR . '</span>';
+                $msgs[] = '&nbsp;&nbsp;<span style="color:#ff0000;">'._AM_SYSTEM_MODULES_GROUP_PERMS_DELETE_ERROR.'</span>';
             } else {
-                $msgs[] = '&nbsp;&nbsp;' . _AM_SYSTEM_MODULES_GROUP_PERMS_DELETED;
+                $msgs[] = '&nbsp;&nbsp;'._AM_SYSTEM_MODULES_GROUP_PERMS_DELETED;
             }
 
             // delete module config options if any
@@ -749,27 +749,27 @@ 
                     $msgs[] = _AM_SYSTEM_MODULES_MODULE_DATA_DELETE;
                     for ($i = 0; $i < $confcount; ++$i) {
                         if (false === $config_handler->deleteConfig($configs[$i])) {
-                            $msgs[] = '&nbsp;&nbsp;<span style="color:#ff0000;">' . _AM_SYSTEM_MODULES_CONFIG_DATA_DELETE_ERROR . sprintf(_AM_SYSTEM_MODULES_GONFIG_ID, '<strong>' . $configs[$i]->getvar('conf_id') . '</strong>') . '</span>';
+                            $msgs[] = '&nbsp;&nbsp;<span style="color:#ff0000;">'._AM_SYSTEM_MODULES_CONFIG_DATA_DELETE_ERROR.sprintf(_AM_SYSTEM_MODULES_GONFIG_ID, '<strong>'.$configs[$i]->getvar('conf_id').'</strong>').'</span>';
                         } else {
-                            $msgs[] = '&nbsp;&nbsp;' . _AM_SYSTEM_MODULES_GONFIG_DATA_DELETE . sprintf(_AM_SYSTEM_MODULES_GONFIG_ID, '<strong>' . $configs[$i]->getvar('conf_id') . '</strong>');
+                            $msgs[] = '&nbsp;&nbsp;'._AM_SYSTEM_MODULES_GONFIG_DATA_DELETE.sprintf(_AM_SYSTEM_MODULES_GONFIG_ID, '<strong>'.$configs[$i]->getvar('conf_id').'</strong>');
                         }
                     }
                 }
             }
 
             // execute module specific install script if any
-            $func = 'xoops_module_uninstall_' . $dirname;
+            $func = 'xoops_module_uninstall_'.$dirname;
             if (function_exists($func)) {
                 if (!$func($module)) {
-                    $msgs[] = '<p>' . sprintf(_AM_SYSTEM_MODULES_FAILED_EXECUTE, $func) . '</p>';
+                    $msgs[] = '<p>'.sprintf(_AM_SYSTEM_MODULES_FAILED_EXECUTE, $func).'</p>';
                 } else {
-                    $msgs[] = '<p>' . sprintf(_AM_SYSTEM_MODULES_FAILED_SUCESS, "<strong>{$func}</strong>") . '</p>';
+                    $msgs[] = '<p>'.sprintf(_AM_SYSTEM_MODULES_FAILED_SUCESS, "<strong>{$func}</strong>").'</p>';
                 }
             }
-            $msgs[] = '<p>' . sprintf(_AM_SYSTEM_MODULES_OKUNINS, '<strong>' . $module->getVar('name') . '</strong>') . '</p>';
+            $msgs[] = '<p>'.sprintf(_AM_SYSTEM_MODULES_OKUNINS, '<strong>'.$module->getVar('name').'</strong>').'</p>';
         }
         $msgs[] = '</div></div>';
-        $msgs[] = '<div class="center"><a href="admin.php?fct=modulesadmin">' . _AM_SYSTEM_MODULES_BTOMADMIN . '</a></div>';
+        $msgs[] = '<div class="center"><a href="admin.php?fct=modulesadmin">'._AM_SYSTEM_MODULES_BTOMADMIN.'</a></div>';
         $ret    = implode('<br>', $msgs);
 
         return $ret;
@@ -784,7 +784,7 @@ 
 {
     global $xoopsUser, $xoopsConfig, $xoopsTpl;
     $dirname = trim($dirname);
-    $xoopsDB =& $GLOBALS['xoopsDB'];
+    $xoopsDB = & $GLOBALS['xoopsDB'];
 
     $myts = MyTextSanitizer::getInstance();
 
@@ -818,34 +818,34 @@ 
 
         */
     if (!$module_handler->insert($module)) {
-        echo '<p>Could not update ' . $module->getVar('name') . '</p>';
-        echo "<br><div class='center'><a href='admin.php?fct=modulesadmin'>" . _AM_SYSTEM_MODULES_BTOMADMIN . '</a></div>';
+        echo '<p>Could not update '.$module->getVar('name').'</p>';
+        echo "<br><div class='center'><a href='admin.php?fct=modulesadmin'>"._AM_SYSTEM_MODULES_BTOMADMIN.'</a></div>';
     } else {
         $newmid = $module->getVar('mid');
         $msgs   = array();
         $msgs[] = '<div id="xo-module-log"><div class="header">';
-        $msgs[] = $errs[] = '<h4>' . _AM_SYSTEM_MODULES_UPDATING . $module->getInfo('name', 's') . '</h4>';
+        $msgs[] = $errs[] = '<h4>'._AM_SYSTEM_MODULES_UPDATING.$module->getInfo('name', 's').'</h4>';
         if ($module->getInfo('image') !== false && trim($module->getInfo('image')) != '') {
-            $msgs[] = '<img src="' . XOOPS_URL . '/modules/' . $dirname . '/' . trim($module->getInfo('image')) . '" alt="" />';
+            $msgs[] = '<img src="'.XOOPS_URL.'/modules/'.$dirname.'/'.trim($module->getInfo('image')).'" alt="" />';
         }
-        $msgs[] = '<strong>' . _VERSION . ':</strong> ' . $module->getInfo('version') . '&nbsp;' . $module->getInfo('module_status');
+        $msgs[] = '<strong>'._VERSION.':</strong> '.$module->getInfo('version').'&nbsp;'.$module->getInfo('module_status');
         if ($module->getInfo('author') !== false && trim($module->getInfo('author')) != '') {
-            $msgs[] = '<strong>' . _AUTHOR . ':</strong> ' . $myts->htmlspecialchars(trim($module->getInfo('author')));
+            $msgs[] = '<strong>'._AUTHOR.':</strong> '.$myts->htmlspecialchars(trim($module->getInfo('author')));
         }
-        $msgs[]          = '</div><div class="logger">';
+        $msgs[] = '</div><div class="logger">';
 
         $update_script = $module->getInfo('onUpdate');
         if (!empty($update_script) && trim($update_script) != '') {
-            include_once XOOPS_ROOT_PATH . '/modules/' . $dirname . '/' . trim($update_script);
+            include_once XOOPS_ROOT_PATH.'/modules/'.$dirname.'/'.trim($update_script);
         }
         // execute module specific update script if any
-        if (function_exists('xoops_module_pre_update_' . $dirname)) {
-            $func = 'xoops_module_pre_update_' . $dirname;
+        if (function_exists('xoops_module_pre_update_'.$dirname)) {
+            $func = 'xoops_module_pre_update_'.$dirname;
             if (!$func($module, $prev_version)) {
-                $msgs[] = '<p>' . sprintf(_AM_SYSTEM_MODULES_FAILED_EXECUTE, $func) . '</p>';
+                $msgs[] = '<p>'.sprintf(_AM_SYSTEM_MODULES_FAILED_EXECUTE, $func).'</p>';
                 $msgs = array_merge($msgs, $module->getErrors());
             } else {
-                $msgs[] = '<p>' . sprintf(_AM_SYSTEM_MODULES_FAILED_SUCESS, '<strong>' . $func . '</strong>') . '</p>';
+                $msgs[] = '<p>'.sprintf(_AM_SYSTEM_MODULES_FAILED_SUCESS, '<strong>'.$func.'</strong>').'</p>';
                 $msgs += $module->getErrors();
             }
         }
@@ -886,7 +886,7 @@ 
                 $criteria->add(new Criteria('tpl_type', $type), 'AND');
                 $tplfiles = $tplfile_handler->getObjects($criteria);
 
-                $tpldata =& xoops_module_gettemplate($dirname, $tpl['file'], $type);
+                $tpldata = & xoops_module_gettemplate($dirname, $tpl['file'], $type);
                 $tplfile = empty($tplfiles) ? $tplfile_handler->create() : $tplfiles[0];
                 // END irmtfan solve templates duplicate issue
                 $tplfile->setVar('tpl_refid', $newmid);
@@ -899,15 +899,15 @@ 
                 $tplfile->setVar('tpl_file', $tpl['file'], true);
                 $tplfile->setVar('tpl_desc', $tpl['description'], true);
                 if (!$tplfile_handler->insert($tplfile)) {
-                    $msgs[] = '&nbsp;&nbsp;<span style="color:#ff0000;">' . sprintf(_AM_SYSTEM_MODULES_TEMPLATE_ADD_ERROR, '<strong>' . $tpl['file'] . '</strong>') . '</span>';
+                    $msgs[] = '&nbsp;&nbsp;<span style="color:#ff0000;">'.sprintf(_AM_SYSTEM_MODULES_TEMPLATE_ADD_ERROR, '<strong>'.$tpl['file'].'</strong>').'</span>';
                 } else {
                     $newid  = $tplfile->getVar('tpl_id');
-                    $msgs[] = '&nbsp;&nbsp;' . sprintf(_AM_SYSTEM_MODULES_TEMPLATE_INSERT_DATA, '<strong>' . $tpl['file'] . '</strong>');
+                    $msgs[] = '&nbsp;&nbsp;'.sprintf(_AM_SYSTEM_MODULES_TEMPLATE_INSERT_DATA, '<strong>'.$tpl['file'].'</strong>');
                     if ($xoopsConfig['template_set'] === 'default') {
                         if (!xoops_template_touch($newid)) {
-                            $msgs[] = '&nbsp;&nbsp;<span style="color:#ff0000;">' . sprintf(_AM_SYSTEM_MODULES_TEMPLATE_RECOMPILE_ERROR, '<strong>' . $tpl['file'] . '</strong>') . '</span>';
+                            $msgs[] = '&nbsp;&nbsp;<span style="color:#ff0000;">'.sprintf(_AM_SYSTEM_MODULES_TEMPLATE_RECOMPILE_ERROR, '<strong>'.$tpl['file'].'</strong>').'</span>';
                         } else {
-                            $msgs[] = '&nbsp;&nbsp;<span>' . sprintf(_AM_SYSTEM_MODULES_TEMPLATE_RECOMPILE, '<strong>' . $tpl['file'] . '</strong>') . '</span>';
+                            $msgs[] = '&nbsp;&nbsp;<span>'.sprintf(_AM_SYSTEM_MODULES_TEMPLATE_RECOMPILE, '<strong>'.$tpl['file'].'</strong>').'</span>';
                         }
                     }
                 }
@@ -934,7 +934,7 @@ 
                     $content = '';
                     $template = '';
                     if (isset($block['template']) && trim($block['template']) != '') {
-                        $content =& xoops_module_gettemplate($dirname, $block['template'], 'blocks');
+                        $content = & xoops_module_gettemplate($dirname, $block['template'], 'blocks');
                     }
                     if (!$content) {
                         $content = '';
@@ -945,17 +945,17 @@ 
                     if (!empty($block['options'])) {
                         $options = $block['options'];
                     }
-                    $sql     = 'SELECT bid, name FROM ' . $xoopsDB->prefix('newblocks') . ' WHERE mid=' . $module->getVar('mid') . ' AND func_num=' . $i . " AND show_func='" . addslashes($block['show_func']) . "' AND func_file='" . addslashes($block['file']) . "'";
+                    $sql     = 'SELECT bid, name FROM '.$xoopsDB->prefix('newblocks').' WHERE mid='.$module->getVar('mid').' AND func_num='.$i." AND show_func='".addslashes($block['show_func'])."' AND func_file='".addslashes($block['file'])."'";
                     $fresult = $xoopsDB->query($sql);
                     $fcount  = 0;
                     while (false !== ($fblock = $xoopsDB->fetchArray($fresult))) {
                         ++$fcount;
-                        $sql    = 'UPDATE ' . $xoopsDB->prefix('newblocks') . " SET name='" . addslashes($block['name']) . "', edit_func='" . addslashes($editfunc) . "', content='', template='" . $template . "', last_modified=" . time() . ' WHERE bid=' . $fblock['bid'];
+                        $sql    = 'UPDATE '.$xoopsDB->prefix('newblocks')." SET name='".addslashes($block['name'])."', edit_func='".addslashes($editfunc)."', content='', template='".$template."', last_modified=".time().' WHERE bid='.$fblock['bid'];
                         $result = $xoopsDB->query($sql);
                         if (!$result) {
-                            $msgs[] = '&nbsp;&nbsp;' . sprintf(_AM_SYSTEM_MODULES_UPDATE_ERROR, $fblock['name']);
+                            $msgs[] = '&nbsp;&nbsp;'.sprintf(_AM_SYSTEM_MODULES_UPDATE_ERROR, $fblock['name']);
                         } else {
-                            $msgs[] = '&nbsp;&nbsp;' . sprintf(_AM_SYSTEM_MODULES_BLOCK_UPDATE, $fblock['name']) . sprintf(_AM_SYSTEM_MODULES_BLOCK_ID, '<strong>' . $fblock['bid'] . '</strong>');
+                            $msgs[] = '&nbsp;&nbsp;'.sprintf(_AM_SYSTEM_MODULES_BLOCK_UPDATE, $fblock['name']).sprintf(_AM_SYSTEM_MODULES_BLOCK_ID, '<strong>'.$fblock['bid'].'</strong>');
                             if ($template != '') {
                                 $tplfile = $tplfile_handler->find('default', 'block', $fblock['bid']);
                                 if (count($tplfile) == 0) {
@@ -974,14 +974,14 @@ 
                                 $tplfile_new->setVar('tpl_lastimported', 0);
                                 $tplfile_new->setVar('tpl_file', $block['template'], true); // irmtfan bug fix:  block template file will not updated after update the module
                                 if (!$tplfile_handler->insert($tplfile_new)) {
-                                    $msgs[] = '&nbsp;&nbsp;<span style="color:#ff0000;">' . sprintf(_AM_SYSTEM_MODULES_TEMPLATE_UPDATE_ERROR, '<strong>' . $block['template'] . '</strong>') . '</span>';
+                                    $msgs[] = '&nbsp;&nbsp;<span style="color:#ff0000;">'.sprintf(_AM_SYSTEM_MODULES_TEMPLATE_UPDATE_ERROR, '<strong>'.$block['template'].'</strong>').'</span>';
                                 } else {
-                                    $msgs[] = '&nbsp;&nbsp;' . sprintf(_AM_SYSTEM_MODULES_TEMPLATE_UPDATE, '<strong>' . $block['template'] . '</strong>');
+                                    $msgs[] = '&nbsp;&nbsp;'.sprintf(_AM_SYSTEM_MODULES_TEMPLATE_UPDATE, '<strong>'.$block['template'].'</strong>');
                                     if ($xoopsConfig['template_set'] === 'default') {
                                         if (!xoops_template_touch($tplfile_new->getVar('tpl_id'))) {
-                                            $msgs[] = '&nbsp;&nbsp;<span style="color:#ff0000;">' . sprintf(_AM_SYSTEM_MODULES_TEMPLATE_RECOMPILE_ERROR, '<strong>' . $block['template'] . '</strong>') . '</span>';
+                                            $msgs[] = '&nbsp;&nbsp;<span style="color:#ff0000;">'.sprintf(_AM_SYSTEM_MODULES_TEMPLATE_RECOMPILE_ERROR, '<strong>'.$block['template'].'</strong>').'</span>';
                                         } else {
-                                            $msgs[] = '&nbsp;&nbsp;' . sprintf(_AM_SYSTEM_MODULES_TEMPLATE_RECOMPILE, '<strong>' . $block['template'] . '</strong>');
+                                            $msgs[] = '&nbsp;&nbsp;'.sprintf(_AM_SYSTEM_MODULES_TEMPLATE_RECOMPILE, '<strong>'.$block['template'].'</strong>');
                                         }
                                     }
                                 }
@@ -989,13 +989,13 @@ 
                         }
                     }
                     if ($fcount == 0) {
-                        $newbid     = $xoopsDB->genId($xoopsDB->prefix('newblocks') . '_bid_seq');
+                        $newbid     = $xoopsDB->genId($xoopsDB->prefix('newblocks').'_bid_seq');
                         $block_name = addslashes($block['name']);
                         $block_type = ($module->getVar('dirname') === 'system') ? 'S' : 'M';
-                        $sql        = 'INSERT INTO ' . $xoopsDB->prefix('newblocks') . ' (bid, mid, func_num, options, name, title, content, side, weight, visible, block_type, isactive, dirname, func_file, show_func, edit_func, template, last_modified) VALUES (' . $newbid . ', ' . $module->getVar('mid') . ', ' . $i . ",'" . addslashes($options) . "','" . $block_name . "', '" . $block_name . "', '', 0, 0, 0, '{$block_type}', 1, '" . addslashes($dirname) . "', '" . addslashes($block['file']) . "', '" . addslashes($block['show_func']) . "', '" . addslashes($editfunc) . "', '" . $template . "', " . time() . ')';
+                        $sql        = 'INSERT INTO '.$xoopsDB->prefix('newblocks').' (bid, mid, func_num, options, name, title, content, side, weight, visible, block_type, isactive, dirname, func_file, show_func, edit_func, template, last_modified) VALUES ('.$newbid.', '.$module->getVar('mid').', '.$i.",'".addslashes($options)."','".$block_name."', '".$block_name."', '', 0, 0, 0, '{$block_type}', 1, '".addslashes($dirname)."', '".addslashes($block['file'])."', '".addslashes($block['show_func'])."', '".addslashes($editfunc)."', '".$template."', ".time().')';
                         $result     = $xoopsDB->query($sql);
                         if (!$result) {
-                            $msgs[] = '&nbsp;&nbsp;' . sprintf(_AM_SYSTEM_MODULES_SQL_NOT_CREATE, $block['name']);
+                            $msgs[] = '&nbsp;&nbsp;'.sprintf(_AM_SYSTEM_MODULES_SQL_NOT_CREATE, $block['name']);
                             echo $sql;
                         } else {
                             if (empty($newbid)) {
@@ -1014,9 +1014,9 @@ 
                                 $bperm->setVar('gperm_name', 'block_read');
                                 $bperm->setVar('gperm_modid', 1);
                                 if (!$gperm_handler->insert($bperm)) {
-                                    $msgs[] = '&nbsp;&nbsp;<span style="color:#ff0000;">' . _AM_SYSTEM_MODULES_BLOCK_ACCESS_ERROR . sprintf(_AM_SYSTEM_MODULES_BLOCK_ID, '<strong>' . $newbid . '</strong>') . sprintf(_AM_SYSTEM_MODULES_GROUP_ID, '<strong>' . $mygroup . '</strong>') . '</span>';
+                                    $msgs[] = '&nbsp;&nbsp;<span style="color:#ff0000;">'._AM_SYSTEM_MODULES_BLOCK_ACCESS_ERROR.sprintf(_AM_SYSTEM_MODULES_BLOCK_ID, '<strong>'.$newbid.'</strong>').sprintf(_AM_SYSTEM_MODULES_GROUP_ID, '<strong>'.$mygroup.'</strong>').'</span>';
                                 } else {
-                                    $msgs[] = '&nbsp;&nbsp;' . _AM_SYSTEM_MODULES_BLOCK_ACCESS . sprintf(_AM_SYSTEM_MODULES_BLOCK_ID, '<strong>' . $newbid . '</strong>') . sprintf(_AM_SYSTEM_MODULES_GROUP_ID, '<strong>' . $mygroup . '</strong>');
+                                    $msgs[] = '&nbsp;&nbsp;'._AM_SYSTEM_MODULES_BLOCK_ACCESS.sprintf(_AM_SYSTEM_MODULES_BLOCK_ID, '<strong>'.$newbid.'</strong>').sprintf(_AM_SYSTEM_MODULES_GROUP_ID, '<strong>'.$mygroup.'</strong>');
                                 }
                             }
 
@@ -1032,21 +1032,21 @@ 
                                 $tplfile->setVar('tpl_lastmodified', time());
                                 $tplfile->setVar('tpl_desc', $block['description'], true);
                                 if (!$tplfile_handler->insert($tplfile)) {
-                                    $msgs[] = '&nbsp;&nbsp;<span style="color:#ff0000;">' . sprintf(_AM_SYSTEM_MODULES_TEMPLATE_ADD_ERROR, '<strong>' . $block['template'] . '</strong>') . '</span>';
+                                    $msgs[] = '&nbsp;&nbsp;<span style="color:#ff0000;">'.sprintf(_AM_SYSTEM_MODULES_TEMPLATE_ADD_ERROR, '<strong>'.$block['template'].'</strong>').'</span>';
                                 } else {
                                     $newid  = $tplfile->getVar('tpl_id');
-                                    $msgs[] = '&nbsp;&nbsp;' . sprintf(_AM_SYSTEM_MODULES_TEMPLATE_ADD_DATA, '<strong>' . $block['template'] . '</strong>');
+                                    $msgs[] = '&nbsp;&nbsp;'.sprintf(_AM_SYSTEM_MODULES_TEMPLATE_ADD_DATA, '<strong>'.$block['template'].'</strong>');
                                     if ($xoopsConfig['template_set'] === 'default') {
                                         if (!xoops_template_touch($newid)) {
-                                            $msgs[] = '&nbsp;&nbsp;<span style="color:#ff0000;">' . sprintf(_AM_SYSTEM_MODULES_TEMPLATE_RECOMPILE_FAILD, '<strong>' . $block['template'] . '</strong>') . '</span>';
+                                            $msgs[] = '&nbsp;&nbsp;<span style="color:#ff0000;">'.sprintf(_AM_SYSTEM_MODULES_TEMPLATE_RECOMPILE_FAILD, '<strong>'.$block['template'].'</strong>').'</span>';
                                         } else {
-                                            $msgs[] = '&nbsp;&nbsp;' . sprintf(_AM_SYSTEM_MODULES_TEMPLATE_RECOMPILE, '<strong>' . $block['template'] . '</strong>');
+                                            $msgs[] = '&nbsp;&nbsp;'.sprintf(_AM_SYSTEM_MODULES_TEMPLATE_RECOMPILE, '<strong>'.$block['template'].'</strong>');
                                         }
                                     }
                                 }
                             }
-                            $msgs[] = '&nbsp;&nbsp;' . sprintf(_AM_SYSTEM_MODULES_BLOCK_CREATED, '<strong>' . $block['name'] . '</strong>') . sprintf(_AM_SYSTEM_MODULES_BLOCK_ID, '<strong>' . $newbid . '</strong>');
-                            $sql    = 'INSERT INTO ' . $xoopsDB->prefix('block_module_link') . ' (block_id, module_id) VALUES (' . $newbid . ', -1)';
+                            $msgs[] = '&nbsp;&nbsp;'.sprintf(_AM_SYSTEM_MODULES_BLOCK_CREATED, '<strong>'.$block['name'].'</strong>').sprintf(_AM_SYSTEM_MODULES_BLOCK_ID, '<strong>'.$newbid.'</strong>');
+                            $sql    = 'INSERT INTO '.$xoopsDB->prefix('block_module_link').' (block_id, module_id) VALUES ('.$newbid.', -1)';
                             $xoopsDB->query($sql);
                         }
                     }
@@ -1058,18 +1058,18 @@ 
                 if (!in_array($block->getVar('show_func'), $showfuncs) || !in_array($block->getVar('func_file'), $funcfiles)) {
                     $sql = sprintf('DELETE FROM %s WHERE bid = %u', $xoopsDB->prefix('newblocks'), $block->getVar('bid'));
                     if (!$xoopsDB->query($sql)) {
-                        $msgs[] = '&nbsp;&nbsp;<span style="color:#ff0000;">' . sprintf(_AM_SYSTEM_MODULES_BLOCK_DELETE_ERROR, '<strong>' . $block->getVar('name') . '</strong>') . sprintf(_AM_SYSTEM_MODULES_BLOCK_ID, '<strong>' . $block->getVar('bid') . '</strong>') . '</span>';
+                        $msgs[] = '&nbsp;&nbsp;<span style="color:#ff0000;">'.sprintf(_AM_SYSTEM_MODULES_BLOCK_DELETE_ERROR, '<strong>'.$block->getVar('name').'</strong>').sprintf(_AM_SYSTEM_MODULES_BLOCK_ID, '<strong>'.$block->getVar('bid').'</strong>').'</span>';
                     } else {
-                        $msgs[] = '&nbsp;&nbsp;Block <strong>' . $block->getVar('name') . '</strong> deleted. Block ID: <strong>' . $block->getVar('bid') . '</strong>';
+                        $msgs[] = '&nbsp;&nbsp;Block <strong>'.$block->getVar('name').'</strong> deleted. Block ID: <strong>'.$block->getVar('bid').'</strong>';
                         if ($block->getVar('template') != '') {
                             $tplfiles = $tplfile_handler->find(null, 'block', $block->getVar('bid'));
                             if (is_array($tplfiles)) {
                                 $btcount = count($tplfiles);
                                 for ($k = 0; $k < $btcount; $k++) {
                                     if (!$tplfile_handler->delete($tplfiles[$k])) {
-                                        $msgs[] = '&nbsp;&nbsp;<span style="color:#ff0000;">' . _AM_SYSTEM_MODULES_BLOCK_DEPRECATED_ERROR . '(ID: <strong>' . $tplfiles[$k]->getVar('tpl_id') . '</strong>)</span>';
+                                        $msgs[] = '&nbsp;&nbsp;<span style="color:#ff0000;">'._AM_SYSTEM_MODULES_BLOCK_DEPRECATED_ERROR.'(ID: <strong>'.$tplfiles[$k]->getVar('tpl_id').'</strong>)</span>';
                                     } else {
-                                        $msgs[] = '&nbsp;&nbsp;' . sprintf(_AM_SYSTEM_MODULES_BLOCK_DEPRECATED, '<strong>' . $tplfiles[$k]->getVar('tpl_file') . '</strong>');
+                                        $msgs[] = '&nbsp;&nbsp;'.sprintf(_AM_SYSTEM_MODULES_BLOCK_DEPRECATED, '<strong>'.$tplfiles[$k]->getVar('tpl_file').'</strong>');
                                     }
                                 }
                             }
@@ -1100,14 +1100,14 @@ 
             $msgs[] = _AM_SYSTEM_MODULES_MODULE_DATA_DELETE;
             for ($i = 0; $i < $confcount; $i++) {
                 if (!$config_handler->deleteConfig($configs[$i])) {
-                    $msgs[] = '&nbsp;&nbsp;<span style="color:#ff0000;">' . _AM_SYSTEM_MODULES_CONFIG_DATA_DELETE_ERROR . sprintf(_AM_SYSTEM_MODULES_GONFIG_ID, '<strong>' . $configs[$i]->getvar('conf_id') . '</strong>') . '</span>';
+                    $msgs[] = '&nbsp;&nbsp;<span style="color:#ff0000;">'._AM_SYSTEM_MODULES_CONFIG_DATA_DELETE_ERROR.sprintf(_AM_SYSTEM_MODULES_GONFIG_ID, '<strong>'.$configs[$i]->getvar('conf_id').'</strong>').'</span>';
                     // save the name of config failed to delete for later use
                     $config_delng[] = $configs[$i]->getvar('conf_name');
                 } else {
                     $config_old[$configs[$i]->getvar('conf_name')]['value']     = $configs[$i]->getvar('conf_value', 'N');
                     $config_old[$configs[$i]->getvar('conf_name')]['formtype']  = $configs[$i]->getvar('conf_formtype');
                     $config_old[$configs[$i]->getvar('conf_name')]['valuetype'] = $configs[$i]->getvar('conf_valuetype');
-                    $msgs[]                                                     = '&nbsp;&nbsp;' . _AM_SYSTEM_MODULES_GONFIG_DATA_DELETE . sprintf(_AM_SYSTEM_MODULES_GONFIG_ID, '<strong>' . $configs[$i]->getVar('conf_id') . '</strong>');
+                    $msgs[]                                                     = '&nbsp;&nbsp;'._AM_SYSTEM_MODULES_GONFIG_DATA_DELETE.sprintf(_AM_SYSTEM_MODULES_GONFIG_ID, '<strong>'.$configs[$i]->getVar('conf_id').'</strong>');
                 }
             }
         }
@@ -1116,7 +1116,7 @@ 
         $configs = $module->getInfo('config');
         if ($configs !== false) {
             if ($module->getVar('hascomments') != 0) {
-                include_once XOOPS_ROOT_PATH . '/include/comment_constants.php';
+                include_once XOOPS_ROOT_PATH.'/include/comment_constants.php';
                 array_push($configs, array(
                     'name'        => 'com_rule',
                     'title'       => '_CM_COMRULES',
@@ -1140,7 +1140,7 @@ 
         } else {
             if ($module->getVar('hascomments') != 0) {
                 $configs = array();
-                include_once XOOPS_ROOT_PATH . '/include/comment_constants.php';
+                include_once XOOPS_ROOT_PATH.'/include/comment_constants.php';
                 $configs[] = array(
                     'name'        => 'com_rule',
                     'title'       => '_CM_COMRULES',
@@ -1168,8 +1168,8 @@ 
                 $configs = array();
             }
             // Main notification options
-            include_once XOOPS_ROOT_PATH . '/include/notification_constants.php';
-            include_once XOOPS_ROOT_PATH . '/include/notification_functions.php';
+            include_once XOOPS_ROOT_PATH.'/include/notification_constants.php';
+            include_once XOOPS_ROOT_PATH.'/include/notification_functions.php';
             $options                             = array();
             $options['_NOT_CONFIG_DISABLE']      = XOOPS_NOTIFICATION_DISABLE;
             $options['_NOT_CONFIG_ENABLEBLOCK']  = XOOPS_NOTIFICATION_ENABLEBLOCK;
@@ -1189,15 +1189,15 @@ 
             // FIXME: for some reason the default doesn't come up properly
             //  initially is ok, but not when 'update' module..
             $options    = array();
-            $categories =& notificationCategoryInfo('', $module->getVar('mid'));
+            $categories = & notificationCategoryInfo('', $module->getVar('mid'));
             foreach ($categories as $category) {
-                $events =& notificationEvents($category['name'], false, $module->getVar('mid'));
+                $events = & notificationEvents($category['name'], false, $module->getVar('mid'));
                 foreach ($events as $event) {
                     if (!empty($event['invisible'])) {
                         continue;
                     }
-                    $option_name           = $category['title'] . ' : ' . $event['title'];
-                    $option_value          = $category['name'] . '-' . $event['name'];
+                    $option_name           = $category['title'].' : '.$event['title'];
+                    $option_value          = $category['name'].'-'.$event['name'];
                     $options[$option_name] = $option_value;
                     //$configs[] = array ('name' => notificationGenerateConfig($category,$event,'name'), 'title' => notificationGenerateConfig($category,$event,'title_constant'), 'description' => notificationGenerateConfig($category,$event,'description_constant'), 'formtype' => 'yesno', 'valuetype' => 'int', 'default' => 1);
                 }
@@ -1247,16 +1247,16 @@ 
                             $confop->setVar('confop_name', $key, true);
                             $confop->setVar('confop_value', $value, true);
                             $confobj->setConfOptions($confop);
-                            $confop_msgs .= '<br>&nbsp;&nbsp;&nbsp;&nbsp; ' . _AM_SYSTEM_MODULES_CONFIG_ADD . _AM_SYSTEM_MODULES_NAME . ' <strong>' . (defined($key) ? constant($key) : $key) . '</strong> ' . _AM_SYSTEM_MODULES_VALUE . ' <strong>' . $value . '</strong> ';
+                            $confop_msgs .= '<br>&nbsp;&nbsp;&nbsp;&nbsp; '._AM_SYSTEM_MODULES_CONFIG_ADD._AM_SYSTEM_MODULES_NAME.' <strong>'.(defined($key) ? constant($key) : $key).'</strong> '._AM_SYSTEM_MODULES_VALUE.' <strong>'.$value.'</strong> ';
                             unset($confop);
                         }
                     }
                     $order++;
                     if (false !== $config_handler->insertConfig($confobj)) {
                         //$msgs[] = '&nbsp;&nbsp;Config <strong>'.$config['name'].'</strong> added to the database.'.$confop_msgs;
-                        $msgs[] = '&nbsp;&nbsp;' . sprintf(_AM_SYSTEM_MODULES_CONFIG_DATA_ADD, '<strong>' . $config['name'] . '</strong>') . $confop_msgs;
+                        $msgs[] = '&nbsp;&nbsp;'.sprintf(_AM_SYSTEM_MODULES_CONFIG_DATA_ADD, '<strong>'.$config['name'].'</strong>').$confop_msgs;
                     } else {
-                        $msgs[] = '&nbsp;&nbsp;<span style="color:#ff0000;">' . sprintf(_AM_SYSTEM_MODULES_CONFIG_DATA_ADD_ERROR, '<strong>' . $config['name'] . '</strong>') . '</span>';
+                        $msgs[] = '&nbsp;&nbsp;<span style="color:#ff0000;">'.sprintf(_AM_SYSTEM_MODULES_CONFIG_DATA_ADD_ERROR, '<strong>'.$config['name'].'</strong>').'</span>';
                     }
                     unset($confobj);
                 }
@@ -1265,19 +1265,19 @@ 
         }
 
         // execute module specific update script if any
-        if (function_exists('xoops_module_update_' . $dirname)) {
-            $func = 'xoops_module_update_' . $dirname;
+        if (function_exists('xoops_module_update_'.$dirname)) {
+            $func = 'xoops_module_update_'.$dirname;
             if (!$func($module, $prev_version)) {
-                $msgs[] = '<p>' . sprintf(_AM_SYSTEM_MODULES_FAILED_EXECUTE, $func) . '</p>';
+                $msgs[] = '<p>'.sprintf(_AM_SYSTEM_MODULES_FAILED_EXECUTE, $func).'</p>';
                 $msgs = array_merge($msgs, $module->getErrors());
             } else {
-                $msgs[] = '<p>' . sprintf(_AM_SYSTEM_MODULES_FAILED_SUCESS, '<strong>' . $func . '</strong>') . '</p>';
+                $msgs[] = '<p>'.sprintf(_AM_SYSTEM_MODULES_FAILED_SUCESS, '<strong>'.$func.'</strong>').'</p>';
                 $msgs += $module->getErrors();
             }
         }
-        $msgs[] = sprintf(_AM_SYSTEM_MODULES_OKUPD, '<strong>' . $module->getVar('name', 's') . '</strong>');
+        $msgs[] = sprintf(_AM_SYSTEM_MODULES_OKUPD, '<strong>'.$module->getVar('name', 's').'</strong>');
         $msgs[] = '</div></div>';
-        $msgs[] = '<div class="center"><a href="admin.php?fct=modulesadmin">' . _AM_SYSTEM_MODULES_BTOMADMIN . '</a>  | <a href="' . XOOPS_URL . '/modules/' . $module->getInfo('dirname', 'e') . '/' . $module->getInfo('adminindex') . '">' . _AM_SYSTEM_MODULES_ADMIN . '</a></div>';
+        $msgs[] = '<div class="center"><a href="admin.php?fct=modulesadmin">'._AM_SYSTEM_MODULES_BTOMADMIN.'</a>  | <a href="'.XOOPS_URL.'/modules/'.$module->getInfo('dirname', 'e').'/'.$module->getInfo('adminindex').'">'._AM_SYSTEM_MODULES_ADMIN.'</a></div>';
         //        foreach ($msgs as $msg) {
         //            echo $msg . '<br>';
         //        }
@@ -1313,7 +1313,7 @@ 
 
     $module_handler = xoops_getHandler('module');
     $module         = $module_handler->get($mid);
-    include_once XOOPS_ROOT_PATH . '/class/template.php';
+    include_once XOOPS_ROOT_PATH.'/class/template.php';
     xoops_template_clear_module_cache($module->getVar('mid'));
     // Display header
     $msgs[] = '<div id="xo-module-log">';
@@ -1321,7 +1321,7 @@ 
     // Change value
     $module->setVar('isactive', 1);
     if (!$module_handler->insert($module)) {
-        $msgs[] = '<p>' . sprintf(_AM_SYSTEM_MODULES_FAILACT, '<strong>' . $module->getVar('name', 's') . '</strong>') . '&nbsp;' . _AM_SYSTEM_MODULES_ERRORSC . '<br>' . $module->getHtmlErrors() . '</p>';
+        $msgs[] = '<p>'.sprintf(_AM_SYSTEM_MODULES_FAILACT, '<strong>'.$module->getVar('name', 's').'</strong>').'&nbsp;'._AM_SYSTEM_MODULES_ERRORSC.'<br>'.$module->getHtmlErrors().'</p>';
     } else {
         $blocks = XoopsBlock::getByModule($module->getVar('mid'));
         $bcount = count($blocks);
@@ -1329,10 +1329,10 @@ 
             $blocks[$i]->setVar('isactive', 1);
             $blocks[$i]->store();
         }
-        $msgs[] = '<p>' . sprintf(_AM_SYSTEM_MODULES_OKACT, '<strong>' . $module->getVar('name', 's') . '</strong>') . '</p></div>';
+        $msgs[] = '<p>'.sprintf(_AM_SYSTEM_MODULES_OKACT, '<strong>'.$module->getVar('name', 's').'</strong>').'</p></div>';
     }
     //$msgs[] = '</div>';
-    $msgs[] = '<div class="center"><a href="admin.php?fct=modulesadmin">' . _AM_SYSTEM_MODULES_BTOMADMIN . '</a></div>';
+    $msgs[] = '<div class="center"><a href="admin.php?fct=modulesadmin">'._AM_SYSTEM_MODULES_BTOMADMIN.'</a></div>';
     $ret    = implode('<br>', $msgs);
 
     return $ret;
@@ -1350,7 +1350,7 @@ 
 
     $module_handler = xoops_getHandler('module');
     $module         = $module_handler->get($mid);
-    include_once XOOPS_ROOT_PATH . '/class/template.php';
+    include_once XOOPS_ROOT_PATH.'/class/template.php';
     xoops_template_clear_module_cache($mid);
     // Display header
     $msgs[] = '<div id="xo-module-log">';
@@ -1358,12 +1358,12 @@ 
     // Change value
     $module->setVar('isactive', 0);
     if ($module->getVar('dirname') === 'system') {
-        $msgs[] = '<p>' . sprintf(_AM_SYSTEM_MODULES_FAILDEACT, '<strong>' . $module->getVar('name') . '</strong>') . '&nbsp;' . _AM_SYSTEM_MODULES_ERRORSC . '<br> - ' . _AM_SYSTEM_MODULES_SYSNO . '</p>';
+        $msgs[] = '<p>'.sprintf(_AM_SYSTEM_MODULES_FAILDEACT, '<strong>'.$module->getVar('name').'</strong>').'&nbsp;'._AM_SYSTEM_MODULES_ERRORSC.'<br> - '._AM_SYSTEM_MODULES_SYSNO.'</p>';
     } elseif ($module->getVar('dirname') == $xoopsConfig['startpage']) {
-        $msgs[] = '<p>' . sprintf(_AM_SYSTEM_MODULES_FAILDEACT, '<strong>' . $module->getVar('name') . '</strong>') . '&nbsp;' . _AM_SYSTEM_MODULES_ERRORSC . '<br> - ' . _AM_SYSTEM_MODULES_STRTNO . '</p>';
+        $msgs[] = '<p>'.sprintf(_AM_SYSTEM_MODULES_FAILDEACT, '<strong>'.$module->getVar('name').'</strong>').'&nbsp;'._AM_SYSTEM_MODULES_ERRORSC.'<br> - '._AM_SYSTEM_MODULES_STRTNO.'</p>';
     } else {
         if (!$module_handler->insert($module)) {
-            $msgs[] = '<p>' . sprintf(_AM_SYSTEM_MODULES_FAILDEACT, '<strong>' . $module->getVar('name') . '</strong>') . '&nbsp;' . _AM_SYSTEM_MODULES_ERRORSC . '<br>' . $module->getHtmlErrors() . '</p>';
+            $msgs[] = '<p>'.sprintf(_AM_SYSTEM_MODULES_FAILDEACT, '<strong>'.$module->getVar('name').'</strong>').'&nbsp;'._AM_SYSTEM_MODULES_ERRORSC.'<br>'.$module->getHtmlErrors().'</p>';
         } else {
             $blocks = XoopsBlock::getByModule($module->getVar('mid'));
             $bcount = count($blocks);
@@ -1371,10 +1371,10 @@ 
                 $blocks[$i]->setVar('isactive', 0);
                 $blocks[$i]->store();
             }
-            $msgs[] = '<p>' . sprintf(_AM_SYSTEM_MODULES_OKDEACT, '<strong>' . $module->getVar('name') . '</strong>') . '</p>';
+            $msgs[] = '<p>'.sprintf(_AM_SYSTEM_MODULES_OKDEACT, '<strong>'.$module->getVar('name').'</strong>').'</p>';
         }
     }
-    $msgs[] = '<div class="center"><a href="admin.php?fct=modulesadmin">' . _AM_SYSTEM_MODULES_BTOMADMIN . '</a></div>';
+    $msgs[] = '<div class="center"><a href="admin.php?fct=modulesadmin">'._AM_SYSTEM_MODULES_BTOMADMIN.'</a></div>';
     $ret    = implode('<br>', $msgs);
 
     return $ret;
@@ -1394,13 +1394,13 @@ 
     $module->setVar('name', $name);
     $myts = MyTextSanitizer::getInstance();
     if (!$module_handler->insert($module)) {
-        $ret = '<p>' . sprintf(_AM_SYSTEM_MODULES_FAILORDER, '<strong>' . $myts->stripSlashesGPC($name) . '</strong>') . '&nbsp;' . _AM_SYSTEM_MODULES_ERRORSC . '<br>';
-        $ret .= $module->getHtmlErrors() . '</p>';
+        $ret = '<p>'.sprintf(_AM_SYSTEM_MODULES_FAILORDER, '<strong>'.$myts->stripSlashesGPC($name).'</strong>').'&nbsp;'._AM_SYSTEM_MODULES_ERRORSC.'<br>';
+        $ret .= $module->getHtmlErrors().'</p>';
 
         return $ret;
     }
 
-    return '<p>' . sprintf(_AM_SYSTEM_MODULES_OKORDER, '<strong>' . $myts->stripSlashesGPC($name) . '</strong>') . '</p>';
+    return '<p>'.sprintf(_AM_SYSTEM_MODULES_OKORDER, '<strong>'.$myts->stripSlashesGPC($name).'</strong>').'</p>';
 }
 
 /**
@@ -1412,13 +1412,13 @@ 
 function xoops_module_log_header($module, $title)
 {
     $msgs[] = '<div class="header">';
-    $msgs[] = $errs[] = '<h4>' . $title . $module->getInfo('name', 's') . '</h4>';
+    $msgs[] = $errs[] = '<h4>'.$title.$module->getInfo('name', 's').'</h4>';
     if ($module->getInfo('image') !== false && trim($module->getInfo('image')) != '') {
-        $msgs[] = '<img src="' . XOOPS_URL . '/modules/' . $module->getVar('dirname') . '/' . trim($module->getInfo('image')) . '" alt="" />';
+        $msgs[] = '<img src="'.XOOPS_URL.'/modules/'.$module->getVar('dirname').'/'.trim($module->getInfo('image')).'" alt="" />';
     }
-    $msgs[] = '<strong>' . _VERSION . ':</strong> ' . $module->getInfo('version') . '&nbsp;' . $module->getInfo('module_status');
+    $msgs[] = '<strong>'._VERSION.':</strong> '.$module->getInfo('version').'&nbsp;'.$module->getInfo('module_status');
     if ($module->getInfo('author') !== false && trim($module->getInfo('author')) != '') {
-        $msgs[] = '<strong>' . _AUTHOR . ':</strong> ' . htmlspecialchars(trim($module->getInfo('author')));
+        $msgs[] = '<strong>'._AUTHOR.':</strong> '.htmlspecialchars(trim($module->getInfo('author')));
     }
     $msgs[] = '</div>';
 
@@ -1438,9 +1438,9 @@ 
 function xoops_module_delayed_clean_cache($cacheList = null)
 {
     if (empty($cacheList)) {
-        $cacheList = array (1,2,3);
+        $cacheList = array(1, 2, 3);
     }
-    require_once XOOPS_ROOT_PATH . '/modules/system/class/maintenance.php';
+    require_once XOOPS_ROOT_PATH.'/modules/system/class/maintenance.php';
     $maintenance = new SystemMaintenance();
     register_shutdown_function(array($maintenance, 'CleanCache'), $cacheList);
 }

htdocs/modules/system/admin/modulesadmin/main.php

Spacing +33 added lines, -33 removed lines

@@ -22,8 +22,8 @@ 
     exit(_NOPERM);
 }
 
-include_once XOOPS_ROOT_PATH . '/class/xoopsblock.php';
-include_once XOOPS_ROOT_PATH . '/modules/system/admin/modulesadmin/modulesadmin.php';
+include_once XOOPS_ROOT_PATH.'/class/xoopsblock.php';
+include_once XOOPS_ROOT_PATH.'/modules/system/admin/modulesadmin/modulesadmin.php';
 XoopsLoad::load('XoopsFilterInput');
 
 if (isset($_POST)) {
@@ -50,8 +50,8 @@ 
         // Call Header
         xoops_cp_header();
         // Define Stylesheet
-        $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/admin.css');
-        $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/ui/' . xoops_getModuleOption('jquery_theme', 'system') . '/ui.all.css');
+        $xoTheme->addStylesheet(XOOPS_URL.'/modules/system/css/admin.css');
+        $xoTheme->addStylesheet(XOOPS_URL.'/modules/system/css/ui/'.xoops_getModuleOption('jquery_theme', 'system').'/ui.all.css');
         // Define scripts
         $xoTheme->addScript('browse.php?Frameworks/jquery/jquery.js');
         $xoTheme->addScript('browse.php?Frameworks/jquery/plugins/jquery.ui.js');
@@ -100,7 +100,7 @@ 
         $toinstall_mods = array();
         $i              = 0;
         foreach ($dirlist as $file) {
-            if (file_exists(XOOPS_ROOT_PATH . '/modules/' . $file . '/xoops_version.php')) {
+            if (file_exists(XOOPS_ROOT_PATH.'/modules/'.$file.'/xoops_version.php')) {
                 clearstatcache();
                 $file = trim($file);
                 if (!in_array($file, $install_mods)) {
@@ -123,8 +123,8 @@ 
         // Call Header
         xoops_cp_header();
         // Define Stylesheet
-        $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/admin.css');
-        $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/ui/' . xoops_getModuleOption('jquery_theme', 'system') . '/ui.all.css');
+        $xoTheme->addStylesheet(XOOPS_URL.'/modules/system/css/admin.css');
+        $xoTheme->addStylesheet(XOOPS_URL.'/modules/system/css/ui/'.xoops_getModuleOption('jquery_theme', 'system').'/ui.all.css');
         // Define scripts
         $xoTheme->addScript('browse.php?Frameworks/jquery/jquery.js');
         $xoTheme->addScript('browse.php?Frameworks/jquery/plugins/jquery.ui.js');
@@ -132,7 +132,7 @@ 
         // Define Breadcrumb and tips
         $xoBreadCrumb->addLink(_AM_SYSTEM_MODULES_ADMIN, system_adminVersion('modulesadmin', 'adminpath'));
         $xoBreadCrumb->addLink(_AM_SYSTEM_MODULES_TOINSTALL);
-        $xoBreadCrumb->addHelp(system_adminVersion('modulesadmin', 'help') . '#install');
+        $xoBreadCrumb->addHelp(system_adminVersion('modulesadmin', 'help').'#install');
         $xoBreadCrumb->addTips(_AM_SYSTEM_MODULES_TIPS);
         $xoBreadCrumb->render();
         // Get Module Handler
@@ -149,7 +149,7 @@ 
         $toinstall_mods = array();
         $i              = 0;
         foreach ($dirlist as $file) {
-            if (file_exists(XOOPS_ROOT_PATH . '/modules/' . $file . '/xoops_version.php')) {
+            if (file_exists(XOOPS_ROOT_PATH.'/modules/'.$file.'/xoops_version.php')) {
                 clearstatcache();
                 $file = trim($file);
                 if (!in_array($file, $install_mods)) {
@@ -206,16 +206,16 @@ 
         // Call Header
         xoops_cp_header();
         // Define Stylesheet
-        $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/admin.css');
+        $xoTheme->addStylesheet(XOOPS_URL.'/modules/system/css/admin.css');
         // Define Breadcrumb and tips
         $xoBreadCrumb->addLink(_AM_SYSTEM_MODULES_ADMIN, system_adminVersion('modulesadmin', 'adminpath'));
         $xoBreadCrumb->addLink(_AM_SYSTEM_MODULES_VALIDATE);
-        $xoBreadCrumb->addHelp(system_adminVersion('modulesadmin', 'help') . '#confirm');
+        $xoBreadCrumb->addHelp(system_adminVersion('modulesadmin', 'help').'#confirm');
         $xoBreadCrumb->addTips(_AM_SYSTEM_MODULES_CONFIRM_TIPS);
         $xoBreadCrumb->render();
         $errorMessage = array();
-        if (!is_writable(XOOPS_CACHE_PATH . '/')) {
-            $errorMessage[] = sprintf(_MUSTWABLE, '<strong>' . XOOPS_CACHE_PATH . '/</strong>');
+        if (!is_writable(XOOPS_CACHE_PATH.'/')) {
+            $errorMessage[] = sprintf(_MUSTWABLE, '<strong>'.XOOPS_CACHE_PATH.'/</strong>');
         }
         if (count($errorMessage) > 0) {
             // Display Error
@@ -316,11 +316,11 @@ 
         // Call Header
         xoops_cp_header();
         // Define Stylesheet
-        $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/admin.css');
+        $xoTheme->addStylesheet(XOOPS_URL.'/modules/system/css/admin.css');
         // Define Breadcrumb and tips
         $xoBreadCrumb->addLink(_AM_SYSTEM_MODULES_ADMIN, system_adminVersion('modulesadmin', 'adminpath'));
         $xoBreadCrumb->addLink(_AM_SYSTEM_MODULES_SUBMITRES);
-        $xoBreadCrumb->addHelp(system_adminVersion('modulesadmin', 'help') . '#submit');
+        $xoBreadCrumb->addHelp(system_adminVersion('modulesadmin', 'help').'#submit');
         $xoBreadCrumb->render();
         if (count($ret) > 0) {
             $xoopsTpl->assign('result', $ret);
@@ -338,17 +338,17 @@ 
         $mod->loadInfoAsVar($module);
         // Construct message
         if ($mod->getInfo('image') !== false && trim($mod->getInfo('image')) != '') {
-            $msgs = '<img src="' . XOOPS_URL . '/modules/' . $mod->getVar('dirname', 'n') . '/' . trim($mod->getInfo('image')) . '" alt="" />';
+            $msgs = '<img src="'.XOOPS_URL.'/modules/'.$mod->getVar('dirname', 'n').'/'.trim($mod->getInfo('image')).'" alt="" />';
         }
-        $msgs .= '<br><span style="font-size:smaller;">' . $mod->getVar('name', 's') . '</span><br><br>' . _AM_SYSTEM_MODULES_RUSUREINS;
+        $msgs .= '<br><span style="font-size:smaller;">'.$mod->getVar('name', 's').'</span><br><br>'._AM_SYSTEM_MODULES_RUSUREINS;
         // Call Header
         xoops_cp_header();
         // Define Stylesheet
-        $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/admin.css');
+        $xoTheme->addStylesheet(XOOPS_URL.'/modules/system/css/admin.css');
         // Define Breadcrumb and tips
         $xoBreadCrumb->addLink(_AM_SYSTEM_MODULES_ADMIN, system_adminVersion('modulesadmin', 'adminpath'));
         $xoBreadCrumb->addLink(_AM_SYSTEM_MODULES_INSTALL);
-        $xoBreadCrumb->addHelp(system_adminVersion('modulesadmin', 'help') . '#install');
+        $xoBreadCrumb->addHelp(system_adminVersion('modulesadmin', 'help').'#install');
         $xoBreadCrumb->render();
         // Display question message
         xoops_confirm(array('module' => $module, 'op' => 'install_ok', 'fct' => 'modulesadmin'), 'admin.php', $msgs, _AM_SYSTEM_MODULES_INSTALL);
@@ -369,11 +369,11 @@ 
         // Call Header
         xoops_cp_header();
         // Define Stylesheet
-        $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/admin.css');
+        $xoTheme->addStylesheet(XOOPS_URL.'/modules/system/css/admin.css');
         // Define Breadcrumb and tips
         $xoBreadCrumb->addLink(_AM_SYSTEM_MODULES_ADMIN, system_adminVersion('modulesadmin', 'adminpath'));
         $xoBreadCrumb->addLink(_AM_SYSTEM_MODULES_INSTALL);
-        $xoBreadCrumb->addHelp(system_adminVersion('modulesadmin', 'help') . '#install');
+        $xoBreadCrumb->addHelp(system_adminVersion('modulesadmin', 'help').'#install');
         $xoBreadCrumb->render();
         if (count($ret) > 0) {
             foreach ($ret as $msg) {
@@ -395,17 +395,17 @@ 
         $mod            = $module_handler->getByDirname($module);
         // Construct message
         if ($mod->getInfo('image') !== false && trim($mod->getInfo('image')) != '') {
-            $msgs = '<img src="' . XOOPS_URL . '/modules/' . $mod->getVar('dirname', 'n') . '/' . trim($mod->getInfo('image')) . '" alt="" />';
+            $msgs = '<img src="'.XOOPS_URL.'/modules/'.$mod->getVar('dirname', 'n').'/'.trim($mod->getInfo('image')).'" alt="" />';
         }
-        $msgs .= '<br><span style="font-size:smaller;">' . $mod->getVar('name') . '</span><br><br>' . _AM_SYSTEM_MODULES_RUSUREUNINS;
+        $msgs .= '<br><span style="font-size:smaller;">'.$mod->getVar('name').'</span><br><br>'._AM_SYSTEM_MODULES_RUSUREUNINS;
         // Call Header
         xoops_cp_header();
         // Define Stylesheet
-        $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/admin.css');
+        $xoTheme->addStylesheet(XOOPS_URL.'/modules/system/css/admin.css');
         // Define Breadcrumb and tips
         $xoBreadCrumb->addLink(_AM_SYSTEM_MODULES_ADMIN, system_adminVersion('modulesadmin', 'adminpath'));
         $xoBreadCrumb->addLink(_AM_SYSTEM_MODULES_UNINSTALL);
-        $xoBreadCrumb->addHelp(system_adminVersion('modulesadmin', 'help') . '#delete');
+        $xoBreadCrumb->addHelp(system_adminVersion('modulesadmin', 'help').'#delete');
         $xoBreadCrumb->render();
         // Display Question
         xoops_confirm(array('module' => $module, 'op' => 'uninstall_ok', 'fct' => 'modulesadmin'), 'admin.php', $msgs, _AM_SYSTEM_MODULES_UNINSTALL);
@@ -426,11 +426,11 @@ 
         // Call Header
         xoops_cp_header();
         // Define Stylesheet
-        $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/admin.css');
+        $xoTheme->addStylesheet(XOOPS_URL.'/modules/system/css/admin.css');
         // Define Breadcrumb and tips
         $xoBreadCrumb->addLink(_AM_SYSTEM_MODULES_ADMIN, system_adminVersion('modulesadmin', 'adminpath'));
         $xoBreadCrumb->addLink(_AM_SYSTEM_MODULES_UNINSTALL);
-        $xoBreadCrumb->addHelp(system_adminVersion('modulesadmin', 'help') . '#delete');
+        $xoBreadCrumb->addHelp(system_adminVersion('modulesadmin', 'help').'#delete');
         $xoBreadCrumb->render();
         if (count($ret) > 0) {
             foreach ($ret as $msg) {
@@ -452,17 +452,17 @@ 
         $mod            = $module_handler->getByDirname($module);
         // Construct message
         if ($mod->getInfo('image') !== false && trim($mod->getInfo('image')) != '') {
-            $msgs = '<img src="' . XOOPS_URL . '/modules/' . $mod->getVar('dirname', 'n') . '/' . trim($mod->getInfo('image')) . '" alt="" />';
+            $msgs = '<img src="'.XOOPS_URL.'/modules/'.$mod->getVar('dirname', 'n').'/'.trim($mod->getInfo('image')).'" alt="" />';
         }
-        $msgs .= '<br><span style="font-size:smaller;">' . $mod->getVar('name', 's') . '</span><br><br>' . _AM_SYSTEM_MODULES_RUSUREUPD;
+        $msgs .= '<br><span style="font-size:smaller;">'.$mod->getVar('name', 's').'</span><br><br>'._AM_SYSTEM_MODULES_RUSUREUPD;
         // Call Header
         xoops_cp_header();
         // Define Stylesheet
-        $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/admin.css');
+        $xoTheme->addStylesheet(XOOPS_URL.'/modules/system/css/admin.css');
         // Define Breadcrumb and tips
         $xoBreadCrumb->addLink(_AM_SYSTEM_MODULES_ADMIN, system_adminVersion('modulesadmin', 'adminpath'));
         $xoBreadCrumb->addLink(_AM_SYSTEM_MODULES_UPDATE);
-        $xoBreadCrumb->addHelp(system_adminVersion('modulesadmin', 'help') . '#update');
+        $xoBreadCrumb->addHelp(system_adminVersion('modulesadmin', 'help').'#update');
         $xoBreadCrumb->render();
         // Display message
         xoops_confirm(array('module' => $module, 'op' => 'update_ok', 'fct' => 'modulesadmin'), 'admin.php', $msgs, _AM_SYSTEM_MODULES_UPDATE);
@@ -483,11 +483,11 @@ 
         // Call Header
         xoops_cp_header();
         // Define Stylesheet
-        $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/admin.css');
+        $xoTheme->addStylesheet(XOOPS_URL.'/modules/system/css/admin.css');
         // Define Breadcrumb and tips
         $xoBreadCrumb->addLink(_AM_SYSTEM_MODULES_ADMIN, system_adminVersion('modulesadmin', 'adminpath'));
         $xoBreadCrumb->addLink(_AM_SYSTEM_MODULES_UPDATE);
-        $xoBreadCrumb->addHelp(system_adminVersion('modulesadmin', 'help') . '#update');
+        $xoBreadCrumb->addHelp(system_adminVersion('modulesadmin', 'help').'#update');
         $xoBreadCrumb->render();
         if (count($ret) > 0) {
             foreach ($ret as $msg) {

htdocs/modules/system/admin/groupperm.php

Spacing +9 added lines, -9 removed lines

@@ -17,18 +17,18 @@ 
  * @author       XOOPS Development Team, Kazumi Ono (AKA onokazu)
  */
 /* @var  $xoopsUser XoopsUser */
-include_once dirname(dirname(dirname(__DIR__))) . '/include/cp_header.php';
+include_once dirname(dirname(dirname(__DIR__))).'/include/cp_header.php';
 $modid = isset($_POST['modid']) ? (int)$_POST['modid'] : 0;
 
 // we don't want system module permissions to be changed here
 if ($modid <= 1 || !is_object($xoopsUser) || !$xoopsUser->isAdmin($modid)) {
-    redirect_header(XOOPS_URL . '/index.php', 1, _NOPERM);
+    redirect_header(XOOPS_URL.'/index.php', 1, _NOPERM);
 }
 /* @var $module_handler XoopsModuleHandler */
 $module_handler = xoops_getHandler('module');
 $module         = $module_handler->get($modid);
 if (!is_object($module) || !$module->getVar('isactive')) {
-    redirect_header(XOOPS_URL . '/admin.php', 1, _MODULENOEXIST);
+    redirect_header(XOOPS_URL.'/admin.php', 1, _MODULENOEXIST);
 }
 
 $msg = array();
@@ -52,7 +52,7 @@ 
                                 //                                if ($pid != 0 && !in_array($pid, array_keys($item_ids))) {
                                 if ($pid != 0 && !array_key_exists($pid, $item_ids)) {
                                     // one of the parent items were not selected, so skip this item
-                                    $msg[] = sprintf(_MD_AM_PERMADDNG, '<strong>' . $perm_name . '</strong>', '<strong>' . $perm_data['itemname'][$item_id] . '</strong>', '<strong>' . $group_list[$group_id] . '</strong>') . ' (' . _MD_AM_PERMADDNGP . ')';
+                                    $msg[] = sprintf(_MD_AM_PERMADDNG, '<strong>'.$perm_name.'</strong>', '<strong>'.$perm_data['itemname'][$item_id].'</strong>', '<strong>'.$group_list[$group_id].'</strong>').' ('._MD_AM_PERMADDNGP.')';
                                     continue 2;
                                 }
                             }
@@ -64,16 +64,16 @@ 
                         $gperm->setVar('gperm_modid', $modid);
                         $gperm->setVar('gperm_itemid', $item_id);
                         if (!$gperm_handler->insert($gperm)) {
-                            $msg[] = sprintf(_MD_AM_PERMADDNG, '<strong>' . $perm_name . '</strong>', '<strong>' . $perm_data['itemname'][$item_id] . '</strong>', '<strong>' . $group_list[$group_id] . '</strong>');
+                            $msg[] = sprintf(_MD_AM_PERMADDNG, '<strong>'.$perm_name.'</strong>', '<strong>'.$perm_data['itemname'][$item_id].'</strong>', '<strong>'.$group_list[$group_id].'</strong>');
                         } else {
-                            $msg[] = sprintf(_MD_AM_PERMADDOK, '<strong>' . $perm_name . '</strong>', '<strong>' . $perm_data['itemname'][$item_id] . '</strong>', '<strong>' . $group_list[$group_id] . '</strong>');
+                            $msg[] = sprintf(_MD_AM_PERMADDOK, '<strong>'.$perm_name.'</strong>', '<strong>'.$perm_data['itemname'][$item_id].'</strong>', '<strong>'.$group_list[$group_id].'</strong>');
                         }
                         unset($gperm);
                     }
                 }
             }
         } else {
-            $msg[] = sprintf(_MD_AM_PERMRESETNG, $module->getVar('name') . '(' . $perm_name . ')');
+            $msg[] = sprintf(_MD_AM_PERMRESETNG, $module->getVar('name').'('.$perm_name.')');
         }
     }
 }
@@ -82,9 +82,9 @@ 
 if ($module->getVar('hasadmin')) {
     $adminindex = isset($_POST['redirect_url']) ? $_POST['redirect_url'] : $module->getInfo('adminindex');
     if ($adminindex) {
-        $backlink = XOOPS_URL . '/modules/' . $module->getVar('dirname') . '/' . $adminindex;
+        $backlink = XOOPS_URL.'/modules/'.$module->getVar('dirname').'/'.$adminindex;
     }
 }
-$backlink = $backlink ?: XOOPS_URL . '/admin.php';
+$backlink = $backlink ?: XOOPS_URL.'/admin.php';
 
 redirect_header($backlink, 2, implode('<br>', $msg));

htdocs/modules/system/admin/preferences/main.php

Indentation +10 added lines, -10 removed lines

@@ -209,16 +209,16 @@
                 case 'site_cache':
                     $ele = new XoopsFormSelect($title, $config[$i]->getVar('conf_name'), $config[$i]->getConfValueForOutput());
                     $ele->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));
+                                                '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));
                     break;
 
                 case 'password':

Spacing +19 added lines, -19 removed lines

@@ -36,7 +36,7 @@ 
 // Call Header
 xoops_cp_header();
 // Define Stylesheet
-$xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/admin.css');
+$xoTheme->addStylesheet(XOOPS_URL.'/modules/system/css/admin.css');
 // Define scripts
 $xoTheme->addScript('browse.php?Frameworks/jquery/jquery.js');
 $xoTheme->addScript('modules/system/js/admin.js');
@@ -113,7 +113,7 @@ 
                 case 'theme':
                 case 'theme_multi':
                     $ele = ($config[$i]->getVar('conf_formtype') !== 'theme_multi') ? new XoopsFormSelect($title, $config[$i]->getVar('conf_name'), $config[$i]->getConfValueForOutput()) : new XoopsFormSelect($title, $config[$i]->getVar('conf_name'), $config[$i]->getConfValueForOutput(), 5, true);
-                    require_once XOOPS_ROOT_PATH . '/class/xoopslists.php';
+                    require_once XOOPS_ROOT_PATH.'/class/xoopslists.php';
                     $dirlist = XoopsLists::getThemesList();
                     if (!empty($dirlist)) {
                         asort($dirlist);
@@ -196,7 +196,7 @@ 
                         $ele = new XoopsFormElementTray($title, '<br>');
                         foreach (array_keys($modules) as $mid) {
                             $c_val   = isset($currrent_val[$mid]) ? (int)$currrent_val[$mid] : null;
-                            $selform = new XoopsFormSelect($modules[$mid]->getVar('name'), $config[$i]->getVar('conf_name') . "[$mid]", $c_val);
+                            $selform = new XoopsFormSelect($modules[$mid]->getVar('name'), $config[$i]->getVar('conf_name')."[$mid]", $c_val);
                             $selform->addOptionArray($cache_options);
                             $ele->addElement($selform);
                             unset($selform);
@@ -268,7 +268,7 @@ 
         if ($count < 1) {
             redirect_header('admin.php?fct=preferences', 1);
         }
-        include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+        include_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
         $form           = new XoopsThemeForm(_MD_AM_MODCONFIG, 'pref_form', 'admin.php?fct=preferences', 'post', true);
         $module_handler = xoops_getHandler('module');
         $module         = $module_handler->get($mod);
@@ -290,7 +290,7 @@ 
             $myts = MyTextSanitizer::getInstance();
             $form->addElement(new XoopsFormHidden('redirect', $myts->htmlspecialchars($_REQUEST['redirect'])));
         } elseif ($module->getInfo('adminindex')) {
-            $form->addElement(new XoopsFormHidden('redirect', XOOPS_URL . '/modules/' . $module->getVar('dirname') . '/' . $module->getInfo('adminindex')));
+            $form->addElement(new XoopsFormHidden('redirect', XOOPS_URL.'/modules/'.$module->getVar('dirname').'/'.$module->getInfo('adminindex')));
         }
         for ($i = 0; $i < $count; ++$i) {
             $title       = constant($config[$i]->getVar('conf_title'));
@@ -334,23 +334,23 @@ 
                     break;
 
                 case 'group':
-                    include_once XOOPS_ROOT_PATH . '/class/xoopslists.php';
+                    include_once XOOPS_ROOT_PATH.'/class/xoopslists.php';
                     $ele = new XoopsFormSelectGroup($title, $config[$i]->getVar('conf_name'), false, $config[$i]->getConfValueForOutput(), 1, false);
                     break;
 
                 case 'group_multi':
-                    include_once XOOPS_ROOT_PATH . '/class/xoopslists.php';
+                    include_once XOOPS_ROOT_PATH.'/class/xoopslists.php';
                     $ele = new XoopsFormSelectGroup($title, $config[$i]->getVar('conf_name'), false, $config[$i]->getConfValueForOutput(), 5, true);
                     break;
 
                 // RMV-NOTIFY: added 'user' and 'user_multi'
                 case 'user':
-                    include_once XOOPS_ROOT_PATH . '/class/xoopslists.php';
+                    include_once XOOPS_ROOT_PATH.'/class/xoopslists.php';
                     $ele = new XoopsFormSelectUser($title, $config[$i]->getVar('conf_name'), false, $config[$i]->getConfValueForOutput(), 1, false);
                     break;
 
                 case 'user_multi':
-                    include_once XOOPS_ROOT_PATH . '/class/xoopslists.php';
+                    include_once XOOPS_ROOT_PATH.'/class/xoopslists.php';
                     $ele = new XoopsFormSelectUser($title, $config[$i]->getVar('conf_name'), false, $config[$i]->getConfValueForOutput(), 5, true);
                     break;
 
@@ -371,7 +371,7 @@ 
 
                 case 'line_break':
                     $myts = MyTextSanitizer::getInstance();
-                    $form->insertBreak('<div style="text-align:center">' . $title . '</div>', $myts->htmlspecialchars($config[$i]->getConfValueForOutput()));
+                    $form->insertBreak('<div style="text-align:center">'.$title.'</div>', $myts->htmlspecialchars($config[$i]->getConfValueForOutput()));
                     break;
 
                 case 'textbox':
@@ -398,9 +398,9 @@ 
             $xoopsTpl->assign('breadcrumb', 1);
         } else {
             if ($module->getInfo('adminindex')) {
-                echo '<a href="' . XOOPS_URL . '/modules/' . $module->getVar('dirname') . '/' . $module->getInfo('adminindex') . '">' . $module->getVar('name') . '</a>&nbsp;<span style="font-weight:bold;">&raquo;</span>&nbsp;' . _PREFERENCES . '<br><br>';
+                echo '<a href="'.XOOPS_URL.'/modules/'.$module->getVar('dirname').'/'.$module->getInfo('adminindex').'">'.$module->getVar('name').'</a>&nbsp;<span style="font-weight:bold;">&raquo;</span>&nbsp;'._PREFERENCES.'<br><br>';
             } else {
-                echo $module->getVar('name') . '&nbsp;<span style="font-weight:bold;">&raquo;</span>&nbsp;' . _PREFERENCES . '<br><br>';
+                echo $module->getVar('name').'&nbsp;<span style="font-weight:bold;">&raquo;</span>&nbsp;'._PREFERENCES.'<br><br>';
             }
         }
         $form->display();
@@ -410,7 +410,7 @@ 
         if (!$GLOBALS['xoopsSecurity']->check()) {
             redirect_header('admin.php?fct=preferences', 3, implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
         }
-        require_once XOOPS_ROOT_PATH . '/class/template.php';
+        require_once XOOPS_ROOT_PATH.'/class/template.php';
         $xoopsTpl         = new XoopsTpl();
         $count            = count($conf_ids);
         $tpl_updated      = false;
@@ -420,7 +420,7 @@ 
         if ($count > 0) {
             for ($i = 0; $i < $count; ++$i) {
                 $config    = $config_handler->getConfig($conf_ids[$i]);
-                $new_value =& ${$config->getVar('conf_name')};
+                $new_value = & ${$config->getVar('conf_name')};
                 if (is_array($new_value) || $new_value != $config->getVar('conf_value')) {
                     // if language has been changed
                     if (!$lang_updated && $config->getVar('conf_catid') == XOOPS_CONF && $config->getVar('conf_name') === 'language') {
@@ -469,7 +469,7 @@ 
                             $image_handler = xoops_getHandler('imagesetimg');
                             $imagefiles    = $image_handler->getObjects(new Criteria('tplset_name', $newtplset), true);
                             foreach (array_keys($imagefiles) as $j) {
-                                if (!$fp = fopen(XOOPS_CACHE_PATH . '/' . $newtplset . '_' . $imagefiles[$j]->getVar('imgsetimg_file'), 'wb')) {
+                                if (!$fp = fopen(XOOPS_CACHE_PATH.'/'.$newtplset.'_'.$imagefiles[$j]->getVar('imgsetimg_file'), 'wb')) {
                                 } else {
                                     fwrite($fp, $imagefiles[$j]->getVar('imgsetimg_body'));
                                     fclose($fp);
@@ -510,9 +510,9 @@ 
         // Clean cached files, may take long time
         // User register_shutdown_function to keep running after connection closes so that cleaning cached files can be finished
         // Cache management should be performed on a separate page
-        require_once XOOPS_ROOT_PATH . '/modules/system/class/maintenance.php';
+        require_once XOOPS_ROOT_PATH.'/modules/system/class/maintenance.php';
         $maintenance = new SystemMaintenance();
-        $options     = array(1,2,3); // smarty_cache and Smarty_compile
+        $options     = array(1, 2, 3); // smarty_cache and Smarty_compile
         register_shutdown_function(array(&$maintenance, 'CleanCache'), $options);
 
         if ($lang_updated) {
@@ -541,10 +541,10 @@ 
         $nbcolonnes_pref = 5;
         foreach (array_keys($confcats) as $i) {
             $preferences['id']    = $confcats[$i]->getVar('confcat_id');
-            $preferences['image'] = system_AdminIcons('xoops/' . $image[$i]);
+            $preferences['image'] = system_AdminIcons('xoops/'.$image[$i]);
             $preferences['name']  = constant($confcats[$i]->getVar('confcat_name'));
             ++$count_prefs;
-            $preferences['newline'] = ($count_prefs % $nbcolonnes_pref == 1);// ? true : false;
+            $preferences['newline'] = ($count_prefs % $nbcolonnes_pref == 1); // ? true : false;
             $xoopsTpl->assign('newline', $preferences['newline']);
 
             $xoopsTpl->append_by_ref('preferences', $preferences);

htdocs/modules/system/admin/banners/main.php

Indentation +9 added lines, -9 removed lines

@@ -113,9 +113,9 @@ 
                 }
             } else {
                 xoops_confirm(array(
-                                  'ok' => 1,
-                                  'bid' => $bid,
-                                  'op' => 'banner_delete'), 'admin.php?fct=banners', sprintf(_AM_SYSTEM_BANNERS_SUREDELE));
+                                    'ok' => 1,
+                                    'bid' => $bid,
+                                    'op' => 'banner_delete'), 'admin.php?fct=banners', sprintf(_AM_SYSTEM_BANNERS_SUREDELE));
             }
         } else {
             redirect_header('admin.php?fct=banners', 1, _AM_SYSTEM_DBERROR);
@@ -141,9 +141,9 @@ 
                 }
             } else {
                 xoops_confirm(array(
-                                  'ok' => 1,
-                                  'bid' => $bid,
-                                  'op' => 'banner_finish_delete'), 'admin.php?fct=banners', sprintf(_AM_SYSTEM_BANNERS_SUREDELE));
+                                    'ok' => 1,
+                                    'bid' => $bid,
+                                    'op' => 'banner_finish_delete'), 'admin.php?fct=banners', sprintf(_AM_SYSTEM_BANNERS_SUREDELE));
             }
         } else {
             redirect_header('admin.php?fct=banners', 1, _AM_SYSTEM_DBERROR);
@@ -214,9 +214,9 @@ 
                 }
             } else {
                 xoops_confirm(array(
-                                  'ok' => 1,
-                                  'cid' => $cid,
-                                  'op' => 'banner_client_delete'), 'admin.php?fct=banners', _AM_SYSTEM_BANNERS_SUREDELBNR);
+                                    'ok' => 1,
+                                    'cid' => $cid,
+                                    'op' => 'banner_client_delete'), 'admin.php?fct=banners', _AM_SYSTEM_BANNERS_SUREDELBNR);
             }
         } else {
             redirect_header('admin.php?fct=banners', 1, _AM_SYSTEM_DBERROR);

Spacing +19 added lines, -19 removed lines

@@ -41,8 +41,8 @@ 
 // Call header
 xoops_cp_header();
 // Define Stylesheet
-$xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/admin.css');
-$xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/ui/' . xoops_getModuleOption('jquery_theme', 'system') . '/ui.all.css');
+$xoTheme->addStylesheet(XOOPS_URL.'/modules/system/css/admin.css');
+$xoTheme->addStylesheet(XOOPS_URL.'/modules/system/css/ui/'.xoops_getModuleOption('jquery_theme', 'system').'/ui.all.css');
 // Define scripts
 $xoTheme->addScript('browse.php?Frameworks/jquery/jquery.js');
 $xoTheme->addScript('browse.php?Frameworks/jquery/plugins/jquery.ui.js');
@@ -78,7 +78,7 @@ 
 
     case 'banner_edit': // Edit banner
         $xoBreadCrumb->addLink(_AM_SYSTEM_BANNERS_NAV_EDITBNR);
-        $xoBreadCrumb->addHelp(system_adminVersion('banners', 'help') . '#banner_edit');
+        $xoBreadCrumb->addHelp(system_adminVersion('banners', 'help').'#banner_edit');
         $xoBreadCrumb->addTips(_AM_SYSTEM_BANNERS_NAV_TIPS);
         $xoBreadCrumb->render();
 
@@ -96,7 +96,7 @@ 
 
     case 'banner_delete': // Delete banner
         $xoBreadCrumb->addLink(_AM_SYSTEM_BANNERS_NAV_DELETEBNR);
-        $xoBreadCrumb->addHelp(system_adminVersion('banners', 'help') . '#banner_delete');
+        $xoBreadCrumb->addHelp(system_adminVersion('banners', 'help').'#banner_delete');
         $xoBreadCrumb->render();
 
         $bid = system_CleanVars($_REQUEST, 'bid', 0, 'int');
@@ -124,7 +124,7 @@ 
 
     case 'banner_finish_delete': // Delete finish banner
         $xoBreadCrumb->addLink(_AM_SYSTEM_BANNERS_NAV_DELETEFINISHBNR);
-        $xoBreadCrumb->addHelp(system_adminVersion('banners', 'help') . '#banner_finish_delete');
+        $xoBreadCrumb->addHelp(system_adminVersion('banners', 'help').'#banner_finish_delete');
         $xoBreadCrumb->render();
 
         $bid = system_CleanVars($_REQUEST, 'bid', 0, 'int');
@@ -176,7 +176,7 @@ 
 
     case 'banner_client_edit': // Edit client
         $xoBreadCrumb->addLink(_AM_SYSTEM_BANNERS_NAV_EDITADVCLI);
-        $xoBreadCrumb->addHelp(system_adminVersion('banners', 'help') . '#banner_client_edit');
+        $xoBreadCrumb->addHelp(system_adminVersion('banners', 'help').'#banner_client_edit');
         $xoBreadCrumb->addTips(_AM_SYSTEM_BANNERS_NAV_TIPS);
         $xoBreadCrumb->render();
 
@@ -193,7 +193,7 @@ 
 
     case 'banner_client_delete': // Delete Client
         $xoBreadCrumb->addLink(_AM_SYSTEM_BANNERS_NAV_DELETECLI);
-        $xoBreadCrumb->addHelp(system_adminVersion('banners', 'help') . '#banner_client_delete');
+        $xoBreadCrumb->addHelp(system_adminVersion('banners', 'help').'#banner_client_delete');
         $xoBreadCrumb->render();
 
         $cid = system_CleanVars($_REQUEST, 'cid', 0, 'int');
@@ -225,7 +225,7 @@ 
 
     case 'new_banner': // Form: New Banner
         $xoBreadCrumb->addLink(_AM_SYSTEM_BANNERS_NAV_ADDBNR);
-        $xoBreadCrumb->addHelp(system_adminVersion('banners', 'help') . '#new_banner');
+        $xoBreadCrumb->addHelp(system_adminVersion('banners', 'help').'#new_banner');
         $xoBreadCrumb->addTips(_AM_SYSTEM_BANNERS_NAV_TIPS);
         $xoBreadCrumb->render();
         /* @var  $obj SystemBanner */
@@ -236,7 +236,7 @@ 
 
     case 'new_client': // Form: New Client
         $xoBreadCrumb->addLink(_AM_SYSTEM_BANNERS_NAV_ADDNWCLI);
-        $xoBreadCrumb->addHelp(system_adminVersion('banners', 'help') . '#new_client');
+        $xoBreadCrumb->addHelp(system_adminVersion('banners', 'help').'#new_client');
         $xoBreadCrumb->addTips(_AM_SYSTEM_BANNERS_NAV_TIPS);
         $xoBreadCrumb->render();
         /* @var  $obj SystemBanner */
@@ -287,7 +287,7 @@ 
                     $percent = substr(100 * $clicks / $impmade, 0, 5);
                 }
                 if ($imptotal == 0) {
-                    $left = '' . _AM_SYSTEM_BANNERS_UNLIMIT . '';
+                    $left = ''._AM_SYSTEM_BANNERS_UNLIMIT.'';
                 } else {
                     $left = $imptotal - $impmade;
                 }
@@ -295,10 +295,10 @@ 
                 //Img
                 $img = '';
                 if ($htmlbanner) {
-                    if ($htmlcode){
+                    if ($htmlcode) {
                         $img .= html_entity_decode($htmlcode);
                     } else {
-                        $img .= ' <iframe src=' . $imageurl . ' border="0" scrolling="no" allowtransparency="true" width="480px" height="60px" style="border:0" alt=""> </iframe>';
+                        $img .= ' <iframe src='.$imageurl.' border="0" scrolling="no" allowtransparency="true" width="480px" height="60px" style="border:0" alt=""> </iframe>';
                     }
                 } else {
                     if (strtolower(substr($imageurl, strrpos($imageurl, '.'))) === '.swf') {
@@ -309,7 +309,7 @@ 
                         $img .= '</embed>';
                         $img .= '</object>';
                     } else {
-                        $img .= "<img src='" . $imageurl . "' alt='' />";
+                        $img .= "<img src='".$imageurl."' alt='' />";
                     }
                 }
 
@@ -320,7 +320,7 @@ 
                 $banner['percent']     = $percent;
                 $banner['imageurl']    = $img;
                 $banner['name']        = $name;
-                $banner['edit_delete'] = '<img class="cursorpointer" onclick="display_dialog(' . $bid . ', true, false, \'slide\', \'slide\', 200, 520);" src="images/icons/view.png" alt="' . _AM_SYSTEM_BANNERS_VIEW . '" title="' . _AM_SYSTEM_BANNERS_VIEW . '" /><a href="admin.php?fct=banners&amp;op=banner_edit&amp;bid=' . $bid . '"><img src="./images/icons/edit.png" border="0" alt="' . _AM_SYSTEM_BANNERS_EDIT . '" title="' . _AM_SYSTEM_BANNERS_EDIT . '"></a><a href="admin.php?fct=banners&amp;op=banner_delete&amp;bid=' . $bid . '"><img src="./images/icons/delete.png" border="0" alt="' . _AM_SYSTEM_BANNERS_DELETE . '" title="' . _AM_SYSTEM_BANNERS_DELETE . '"></a>';
+                $banner['edit_delete'] = '<img class="cursorpointer" onclick="display_dialog('.$bid.', true, false, \'slide\', \'slide\', 200, 520);" src="images/icons/view.png" alt="'._AM_SYSTEM_BANNERS_VIEW.'" title="'._AM_SYSTEM_BANNERS_VIEW.'" /><a href="admin.php?fct=banners&amp;op=banner_edit&amp;bid='.$bid.'"><img src="./images/icons/edit.png" border="0" alt="'._AM_SYSTEM_BANNERS_EDIT.'" title="'._AM_SYSTEM_BANNERS_EDIT.'"></a><a href="admin.php?fct=banners&amp;op=banner_delete&amp;bid='.$bid.'"><img src="./images/icons/delete.png" border="0" alt="'._AM_SYSTEM_BANNERS_DELETE.'" title="'._AM_SYSTEM_BANNERS_DELETE.'"></a>';
 
                 $xoopsTpl->append_by_ref('banner', $banner);
                 $xoopsTpl->append_by_ref('popup_banner', $banner);
@@ -329,7 +329,7 @@ 
         }
         // Display Page Navigation
         if ($banner_count > $nb_aff) {
-            $nav = new XoopsPageNav($banner_count, $nb_aff, $start, 'start', 'fct=banners&amp;startF=' . $startF . '&amp;startC=' . $startC);
+            $nav = new XoopsPageNav($banner_count, $nb_aff, $start, 'start', 'fct=banners&amp;startF='.$startF.'&amp;startC='.$startC);
             $xoopsTpl->assign('nav_menu_banner', $nav->renderNav(4));
         }
         // Display Finished Banners
@@ -364,7 +364,7 @@ 
                 $banner_finish['dateend']     = formatTimestamp($banner_finish_arr[$i]->getVar('dateend'), 'm');
                 $name_client                  = $banner_client_Handler->get($banner_finish_arr[$i]->getVar('cid'));
                 $banner_finish['name']        = $name_client->getVar('name');
-                $banner_finish['edit_delete'] = '<img class="cursorpointer" onclick="display_dialog(' . $bid . '000, true, true, \'slide\', \'slide\', 200, 520);" src="images/icons/view.png" alt="' . _AM_SYSTEM_BANNERS_VIEW . '" title="' . _AM_SYSTEM_BANNERS_VIEW . '" /><a href="admin.php?fct=banners&amp;op=banner_finish_delete&amp;bid=' . $bid . '"><img src="./images/icons/delete.png" border="0" alt="' . _AM_SYSTEM_BANNERS_DELETE . '" title="' . _AM_SYSTEM_BANNERS_DELETE . '"></a>';
+                $banner_finish['edit_delete'] = '<img class="cursorpointer" onclick="display_dialog('.$bid.'000, true, true, \'slide\', \'slide\', 200, 520);" src="images/icons/view.png" alt="'._AM_SYSTEM_BANNERS_VIEW.'" title="'._AM_SYSTEM_BANNERS_VIEW.'" /><a href="admin.php?fct=banners&amp;op=banner_finish_delete&amp;bid='.$bid.'"><img src="./images/icons/delete.png" border="0" alt="'._AM_SYSTEM_BANNERS_DELETE.'" title="'._AM_SYSTEM_BANNERS_DELETE.'"></a>';
 
                 $xoopsTpl->append_by_ref('banner_finish', $banner_finish);
                 unset($banner_finish);
@@ -372,7 +372,7 @@ 
         }
         // Display Page Navigation
         if ($banner_finish_count > $nb_aff) {
-            $nav = new XoopsPageNav($banner_count, $nb_aff, $startF, 'startF', 'fct=banners&amp;start=' . $start . '&amp;startC=' . $startC);
+            $nav = new XoopsPageNav($banner_count, $nb_aff, $startF, 'startF', 'fct=banners&amp;start='.$start.'&amp;startC='.$startC);
             $xoopsTpl->assign('nav_menu_bannerF', $nav->renderNav(4));
         }
         // Display client
@@ -399,7 +399,7 @@ 
                 $banner_client['name']          = $banner_client_arr[$i]->getVar('name');
                 $banner_client['contact']       = $banner_client_arr[$i]->getVar('contact');
                 $banner_client['email']         = $banner_client_arr[$i]->getVar('email');
-                $banner_client['edit_delete']   = '<a href="admin.php?fct=banners&amp;op=banner_client_edit&amp;cid=' . $cid . '"><img src="./images/icons/edit.png" border="0" alt="' . _AM_SYSTEM_BANNERS_EDIT . '" title="' . _AM_SYSTEM_BANNERS_EDIT . '"></a><a href="admin.php?fct=banners&amp;op=banner_client_delete&amp;cid=' . $cid . '"><img src="./images/icons/delete.png" border="0" alt="' . _AM_SYSTEM_BANNERS_DELETE . '" title="' . _AM_SYSTEM_BANNERS_DELETE . '"></a>';
+                $banner_client['edit_delete']   = '<a href="admin.php?fct=banners&amp;op=banner_client_edit&amp;cid='.$cid.'"><img src="./images/icons/edit.png" border="0" alt="'._AM_SYSTEM_BANNERS_EDIT.'" title="'._AM_SYSTEM_BANNERS_EDIT.'"></a><a href="admin.php?fct=banners&amp;op=banner_client_delete&amp;cid='.$cid.'"><img src="./images/icons/delete.png" border="0" alt="'._AM_SYSTEM_BANNERS_DELETE.'" title="'._AM_SYSTEM_BANNERS_DELETE.'"></a>';
 
                 $xoopsTpl->append_by_ref('banner_client', $banner_client);
                 unset($banner_client);
@@ -407,7 +407,7 @@ 
         }
         // Display Page Navigation
         if ($banner_client_count > $nb_aff) {
-            $nav = new XoopsPageNav($banner_count, $nb_aff, $startC, 'startC', 'fct=banners&amp;start=' . $start . '&amp;startF=' . $startF);
+            $nav = new XoopsPageNav($banner_count, $nb_aff, $startC, 'startC', 'fct=banners&amp;start='.$start.'&amp;startF='.$startF);
             $xoopsTpl->assign('nav_menu_client', $nav->renderNav(4));
         }
         break;

htdocs/modules/system/admin/maintenance/main.php

Spacing +5 added lines, -5 removed lines

@@ -15,7 +15,7 @@ 
  * @package             system
  */
 
-require_once XOOPS_ROOT_PATH . '/modules/system/class/maintenance.php';
+require_once XOOPS_ROOT_PATH.'/modules/system/class/maintenance.php';
 
 // Check users rights
 if (!is_object($xoopsUser) || !is_object($xoopsModule) || !$xoopsUser->isAdmin($xoopsModule->mid())) {
@@ -33,7 +33,7 @@ 
 // Call Header
 xoops_cp_header();
 // Define Stylesheet
-$xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/admin.css');
+$xoTheme->addStylesheet(XOOPS_URL.'/modules/system/css/admin.css');
 // Define scripts
 $xoTheme->addScript('browse.php?Frameworks/jquery/jquery.js');
 $xoTheme->addScript('modules/system/js/admin.js');
@@ -53,7 +53,7 @@ 
         $form_maintenance = new XoopsThemeForm(_AM_SYSTEM_MAINTENANCE, 'maintenance_save', 'admin.php?fct=maintenance', 'post', true);
 
         $cache = new XoopsFormSelect(_AM_SYSTEM_MAINTENANCE_CACHE, 'cache', '', 3, true);
-        $cache->setDescription(XOOPS_VAR_PATH . '/cache/smarty_cache/<br>' . XOOPS_VAR_PATH . '/cache/smarty_compile/<br>' . XOOPS_VAR_PATH . '/cache/xoops_cache/');
+        $cache->setDescription(XOOPS_VAR_PATH.'/cache/smarty_cache/<br>'.XOOPS_VAR_PATH.'/cache/smarty_compile/<br>'.XOOPS_VAR_PATH.'/cache/xoops_cache/');
         $cache_arr = array(
             1 => 'smarty_cache',
             2 => 'smarty_compile',
@@ -68,7 +68,7 @@ 
         $select_tables = new XoopsFormSelect('', 'tables', '', 7, true);
         $select_tables->addOptionArray($maintenance->displayTables(true));
         $tables_tray->addElement($select_tables, false);
-        $tables_tray->addElement(new xoopsFormLabel('&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;' . _AM_SYSTEM_MAINTENANCE_DUMP_AND . '&nbsp;'));
+        $tables_tray->addElement(new xoopsFormLabel('&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'._AM_SYSTEM_MAINTENANCE_DUMP_AND.'&nbsp;'));
         $choice  = new XoopsFormSelect('&nbsp;&nbsp;', 'maintenance', '', 4, true);
         $options = array(
             '1' => _AM_SYSTEM_MAINTENANCE_CHOICE1,
@@ -92,7 +92,7 @@ 
         $select_tables1->addOptionArray($maintenance->displayTables(true));
         $dump_tray->addElement($select_tables1, false);
 
-        $dump_tray->addElement(new xoopsFormLabel('&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;' . _AM_SYSTEM_MAINTENANCE_DUMP_OR . '&nbsp;'));
+        $dump_tray->addElement(new xoopsFormLabel('&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'._AM_SYSTEM_MAINTENANCE_DUMP_OR.'&nbsp;'));
         $ele            = new XoopsFormSelect('&nbsp;&nbsp;', 'dump_modules', '', 7, true);
     /* @var $module_handler XoopsModuleHandler */
         $module_handler = xoops_getHandler('module');