XOOPS / XoopsCore25

htdocs/modules/profile/userinfo.php

Spacing +13 added lines, -13 removed lines

@@ -17,7 +17,7 @@ 
  * @author              Taiwen Jiang <phppp@users.sourceforge.net>
  */
 
-include __DIR__ . '/header.php';
+include __DIR__.'/header.php';
 include_once $GLOBALS['xoops']->path('modules/system/constants.php');
 
 $uid = isset($_GET['uid']) ? (int)$_GET['uid'] : 0;
@@ -25,7 +25,7 @@ 
     if (is_object($GLOBALS['xoopsUser'])) {
         $uid = $GLOBALS['xoopsUser']->getVar('uid');
     } else {
-        header('location: ' . XOOPS_URL);
+        header('location: '.XOOPS_URL);
         exit();
     }
 }
@@ -37,7 +37,7 @@ 
 if (is_object($GLOBALS['xoopsUser']) && $uid == $GLOBALS['xoopsUser']->getVar('uid')) {
     //disable cache
     $GLOBALS['xoopsConfig']['module_cache'][$GLOBALS['xoopsModule']->getVar('mid')] = 0;
-    $GLOBALS['xoopsOption']['template_main']                                                   = 'profile_userinfo.tpl';
+    $GLOBALS['xoopsOption']['template_main'] = 'profile_userinfo.tpl';
     include $GLOBALS['xoops']->path('header.php');
 
     /* @var $config_handler XoopsConfigHandler  */
@@ -57,7 +57,7 @@ 
         $GLOBALS['xoopsTpl']->assign('user_candelete', false);
     }
     $GLOBALS['xoopsTpl']->assign('user_changeemail', $GLOBALS['xoopsConfigUser']['allow_chgmail']);
-    $thisUser =& $GLOBALS['xoopsUser'];
+    $thisUser = & $GLOBALS['xoopsUser'];
 } else {
     /* @var $member_handler XoopsMemberHandler */
     $member_handler = xoops_getHandler('member');
@@ -65,7 +65,7 @@ 
 
     // Redirect if not a user or not active and the current user is not admin
     if (!is_object($thisUser) || (!$thisUser->isActive() && (!$GLOBALS['xoopsUser'] || !$GLOBALS['xoopsUser']->isAdmin()))) {
-        redirect_header(XOOPS_URL . '/modules/' . $GLOBALS['xoopsModule']->getVar('dirname', 'n'), 3, _US_SELECTNG);
+        redirect_header(XOOPS_URL.'/modules/'.$GLOBALS['xoopsModule']->getVar('dirname', 'n'), 3, _US_SELECTNG);
     }
 
     /**
@@ -100,7 +100,7 @@ 
     }
 
     if ($rejected) {
-        redirect_header(XOOPS_URL . '/modules/' . $GLOBALS['xoopsModule']->getVar('dirname', 'n'), 3, _NOPERM);
+        redirect_header(XOOPS_URL.'/modules/'.$GLOBALS['xoopsModule']->getVar('dirname', 'n'), 3, _NOPERM);
     }
 
     if (is_object($GLOBALS['xoopsUser']) && $GLOBALS['xoopsUser']->isAdmin()) {
@@ -137,7 +137,7 @@ 
 
 $avatar = '';
 if ($thisUser->getVar('user_avatar') && 'blank.gif' !== $thisUser->getVar('user_avatar')) {
-    $avatar = XOOPS_UPLOAD_URL . '/' . $thisUser->getVar('user_avatar');
+    $avatar = XOOPS_UPLOAD_URL.'/'.$thisUser->getVar('user_avatar');
 }
 
 $email = '';
@@ -191,25 +191,25 @@ 
             if (in_array($mid, $allowed_mids)) {
                 $results = $modules[$mid]->search('', '', 5, 0, $thisUser->getVar('uid'));
                 $count = 0;
-                if(is_array($results)) {
+                if (is_array($results)) {
                     $count = count($results);
                 }
                 if (is_array($results) && $count > 0) {
                     for ($i = 0; $i < $count; ++$i) {
                         if (isset($results[$i]['image']) && $results[$i]['image'] != '') {
-                            $results[$i]['image'] = XOOPS_URL . '/modules/' . $modules[$mid]->getVar('dirname', 'n') . '/' . $results[$i]['image'];
+                            $results[$i]['image'] = XOOPS_URL.'/modules/'.$modules[$mid]->getVar('dirname', 'n').'/'.$results[$i]['image'];
                         } else {
-                            $results[$i]['image'] = XOOPS_URL . '/images/icons/posticon2.gif';
+                            $results[$i]['image'] = XOOPS_URL.'/images/icons/posticon2.gif';
                         }
                         if (!preg_match("/^http[s]*:\/\//i", $results[$i]['link'])) {
-                            $results[$i]['link'] = XOOPS_URL . '/modules/' . $modules[$mid]->getVar('dirname', 'n') . '/' . $results[$i]['link'];
+                            $results[$i]['link'] = XOOPS_URL.'/modules/'.$modules[$mid]->getVar('dirname', 'n').'/'.$results[$i]['link'];
                         }
                         $results[$i]['title'] = $myts->htmlspecialchars($results[$i]['title']);
                         $results[$i]['time']  = isset($results[$i]['time']) ? formatTimestamp($results[$i]['time']) : '';
                     }
                     $showall_link = '';
                     if ($count == 5) {
-                        $showall_link = '<a href="' . XOOPS_URL . '/search.php?action=showallbyuser&amp;mid=' . $mid . '&amp;uid=' . $thisUser->getVar('uid') . '">' . _US_SHOWALL . '</a>';
+                        $showall_link = '<a href="'.XOOPS_URL.'/search.php?action=showallbyuser&amp;mid='.$mid.'&amp;uid='.$thisUser->getVar('uid').'">'._US_SHOWALL.'</a>';
                     }
                     $GLOBALS['xoopsTpl']->append('modules', array(
                         'name'         => $modules[$mid]->getVar('name'),
@@ -228,4 +228,4 @@ 
 $GLOBALS['xoopsTpl']->assign('avatar', $avatar);
 $GLOBALS['xoopsTpl']->assign('recent_activity', _PROFILE_MA_RECENTACTIVITY);
 $xoBreadcrumbs[] = array('title' => _PROFILE_MA_USERINFO);
-include __DIR__ . '/footer.php';
+include __DIR__.'/footer.php';

htdocs/modules/system/help.php

Spacing +30 added lines, -30 removed lines

@@ -16,7 +16,7 @@ 
 /* @var $module XoopsModule */
 
 // Include header
-include __DIR__ . '/header.php';
+include __DIR__.'/header.php';
 
 $page = system_CleanVars($_REQUEST, 'page', '', 'string');
 $mid  = system_CleanVars($_REQUEST, 'mid', 0, 'int');
@@ -25,8 +25,8 @@ 
 $GLOBALS['xoopsOption']['template_main'] = 'system_help.tpl';
 xoops_cp_header();
 // Define Stylesheet
-$xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/admin.css');
-$xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/help.css');
+$xoTheme->addStylesheet(XOOPS_URL.'/modules/system/css/admin.css');
+$xoTheme->addStylesheet(XOOPS_URL.'/modules/system/css/help.css');
 // Define Breadcrumb and tips
 $xoBreadCrumb->addLink(_AM_SYSTEM_HELP, 'help.php');
 
@@ -37,21 +37,21 @@ 
     /* @var $module XoopsModule */
     $module         = $module_handler->get($mid);
 
-    $xoBreadCrumb->addLink($module->getVar('name'), 'help.php?mid=' . $module->getVar('mid', 's'));
+    $xoBreadCrumb->addLink($module->getVar('name'), 'help.php?mid='.$module->getVar('mid', 's'));
     $xoBreadCrumb->addLink(system_adminVersion($page, 'name'));
     $xoBreadCrumb->render();
 
     // Special handling for the System Module
     if ($module->getVar('dirname', 'e') === 'system') {
         xoops_load('xoopslists');
-        $admin_dir = XOOPS_ROOT_PATH . '/modules/system/admin';
+        $admin_dir = XOOPS_ROOT_PATH.'/modules/system/admin';
         $dirlist   = XoopsLists::getDirListAsArray($admin_dir);
         foreach ($dirlist as $directory) {
-            if (file_exists($admin_dir . '/' . $directory . '/xoops_version.php')) {
-                require $admin_dir . '/' . $directory . '/xoops_version.php';
+            if (file_exists($admin_dir.'/'.$directory.'/xoops_version.php')) {
+                require $admin_dir.'/'.$directory.'/xoops_version.php';
                 if ($modversion['help']) {
                     $help['name'] = system_adminVersion($directory, 'name');
-                    $help['link'] = 'help.php?mid=' . $mid . '&' . system_adminVersion($directory, 'help');
+                    $help['link'] = 'help.php?mid='.$mid.'&'.system_adminVersion($directory, 'help');
                     $xoopsTpl->append_by_ref('help', $help);
                     unset($help);
                 }
@@ -70,7 +70,7 @@ 
             foreach ($helplist as $helpitem) {
                 if (($helpitem['name'] !== '') && ($helpitem['link'] !== '')) {
                     $list_help[$j]['name'] = $helpitem['name'];
-                    $list_help[$j]['link'] = 'help.php?mid=' . $mid . '&' . $helpitem['link'];
+                    $list_help[$j]['link'] = 'help.php?mid='.$mid.'&'.$helpitem['link'];
                     ++$j;
                 }
             }
@@ -80,7 +80,7 @@ 
         unset($helplist);
         if (($module->getInfo('help') !== '') && ($j == 0)) {
             $help['name'] = $module->getInfo('name');
-            $help['link'] = 'help.php?mid=' . $mid . '&' . $module->getInfo('help');
+            $help['link'] = 'help.php?mid='.$mid.'&'.$module->getInfo('help');
             $xoopsTpl->append_by_ref('help', $help);
         }
         unset($help);
@@ -90,24 +90,24 @@ 
 
     if ($page !== '') {
         // Call template
-        if (file_exists(XOOPS_ROOT_PATH . '/modules/' . $module->getVar('dirname', 'e') . '/language/' . $xoopsConfig['language'] . '/help/' . $page . '.html')) {
-            $helpcontent = $xoopsTpl->fetch(XOOPS_ROOT_PATH . '/modules/' . $module->getVar('dirname', 'e') . '/language/' . $xoopsConfig['language'] . '/help/' . $page . '.html');
-        } elseif (file_exists(XOOPS_ROOT_PATH . '/modules/' . $module->getVar('dirname', 'e') . '/language/' . $xoopsConfig['language'] . '/help/' . $page . '.tpl')) {
-            $helpcontent = $xoopsTpl->fetch(XOOPS_ROOT_PATH . '/modules/' . $module->getVar('dirname', 'e') . '/language/' . $xoopsConfig['language'] . '/help/' . $page . '.tpl');
-        } elseif (file_exists(XOOPS_ROOT_PATH . '/modules/' . $module->getVar('dirname', 'e') . '/language/english/help/' . $page . '.html')) {
-            $helpcontent = $xoopsTpl->fetch(XOOPS_ROOT_PATH . '/modules/' . $module->getVar('dirname', 'e') . '/language/english/help/' . $page . '.html');
-        } elseif (file_exists(XOOPS_ROOT_PATH . '/modules/' . $module->getVar('dirname', 'e') . '/language/english/help/' . $page . '.tpl')) {
-            $helpcontent = $xoopsTpl->fetch(XOOPS_ROOT_PATH . '/modules/' . $module->getVar('dirname', 'e') . '/language/english/help/' . $page . '.tpl');
+        if (file_exists(XOOPS_ROOT_PATH.'/modules/'.$module->getVar('dirname', 'e').'/language/'.$xoopsConfig['language'].'/help/'.$page.'.html')) {
+            $helpcontent = $xoopsTpl->fetch(XOOPS_ROOT_PATH.'/modules/'.$module->getVar('dirname', 'e').'/language/'.$xoopsConfig['language'].'/help/'.$page.'.html');
+        } elseif (file_exists(XOOPS_ROOT_PATH.'/modules/'.$module->getVar('dirname', 'e').'/language/'.$xoopsConfig['language'].'/help/'.$page.'.tpl')) {
+            $helpcontent = $xoopsTpl->fetch(XOOPS_ROOT_PATH.'/modules/'.$module->getVar('dirname', 'e').'/language/'.$xoopsConfig['language'].'/help/'.$page.'.tpl');
+        } elseif (file_exists(XOOPS_ROOT_PATH.'/modules/'.$module->getVar('dirname', 'e').'/language/english/help/'.$page.'.html')) {
+            $helpcontent = $xoopsTpl->fetch(XOOPS_ROOT_PATH.'/modules/'.$module->getVar('dirname', 'e').'/language/english/help/'.$page.'.html');
+        } elseif (file_exists(XOOPS_ROOT_PATH.'/modules/'.$module->getVar('dirname', 'e').'/language/english/help/'.$page.'.tpl')) {
+            $helpcontent = $xoopsTpl->fetch(XOOPS_ROOT_PATH.'/modules/'.$module->getVar('dirname', 'e').'/language/english/help/'.$page.'.tpl');
         } else {
             $xoopsTpl->assign('load_error', 1);
         }
         $xoopsTpl->assign('helpcontent', $helpcontent);
     } else {
-        if (file_exists(XOOPS_ROOT_PATH . '/modules/' . $module->getVar('dirname', 'e') . '/language/' . $xoopsConfig['language'] . '/help/module_index.html')) {
-            $helpcontent = $xoopsTpl->fetch(XOOPS_ROOT_PATH . '/modules/' . $module->getVar('dirname', 'e') . '/language/' . $xoopsConfig['language'] . '/help/module_index.html');
+        if (file_exists(XOOPS_ROOT_PATH.'/modules/'.$module->getVar('dirname', 'e').'/language/'.$xoopsConfig['language'].'/help/module_index.html')) {
+            $helpcontent = $xoopsTpl->fetch(XOOPS_ROOT_PATH.'/modules/'.$module->getVar('dirname', 'e').'/language/'.$xoopsConfig['language'].'/help/module_index.html');
         } else {
             $helpcontent = $module->getInfo('description');
-            $helpcontent = '<div id="non-modhelp">' . $helpcontent . '</div>';
+            $helpcontent = '<div id="non-modhelp">'.$helpcontent.'</div>';
         }
         $xoopsTpl->assign('helpcontent', $helpcontent);
     }
@@ -142,14 +142,14 @@ 
         // Special handling for the System module
         if ($module->getVar('dirname', 'e') === 'system') {
             xoops_load('xoopslists');
-            $admin_dir = XOOPS_ROOT_PATH . '/modules/system/admin';
+            $admin_dir = XOOPS_ROOT_PATH.'/modules/system/admin';
             $dirlist   = XoopsLists::getDirListAsArray($admin_dir);
             foreach ($dirlist as $directory) {
-                if (file_exists($admin_dir . '/' . $directory . '/xoops_version.php')) {
-                    require $admin_dir . '/' . $directory . '/xoops_version.php';
+                if (file_exists($admin_dir.'/'.$directory.'/xoops_version.php')) {
+                    require $admin_dir.'/'.$directory.'/xoops_version.php';
                     if ($modversion['help']) {
                         $list_help[$j]['name'] = system_adminVersion($directory, 'name');
-                        $list_help[$j]['link'] = 'help.php?mid=' . $module->getVar('mid', 'e') . '&amp;' . system_adminVersion($directory, 'help');
+                        $list_help[$j]['link'] = 'help.php?mid='.$module->getVar('mid', 'e').'&amp;'.system_adminVersion($directory, 'help');
                     }
                     unset($modversion);
                     ++$j;
@@ -167,7 +167,7 @@ 
                 foreach ($helplist as $helpitem) {
                     if (($helpitem['name'] !== '') && ($helpitem['link'] !== '')) {
                         $list_help[$j]['name'] = $helpitem['name'];
-                        $list_help[$j]['link'] = 'help.php?mid=' . $module->getVar('mid', 'e') . '&amp;' . $helpitem['link'];
+                        $list_help[$j]['link'] = 'help.php?mid='.$module->getVar('mid', 'e').'&amp;'.$helpitem['link'];
                         ++$j;
                         ++$k;
                     }
@@ -178,7 +178,7 @@ 
             // If there is no help section ($k=0), and a lone help parameter has been defined.
             if (($module->getInfo('help') !== '') && ($k == 0)) {
                 $list_help[$j]['name'] = $module->getInfo('name');
-                $list_help[$j]['link'] = 'help.php?mid=' . $module->getVar('mid', 'e') . '&amp;' . $module->getInfo('help');
+                $list_help[$j]['link'] = 'help.php?mid='.$module->getVar('mid', 'e').'&amp;'.$module->getInfo('help');
             }
         }
 
@@ -192,10 +192,10 @@ 
     }
     $xoopsTpl->assign('list_mods', $listed_mods);
 
-    if (file_exists(XOOPS_ROOT_PATH . '/modules/system/language/' . $xoopsConfig['language'] . '/help/help_center.html')) {
-        $helpcontent = $xoopsTpl->fetch(XOOPS_ROOT_PATH . '/modules/system/language/' . $xoopsConfig['language'] . '/help/help_center.html');
+    if (file_exists(XOOPS_ROOT_PATH.'/modules/system/language/'.$xoopsConfig['language'].'/help/help_center.html')) {
+        $helpcontent = $xoopsTpl->fetch(XOOPS_ROOT_PATH.'/modules/system/language/'.$xoopsConfig['language'].'/help/help_center.html');
     } else {
-        $helpcontent = '<div id="non-modhelp">' . _MD_CPANEL_HELPCENTER . '</div>';
+        $helpcontent = '<div id="non-modhelp">'._MD_CPANEL_HELPCENTER.'</div>';
     }
 
     $xoopsTpl->assign('helpcontent', $helpcontent);

htdocs/modules/system/preloads/core.php

Spacing +3 added lines, -3 removed lines

@@ -36,7 +36,7 @@ 
         }
         if (!headers_sent() && isset($xoopsConfig['redirect_message_ajax']) && $xoopsConfig['redirect_message_ajax']) {
             $_SESSION['redirect_message'] = $args[2];
-            header('Location: ' . preg_replace('/[&]amp;/i', '&', $url));
+            header('Location: '.preg_replace('/[&]amp;/i', '&', $url));
             exit();
         }
     }
@@ -71,7 +71,7 @@ 
             $GLOBALS['xoTheme']->addScript('', array('type' => 'text/javascript'), '
             (function($){
                 $(document).ready(function(){
-                $.jGrowl("' . $_SESSION['redirect_message'] . '", {  life:3000 , position: "center", speed: "slow" });
+                $.jGrowl("' . $_SESSION['redirect_message'].'", {  life:3000 , position: "center", speed: "slow" });
             });
             })(jQuery);
             ');
@@ -91,7 +91,7 @@ 
             $GLOBALS['xoTheme']->addScript('', array('type' => 'text/javascript'), '
             (function($){
             $(document).ready(function(){
-                $.jGrowl("' . $_SESSION['redirect_message'] . '", {  life:3000 , position: "center", speed: "slow" });
+                $.jGrowl("' . $_SESSION['redirect_message'].'", {  life:3000 , position: "center", speed: "slow" });
             });
             })(jQuery);
             ');

htdocs/modules/system/language/english/blocks.php

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
 define('_MB_SYSTEM_RECO', 'Recommend Us');
 define('_MB_SYSTEM_PWWIDTH', 'Pop-Up Window Width');
 define('_MB_SYSTEM_PWHEIGHT', 'Pop-Up Window Height');
-define('_MB_SYSTEM_LOGO', 'Logo image is located %s directory');  // %s is your root image directory name
+define('_MB_SYSTEM_LOGO', 'Logo image is located %s directory'); // %s is your root image directory name
 define('_MB_SYSTEM_COMPEND', 'Comments');
 //define('_MB_SYSTEM_LOGGEDINAS',"Logged in as");
 define('_MB_SYSTEM_SADMIN', 'Show admin groups');

htdocs/modules/system/language/english/admin/blocksadmin.php

Spacing +2 added lines, -2 removed lines

@@ -80,9 +80,9 @@
 define('_AM_SYSTEM_BLOCKS_MODULECANT', 'This block cannot be deleted directly! If you wish to disable this block, deactivate the module.');
 // Tips
 define('_AM_SYSTEM_BLOCKS_TIPS', '<ul>
-<li>You can easily change side or order position with the drag\'n drop, click on <img class="tooltip" src="%s" alt="' . _AM_SYSTEM_BLOCKS_DRAG . '" title="' . _AM_SYSTEM_BLOCKS_DRAG . '" /> this image and set your site just the way you want it</li>
+<li>You can easily change side or order position with the drag\'n drop, click on <img class="tooltip" src="%s" alt="' . _AM_SYSTEM_BLOCKS_DRAG.'" title="'._AM_SYSTEM_BLOCKS_DRAG.'" /> this image and set your site just the way you want it</li>
 <li>Add a new custom block</li>
-<li>Set block online or offline by clicking on <img class="tooltip" width="16" src="%s" alt="' . _AM_SYSTEM_BLOCKS_DISPLAY . '" title="' . _AM_SYSTEM_BLOCKS_DISPLAY . '"/> or <img class="tooltip" width="16" src="%s" alt="' . _AM_SYSTEM_BLOCKS_HIDE . '" title="' . _AM_SYSTEM_BLOCKS_HIDE . '" /></li>
+<li>Set block online or offline by clicking on <img class="tooltip" width="16" src="%s" alt="' . _AM_SYSTEM_BLOCKS_DISPLAY.'" title="'._AM_SYSTEM_BLOCKS_DISPLAY.'"/> or <img class="tooltip" width="16" src="%s" alt="'._AM_SYSTEM_BLOCKS_HIDE.'" title="'._AM_SYSTEM_BLOCKS_HIDE.'" /></li>
 </ul>');
 
 define('_AM_SYSTEM_BLOCKS_FOOTER_LEFT', 'Footer Left');

htdocs/modules/system/language/english/admin/preferences.php

Spacing +4 added lines, -4 removed lines

@@ -238,7 +238,7 @@ 
 define('_MD_AM_SOAP_SOAP_RESPONSETIMEOUT', 'SOAP - SOAP Response Timeout');
 define('_MD_AM_SOAP_SOAP_RESPONSETIMEOUTDESC', 'Keep The Soap Query Alive for <strong>xx</strong> seconds.');
 define('_MD_AM_SOAP_FIELDMAPPING', 'Xoops-Auth server fields mapping');
-define('_MD_AM_SOAP_FIELDMAPPINGDESC', 'Describe here the mapping between the Xoops database field and the LDAP Authentication system field.' . '<br><br>Format [Xoops Database field]=[Auth system SOAP attribute]' . '<br>for example : email=mail' . '<br>Separate each with a |' . '<br><br>!! For advanced users !!');
+define('_MD_AM_SOAP_FIELDMAPPINGDESC', 'Describe here the mapping between the Xoops database field and the LDAP Authentication system field.'.'<br><br>Format [Xoops Database field]=[Auth system SOAP attribute]'.'<br>for example : email=mail'.'<br>Separate each with a |'.'<br><br>!! For advanced users !!');
 // Xoops Authentication constants
 define('_MD_AM_AUTH_CONFOPTION_XOOPS', 'XOOPS Database');
 define('_MD_AM_AUTH_CONFOPTION_LDAP', 'Standard LDAP Directory');
@@ -270,14 +270,14 @@ 
 define('_MD_AM_LDAP_USERS_BYPASS', 'Users allowed to bypass LDAP authentication');
 define('_MD_AM_LDAP_USERS_BYPASS_DESC', 'Users to be authenticated with native XOOPS method');
 define('_MD_AM_LDAP_USETLS', ' Use TLS connection');
-define('_MD_AM_LDAP_USETLS_DESC', 'Use a TLS (Transport Layer Security) connection. TLS use standard 389 port number<BR>' . ' and the LDAP version must be set to 3.');
+define('_MD_AM_LDAP_USETLS_DESC', 'Use a TLS (Transport Layer Security) connection. TLS use standard 389 port number<BR>'.' and the LDAP version must be set to 3.');
 
 define('_MD_AM_LDAP_LOGINLDAP_ATTR', 'LDAP Attribute use to search the user');
 define('_MD_AM_LDAP_LOGINLDAP_ATTR_D', 'When Login name use in the DN option is set to yes, must correspond to the login name XOOPS');
 define('_MD_AM_LDAP_LOGINNAME_ASDN', 'Login name use in the DN');
 define('_MD_AM_LDAP_LOGINNAME_ASDN_D', 'The XOOPS login name is used in the LDAP DN (eg : uid=<loginname>,dc=xoops,dc=org)<br>The entry is directly read in the LDAP Server without search');
 define('_MD_AM_LDAP_FILTER_PERSON', 'The search filter LDAP query to find user');
-define('_MD_AM_LDAP_FILTER_PERSON_DESC', "Special LDAP Filter to find user. @@loginname@@ is replace by the users's login name<br> MUST BE BLANK IF YOU DON'T KNOW WHAT YOU DO' !" . '<br>Ex : (&(objectclass=person)(samaccountname=@@loginname@@)) for AD' . '<br>Ex : (&(objectclass=inetOrgPerson)(uid=@@loginname@@)) for LDAP');
+define('_MD_AM_LDAP_FILTER_PERSON_DESC', "Special LDAP Filter to find user. @@loginname@@ is replace by the users's login name<br> MUST BE BLANK IF YOU DON'T KNOW WHAT YOU DO' !".'<br>Ex : (&(objectclass=person)(samaccountname=@@loginname@@)) for AD'.'<br>Ex : (&(objectclass=inetOrgPerson)(uid=@@loginname@@)) for LDAP');
 define('_MD_AM_LDAP_DOMAIN_NAME', 'The domain name');
 define('_MD_AM_LDAP_DOMAIN_NAME_DESC', 'Windows domain name. for ADS and NT Server only');
 define('_MD_AM_LDAP_PROVIS', 'Automatic XOOPS account provisionning');
@@ -285,7 +285,7 @@ 
 define('_MD_AM_LDAP_PROVIS_GROUP', 'Default affect group');
 define('_MD_AM_LDAP_PROVIS_GROUP_DSC', 'The new user is assign to these groups');
 define('_MD_AM_LDAP_FIELD_MAPPING_ATTR', 'Xoops-Auth server fields mapping');
-define('_MD_AM_LDAP_FIELD_MAPPING_DESC', 'Describe here the mapping between the XOOPS database field and the LDAP Authentication system field.' . '<br><br>Format [Xoops Database field]=[Auth system LDAP attribute]' . '<br>for example : email=mail' . '<br>Separate each with a |' . '<br><br>!! For advanced users !!');
+define('_MD_AM_LDAP_FIELD_MAPPING_DESC', 'Describe here the mapping between the XOOPS database field and the LDAP Authentication system field.'.'<br><br>Format [Xoops Database field]=[Auth system LDAP attribute]'.'<br>for example : email=mail'.'<br>Separate each with a |'.'<br><br>!! For advanced users !!');
 define('_MD_AM_LDAP_PROVIS_UPD', 'Maintain XOOPS account provisionning');
 define('_MD_AM_LDAP_PROVIS_UPD_DESC', 'The XOOPS User account is always synchronized with the Authentication Server');
 define('_MD_AM_CPANEL', 'Control Panel GUI');

htdocs/modules/system/include/functions.php

Spacing +11 added lines, -11 removed lines

@@ -67,11 +67,11 @@ 
         return false;
     }
     $language = empty($language) ? $GLOBALS['xoopsConfig']['language'] : $language;
-    $path     = 'modules/' . $domain . '/language/';
-    if (file_exists($file = $GLOBALS['xoops']->path($path . $language . '/admin/' . $name . '.php'))) {
+    $path     = 'modules/'.$domain.'/language/';
+    if (file_exists($file = $GLOBALS['xoops']->path($path.$language.'/admin/'.$name.'.php'))) {
         $ret = include_once $file;
     } else {
-        $ret = include_once $GLOBALS['xoops']->path($path . 'english/admin/' . $name . '.php');
+        $ret = include_once $GLOBALS['xoops']->path($path.'english/admin/'.$name.'.php');
     }
 
     return $ret;
@@ -86,15 +86,15 @@ 
 function system_adminVersion($version, $value = '')
 {
     static $tblVersion = array();
-    if (is_array($tblVersion) && array_key_exists($version . '.' . $value, $tblVersion)) {
-        return $tblVersion[$version . '.' . $value];
+    if (is_array($tblVersion) && array_key_exists($version.'.'.$value, $tblVersion)) {
+        return $tblVersion[$version.'.'.$value];
     }
-    $path = XOOPS_ROOT_PATH . '/modules/system/admin/' . $version . '/xoops_version.php';
+    $path = XOOPS_ROOT_PATH.'/modules/system/admin/'.$version.'/xoops_version.php';
     if (file_exists($path)) {
         include $path;
 
         $retvalue                            = $modversion[$value];
-        $tblVersion[$version . '.' . $value] = $retvalue;
+        $tblVersion[$version.'.'.$value] = $retvalue;
 
         return $retvalue;
     }
@@ -114,7 +114,7 @@ 
         $style = 'default';
     }
 
-    $url = $GLOBALS['xoops']->url('modules/system/images/icons/' . $style . '/' . $img);
+    $url = $GLOBALS['xoops']->url('modules/system/images/icons/'.$style.'/'.$img);
 
     return $url;
 }
@@ -126,11 +126,11 @@ 
 {
     global $sysTpl, $xoopsModule;
 
-    $path = XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/templates/admin/' . $name . '.tpl';
+    $path = XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/templates/admin/'.$name.'.tpl';
     if (file_exists($path)) {
         echo $sysTpl->fetch($path);
     } else {
-        echo 'Unable to read ' . $name;
+        echo 'Unable to read '.$name;
     }
 }
 
@@ -143,7 +143,7 @@ 
  */
 function modify_chmod($value_chmod, $path_file, $id)
 {
-    $chmod = '<div id="loading_' . $id . '" align="center" style="display:none;">' . '<img src="./images/mimetypes/spinner.gif" title="Loading" alt="Loading" width="12px"/></div>' . '<div id="chmod' . $id . '">' . '<select size="1" onChange="filemanager_modify_chmod(\'' . $path_file . '\', \'' . $id . '\')" name="chmod" id="chmod">';
+    $chmod = '<div id="loading_'.$id.'" align="center" style="display:none;">'.'<img src="./images/mimetypes/spinner.gif" title="Loading" alt="Loading" width="12px"/></div>'.'<div id="chmod'.$id.'">'.'<select size="1" onChange="filemanager_modify_chmod(\''.$path_file.'\', \''.$id.'\')" name="chmod" id="chmod">';
     if ($value_chmod == 777) {
         $chmod .= '<option value="777" selected><span style="color:green;">777</span></option>';
     } else {

htdocs/modules/system/include/update.php

Spacing +6 added lines, -6 removed lines

@@ -50,14 +50,14 @@ 
 function update_system_v211($module)
 {
     global $xoopsDB;
-    $result = $xoopsDB->query('SELECT t1.tpl_id FROM ' . $xoopsDB->prefix('tplfile') . ' t1, ' . $xoopsDB->prefix('tplfile') . ' t2 WHERE t1.tpl_refid = t2.tpl_refid AND t1.tpl_module = t2.tpl_module AND t1.tpl_tplset=t2.tpl_tplset AND t1.tpl_file = t2.tpl_file AND t1.tpl_type = t2.tpl_type AND t1.tpl_id > t2.tpl_id');
+    $result = $xoopsDB->query('SELECT t1.tpl_id FROM '.$xoopsDB->prefix('tplfile').' t1, '.$xoopsDB->prefix('tplfile').' t2 WHERE t1.tpl_refid = t2.tpl_refid AND t1.tpl_module = t2.tpl_module AND t1.tpl_tplset=t2.tpl_tplset AND t1.tpl_file = t2.tpl_file AND t1.tpl_type = t2.tpl_type AND t1.tpl_id > t2.tpl_id');
     $tplids = array();
     while (false !== (list($tplid) = $xoopsDB->fetchRow($result))) {
         $tplids[] = $tplid;
     }
     if (count($tplids) > 0) {
         $tplfile_handler = xoops_getHandler('tplfile');
-        $duplicate_files = $tplfile_handler->getObjects(new Criteria('tpl_id', '(' . implode(',', $tplids) . ')', 'IN'));
+        $duplicate_files = $tplfile_handler->getObjects(new Criteria('tpl_id', '('.implode(',', $tplids).')', 'IN'));
 
         if (count($duplicate_files) > 0) {
             foreach (array_keys($duplicate_files) as $i) {
@@ -65,9 +65,9 @@ 
             }
         }
     }
-    $sql = 'SHOW INDEX FROM ' . $xoopsDB->prefix('tplfile') . " WHERE KEY_NAME = 'tpl_refid_module_set_file_type'";
+    $sql = 'SHOW INDEX FROM '.$xoopsDB->prefix('tplfile')." WHERE KEY_NAME = 'tpl_refid_module_set_file_type'";
     if (!$result = $xoopsDB->queryF($sql)) {
-        xoops_error($this->db->error() . '<br>' . $sql);
+        xoops_error($this->db->error().'<br>'.$sql);
 
         return false;
     }
@@ -80,9 +80,9 @@ 
 
         return true;
     }
-    $sql = 'ALTER TABLE ' . $xoopsDB->prefix('tplfile') . ' ADD UNIQUE tpl_refid_module_set_file_type ( tpl_refid, tpl_module, tpl_tplset, tpl_file, tpl_type )';
+    $sql = 'ALTER TABLE '.$xoopsDB->prefix('tplfile').' ADD UNIQUE tpl_refid_module_set_file_type ( tpl_refid, tpl_module, tpl_tplset, tpl_file, tpl_type )';
     if (!$result = $xoopsDB->queryF($sql)) {
-        xoops_error($xoopsDB->error() . '<br>' . $sql);
+        xoops_error($xoopsDB->error().'<br>'.$sql);
         $module->setErrors("'tpl_refid_module_set_file_type' unique index is not added to 'tplfile' table. Warning: do not use XOOPS until you add this unique index.");
 
         return false;

htdocs/modules/system/header.php

Spacing +2 added lines, -2 removed lines

@@ -15,7 +15,7 @@ 
 /* @var  $xoopsUser XoopsUser */
 
 // Include XOOPS control panel header
-include_once dirname(dirname(__DIR__)) . '/include/cp_header.php';
+include_once dirname(dirname(__DIR__)).'/include/cp_header.php';
 // Check user rights
 if (is_object($xoopsUser)) {
     $admintest   = 0;
@@ -45,4 +45,4 @@ 
 $fct = system_CleanVars($_REQUEST, 'fct', '', 'string');
 
 $xoBreadCrumb = new SystemBreadcrumb($fct);
-$xoBreadCrumb->addLink(_AM_SYSTEM_CPANEL, XOOPS_URL . '/admin.php', true);
+$xoBreadCrumb->addLink(_AM_SYSTEM_CPANEL, XOOPS_URL.'/admin.php', true);