XOOPS / XoopsCore

htdocs/modules/system/locale/en_US/en_US.php

Indentation +1 added lines, -1 removed lines

@@ -408,7 +408,7 @@
     const USERS_MANAGEMENT = "Users management";
     const USERS_TIPS = "<ul><li>Manage Xoops users</li></ul>";
     const VIEW_USER_INFO = "View user info";
-	const WEBMASTERS = "Webmasters";
+    const WEBMASTERS = "Webmasters";
     const WEBMASTERS_OF_THIS_SITE = "Webmasters of this site";
     const WELCOME_TO_XOOPS_HELP_CENTER = "Welcome to XOOPS Help Center";
     const WORD_CENSORING = "Word censoring";

Spacing +2 added lines, -2 removed lines

@@ -89,7 +89,7 @@ 
     const CONF_BAD_IPS_DESC = "^aaa\.bbb\.ccc will disallow visitors with an IP that starts with aaa.bbb.ccc<br />aaa\.bbb\.ccc$ will disallow visitors with an IP that ends with aaa.bbb.ccc<br />aaa\.bbb\.ccc will disallow visitors with an IP that contains aaa.bbb.ccc";
     const CONF_BAD_USERNAMES = "Enter names that should not be selected as username";
     const CONF_BLOCKS_EDITOR = "Editor for blocks:";
-    const CONF_BREADCRUMB ="Breadcrumb";
+    const CONF_BREADCRUMB = "Breadcrumb";
     const CONF_CENSORRPLC = "Censored words will be replaced with:";
     const CONF_CENSORRPLC_DESC = "Censored words will be replaced with the characters entered in this textbox";
     const CONF_CENSORWRD = "Words to censor";
@@ -177,7 +177,7 @@ 
     const CONF_METACOPYR_DEFAULT = "Copyright @ 2001-%s";
     const CONF_METACOPYR_DESC = "The copyright meta tag defines any copyright statements you wish to disclose about your web page documents.";
     const CONF_METADESC = "Meta Description";
-    const CONF_METADESC_DEFAULT= "XOOPS is a dynamic Object Oriented based open source portal script written in PHP.";
+    const CONF_METADESC_DEFAULT = "XOOPS is a dynamic Object Oriented based open source portal script written in PHP.";
     const CONF_METADESC_DESC = "The description meta tag is a general description of what is contained in your web page";
     const CONF_METAKEY = "Meta Keywords";
     const CONF_METAKEY_DEFAULT = "xoops, web applications, web 2.0, sns, news, technology, headlines, linux, software, download, downloads, free, community, forum, bulletin board, bbs, php, survey, polls, kernel, comment, comments, portal, odp, open source, opensource, FreeSoftware, gnu, gpl, license, Unix, *nix, mysql, sql, database, databases, web site, blog, wiki, module, modules, theme, themes, cms, content management";

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

Spacing +5 added lines, -5 removed lines

@@ -41,9 +41,9 @@ 
     // we need to decide how to handle that. Right now, some js will redirect us from
     // provider sort to service select just before the token should expire.
     if (isset($_POST['token']) && $security->validateToken($_POST['token'], false)) {
-        if (isset($_POST['op']) && $_POST['op']==='order') {
+        if (isset($_POST['op']) && $_POST['op'] === 'order') {
             if (isset($_POST['service'])) {
-                $service=$_POST['service'];
+                $service = $_POST['service'];
                 if (isset($_POST[$service]) && is_array($_POST[$service])) {
                     $service_order = array_flip($_POST[$service]);
                     $sm = Manager::getInstance();
@@ -66,7 +66,7 @@ 
 $xoops->header('admin:system/system_services.tpl');
 
 $admin_page = new \Xoops\Module\Admin();
-$admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, \XoopsBaseConfig::get('url') . '/admin.php', true);
+$admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, \XoopsBaseConfig::get('url').'/admin.php', true);
 $admin_page->addBreadcrumbLink(
     SystemLocale::SERVICES_MANAGER,
     $system->adminVersion('services', 'adminpath')
@@ -76,7 +76,7 @@ 
 $admin_page->renderBreadcrumb();
 $admin_page->renderTips();
 
-$selected_service='';
+$selected_service = '';
 if (isset($_GET['service'])) {
     $selected_service = strtolower(XoopsFilterInput::clean($_GET['service'], 'WORD'));
 }
@@ -100,7 +100,7 @@ 
     $service_list[] = array(
         'name' => $v,
         'display' => ucfirst($v),
-        'active' => ($v==$selected_service),
+        'active' => ($v == $selected_service),
         );
 }
 $xoops->tpl()->assign('service_list', $service_list);

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

Spacing +4 added lines, -4 removed lines

@@ -58,7 +58,7 @@ 
         $xoops->theme()->addScript('modules/system/js/module.js');
         // Define Breadcrumb and tips
         $admin_page = new \Xoops\Module\Admin();
-        $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, \XoopsBaseConfig::get('url') . '/admin.php', true);
+        $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, \XoopsBaseConfig::get('url').'/admin.php', true);
         $admin_page->addBreadcrumbLink(
             SystemLocale::MODULES_ADMINISTRATION,
             $system->adminVersion('modulesadmin', 'adminpath')
@@ -182,7 +182,7 @@ 
         $xoops->theme()->addStylesheet('modules/system/css/admin.css');
         // Define Breadcrumb and tips
         $admin_page = new \Xoops\Module\Admin();
-        $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, \XoopsBaseConfig::get('url') . '/admin.php', true);
+        $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, \XoopsBaseConfig::get('url').'/admin.php', true);
         $admin_page->addBreadcrumbLink(
             SystemLocale::MODULES_ADMINISTRATION,
             $system->adminVersion('modulesadmin', 'adminpath')
@@ -222,7 +222,7 @@ 
         $xoops->theme()->addStylesheet('modules/system/css/admin.css');
         // Define Breadcrumb and tips
         $admin_page = new \Xoops\Module\Admin();
-        $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, \XoopsBaseConfig::get('url') . '/admin.php', true);
+        $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, \XoopsBaseConfig::get('url').'/admin.php', true);
         $admin_page->addBreadcrumbLink(
             SystemLocale::MODULES_ADMINISTRATION,
             $system->adminVersion('modulesadmin', 'adminpath')
@@ -259,7 +259,7 @@ 
         $xoops->theme()->addStylesheet('modules/system/css/admin.css');
         // Define Breadcrumb and tips
         $admin_page = new \Xoops\Module\Admin();
-        $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, \XoopsBaseConfig::get('url') . '/admin.php', true);
+        $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, \XoopsBaseConfig::get('url').'/admin.php', true);
         $admin_page->addBreadcrumbLink(
             SystemLocale::MODULES_ADMINISTRATION,
             $system->adminVersion('modulesadmin', 'adminpath')

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

Indentation +1 added lines, -1 removed lines

@@ -146,7 +146,7 @@
         }
         $folder = array(1, 2, 3);
         $system->cleanCache($folder);
-         //Set active modules in cache folder
+            //Set active modules in cache folder
         $xoops->setActiveModules();
         // Call Footer
         $xoops->footer();

Spacing +4 added lines, -4 removed lines

@@ -58,7 +58,7 @@ 
         $xoops->theme()->addScript('modules/system/js/module.js');
         // Define Breadcrumb and tips
         $admin_page = new \Xoops\Module\Admin();
-        $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, \XoopsBaseConfig::get('url') . '/admin.php', true);
+        $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, \XoopsBaseConfig::get('url').'/admin.php', true);
         $admin_page->addBreadcrumbLink(
             SystemLocale::EXTENSIONS_ADMINISTRATION,
             $system->adminVersion('extensions', 'adminpath')
@@ -86,7 +86,7 @@ 
         $xoops->theme()->addStylesheet('modules/system/css/admin.css');
         // Define Breadcrumb and tips
         $admin_page = new \Xoops\Module\Admin();
-        $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, \XoopsBaseConfig::get('url') . '/admin.php', true);
+        $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, \XoopsBaseConfig::get('url').'/admin.php', true);
         $admin_page->addBreadcrumbLink(
             SystemLocale::EXTENSIONS_ADMINISTRATION,
             $system->adminVersion('extensions', 'adminpath')
@@ -126,7 +126,7 @@ 
         $xoops->theme()->addStylesheet('modules/system/css/admin.css');
         // Define Breadcrumb and tips
         $admin_page = new \Xoops\Module\Admin();
-        $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, \XoopsBaseConfig::get('url') . '/admin.php', true);
+        $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, \XoopsBaseConfig::get('url').'/admin.php', true);
         $admin_page->addBreadcrumbLink(
             SystemLocale::EXTENSIONS_ADMINISTRATION,
             $system->adminVersion('extensions', 'adminpath')
@@ -163,7 +163,7 @@ 
         $xoops->theme()->addStylesheet('modules/system/css/admin.css');
         // Define Breadcrumb and tips
         $admin_page = new \Xoops\Module\Admin();
-        $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, \XoopsBaseConfig::get('url') . '/admin.php', true);
+        $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, \XoopsBaseConfig::get('url').'/admin.php', true);
         $admin_page->addBreadcrumbLink(
             SystemLocale::EXTENSIONS_ADMINISTRATION,
             $system->adminVersion('extensions', 'adminpath')

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

Spacing +81 added lines, -81 removed lines

@@ -64,7 +64,7 @@ 
     case 'users_edit':
         // Assign Breadcrumb menu
         $admin_page = new \Xoops\Module\Admin();
-        $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, \XoopsBaseConfig::get('url') . '/admin.php', true);
+        $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, \XoopsBaseConfig::get('url').'/admin.php', true);
         $admin_page->addBreadcrumbLink(SystemLocale::USERS_MANAGEMENT, $system->adminVersion('users', 'adminpath'));
         $admin_page->addBreadcrumbLink(SystemLocale::EDIT_USER);
         $admin_page->renderBreadcrumb();
@@ -79,7 +79,7 @@ 
     case 'users_add':
         // Assign Breadcrumb menu
         $admin_page = new \Xoops\Module\Admin();
-        $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, \XoopsBaseConfig::get('url') . '/admin.php', true);
+        $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, \XoopsBaseConfig::get('url').'/admin.php', true);
         $admin_page->addBreadcrumbLink(SystemLocale::USERS_MANAGEMENT, $system->adminVersion('users', 'adminpath'));
         $admin_page->addBreadcrumbLink(SystemLocale::ADD_USER);
         $admin_page->renderBreadcrumb();
@@ -93,7 +93,7 @@ 
     case 'users_delete':
         // Assign Breadcrumb menu
         $admin_page = new \Xoops\Module\Admin();
-        $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, \XoopsBaseConfig::get('url') . '/admin.php', true);
+        $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, \XoopsBaseConfig::get('url').'/admin.php', true);
         $admin_page->addBreadcrumbLink(SystemLocale::USERS_MANAGEMENT, $system->adminVersion('users', 'adminpath'));
         $admin_page->addBreadcrumbLink(SystemLocale::DELETE_USER);
         $admin_page->renderBreadcrumb();
@@ -118,12 +118,12 @@ 
             }
         } else {
             //Assign Breadcrumb menu
-            $system_breadcrumb->addHelp(system_adminVersion('users', 'help') . '#delete');
+            $system_breadcrumb->addHelp(system_adminVersion('users', 'help').'#delete');
             $system_breadcrumb->addLink(SystemLocale::DELETE_USER);
             $system_breadcrumb->render();
             echo $xoops->confirm(array(
                 'ok' => 1, 'uid' => $uid, 'op' => 'users_delete'
-            ), "admin.php?fct=users", sprintf(SystemLocale::F_DELETE_USER, $user->getVar('uname')) . '<br />');
+            ), "admin.php?fct=users", sprintf(SystemLocale::F_DELETE_USER, $user->getVar('uname')).'<br />');
         }
         break;
 
@@ -214,7 +214,7 @@ 
                     if ($_REQUEST['password'] != $_REQUEST['pass2']) {
                         $xoops->header();
                         echo "
-                        <strong>" . SystemLocale::E_NEW_PASSWORDS_NOT_MATCH_TRY_AGAIN . "</strong>";
+                        <strong>" . SystemLocale::E_NEW_PASSWORDS_NOT_MATCH_TRY_AGAIN."</strong>";
                         $xoops->footer();
                         exit();
                     }
@@ -255,7 +255,7 @@ 
                 $member_handler = $xoops->getHandlerMember();
                 // make sure the username doesnt exist yet
                 if ($member_handler->getUserCount(new Criteria('uname', $_REQUEST['username'])) > 0) {
-                    $adduser_errormsg = 'User name ' . $myts->htmlSpecialChars($_REQUEST['username']) . ' already exists';
+                    $adduser_errormsg = 'User name '.$myts->htmlSpecialChars($_REQUEST['username']).' already exists';
                 } else {
                     $newuser = $member_handler->createUser();
                     if (isset($user_viewemail)) {
@@ -279,7 +279,7 @@ 
                     if ($_REQUEST['pass2'] != "") {
                         if ($_REQUEST['password'] != $_REQUEST['pass2']) {
                             $xoops->header();
-                            echo "<strong>" . SystemLocale::E_NEW_PASSWORDS_NOT_MATCH_TRY_AGAIN . "</strong>";
+                            echo "<strong>".SystemLocale::E_NEW_PASSWORDS_NOT_MATCH_TRY_AGAIN."</strong>";
                             $xoops->footer();
                             exit();
                         }
@@ -308,7 +308,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(SystemLocale::EF_COULD_NOT_ADD_USER_TO_GROUPS, implode(", ", $group_names));
                         } else {
                             XoopsUserUtility::sendWelcome($newuser);
@@ -356,7 +356,7 @@ 
         if (isset($_REQUEST['complet_search'])) {
             // Assign Breadcrumb menu
             $admin_page = new \Xoops\Module\Admin();
-            $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, \XoopsBaseConfig::get('url') . '/admin.php', true);
+            $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, \XoopsBaseConfig::get('url').'/admin.php', true);
             $admin_page->addBreadcrumbLink(SystemLocale::USERS_MANAGEMENT, $system->adminVersion('users', 'adminpath'));
             $admin_page->addBreadcrumbLink(XoopsLocale::ADVANCED_SEARCH);
             $admin_page->renderBreadcrumb();
@@ -370,7 +370,7 @@ 
             /* @var $group XoopsGroup */
             foreach ($group_arr as $group) {
                 if ($group->getVar("groupid") != FixedGroups::ANONYMOUS) {
-                    $group_select->addOption("" . $group->getVar("groupid") . "", "" . $group->getVar("name") . "");
+                    $group_select->addOption("".$group->getVar("groupid")."", "".$group->getVar("name")."");
                 }
             }
             unset($group);
@@ -477,7 +477,7 @@ 
             //Display data
             // Assign Breadcrumb menu
             $admin_page = new \Xoops\Module\Admin();
-            $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, \XoopsBaseConfig::get('url') . '/admin.php', true);
+            $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, \XoopsBaseConfig::get('url').'/admin.php', true);
             $admin_page->addBreadcrumbLink(SystemLocale::USERS_MANAGEMENT, $system->adminVersion('users', 'adminpath'));
             $admin_page->addBreadcrumbLink(XoopsLocale::LIST_);
             $admin_page->renderBreadcrumb();
@@ -487,7 +487,7 @@ 
             $admin_page->addItemButton(SystemLocale::ADD_USER, 'admin.php?fct=users&amp;op=users_add', 'add');
             $admin_page->renderButton();
 
-            $requete_search = '<br /><br /><strong>' . SystemLocale::C_SEE_SEARCH_REQUEST . '</strong><br /><br />';
+            $requete_search = '<br /><br /><strong>'.SystemLocale::C_SEE_SEARCH_REQUEST.'</strong><br /><br />';
             $requete_pagenav = '';
 
             $criteria = new CriteriaCompo();
@@ -496,84 +496,84 @@ 
             if (!empty($value)) {
                 $match = Request::getInt('user_uname_match', XOOPS_MATCH_START);
                 addCriteria($criteria, 'uname', $value, $match);
-                $requete_pagenav .= '&amp;user_uname=' . $myts->htmlSpecialChars($value) . '&amp;user_uname_match=' . $match;
-                $requete_search .= 'uname : ' . $value . ' and user_uname_match=' . $match . '<br />';
+                $requete_pagenav .= '&amp;user_uname='.$myts->htmlSpecialChars($value).'&amp;user_uname_match='.$match;
+                $requete_search .= 'uname : '.$value.' and user_uname_match='.$match.'<br />';
             }
 
             $value = Request::getString('user_name', '');
             if (!empty($value)) {
                 $match = Request::getInt('user_name_match', XOOPS_MATCH_START);
                 addCriteria($criteria, 'name', $value, $match);
-                $requete_pagenav .= '&amp;user_name=' . $myts->htmlSpecialChars($value) . '&amp;user_name_match=' . $match;
-                $requete_search .= 'name : ' . $value . ' and user_name_match=' . $match . '<br />';
+                $requete_pagenav .= '&amp;user_name='.$myts->htmlSpecialChars($value).'&amp;user_name_match='.$match;
+                $requete_search .= 'name : '.$value.' and user_name_match='.$match.'<br />';
             }
 
             $value = Request::getString('user_email', '');
             if (!empty($value)) {
                 $match = Request::getInt('user_email_match', XOOPS_MATCH_START);
                 addCriteria($criteria, 'email', $value, $match);
-                $requete_pagenav .= '&amp;user_email=' . $myts->htmlSpecialChars($value) . '&amp;user_email_match=' . $match;
-                $requete_search .= 'email : ' . $value . ' and user_email_match=' . $match . '<br />';
+                $requete_pagenav .= '&amp;user_email='.$myts->htmlSpecialChars($value).'&amp;user_email_match='.$match;
+                $requete_search .= 'email : '.$value.' and user_email_match='.$match.'<br />';
             }
 
             $value = Request::getString('user_url', '');
             if (!empty($value)) {
                 //$url = $xoops->formatURL(trim($_REQUEST['user_url']));
-                $criteria->add(new Criteria('url', '%' . $value . '%', 'LIKE'));
-                $requete_search .= 'url : ' . $value . '<br />';
+                $criteria->add(new Criteria('url', '%'.$value.'%', 'LIKE'));
+                $requete_search .= 'url : '.$value.'<br />';
             }
 
             $value = Request::getInt('user_icq', 0);
             if (!empty($value)) {
                 $match = Request::getInt('user_icq_match', XOOPS_MATCH_START);
-                addCriteria($criteria, 'user_icq', (string) $value, $match);
-                $requete_pagenav .= '&amp;user_icq=' . $value . '&amp;user_icq_match=' . $match;
-                $requete_search .= 'icq : ' . $value . ' and user_icq_match=' . $match . '<br />';
+                addCriteria($criteria, 'user_icq', (string)$value, $match);
+                $requete_pagenav .= '&amp;user_icq='.$value.'&amp;user_icq_match='.$match;
+                $requete_search .= 'icq : '.$value.' and user_icq_match='.$match.'<br />';
             }
 
             $value = Request::getString('user_aim', '');
             if (!empty($value)) {
                 $match = Request::getInt('user_aim_match', XOOPS_MATCH_START);
                 addCriteria($criteria, 'user_aim', $value, $match);
-                $requete_pagenav .= '&amp;user_aim=' . $myts->htmlSpecialChars($value) . '&amp;user_aim_match=' . $match;
-                $requete_search .= 'aim : ' . $value . ' and user_aim_match=' . $match . '<br />';
+                $requete_pagenav .= '&amp;user_aim='.$myts->htmlSpecialChars($value).'&amp;user_aim_match='.$match;
+                $requete_search .= 'aim : '.$value.' and user_aim_match='.$match.'<br />';
             }
 
             $value = Request::getString('user_yim', '');
             if (!empty($value)) {
                 $match = Request::getInt('user_yim_match', XOOPS_MATCH_START);
                 addCriteria($criteria, 'user_yim', $value, $match);
-                $requete_pagenav .= '&amp;user_yim=' . $myts->htmlSpecialChars($value) . '&amp;user_yim_match=' . $match;
-                $requete_search .= 'yim : ' . $value . ' and user_yim_match=' . $match . '<br />';
+                $requete_pagenav .= '&amp;user_yim='.$myts->htmlSpecialChars($value).'&amp;user_yim_match='.$match;
+                $requete_search .= 'yim : '.$value.' and user_yim_match='.$match.'<br />';
             }
 
             $value = Request::getString('user_msnm', '');
             if (!empty($value)) {
                 $match = Request::getInt('user_msnm_match', XOOPS_MATCH_START);
                 addCriteria($criteria, 'user_msnm', $value, $match);
-                $requete_pagenav .= '&amp;user_msnm=' . $myts->htmlSpecialChars($value) . '&amp;user_msnm_match=' . $match;
-                $requete_search .= 'msnm : ' . $value . ' and user_msnm_match=' . $match . '<br />';
+                $requete_pagenav .= '&amp;user_msnm='.$myts->htmlSpecialChars($value).'&amp;user_msnm_match='.$match;
+                $requete_search .= 'msnm : '.$value.' and user_msnm_match='.$match.'<br />';
             }
 
             $value = Request::getString('user_from', '');
             if (!empty($value)) {
-                $criteria->add(new Criteria('user_from', '%' . $value . '%', 'LIKE'));
-                $requete_pagenav .= '&amp;user_from=' . $myts->htmlSpecialChars($value);
-                $requete_search .= 'from : ' . $value . '<br />';
+                $criteria->add(new Criteria('user_from', '%'.$value.'%', 'LIKE'));
+                $requete_pagenav .= '&amp;user_from='.$myts->htmlSpecialChars($value);
+                $requete_search .= 'from : '.$value.'<br />';
             }
 
             $value = Request::getString('user_intrest', '');
             if (!empty($value)) {
-                $criteria->add(new Criteria('user_intrest', '%' . $value . '%', 'LIKE'));
-                $requete_pagenav .= '&amp;user_intrest=' . $myts->htmlSpecialChars($value);
-                $requete_search .= 'interet : ' . $value . '<br />';
+                $criteria->add(new Criteria('user_intrest', '%'.$value.'%', 'LIKE'));
+                $requete_pagenav .= '&amp;user_intrest='.$myts->htmlSpecialChars($value);
+                $requete_search .= 'interet : '.$value.'<br />';
             }
 
             $value = Request::getString('user_occ', '');
             if (!empty($value)) {
-                $criteria->add(new Criteria('user_occ', '%' . $value . '%', 'LIKE'));
-                $requete_pagenav .= '&amp;user_occ=' . $myts->htmlSpecialChars($value);
-                $requete_search .= 'location : ' . $value . '<br />';
+                $criteria->add(new Criteria('user_occ', '%'.$value.'%', 'LIKE'));
+                $requete_pagenav .= '&amp;user_occ='.$myts->htmlSpecialChars($value);
+                $requete_search .= 'location : '.$value.'<br />';
             }
 
             $value = Request::getInt('user_lastlog_more', 0);
@@ -581,8 +581,8 @@ 
                 $time = time() - (60 * 60 * 24 * $value);
                 if ($time > 0) {
                     $criteria->add(new Criteria('last_login', $time, '<'));
-                    $requete_pagenav .= '&amp;user_lastlog_more=' . $value;
-                    $requete_search .= 'derniere connexion apres : ' . $value . '<br />';
+                    $requete_pagenav .= '&amp;user_lastlog_more='.$value;
+                    $requete_search .= 'derniere connexion apres : '.$value.'<br />';
                 }
             }
 
@@ -591,8 +591,8 @@ 
                 $time = time() - (60 * 60 * 24 * $value);
                 if ($time > 0) {
                     $criteria->add(new Criteria('last_login', $time, '>'));
-                    $requete_pagenav .= '&amp;user_lastlog_less=' . $value;
-                    $requete_search .= 'derniere connexion avant : ' . $value . '<br />';
+                    $requete_pagenav .= '&amp;user_lastlog_less='.$value;
+                    $requete_search .= 'derniere connexion avant : '.$value.'<br />';
                 }
             }
 
@@ -601,8 +601,8 @@ 
                 $time = time() - (60 * 60 * 24 * $value);
                 if ($time > 0) {
                     $criteria->add(new Criteria('user_regdate', $time, '<'));
-                    $requete_pagenav .= '&amp;user_reg_more=' . $value;
-                    $requete_search .= 'enregistre apres : ' . $value . '<br />';
+                    $requete_pagenav .= '&amp;user_reg_more='.$value;
+                    $requete_search .= 'enregistre apres : '.$value.'<br />';
                 }
             }
 
@@ -611,31 +611,31 @@ 
                 $time = time() - (60 * 60 * 24 * $value);
                 if ($time > 0) {
                     $criteria->add(new Criteria('user_regdate', $time, '>'));
-                    $requete_pagenav .= '&amp;user_reg_less=' . $value;
-                    $requete_search .= 'enregistre avant : ' . $value . '<br />';
+                    $requete_pagenav .= '&amp;user_reg_less='.$value;
+                    $requete_search .= 'enregistre avant : '.$value.'<br />';
                 }
             }
 
             $value = Request::getInt('user_posts_more', 0);
             if (!empty($value)) {
                 $criteria->add(new Criteria('posts', $value, '>'));
-                $requete_pagenav .= '&amp;user_posts_more=' . $value;
-                $requete_search .= 'posts plus de : ' . $value . '<br />';
+                $requete_pagenav .= '&amp;user_posts_more='.$value;
+                $requete_search .= 'posts plus de : '.$value.'<br />';
             }
 
             $value = Request::getInt('user_posts_less', 0);
             if (!empty($value)) {
                 $criteria->add(new Criteria('posts', $value, '<'));
-                $requete_pagenav .= '&amp;user_posts_less=' . $value;
-                $requete_search .= 'post moins de : ' . $value . '<br />';
+                $requete_pagenav .= '&amp;user_posts_less='.$value;
+                $requete_search .= 'post moins de : '.$value.'<br />';
             }
 
             $value = Request::getWord('user_mailok', '');
             if (!empty($value) && ($value !== 'both')) {
                 $ok = ($value === 'mailok') ? 1 : 0;
                 $criteria->add(new Criteria('user_mailok', $ok));
-                $requete_pagenav .= '&amp;user_mailok=' . $value;
-                $requete_search .= 'accept email : ' . $value . '<br />';
+                $requete_pagenav .= '&amp;user_mailok='.$value;
+                $requete_search .= 'accept email : '.$value.'<br />';
             }
 
             $user_type = Request::getWord('user_type', '');
@@ -645,31 +645,31 @@ 
                 } elseif ($user_type === "actv") {
                     $criteria->add(new Criteria('level', 0, '>'));
                 }
-                $requete_search .= 'actif ou inactif : ' . $user_type . '<br />';
-                $requete_pagenav .= '&amp;user_type=' . $user_type;
+                $requete_search .= 'actif ou inactif : '.$user_type.'<br />';
+                $requete_pagenav .= '&amp;user_type='.$user_type;
             }
 
             //$groups = empty($_REQUEST['selgroups']) ? array() : array_map("intval", $_REQUEST['selgroups']);
             $validsort = array("uname", "email", "last_login", "user_regdate", "posts");
             $sort = Request::getWord('user_sort', 'user_regdate');
             $sort = (!in_array($sort, $validsort)) ? "user_regdate" : $sort;
-            $requete_pagenav .= '&amp;user_sort=' . $sort;
-            $requete_search .= 'order by : ' . $sort . '<br />';
+            $requete_pagenav .= '&amp;user_sort='.$sort;
+            $requete_search .= 'order by : '.$sort.'<br />';
             $criteria->setSort($sort);
 
             $order = Request::getWord('user_order', 'DESC');
-            $requete_pagenav .= '&amp;user_order=' . $order;
-            $requete_search .= 'tris : ' . $order . '<br />';
+            $requete_pagenav .= '&amp;user_order='.$order;
+            $requete_search .= 'tris : '.$order.'<br />';
             $criteria->setOrder($order);
 
             $user_limit = $xoops->getModuleConfig('users_pager', 'system');
             if (isset($_REQUEST['user_limit'])) {
                 $user_limit = $_REQUEST['user_limit'];
-                $requete_pagenav .= '&amp;user_limit=' . $myts->htmlSpecialChars($_REQUEST['user_limit']);
-                $requete_search .= 'limit : ' . $user_limit . '<br />';
+                $requete_pagenav .= '&amp;user_limit='.$myts->htmlSpecialChars($_REQUEST['user_limit']);
+                $requete_search .= 'limit : '.$user_limit.'<br />';
             } else {
-                $requete_pagenav .= '&amp;user_limit=' . $xoops->getModuleConfig('users_pager', 'system');
-                $requete_search .= 'limit : ' . $user_limit . '<br />';
+                $requete_pagenav .= '&amp;user_limit='.$xoops->getModuleConfig('users_pager', 'system');
+                $requete_search .= 'limit : '.$user_limit.'<br />';
             }
 
             $start = (!empty($_REQUEST['start'])) ? (int)($_REQUEST['start']) : 0;
@@ -684,7 +684,7 @@ 
                 } else {
                     $groups = array();
                 }
-                $requete_pagenav .= '&amp;selgroups=' . $myts->htmlSpecialChars($_REQUEST['selgroups']);
+                $requete_pagenav .= '&amp;selgroups='.$myts->htmlSpecialChars($_REQUEST['selgroups']);
             } else {
                 $groups = array();
             }
@@ -693,7 +693,7 @@ 
             $users_count = $member_handler->getUserCountByGroupLink($groups, $criteria);
             $users_arr = array();
             if ($start < $users_count) {
-                echo sprintf(XoopsLocale::F_USERS_FOUND, $users_count) . "<br />";
+                echo sprintf(XoopsLocale::F_USERS_FOUND, $users_count)."<br />";
                 $criteria->setSort($sort);
                 $criteria->setOrder($order);
                 $criteria->setLimit($user_limit);
@@ -716,32 +716,32 @@ 
             $user_uname = (!isset($_REQUEST['user_uname'])) ? '' : $_REQUEST['user_uname'];
             //Form tris
             $form = '<form action="admin.php?fct=users" method="post">
-                    ' . SystemLocale::C_SEARCH_USER . '<input type="text" name="user_uname" value="' . $myts->htmlSpecialChars($user_uname) . '" size="15">
+                    ' . SystemLocale::C_SEARCH_USER.'<input type="text" name="user_uname" value="'.$myts->htmlSpecialChars($user_uname).'" size="15">
                     <select name="selgroups">
-                        <option value="" selected="selected">' . XoopsLocale::ALL_GROUPS . '</option>';
+                        <option value="" selected="selected">' . XoopsLocale::ALL_GROUPS.'</option>';
             $group_handler = $xoops->getHandlerGroup();
             $group_arr = $group_handler->getObjects();
             /* @var $group XoopsGroup */
             foreach ($group_arr as $group) {
                 if ($group->getVar("groupid") != FixedGroups::ANONYMOUS) {
-                    $form .= '<option value="' . $group->getVar("groupid") . '"  ' . ($selgroups == $group->getVar("groupid") ? ' selected="selected"' : '') . '>' . $group->getVar("name") . '</option>';
+                    $form .= '<option value="'.$group->getVar("groupid").'"  '.($selgroups == $group->getVar("groupid") ? ' selected="selected"' : '').'>'.$group->getVar("name").'</option>';
                 }
             }
             unset($group);
             $form .= '</select>&nbsp;
                 <select name="user_type">
-                    <option value="" ' . ($user_type == '' ? ' selected="selected"' : '') . '>' . XoopsLocale::ALL_USERS . '</option>
-                    <option value="actv" ' . ($user_type === 'actv' ? ' selected="selected"' : '') . '>' . SystemLocale::ONLY_ACTIVE_USERS . '</option>
-                    <option value="inactv" ' . ($user_type === 'inactv' ? ' selected="selected"' : '') . '>' . SystemLocale::ONLY_INACTIVE_USERS . '</option>
+                    <option value="" ' . ($user_type == '' ? ' selected="selected"' : '').'>'.XoopsLocale::ALL_USERS.'</option>
+                    <option value="actv" ' . ($user_type === 'actv' ? ' selected="selected"' : '').'>'.SystemLocale::ONLY_ACTIVE_USERS.'</option>
+                    <option value="inactv" ' . ($user_type === 'inactv' ? ' selected="selected"' : '').'>'.SystemLocale::ONLY_INACTIVE_USERS.'</option>
                 </select>&nbsp;
                 <select name="user_limit">
-                    <option value="20" ' . ($user_limit == 20 ? ' selected="selected"' : '') . '>20</option>
-                    <option value="50" ' . ($user_limit == 50 ? ' selected="selected"' : '') . '>50</option>
-                    <option value="100" ' . ($user_limit == 100 ? ' selected="selected"' : '') . '>100</option>
+                    <option value="20" ' . ($user_limit == 20 ? ' selected="selected"' : '').'>20</option>
+                    <option value="50" ' . ($user_limit == 50 ? ' selected="selected"' : '').'>50</option>
+                    <option value="100" ' . ($user_limit == 100 ? ' selected="selected"' : '').'>100</option>
                 </select>&nbsp;
                 <input type="hidden" name="user_uname_match" value="XOOPS_MATCH_START" />
-                <input class="btn" type="submit" value="' . XoopsLocale::A_SEARCH . '" name="speed_search">&nbsp;
-                <input class="btn success" type="submit" value="' . XoopsLocale::ADVANCED_SEARCH . '" name="complet_search"></form>
+                <input class="btn" type="submit" value="' . XoopsLocale::A_SEARCH.'" name="speed_search">&nbsp;
+                <input class="btn success" type="submit" value="' . XoopsLocale::ADVANCED_SEARCH.'" name="complet_search"></form>
                 ';
 
             //select groupe
@@ -752,7 +752,7 @@ 
             /* @var $group XoopsGroup */
             foreach ($group_arr as $group) {
                 if ($group->getVar("groupid") != FixedGroups::ANONYMOUS) {
-                    $form_select_groups .= '<option value="' . $group->getVar("groupid") . '"  ' . ($selgroups == $group->getVar("groupid") ? ' selected="selected"' : '') . '>' . $group->getVar("name") . '</option>';
+                    $form_select_groups .= '<option value="'.$group->getVar("groupid").'"  '.($selgroups == $group->getVar("groupid") ? ' selected="selected"' : '').'>'.$group->getVar("name").'</option>';
                 }
             }
             unset($group);
@@ -807,7 +807,7 @@ 
             }
 
             if ($users_count > $user_limit) {
-                $nav = new XoopsPageNav($users_count, $user_limit, $start, 'start', 'fct=users&amp;op=default' . $requete_pagenav);
+                $nav = new XoopsPageNav($users_count, $user_limit, $start, 'start', 'fct=users&amp;op=default'.$requete_pagenav);
                 $xoops->tpl()->assign('nav', $nav->renderNav());
             }
         }
@@ -832,17 +832,17 @@ 
     switch ($match) {
         default:
         case XOOPS_MATCH_START:
-            $value = $value . '%';
+            $value = $value.'%';
             break;
         case XOOPS_MATCH_END:
-            $value = '%' . $value;
+            $value = '%'.$value;
             break;
         case XOOPS_MATCH_EQUAL:
             //$value = $value;
             $relation = '=';
             break;
         case XOOPS_MATCH_CONTAIN:
-            $value = '%' . $value . '%';
+            $value = '%'.$value.'%';
             break;
     }
     $criteria->add(new Criteria($column, $value, $relation));

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

Switch Indentation +20 added lines, -20 removed lines

@@ -40,28 +40,28 @@
 switch ($op) {
 
     // Display post
-    case 'display_post':
-        include_once $xoops->path('modules/system/include/functions.php');
+        case 'display_post':
+            include_once $xoops->path('modules/system/include/functions.php');
 
-        $uid = $system->cleanVars($_REQUEST, 'uid', 'int');
-        $total_posts = 0;
+            $uid = $system->cleanVars($_REQUEST, 'uid', 'int');
+            $total_posts = 0;
 
-        /* @var $plugin SystemPluginInterface */
-        $plugins = \Xoops\Module\Plugin::getPlugins();
-        foreach ($plugins as $plugin) {
-            if ($res = $plugin->userPosts($uid)) {
-                $total_posts += $res;
+            /* @var $plugin SystemPluginInterface */
+            $plugins = \Xoops\Module\Plugin::getPlugins();
+            foreach ($plugins as $plugin) {
+                if ($res = $plugin->userPosts($uid)) {
+                    $total_posts += $res;
+                }
             }
-        }
 
-        $qb = $xoops->db()->createXoopsQueryBuilder();
-        $eb = $qb->expr();
-        $sql = $qb->updatePrefix('system_user')
-            ->set('posts', ':posts')
-            ->where('uid = :uid')
-            ->setParameter(':posts', $total_posts)
-            ->setParameter(':uid', $uid);
-        $row_count = $sql->execute();
-        echo $row_count;
-        break;
+            $qb = $xoops->db()->createXoopsQueryBuilder();
+            $eb = $qb->expr();
+            $sql = $qb->updatePrefix('system_user')
+                ->set('posts', ':posts')
+                ->where('uid = :uid')
+                ->setParameter(':posts', $total_posts)
+                ->setParameter(':uid', $uid);
+            $row_count = $sql->execute();
+            echo $row_count;
+            break;
 }

Spacing +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
  * @version     $Id$
  */
 
-include dirname(dirname(__DIR__)) . '/header.php';
+include dirname(dirname(__DIR__)).'/header.php';
 
 $xoops = Xoops::getInstance();
 $system = System::getInstance();

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

Spacing +1 added lines, -1 removed lines

@@ -79,7 +79,7 @@
 
         // Define Breadcrumb and tips
         $admin_page = new \Xoops\Module\Admin();
-        $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, \XoopsBaseConfig::get('url') . '/admin.php', true);
+        $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, \XoopsBaseConfig::get('url').'/admin.php', true);
         $admin_page->addBreadcrumbLink(XoopsLocale::PREFERENCES, $system->adminVersion('extensions', 'adminpath'));
         $admin_page->addBreadcrumbLink($module->getVar('name'));
         $admin_page->renderBreadcrumb();

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

Spacing +46 added lines, -46 removed lines

@@ -55,7 +55,7 @@ 
     default:
         // Define Breadcrumb and tips
         $admin_page = new \Xoops\Module\Admin();
-        $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, \XoopsBaseConfig::get('url') . '/admin.php', true);
+        $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, \XoopsBaseConfig::get('url').'/admin.php', true);
         $admin_page->addBreadcrumbLink(SystemLocale::TEMPLATES_MANAGER, $system->adminVersion('tplsets', 'adminpath'));
         $admin_page->renderBreadcrumb();
         $admin_page->addTips(SystemLocale::TEMPLATES_TIPS);
@@ -104,7 +104,7 @@ 
             $xoops->redirect('admin.php?fct=tplsets', 3, implode('<br />', $xoops->security()->getErrors()));
         }
         // Assign Breadcrumb menu
-        $system_breadcrumb->addHelp(system_adminVersion('tplsets', 'help') . '#override');
+        $system_breadcrumb->addHelp(system_adminVersion('tplsets', 'help').'#override');
         $system_breadcrumb->addLink(SystemLocale::FILES_GENERATED);
         $system_breadcrumb->render();
 
@@ -113,8 +113,8 @@ 
             if (isset($_REQUEST['select_theme']) && isset($_REQUEST['force_generated'])) {
                 //on verifie si le dossier module existe
                 $template_overload = \XoopsBaseConfig::get('themes-path')
-                    . '/' . $_REQUEST['select_theme'] . '/modules';
-                $indexFile = \XoopsBaseConfig::get('root-path') . "/modules/system/include/index.html";
+                    . '/'.$_REQUEST['select_theme'].'/modules';
+                $indexFile = \XoopsBaseConfig::get('root-path')."/modules/system/include/index.html";
                 $verif_write = false;
                 $text = '';
 
@@ -125,7 +125,7 @@ 
                         mkdir($template_overload, 0777);
                     }
                     chmod($template_overload, 0777);
-                    copy($indexFile, $template_overload . "/index.html");
+                    copy($indexFile, $template_overload."/index.html");
                 }
 
                 $tplset = $system->cleanVars($POST, 'tplset', 'default', 'string');
@@ -153,42 +153,42 @@ 
                                 $module = $xoops->getModuleByDirname($moddir);
                                 if (is_object($module)) {
                                     // create module folder
-                                    if (!is_dir($template_overload . '/' . $module->getVar('dirname'))) {
-                                        mkdir($template_overload . '/' . $module->getVar('dirname'), 0777);
-                                        chmod($template_overload . '/' . $module->getVar('dirname'), 0777);
-                                        copy($indexFile, $template_overload . '/' . $module->getVar('dirname') . '/index.html');
+                                    if (!is_dir($template_overload.'/'.$module->getVar('dirname'))) {
+                                        mkdir($template_overload.'/'.$module->getVar('dirname'), 0777);
+                                        chmod($template_overload.'/'.$module->getVar('dirname'), 0777);
+                                        copy($indexFile, $template_overload.'/'.$module->getVar('dirname').'/index.html');
                                     }
 
                                     // create block folder
-                                    if (!is_dir($template_overload . '/' . $module->getVar('dirname') . '/blocks')) {
-                                        if (!is_dir($template_overload . '/' . $module->getVar('dirname') . '/blocks')) {
-                                            mkdir($template_overload . '/' . $module->getVar('dirname') . '/blocks', 0777);
+                                    if (!is_dir($template_overload.'/'.$module->getVar('dirname').'/blocks')) {
+                                        if (!is_dir($template_overload.'/'.$module->getVar('dirname').'/blocks')) {
+                                            mkdir($template_overload.'/'.$module->getVar('dirname').'/blocks', 0777);
                                         }
-                                        chmod($template_overload . '/' . $module->getVar('dirname') . '/blocks', 0777);
-                                        copy($indexFile, $template_overload . '/' . $module->getVar('dirname') . '/blocks' . '/index.html');
+                                        chmod($template_overload.'/'.$module->getVar('dirname').'/blocks', 0777);
+                                        copy($indexFile, $template_overload.'/'.$module->getVar('dirname').'/blocks'.'/index.html');
                                     }
 
                                     $class = "odd";
-                                    $text .= '<table cellspacing="1" class="outer"><tr><th colspan="3" align="center">' . XoopsLocale::C_MODULES . ucfirst($module->getVar('dirname')) . '</th></tr><tr><th align="center">' . XoopsLocale::TYPES . '</th><th  align="center">' . XoopsLocale::FILES . '</th><th>' . XoopsLocale::STATUS . '</th></tr>';
+                                    $text .= '<table cellspacing="1" class="outer"><tr><th colspan="3" align="center">'.XoopsLocale::C_MODULES.ucfirst($module->getVar('dirname')).'</th></tr><tr><th align="center">'.XoopsLocale::TYPES.'</th><th  align="center">'.XoopsLocale::FILES.'</th><th>'.XoopsLocale::STATUS.'</th></tr>';
 
                                     // create template
                                     $templates = $tpltpl_handler->find($tplsetname, 'module', null, $moddir);
                                     for ($j = 0; $j < count($templates); ++$j) {
                                         $filename = $templates[$j]->getVar('tpl_file');
                                         if ($tplsetname == $tplset) {
-                                            $physical_file = \XoopsBaseConfig::get('themes-path') . '/' . $_REQUEST['select_theme'] . '/modules/' . $moddir . '/' . $filename;
+                                            $physical_file = \XoopsBaseConfig::get('themes-path').'/'.$_REQUEST['select_theme'].'/modules/'.$moddir.'/'.$filename;
 
                                             $tplfile = $tpltpl_handler->get($templates[$j]->getVar('tpl_id'), true);
 
                                             if (is_object($tplfile)) {
                                                 if (!XoopsLoad::fileExists($physical_file) || $_REQUEST['force_generated'] == 1) {
                                                     $open = fopen($physical_file, 'w+');
-                                                    if (fwrite($open, "" . html_entity_decode($tplfile->getVar('tpl_source', 'E'), ENT_QUOTES))) {
-                                                        $text .= '<tr class="' . $class . '"><td align="center">' . XoopsLocale::TEMPLATES . '</td><td>' . $physical_file . '</td><td align="center">';
+                                                    if (fwrite($open, "".html_entity_decode($tplfile->getVar('tpl_source', 'E'), ENT_QUOTES))) {
+                                                        $text .= '<tr class="'.$class.'"><td align="center">'.XoopsLocale::TEMPLATES.'</td><td>'.$physical_file.'</td><td align="center">';
                                                         if (XoopsLoad::fileExists($physical_file)) {
-                                                            $text .= '<img width="16" src="' . system_AdminIcons('success.png') . '" /></td></tr>';
+                                                            $text .= '<img width="16" src="'.system_AdminIcons('success.png').'" /></td></tr>';
                                                         } else {
-                                                            $text .= '<img width="16" src="' . system_AdminIcons('cancel.png') . '" /></td></tr>';
+                                                            $text .= '<img width="16" src="'.system_AdminIcons('cancel.png').'" /></td></tr>';
                                                         }
                                                         $verif_write = true;
                                                     }
@@ -204,18 +204,18 @@ 
                                     for ($k = 0; $k < count($btemplates); ++$k) {
                                         $filename = $btemplates[$k]->getVar('tpl_file');
                                         if ($tplsetname == $tplset) {
-                                            $physical_file = \XoopsBaseConfig::get('themes-path') . '/' . $_REQUEST['select_theme'] . '/modules/' . $moddir . '/blocks/' . $filename;
+                                            $physical_file = \XoopsBaseConfig::get('themes-path').'/'.$_REQUEST['select_theme'].'/modules/'.$moddir.'/blocks/'.$filename;
                                             $btplfile = $tpltpl_handler->get($btemplates[$k]->getVar('tpl_id'), true);
 
                                             if (is_object($btplfile)) {
                                                 if (!XoopsLoad::fileExists($physical_file) || $_REQUEST['force_generated'] == 1) {
                                                     $open = fopen($physical_file, 'w+');
-                                                    if (fwrite($open, "" . utf8_encode(html_entity_decode($btplfile->getVar('tpl_source', 'E'))) . "")) {
-                                                        $text .= '<tr class="' . $class . '"><td align="center">' . XoopsLocale::BLOCKS . '</td><td>' . $physical_file . '</td><td align="center">';
+                                                    if (fwrite($open, "".utf8_encode(html_entity_decode($btplfile->getVar('tpl_source', 'E')))."")) {
+                                                        $text .= '<tr class="'.$class.'"><td align="center">'.XoopsLocale::BLOCKS.'</td><td>'.$physical_file.'</td><td align="center">';
                                                         if (XoopsLoad::fileExists($physical_file)) {
-                                                            $text .= '<img width="16" src="' . system_AdminIcons('success.png') . '" /></td></tr>';
+                                                            $text .= '<img width="16" src="'.system_AdminIcons('success.png').'" /></td></tr>';
                                                         } else {
-                                                            $text .= '<img width="16" src="' . system_AdminIcons('cancel.png') . '" /></td></tr>';
+                                                            $text .= '<img width="16" src="'.system_AdminIcons('cancel.png').'" /></td></tr>';
                                                         }
                                                         $verif_write = true;
                                                     }
@@ -241,23 +241,23 @@ 
                             $module = $xoops->getModuleByDirname($moddir);
                             if (is_object($module)) {
                                 // create module folder
-                                if (!is_dir($template_overload . '/' . $module->getVar('dirname'))) {
-                                    mkdir($template_overload . '/' . $module->getVar('dirname'), 0777);
-                                    chmod($template_overload . '/' . $module->getVar('dirname'), 0777);
-                                    copy($indexFile, $template_overload . '/' . $module->getVar('dirname') . '/index.html');
+                                if (!is_dir($template_overload.'/'.$module->getVar('dirname'))) {
+                                    mkdir($template_overload.'/'.$module->getVar('dirname'), 0777);
+                                    chmod($template_overload.'/'.$module->getVar('dirname'), 0777);
+                                    copy($indexFile, $template_overload.'/'.$module->getVar('dirname').'/index.html');
                                 }
 
                                 // create block folder
-                                if (!is_dir($template_overload . '/' . $module->getVar('dirname') . '/blocks')) {
-                                    if (!is_dir($template_overload . '/' . $module->getVar('dirname') . '/blocks')) {
-                                        mkdir($template_overload . '/' . $module->getVar('dirname') . '/blocks', 0777);
+                                if (!is_dir($template_overload.'/'.$module->getVar('dirname').'/blocks')) {
+                                    if (!is_dir($template_overload.'/'.$module->getVar('dirname').'/blocks')) {
+                                        mkdir($template_overload.'/'.$module->getVar('dirname').'/blocks', 0777);
                                     }
-                                    chmod($template_overload . '/' . $module->getVar('dirname') . '/blocks', 0777);
-                                    copy($indexFile, $template_overload . '/' . $module->getVar('dirname') . '/blocks' . '/index.html');
+                                    chmod($template_overload.'/'.$module->getVar('dirname').'/blocks', 0777);
+                                    copy($indexFile, $template_overload.'/'.$module->getVar('dirname').'/blocks'.'/index.html');
                                 }
 
                                 $class = "odd";
-                                $text .= '<table cellspacing="1" class="outer"><tr><th colspan="3" align="center">' . XoopsLocale::C_MODULES . ucfirst($module->getVar('dirname')) . '</th></tr><tr><th align="center">' . XoopsLocale::TYPES . '</th><th  align="center">' . XoopsLocale::FILES . '</th><th>' . XoopsLocale::STATUS . '</th></tr>';
+                                $text .= '<table cellspacing="1" class="outer"><tr><th colspan="3" align="center">'.XoopsLocale::C_MODULES.ucfirst($module->getVar('dirname')).'</th></tr><tr><th align="center">'.XoopsLocale::TYPES.'</th><th  align="center">'.XoopsLocale::FILES.'</th><th>'.XoopsLocale::STATUS.'</th></tr>';
                                 $select_templates_modules = $_REQUEST['select_templates_modules'];
                                 for ($l = 0; $l < count($_REQUEST['select_templates_modules']); ++$l) {
                                     // create template
@@ -265,7 +265,7 @@ 
                                     for ($j = 0; $j < count($templates); ++$j) {
                                         $filename = $templates[$j]->getVar('tpl_file');
                                         if ($tplsetname == $tplset) {
-                                            $physical_file = \XoopsBaseConfig::get('themes-path') . '/' . $_REQUEST['select_theme'] . '/modules/' . $moddir . '/' . $filename;
+                                            $physical_file = \XoopsBaseConfig::get('themes-path').'/'.$_REQUEST['select_theme'].'/modules/'.$moddir.'/'.$filename;
 
                                             $tplfile = $tpltpl_handler->get($templates[$j]->getVar('tpl_id'), true);
 
@@ -274,11 +274,11 @@ 
                                                     if ($select_templates_modules[$l] == $filename) {
                                                         $open = fopen($physical_file, 'w+');
                                                         if (fwrite($open, html_entity_decode($tplfile->getVar('tpl_source', 'E'), ENT_QUOTES))) {
-                                                            $text .= '<tr class="' . $class . '"><td align="center">' . XoopsLocale::TEMPLATES . '</td><td>' . $physical_file . '</td><td align="center">';
+                                                            $text .= '<tr class="'.$class.'"><td align="center">'.XoopsLocale::TEMPLATES.'</td><td>'.$physical_file.'</td><td align="center">';
                                                             if (XoopsLoad::fileExists($physical_file)) {
-                                                                $text .= '<img width="16" src="' . system_AdminIcons('success.png') . '" /></td></tr>';
+                                                                $text .= '<img width="16" src="'.system_AdminIcons('success.png').'" /></td></tr>';
                                                             } else {
-                                                                $text .= '<img width="16" src="' . system_AdminIcons('cancel.png') . '" /></td></tr>';
+                                                                $text .= '<img width="16" src="'.system_AdminIcons('cancel.png').'" /></td></tr>';
                                                             }
                                                             $verif_write = true;
                                                         }
@@ -295,19 +295,19 @@ 
                                     for ($k = 0; $k < count($btemplates); ++$k) {
                                         $filename = $btemplates[$k]->getVar('tpl_file');
                                         if ($tplsetname == $tplset) {
-                                            $physical_file = \XoopsBaseConfig::get('themes-path') . '/' . $_REQUEST['select_theme'] . '/modules/' . $moddir . '/blocks/' . $filename;
+                                            $physical_file = \XoopsBaseConfig::get('themes-path').'/'.$_REQUEST['select_theme'].'/modules/'.$moddir.'/blocks/'.$filename;
                                             $btplfile = $tpltpl_handler->get($btemplates[$k]->getVar('tpl_id'), true);
 
                                             if (is_object($btplfile)) {
                                                 if (!XoopsLoad::fileExists($physical_file) || $_REQUEST['force_generated'] == 1) {
                                                     if ($select_templates_modules[$l] == $filename) {
                                                         $open = fopen($physical_file, 'w+');
-                                                        if (fwrite($open, utf8_encode(html_entity_decode($btplfile->getVar('tpl_source', 'E'))) . "")) {
-                                                            $text .= '<tr class="' . $class . '"><td align="center">' . XoopsLocale::BLOCKS . '</td><td>' . $physical_file . '</td><td align="center">';
+                                                        if (fwrite($open, utf8_encode(html_entity_decode($btplfile->getVar('tpl_source', 'E')))."")) {
+                                                            $text .= '<tr class="'.$class.'"><td align="center">'.XoopsLocale::BLOCKS.'</td><td>'.$physical_file.'</td><td align="center">';
                                                             if (XoopsLoad::fileExists($physical_file)) {
-                                                                $text .= '<img width="16" src="' . system_AdminIcons('success.png') . '" /></td></tr>';
+                                                                $text .= '<img width="16" src="'.system_AdminIcons('success.png').'" /></td></tr>';
                                                             } else {
-                                                                $text .= '<img width="16" src="' . system_AdminIcons('cancel.png') . '" /></td></tr>';
+                                                                $text .= '<img width="16" src="'.system_AdminIcons('cancel.png').'" /></td></tr>';
                                                             }
                                                             $verif_write = true;
                                                         }
@@ -365,14 +365,14 @@ 
         }
         $clean_path_file = Request::getString('path_file', '');
         if (!empty($clean_path_file)) {
-            $path_file = realpath(\XoopsBaseConfig::get('themes-path') . '/' . trim($clean_path_file));
+            $path_file = realpath(\XoopsBaseConfig::get('themes-path').'/'.trim($clean_path_file));
             $path_file = str_replace('\\', '/', $path_file);
             $pathInfo = pathinfo($path_file);
             if (!in_array($pathInfo['extension'], array('css', 'html', 'tpl'))) {
                 $xoops->redirect("admin.php?fct=tplsets", 2, XoopsLocale::E_NOT_DONE);
             }
             // copy file
-            $copy_file = $path_file . '.back';
+            $copy_file = $path_file.'.back';
             copy($path_file, $copy_file);
             // Save modif
             if (isset($_REQUEST['templates'])) {

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

Spacing +20 added lines, -20 removed lines

@@ -20,7 +20,7 @@ 
  * @package     system
  */
 
-include dirname(dirname(__DIR__)) . '/header.php';
+include dirname(dirname(__DIR__)).'/header.php';
 
 $xoops = Xoops::getInstance();
 $xoops->logger()->quiet();
@@ -29,7 +29,7 @@ 
     exit(XoopsLocale::E_NO_ACCESS_PERMISSION);
 }
 
-if (isset($_REQUEST['dir']) && strpos($_REQUEST['dir'],'..') !== false || isset($_REQUEST['path_file']) && strpos($_REQUEST['path_file'],'..') !== false) {
+if (isset($_REQUEST['dir']) && strpos($_REQUEST['dir'], '..') !== false || isset($_REQUEST['path_file']) && strpos($_REQUEST['path_file'], '..') !== false) {
     exit(XoopsLocale::E_NO_ACCESS_PERMISSION);
 }
 
@@ -42,33 +42,33 @@ 
     case "tpls_display_folder":
         $_REQUEST['dir'] = urldecode($_REQUEST['dir']);
         $root = \XoopsBaseConfig::get('themes-path');
-        if (XoopsLoad::fileExists($root . $_REQUEST['dir'])) {
-            $files = scandir($root . $_REQUEST['dir']);
+        if (XoopsLoad::fileExists($root.$_REQUEST['dir'])) {
+            $files = scandir($root.$_REQUEST['dir']);
             natcasesort($files);
             if (count($files) > 2) { /* The 2 accounts for . and .. */
                 echo "<ul class=\"jqueryFileTree\" style=\"display: none;\">";
                 // All dirs
                 foreach ($files as $file) {
 
-                    if (XoopsLoad::fileExists($root . $_REQUEST['dir'] . $file) && $file !== '.' && $file !== '..' && is_dir($root . $_REQUEST['dir'] . $file)) {
+                    if (XoopsLoad::fileExists($root.$_REQUEST['dir'].$file) && $file !== '.' && $file !== '..' && is_dir($root.$_REQUEST['dir'].$file)) {
                         //retirer .svn
                         $file_no_valid = array('.svn', 'icons', 'img', 'images', 'language', 'locale');
 
                         if (!in_array($file, $file_no_valid)) {
-                            echo "<li class=\"directory collapsed\"><a href=\"#\" rel=\"" . htmlentities($_REQUEST['dir'] . $file) . "/\">" . htmlentities($file) . "</a></li>";
+                            echo "<li class=\"directory collapsed\"><a href=\"#\" rel=\"".htmlentities($_REQUEST['dir'].$file)."/\">".htmlentities($file)."</a></li>";
                         }
                     }
                 }
                 // All files
                 foreach ($files as $file) {
-                    if (XoopsLoad::fileExists($root . $_REQUEST['dir'] . $file) && $file !== '.' && $file !== '..' && !is_dir($root . $_REQUEST['dir'] . $file) && $file !== 'index.html') {
+                    if (XoopsLoad::fileExists($root.$_REQUEST['dir'].$file) && $file !== '.' && $file !== '..' && !is_dir($root.$_REQUEST['dir'].$file) && $file !== 'index.html') {
                         $ext = preg_replace('/^.*\./', '', $file);
 
                         $extensions = array('.tpl', '.html', '.htm', '.css');
                         $extension_verif = strrchr($file, '.');
 
                         if (in_array($extension_verif, $extensions)) {
-                            echo "<li class=\"file ext_$ext\"><a href=\"#\" onclick=\"tpls_edit_file('" . htmlentities($_REQUEST['dir'] . $file) . "', '" . htmlentities($_REQUEST['dir']) . "', '" . htmlentities($file) . "', '" . $ext . "');\" rel=\"tpls_edit_file('" . htmlentities($_REQUEST['dir'] . $file) . "', '" . htmlentities($_REQUEST['dir']) . "', '" . htmlentities($file) . "', '" . $ext . "');\">" . htmlentities($file) . "</a></li>";
+                            echo "<li class=\"file ext_$ext\"><a href=\"#\" onclick=\"tpls_edit_file('".htmlentities($_REQUEST['dir'].$file)."', '".htmlentities($_REQUEST['dir'])."', '".htmlentities($file)."', '".$ext."');\" rel=\"tpls_edit_file('".htmlentities($_REQUEST['dir'].$file)."', '".htmlentities($_REQUEST['dir'])."', '".htmlentities($file)."', '".$ext."');\">".htmlentities($file)."</a></li>";
                         } else {
                             //echo "<li class=\"file ext_$ext\">" . htmlentities($file) . "</li>";
                         }
@@ -83,12 +83,12 @@ 
         $clean_file = Request::getString('file', '');
         $clean_path_file = Request::getString('path_file', '');
         $path_file = realpath(XOOPS_ROOT_PATH.'/themes'.trim($clean_path_file));
-        $path_file = str_replace('\\','/',$path_file);
+        $path_file = str_replace('\\', '/', $path_file);
 
         //Button restore
-        if (XoopsLoad::fileExists($path_file . '.back')) {
-            $restore = '<button class="ui-corner-all tooltip" type="button" onclick="tpls_restore(\'' . $path_file . '\')" value="' . XoopsLocale::A_RESTORE . '" title="' . XoopsLocale::A_RESTORE . '">
-                            <img src="' . system_AdminIcons('revert.png') . '" alt="' . XoopsLocale::A_RESTORE . '" />
+        if (XoopsLoad::fileExists($path_file.'.back')) {
+            $restore = '<button class="ui-corner-all tooltip" type="button" onclick="tpls_restore(\''.$path_file.'\')" value="'.XoopsLocale::A_RESTORE.'" title="'.XoopsLocale::A_RESTORE.'">
+                            <img src="' . system_AdminIcons('revert.png').'" alt="'.XoopsLocale::A_RESTORE.'" />
                         </button>';
         } else {
             $restore = '';
@@ -107,12 +107,12 @@ 
                       <td>
                           <div class="xo-btn-actions">
                               <div class="xo-buttons">
-                                  <button class="ui-corner-all tooltip" type="submit" value="' . XoopsLocale::A_SAVE . '" title="' . XoopsLocale::A_SAVE . '">
-                                      <img src="' . system_AdminIcons('save.png') . '" alt="' . XoopsLocale::A_SAVE . '" />
+                                  <button class="ui-corner-all tooltip" type="submit" value="' . XoopsLocale::A_SAVE.'" title="'.XoopsLocale::A_SAVE.'">
+                                      <img src="' . system_AdminIcons('save.png').'" alt="'.XoopsLocale::A_SAVE.'" />
                                   </button>
-                                  ' . $restore . '
-                                  <button class="ui-corner-all tooltip" type="button" onclick="$(\'#display_contenu\').hide();$(\'#display_form\').fadeIn(\'fast\');" title="' . XoopsLocale::A_CANCEL . '">
-                                      <img src="' . system_AdminIcons('cancel.png') . '" alt="' . XoopsLocale::A_CANCEL . '" />
+                                  ' . $restore.'
+                                  <button class="ui-corner-all tooltip" type="button" onclick="$(\'#display_contenu\').hide();$(\'#display_form\').fadeIn(\'fast\');" title="' . XoopsLocale::A_CANCEL.'">
+                                      <img src="' . system_AdminIcons('cancel.png').'" alt="'.XoopsLocale::A_CANCEL.'" />
                                   </button>
                                   <div class="clear"></div>
                              </div>
@@ -120,7 +120,7 @@ 
                       </td>
                   </tr>
                   <tr>
-                      <td><textarea id="code_mirror" name="templates" rows=24 cols=110>' . $content . '</textarea></td>
+                      <td><textarea id="code_mirror" name="templates" rows=24 cols=110>' . $content.'</textarea></td>
                   </tr>
               </table>';
         $xoopsToken = new \Xoops\Form\Token();
@@ -133,9 +133,9 @@ 
         $extensions = array('.tpl', '.html', '.htm', '.css');
 
         //check if the file is inside themes directory
-        $valid_dir = stristr(realpath($_REQUEST['path_file']), realpath(\XoopsBaseConfig::get('root-path') . '/themes'));
+        $valid_dir = stristr(realpath($_REQUEST['path_file']), realpath(\XoopsBaseConfig::get('root-path').'/themes'));
 
-        $old_file = $_REQUEST['path_file'] . '.back';
+        $old_file = $_REQUEST['path_file'].'.back';
         $new_file = $_REQUEST['path_file'];
 
         $extension_verif = strrchr($new_file, '.');