XOOPS / XoopsCore25

htdocs/Frameworks/art/functions.config.php

Spacing +2 added lines, -2 removed lines

@@ -29,7 +29,7 @@ 
 
         if (isset($GLOBALS['xoopsModule']) && is_object($GLOBALS['xoopsModule']) && $GLOBALS['xoopsModule']->getVar('dirname', 'n') == $dirname) {
             if (isset($GLOBALS['xoopsModuleConfig'])) {
-                $moduleConfig =& $GLOBALS['xoopsModuleConfig'];
+                $moduleConfig = & $GLOBALS['xoopsModuleConfig'];
             } else {
                 return null;
             }
@@ -40,7 +40,7 @@ 
                 XoopsCache::write("{$dirname}_config", $moduleConfig);
             }
         }
-        if ($customConfig = @include XOOPS_ROOT_PATH . "/modules/{$dirname}/include/plugin.php") {
+        if ($customConfig = @include XOOPS_ROOT_PATH."/modules/{$dirname}/include/plugin.php") {
             $moduleConfig = array_merge($moduleConfig, $customConfig);
         }
 

htdocs/Frameworks/art/functions.admin.php

Spacing +10 added lines, -10 removed lines

@@ -13,7 +13,7 @@ 
 if (!defined('FRAMEWORKS_ART_FUNCTIONS_ADMIN')):
     define('FRAMEWORKS_ART_FUNCTIONS_ADMIN', true);
 
-    defined('FRAMEWORKS_ART_FUNCTIONS_INI') || include_once __DIR__ . '/functions.ini.php';
+    defined('FRAMEWORKS_ART_FUNCTIONS_INI') || include_once __DIR__.'/functions.ini.php';
 
     /**
      * @param        $currentoption
@@ -28,18 +28,18 @@ 
         }
 
         $breadcrumb  = empty($breadcrumb) ? $adminmenu[$currentoption]['title'] : $breadcrumb;
-        $module_link = XOOPS_URL . '/modules/' . $GLOBALS['xoopsModule']->getVar('dirname') . '/';
-        $image_link  = XOOPS_URL . '/Frameworks/compat/include';
+        $module_link = XOOPS_URL.'/modules/'.$GLOBALS['xoopsModule']->getVar('dirname').'/';
+        $image_link  = XOOPS_URL.'/Frameworks/compat/include';
 
         $adminmenu_text = '
     <style type="text/css">
     <!--
     #buttontop { float: left; width: 100%; background: #e7e7e7; font-size: 93%; line-height: normal; border-top: 1px solid black; border-left: 1px solid black; border-right: 1px solid black; margin: 0;}
-    #buttonbar { float: left; width: 100%; background: #e7e7e7 url("' . $image_link . '/modadminbg.gif") repeat-x left bottom; font-size: 93%; line-height: normal; border-left: 1px solid black; border-right: 1px solid black; margin-bottom: 12px;}
+    #buttonbar { float: left; width: 100%; background: #e7e7e7 url("' . $image_link.'/modadminbg.gif") repeat-x left bottom; font-size: 93%; line-height: normal; border-left: 1px solid black; border-right: 1px solid black; margin-bottom: 12px;}
     #buttonbar ul { margin: 0; margin-top: 15px; padding: 10px 10px 0; list-style: none; }
     #buttonbar li { display: inline; margin: 0; padding: 0; }
-    #buttonbar a { float: left; background: url("' . $image_link . '/left_both.gif") no-repeat left top; margin: 0; padding: 0 0 0 9px; border-bottom: 1px solid #000; text-decoration: none; }
-    #buttonbar a span { float: left; display: block; background: url("' . $image_link . '/right_both.gif") no-repeat right top; padding: 5px 15px 4px 6px; font-weight: bold; color: #765; }
+    #buttonbar a { float: left; background: url("' . $image_link.'/left_both.gif") no-repeat left top; margin: 0; padding: 0 0 0 9px; border-bottom: 1px solid #000; text-decoration: none; }
+    #buttonbar a span { float: left; display: block; background: url("' . $image_link.'/right_both.gif") no-repeat right top; padding: 5px 15px 4px 6px; font-weight: bold; color: #765; }
     /* Commented Backslash Hack hides rule from IE5-Mac \*/
     #buttonbar a span {float: none;}
     /* End IE5-Mac hack */
@@ -54,10 +54,10 @@ 
      <table style="width: 100%; padding: 0; " cellspacing="0">
          <tr>
              <td style="width: 70%; font-size: 10px; text-align: left; color: #2F5376; padding: 0 6px; line-height: 18px;">
-                 <a href="../index.php">' . $GLOBALS['xoopsModule']->getVar('name') . '</a>
+                 <a href="../index.php">' . $GLOBALS['xoopsModule']->getVar('name').'</a>
              </td>
              <td style="width: 30%; font-size: 10px; text-align: right; color: #2F5376; padding: 0 6px; line-height: 18px;">
-                 <strong>' . $GLOBALS['xoopsModule']->getVar('name') . '</strong>&nbsp;' . $breadcrumb . '
+                 <strong>' . $GLOBALS['xoopsModule']->getVar('name').'</strong>&nbsp;'.$breadcrumb.'
              </td>
          </tr>
      </table>
@@ -66,10 +66,10 @@ 
      <ul>
     ';
         foreach (array_keys($adminmenu) as $key) {
-            $adminmenu_text .= (($currentoption == $key) ? '<li class="current">' : '<li>') . '<a href="' . $module_link . $adminmenu[$key]['link'] . '"><span>' . $adminmenu[$key]['title'] . '</span></a></li>';
+            $adminmenu_text .= (($currentoption == $key) ? '<li class="current">' : '<li>').'<a href="'.$module_link.$adminmenu[$key]['link'].'"><span>'.$adminmenu[$key]['title'].'</span></a></li>';
         }
         if ($GLOBALS['xoopsModule']->getVar('hasconfig') || $GLOBALS['xoopsModule']->getVar('hascomments') || $GLOBALS['xoopsModule']->getVar('hasnotification')) {
-            $adminmenu_text .= '<li><a href="' . XOOPS_URL . '/modules/system/admin.php?fct=preferences&op=showmod&mod=' . $GLOBALS['xoopsModule']->getVar('mid') . '"><span>' . _PREFERENCES . '</span></a></li>';
+            $adminmenu_text .= '<li><a href="'.XOOPS_URL.'/modules/system/admin.php?fct=preferences&op=showmod&mod='.$GLOBALS['xoopsModule']->getVar('mid').'"><span>'._PREFERENCES.'</span></a></li>';
         }
         $adminmenu_text .= '
      </ul>

htdocs/Frameworks/art/functions.cache.php

Spacing +9 added lines, -9 removed lines

@@ -28,7 +28,7 @@ 
         }
         if (!empty($groups) && is_array($groups)) {
             sort($groups);
-            $contentCacheId = substr(md5(implode(',', $groups) . XOOPS_DB_PASS . XOOPS_DB_NAME), 0, strlen(XOOPS_DB_USER) * 2);
+            $contentCacheId = substr(md5(implode(',', $groups).XOOPS_DB_PASS.XOOPS_DB_NAME), 0, strlen(XOOPS_DB_USER) * 2);
         } else {
             $contentCacheId = XOOPS_GROUP_ANONYMOUS;
         }
@@ -58,8 +58,8 @@ 
     {
         global $xoopsModule;
 
-        $name    = $name ? : (string)time();
-        $dirname = $dirname ? : (is_object($xoopsModule) ? $xoopsModule->getVar('dirname', 'n') : 'system');
+        $name    = $name ?: (string)time();
+        $dirname = $dirname ?: (is_object($xoopsModule) ? $xoopsModule->getVar('dirname', 'n') : 'system');
 
         xoops_load('XoopsCache');
         $key = "{$dirname}_{$name}";
@@ -110,7 +110,7 @@ 
         if (empty($name)) {
             return $data;
         }
-        $dirname = $dirname ? : (is_object($xoopsModule) ? $xoopsModule->getVar('dirname', 'n') : 'system');
+        $dirname = $dirname ?: (is_object($xoopsModule) ? $xoopsModule->getVar('dirname', 'n') : 'system');
         xoops_load('XoopsCache');
         $key = "{$dirname}_{$name}";
 
@@ -160,14 +160,14 @@ 
             $pattern = $dirname ? "{$dirname}_{$name}.*\.php" : "[^_]+_{$name}.*\.php";
             if ($handle = opendir($root_path)) {
                 while (false !== ($file = readdir($handle))) {
-                    if (is_file($root_path . '/' . $file) && preg_match("/{$pattern}$/", $file)) {
-                        @unlink($root_path . '/' . $file);
+                    if (is_file($root_path.'/'.$file) && preg_match("/{$pattern}$/", $file)) {
+                        @unlink($root_path.'/'.$file);
                     }
                 }
                 closedir($handle);
             }
         } else {
-            $files = (array)glob($root_path . "/*{$dirname}_{$name}*.php");
+            $files = (array)glob($root_path."/*{$dirname}_{$name}*.php");
             foreach ($files as $file) {
                 @unlink($file);
             }
@@ -202,8 +202,8 @@ 
         }
         if ($handle = opendir(XOOPS_CACHE_PATH)) {
             while (false !== ($file = readdir($handle))) {
-                if (is_file(XOOPS_CACHE_PATH . '/' . $file) && preg_match($pattern, $file)) {
-                    @unlink(XOOPS_CACHE_PATH . '/' . $file);
+                if (is_file(XOOPS_CACHE_PATH.'/'.$file) && preg_match($pattern, $file)) {
+                    @unlink(XOOPS_CACHE_PATH.'/'.$file);
                 }
             }
             closedir($handle);

htdocs/Frameworks/art/functions.ini.php

Spacing +14 added lines, -14 removed lines

@@ -17,7 +17,7 @@ 
 if (!defined('FRAMEWORKS_ART_FUNCTIONS_INI')):
     define('FRAMEWORKS_ART_FUNCTIONS_INI', true);
 
-    define('FRAMEWORKS_ROOT_PATH', XOOPS_ROOT_PATH . '/Frameworks');
+    define('FRAMEWORKS_ROOT_PATH', XOOPS_ROOT_PATH.'/Frameworks');
 
     /**
      * Load declaration of an object handler
@@ -34,11 +34,11 @@ 
             $handlerClass = 'ArtObject';
             $fileName     = 'object.php';
         } else {
-            $handlerClass = 'ArtObject' . ucfirst($handler) . 'Handler';
+            $handlerClass = 'ArtObject'.ucfirst($handler).'Handler';
             $fileName     = "object.{$handler}.php";
         }
 
-        class_exists($handlerClass) || require_once FRAMEWORKS_ROOT_PATH . "/{$dirname}/{$fileName}";
+        class_exists($handlerClass) || require_once FRAMEWORKS_ROOT_PATH."/{$dirname}/{$fileName}";
 
         return class_exists($handlerClass);
     }
@@ -61,12 +61,12 @@ 
     function load_functions($group = '', $dirname = 'art')
     {
         $dirname  = ('' == $dirname) ? 'art' : $dirname;
-        $constant = strtoupper("frameworks_{$dirname}_functions" . ($group ? "_{$group}" : ''));
+        $constant = strtoupper("frameworks_{$dirname}_functions".($group ? "_{$group}" : ''));
         if (defined($constant)) {
             return true;
         }
 
-        return include_once FRAMEWORKS_ROOT_PATH . "/{$dirname}/functions.{$group}" . (empty($group) ? '' : '.') . 'php';
+        return include_once FRAMEWORKS_ROOT_PATH."/{$dirname}/functions.{$group}".(empty($group) ? '' : '.').'php';
     }
 
     /**
@@ -84,11 +84,11 @@ 
     function mod_loadFunctions($group = '', $dirname = '')
     {
         $dirname  = !empty($dirname) ? $dirname : $GLOBALS['xoopsModule']->getVar('dirname', 'n');
-        $constant = strtoupper("{$dirname}_functions" . ($group ? "_{$group}" : '') . '_loaded');
+        $constant = strtoupper("{$dirname}_functions".($group ? "_{$group}" : '').'_loaded');
         if (defined($constant)) {
             return true;
         }
-        $filename = XOOPS_ROOT_PATH . "/modules/{$dirname}/include/functions.{$group}" . (empty($group) ? '' : '.') . 'php';
+        $filename = XOOPS_ROOT_PATH."/modules/{$dirname}/include/functions.{$group}".(empty($group) ? '' : '.').'php';
 
         return include_once $filename;
     }
@@ -106,9 +106,9 @@ 
     function mod_loadRenderer($class, $dirname = '')
     {
         $dirname  = !empty($dirname) ? $dirname : $GLOBALS['xoopsModule']->getVar('dirname', 'n');
-        $renderer = ucfirst($dirname) . ucfirst($class) . 'Renderer';
+        $renderer = ucfirst($dirname).ucfirst($class).'Renderer';
         if (!class_exists($renderer)) {
-            require_once XOOPS_ROOT_PATH . "/modules/{$dirname}/class/{$class}.renderer.php";
+            require_once XOOPS_ROOT_PATH."/modules/{$dirname}/class/{$class}.renderer.php";
         }
         $instance = eval("{$renderer}::instance()");
 
@@ -128,10 +128,10 @@ 
          */
         function mod_constant($name)
         {
-            if (!empty($GLOBALS['VAR_PREFIXU']) && @defined($GLOBALS['VAR_PREFIXU'] . '_' . strtoupper($name))) {
-                return constant($GLOBALS['VAR_PREFIXU'] . '_' . strtoupper($name));
-            } elseif (!empty($GLOBALS['xoopsModule']) && @defined(strtoupper($GLOBALS['xoopsModule']->getVar('dirname', 'n') . '_' . $name))) {
-                return constant(strtoupper($GLOBALS['xoopsModule']->getVar('dirname', 'n') . '_' . $name));
+            if (!empty($GLOBALS['VAR_PREFIXU']) && @defined($GLOBALS['VAR_PREFIXU'].'_'.strtoupper($name))) {
+                return constant($GLOBALS['VAR_PREFIXU'].'_'.strtoupper($name));
+            } elseif (!empty($GLOBALS['xoopsModule']) && @defined(strtoupper($GLOBALS['xoopsModule']->getVar('dirname', 'n').'_'.$name))) {
+                return constant(strtoupper($GLOBALS['xoopsModule']->getVar('dirname', 'n').'_'.$name));
             } elseif (defined(strtoupper($name))) {
                 return constant(strtoupper($name));
             } else {
@@ -155,7 +155,7 @@ 
          */
         function mod_DB_prefix($name, $isRel = false)
         {
-            $relative_name = $GLOBALS['MOD_DB_PREFIX'] . '_' . $name;
+            $relative_name = $GLOBALS['MOD_DB_PREFIX'].'_'.$name;
             if ($isRel) {
                 return $relative_name;
             }

htdocs/Frameworks/moduleclasses/moduleadmin/moduleadmin.php

Indentation +54 added lines, -54 removed lines

@@ -507,16 +507,16 @@ 
         $release_date = formatTimestamp(mktime(0, 0, 0, $date[1], $date[2], $date[0]), 's');
         $module_dir   = $this->_obj->getVar('dirname');
         $module_info  = "<div id=\"about\"><label class=\"label_after\">" . _AM_MODULEADMIN_ABOUT_DESCRIPTION . "</label>\n"
-                      . "<text>" . $this->_obj->getInfo('description') . "</text><br>\n"
-                      . "<label class=\"label_after\">" . _AM_MODULEADMIN_ABOUT_UPDATEDATE . "</label>\n"
-                      . "<text class=\"bold\">" . formatTimestamp($this->_obj->getVar('last_update'), 'm') . "</text><br>\n"
-                      . "<label class=\"label_after\">" . _AM_MODULEADMIN_ABOUT_MODULESTATUS . "</label>\n"
-                      . "<text>" . $this->_obj->getInfo('module_status') . "</text><br>\n"
-                      . "<label class=\"label_after\">" . _AM_MODULEADMIN_ABOUT_WEBSITE . "</label>\n"
-                      . "<text><a class=\"tooltip\" href=\"http://" . $this->_obj->getInfo('module_website_url') . "\" rel=\"external\" title=\""
-                      . $this->_obj->getInfo('module_website_name') . " - " . $this->_obj->getInfo('module_website_url') . "\">"
-                      . $this->_obj->getInfo('module_website_name') . "</a></text>\n"
-                      . "</div>\n";
+                        . "<text>" . $this->_obj->getInfo('description') . "</text><br>\n"
+                        . "<label class=\"label_after\">" . _AM_MODULEADMIN_ABOUT_UPDATEDATE . "</label>\n"
+                        . "<text class=\"bold\">" . formatTimestamp($this->_obj->getVar('last_update'), 'm') . "</text><br>\n"
+                        . "<label class=\"label_after\">" . _AM_MODULEADMIN_ABOUT_MODULESTATUS . "</label>\n"
+                        . "<text>" . $this->_obj->getInfo('module_status') . "</text><br>\n"
+                        . "<label class=\"label_after\">" . _AM_MODULEADMIN_ABOUT_WEBSITE . "</label>\n"
+                        . "<text><a class=\"tooltip\" href=\"http://" . $this->_obj->getInfo('module_website_url') . "\" rel=\"external\" title=\""
+                        . $this->_obj->getInfo('module_website_name') . " - " . $this->_obj->getInfo('module_website_url') . "\">"
+                        . $this->_obj->getInfo('module_website_name') . "</a></text>\n"
+                        . "</div>\n";
         $authorArray  = array();
         foreach ( $author as $k => $aName ) {
             $authorArray[$k] = ( isset( $nickname[$k] ) && ( '' != $nickname[$k] ) ) ? "{$aName} ({$nickname[$k]})" : "{$aName}";
@@ -527,51 +527,51 @@ 
         $website = preg_match('%^(https?:)?//%', $website) ? $website : 'http://' . $website;
 
         $ret = "<table>\n<tr>\n"
-             . "<td width=\"50%\">\n"
-             . "<table>\n<tr>\n<td style=\"width: 100px;\">\n"
-             . "<img src=\"" . XOOPS_URL . '/modules/' . $module_dir . '/' . $this->_obj->getInfo('image') . "\" alt=\"" . $module_dir . "\" style=\"float: left; margin-right: 10px;\">\n"
-             . "</td><td>\n"
-             . "<div style=\"margin-top: 1px; margin-bottom: 4px; font-size: 18px; line-height: 18px; color: #2F5376; font-weight: bold;\">\n"
-             . $this->_obj->getInfo('name') . ' ' . $this->_obj->getInfo('version') . ' ' . $this->_obj->getInfo('module_status') . " ({$release_date})\n"
-             . "<br>\n"
-             . "</div>\n"
-             . "<div style=\"line-height: 16px; font-weight: bold;\">\n"
-             . _AM_MODULEADMIN_ABOUT_BY . implode(', ', $authorArray) . "\n"
-             . "</div>\n"
-             . "<div style=\"line-height: 16px;\">\n"
-             . "<a href=\"$license_url\" target=\"_blank\" rel=\"external\">" . $this->_obj->getInfo('license') . "</a>\n"
-             . "<br>\n"
-             . "<a href=\"$website\" target=\"_blank\">" . $this->_obj->getInfo('website') . "</a>\n"
-             . "<br>\n"
-             . "<br>\n"
-             . "</div>\n"
-             . "</td></tr>\n";
+                . "<td width=\"50%\">\n"
+                . "<table>\n<tr>\n<td style=\"width: 100px;\">\n"
+                . "<img src=\"" . XOOPS_URL . '/modules/' . $module_dir . '/' . $this->_obj->getInfo('image') . "\" alt=\"" . $module_dir . "\" style=\"float: left; margin-right: 10px;\">\n"
+                . "</td><td>\n"
+                . "<div style=\"margin-top: 1px; margin-bottom: 4px; font-size: 18px; line-height: 18px; color: #2F5376; font-weight: bold;\">\n"
+                . $this->_obj->getInfo('name') . ' ' . $this->_obj->getInfo('version') . ' ' . $this->_obj->getInfo('module_status') . " ({$release_date})\n"
+                . "<br>\n"
+                . "</div>\n"
+                . "<div style=\"line-height: 16px; font-weight: bold;\">\n"
+                . _AM_MODULEADMIN_ABOUT_BY . implode(', ', $authorArray) . "\n"
+                . "</div>\n"
+                . "<div style=\"line-height: 16px;\">\n"
+                . "<a href=\"$license_url\" target=\"_blank\" rel=\"external\">" . $this->_obj->getInfo('license') . "</a>\n"
+                . "<br>\n"
+                . "<a href=\"$website\" target=\"_blank\">" . $this->_obj->getInfo('website') . "</a>\n"
+                . "<br>\n"
+                . "<br>\n"
+                . "</div>\n"
+                . "</td></tr>\n";
         if ((1 !== preg_match('/[^a-zA-Z0-9]/', $business)) || (false !== checkEmail($business))) {
             $ret .= "<td colspan=\"2\">"
-                  . "<div id=\"about_donate\"><fieldset><legend class=\"label\">Donation</legend><br>\n"
-                  . "<div style=\"clear: both; height: 1em;\"></div>\n"
-                  . "<form action=\"https://www.paypal.com/cgi-bin/webscr\" method=\"post\" target=\"_blank\" rel=\external\">\n"
-                  . "<input name=\"cmd\" type=\"hidden\" value=\"_donations\">\n"
-                  . "<input name=\"business\" type=\"hidden\" value=\"{$business}\">\n"
-                  . "<input name=\"currency_code\" type=\"hidden\" value=\"" . _AM_MODULEADMIN_ABOUT_AMOUNT_CURRENCY . "\">\n"
-                  . "<label class=\"label_after\" for=\"amount\">" . _AM_MODULEADMIN_ABOUT_AMOUNT . "</label><text><input class=\"donate_amount\" type=\"text\" name=\"amount\" value=\"" . _AM_MODULEADMIN_ABOUT_AMOUNT_SUGGESTED . "\" title=\"" . _AM_MODULEADMIN_ABOUT_AMOUNT_TTL . "\" pattern=\"" . _AM_MODULEADMIN_ABOUT_AMOUNT_PATTERN . "\"></text>\n"
-                  . "<br>\n"
-                  . "<text><input type=\"image\" name=\"submit\" class=\"donate_button\" src=\"https://www.paypal.com/en_US/i/btn/btn_donate_LG.gif\" alt=\"" . _AM_MODULEADMIN_ABOUT_DONATE_IMG_ALT . "\"></text>\n"
-                  . "<img alt=\"\" height=\"1\" src=\"https://www.paypalobjects.com/en_US/i/scr/pixel.gif\" style=\"border-width: 0px;\" width=\"1\">\n"
-                  . "</form>\n"
-                  . "<br>\n"
-                  . "</fieldset>\n"
-                  . "</div>\n"
-                  . "</td>\n</tr>\n";
+                    . "<div id=\"about_donate\"><fieldset><legend class=\"label\">Donation</legend><br>\n"
+                    . "<div style=\"clear: both; height: 1em;\"></div>\n"
+                    . "<form action=\"https://www.paypal.com/cgi-bin/webscr\" method=\"post\" target=\"_blank\" rel=\external\">\n"
+                    . "<input name=\"cmd\" type=\"hidden\" value=\"_donations\">\n"
+                    . "<input name=\"business\" type=\"hidden\" value=\"{$business}\">\n"
+                    . "<input name=\"currency_code\" type=\"hidden\" value=\"" . _AM_MODULEADMIN_ABOUT_AMOUNT_CURRENCY . "\">\n"
+                    . "<label class=\"label_after\" for=\"amount\">" . _AM_MODULEADMIN_ABOUT_AMOUNT . "</label><text><input class=\"donate_amount\" type=\"text\" name=\"amount\" value=\"" . _AM_MODULEADMIN_ABOUT_AMOUNT_SUGGESTED . "\" title=\"" . _AM_MODULEADMIN_ABOUT_AMOUNT_TTL . "\" pattern=\"" . _AM_MODULEADMIN_ABOUT_AMOUNT_PATTERN . "\"></text>\n"
+                    . "<br>\n"
+                    . "<text><input type=\"image\" name=\"submit\" class=\"donate_button\" src=\"https://www.paypal.com/en_US/i/btn/btn_donate_LG.gif\" alt=\"" . _AM_MODULEADMIN_ABOUT_DONATE_IMG_ALT . "\"></text>\n"
+                    . "<img alt=\"\" height=\"1\" src=\"https://www.paypalobjects.com/en_US/i/scr/pixel.gif\" style=\"border-width: 0px;\" width=\"1\">\n"
+                    . "</form>\n"
+                    . "<br>\n"
+                    . "</fieldset>\n"
+                    . "</div>\n"
+                    . "</td>\n</tr>\n";
         }
         $ret .= "</table>\n";
         $this->addInfoBox( _AM_MODULEADMIN_ABOUT_MODULEINFO );
         $this->addInfoBoxLine( _AM_MODULEADMIN_ABOUT_MODULEINFO, $module_info, '', '', 'information' );
         $ret .= $this->renderInfoBox()
-              . "</td>\n"
-              . "<td width=\"50%\">\n"
-              . "<fieldset><legend class=\"label\">" . _AM_MODULEADMIN_ABOUT_CHANGELOG . "</legend><br>\n"
-              . "<div class=\"txtchangelog\">\n";
+                . "</td>\n"
+                . "<td width=\"50%\">\n"
+                . "<fieldset><legend class=\"label\">" . _AM_MODULEADMIN_ABOUT_CHANGELOG . "</legend><br>\n"
+                . "<div class=\"txtchangelog\">\n";
         $language = empty( $GLOBALS['xoopsConfig']['language'] ) ? 'english' : $GLOBALS['xoopsConfig']['language'];
         $file     = XOOPS_ROOT_PATH . "/modules/{$module_dir}/language/{$language}/changelog.txt";
         if ( !is_file( $file ) && ( 'english' !== $language ) ) {
@@ -586,14 +586,14 @@ 
             }
         }
         $ret .= "</div>\n"
-              . "</fieldset>\n"
-              . "</td>\n"
-              . "</tr>\n"
-              . "</table>\n";
+                . "</fieldset>\n"
+                . "</td>\n"
+                . "</tr>\n"
+                . "</table>\n";
         if ( true === $logo_xoops ) {
             $ret .= "<div class=\"center\">"
-                  . "<a href=\"http://www.xoops.org\" target=\"_blank\"><img src=\"{$path}xoopsmicrobutton.gif\" alt=\"XOOPS\" title=\"XOOPS\"></a>"
-                  . "</div>";
+                    . "<a href=\"http://www.xoops.org\" target=\"_blank\"><img src=\"{$path}xoopsmicrobutton.gif\" alt=\"XOOPS\" title=\"XOOPS\"></a>"
+                    . "</div>";
         }
         return $ret;
     }

Spacing +77 added lines, -77 removed lines

@@ -33,7 +33,7 @@ 
     public function __construct()
     {
         global $xoopsModule;
-        $this->_obj =& $xoopsModule;
+        $this->_obj = & $xoopsModule;
         $this->loadLanguage();
     }
 
@@ -121,8 +121,8 @@ 
     public function loadLanguage()
     {
         $language = $GLOBALS['xoopsConfig']['language'];
-        if (!file_exists($fileinc = XOOPS_ROOT_PATH . "/Frameworks/moduleclasses/moduleadmin/language/{$language}/main.php")) {
-            if (!file_exists($fileinc = XOOPS_ROOT_PATH . '/Frameworks/moduleclasses/moduleadmin/language/english/main.php')) {
+        if (!file_exists($fileinc = XOOPS_ROOT_PATH."/Frameworks/moduleclasses/moduleadmin/language/{$language}/main.php")) {
+            if (!file_exists($fileinc = XOOPS_ROOT_PATH.'/Frameworks/moduleclasses/moduleadmin/language/english/main.php')) {
                 return false;
             }
         }
@@ -141,26 +141,26 @@ 
     public function renderMenuIndex()
     {
         $this->addAssets();
-        $path       = XOOPS_URL . '/modules/' . $this->_obj->getVar('dirname') . '/';
-        $pathsystem = XOOPS_URL . '/modules/system/';
+        $path       = XOOPS_URL.'/modules/'.$this->_obj->getVar('dirname').'/';
+        $pathsystem = XOOPS_URL.'/modules/system/';
         $this->_obj->loadAdminMenu();
         $ret = "<div class=\"rmmenuicon\">\n";
         foreach (array_keys($this->_obj->adminmenu) as $i) {
             if ($this->_obj->adminmenu[$i]['link'] !== 'admin/index.php') {
-                $ret .= "<a href=\"../" . $this->_obj->adminmenu[$i]['link'] . "\" title=\"" . (isset($this->_obj->adminmenu[$i]['desc']) ? $this->_obj->adminmenu[$i]['desc'] : '') . "\">";
+                $ret .= "<a href=\"../".$this->_obj->adminmenu[$i]['link']."\" title=\"".(isset($this->_obj->adminmenu[$i]['desc']) ? $this->_obj->adminmenu[$i]['desc'] : '')."\">";
                 //$ret .= "<img src=\"" . $path . $this->_obj->adminmenu[$i]['icon']. "\" alt=\"" . $this->_obj->adminmenu[$i]['title'] . "\" />";
                 //mb for direct URL access to icons in modules Admin
-                $ret .= "<img src=\"" . (filter_var($this->_obj->adminmenu[$i]['icon'], FILTER_VALIDATE_URL) ? $this->_obj->adminmenu[$i]['icon'] : $path . $this->_obj->adminmenu[$i]['icon']) . "\" alt=\"" . $this->_obj->adminmenu[$i]['title'] . "\" />";
+                $ret .= "<img src=\"".(filter_var($this->_obj->adminmenu[$i]['icon'], FILTER_VALIDATE_URL) ? $this->_obj->adminmenu[$i]['icon'] : $path.$this->_obj->adminmenu[$i]['icon'])."\" alt=\"".$this->_obj->adminmenu[$i]['title']."\" />";
 
-                $ret .= '<span>' . $this->_obj->adminmenu[$i]['title'] . '</span>';
+                $ret .= '<span>'.$this->_obj->adminmenu[$i]['title'].'</span>';
                 $ret .= '</a>';
             }
         }
         if ($this->_obj->getInfo('help')) {
             if (substr(XOOPS_VERSION, 0, 9) >= 'XOOPS 2.5') {
-                $ret .= "<a href=\"" . $pathsystem . 'help.php?mid=' . $this->_obj->getVar('mid', 's') . '&amp;' . $this->_obj->getInfo('help') . "\" title=\"" . _AM_SYSTEM_HELP . "\">";
-                $ret .= "<img width=\"32px\" src=\"" . XOOPS_URL . "/Frameworks/moduleclasses/icons/32/help.png\" alt=\"" . _AM_SYSTEM_HELP . "\" /> ";
-                $ret .= '<span>' . _AM_SYSTEM_HELP . '</span>';
+                $ret .= "<a href=\"".$pathsystem.'help.php?mid='.$this->_obj->getVar('mid', 's').'&amp;'.$this->_obj->getInfo('help')."\" title=\""._AM_SYSTEM_HELP."\">";
+                $ret .= "<img width=\"32px\" src=\"".XOOPS_URL."/Frameworks/moduleclasses/icons/32/help.png\" alt=\""._AM_SYSTEM_HELP."\" /> ";
+                $ret .= '<span>'._AM_SYSTEM_HELP.'</span>';
                 $ret .= '</a>';
             }
         }
@@ -182,7 +182,7 @@ 
     public function renderButton($position = 'right', $delimeter = '&nbsp;')
     {
         $this->addAssets();
-        $path = XOOPS_URL . '/Frameworks/moduleclasses/icons/32/';
+        $path = XOOPS_URL.'/Frameworks/moduleclasses/icons/32/';
         switch ($position) {
             default:
             case 'right':
@@ -198,11 +198,11 @@ 
         }
         $ret .= "<div class=\"xo-buttons\">\n";
         foreach (array_keys($this->_itemButton) as $i) {
-            $ret .= "<a class='ui-corner-all tooltip' href='" . $this->_itemButton[$i]['link'] . "' title='" . $this->_itemButton[$i]['title'] . "' " . $this->_itemButton[$i]['extra'] . '>';
+            $ret .= "<a class='ui-corner-all tooltip' href='".$this->_itemButton[$i]['link']."' title='".$this->_itemButton[$i]['title']."' ".$this->_itemButton[$i]['extra'].'>';
             $ret .= "<img src='"
                     //. $path . $this -> _itemButton[$i]['icon']
                     //mb for direct URL access to icons in modules Admin
-                    . (filter_var($this->_itemButton[$i]['icon'], FILTER_VALIDATE_URL) ? $this->_itemButton[$i]['icon'] : $path . $this->_itemButton[$i]['icon']) . "' title='" . $this->_itemButton[$i]['title'] . "' alt='" . $this->_itemButton[$i]['title'] . "' />" . $this->_itemButton[$i]['title'];
+                    . (filter_var($this->_itemButton[$i]['icon'], FILTER_VALIDATE_URL) ? $this->_itemButton[$i]['icon'] : $path.$this->_itemButton[$i]['icon'])."' title='".$this->_itemButton[$i]['title']."' alt='".$this->_itemButton[$i]['title']."' />".$this->_itemButton[$i]['title'];
             $ret .= "</a>\n";
             $ret .= $delimeter;
         }
@@ -225,7 +225,7 @@ 
         $ret = array();
         $ret['title']        = $title;
         $ret['link']         = $link;
-        $ret['icon']         = $icon . '.png';
+        $ret['icon']         = $icon.'.png';
         $ret['extra']        = $extra;
         $this->_itemButton[] = $ret;
 
@@ -249,22 +249,22 @@ 
     public function addConfigBoxLine($value = '', $type = 'default')
     {
         $line = '';
-        $path = XOOPS_URL . '/Frameworks/moduleclasses/icons/16/';
+        $path = XOOPS_URL.'/Frameworks/moduleclasses/icons/16/';
         switch ($type) {
             default:
             case 'default':
-                $line .= '<span>' . $value . '</span>';
+                $line .= '<span>'.$value.'</span>';
                 break;
 
             case 'folder':
                 if (!is_dir($value)) {
                     $line .= "<span style='color : red; font-weight : bold;'>";
-                    $line .= "<img src='" . $path . "0.png' >";
+                    $line .= "<img src='".$path."0.png' >";
                     $line .= sprintf(_AM_MODULEADMIN_CONFIG_FOLDERKO, $value);
                     $line .= "</span>\n";
                 } else {
                     $line .= "<span style='color : green;'>";
-                    $line .= "<img src='" . $path . "1.png' >";
+                    $line .= "<img src='".$path."1.png' >";
                     $line .= sprintf(_AM_MODULEADMIN_CONFIG_FOLDEROK, $value);
                     $line .= "</span>\n";
                 }
@@ -274,12 +274,12 @@ 
                 if (is_dir($value[0])) {
                     if (substr(decoct(fileperms($value[0])), 2) != $value[1]) {
                         $line .= "<span style='color : red; font-weight : bold;'>";
-                        $line .= "<img src='" . $path . "0.png' >";
+                        $line .= "<img src='".$path."0.png' >";
                         $line .= sprintf(_AM_MODULEADMIN_CONFIG_CHMOD, $value[0], $value[1], substr(decoct(fileperms($value[0])), 2));
                         $line .= "</span>\n";
                     } else {
                         $line .= "<span style='color : green;'>";
-                        $line .= "<img src='" . $path . "1.png' >";
+                        $line .= "<img src='".$path."1.png' >";
                         $line .= sprintf(_AM_MODULEADMIN_CONFIG_CHMOD, $value[0], $value[1], substr(decoct(fileperms($value[0])), 2));
                         $line .= "</span>\n";
                     }
@@ -318,18 +318,18 @@ 
             $ret .= "</legend>\n";
 
             // php version
-            $path = XOOPS_URL . '/Frameworks/moduleclasses/icons/16/';
+            $path = XOOPS_URL.'/Frameworks/moduleclasses/icons/16/';
             if ($this->_obj->getInfo('min_php')) {
                 if (version_compare(phpversion(), $this->_obj->getInfo('min_php'), '<')) {
-                    $ret .= "<span style='color : red; font-weight : bold;'><img src='" . $path . "0.png' >" . sprintf(_AM_MODULEADMIN_CONFIG_PHP, $this->_obj->getInfo('min_php'), phpversion()) . "</span>\n";
+                    $ret .= "<span style='color : red; font-weight : bold;'><img src='".$path."0.png' >".sprintf(_AM_MODULEADMIN_CONFIG_PHP, $this->_obj->getInfo('min_php'), phpversion())."</span>\n";
                 } else {
-                    $ret .= "<span style='color : green;'><img src='" . $path . "1.png' >" . sprintf(_AM_MODULEADMIN_CONFIG_PHP, $this->_obj->getInfo('min_php'), phpversion()) . "</span>\n";
+                    $ret .= "<span style='color : green;'><img src='".$path."1.png' >".sprintf(_AM_MODULEADMIN_CONFIG_PHP, $this->_obj->getInfo('min_php'), phpversion())."</span>\n";
                 }
                 $ret .= '<br>';
             }
 
             // Database version
-            $path    = XOOPS_URL . '/Frameworks/moduleclasses/icons/16/';
+            $path    = XOOPS_URL.'/Frameworks/moduleclasses/icons/16/';
             $dbarray = $this->_obj->getInfo('min_db');
 
             if ($dbarray[XOOPS_DB_TYPE]) {
@@ -366,9 +366,9 @@ 
                     }
                 }
                 if ($reqVer > $curVer) {
-                    $ret .= "<span style='color : red; font-weight : bold;'><img src='" . $path . "0.png' >" . sprintf(XOOPS_DB_TYPE . ' ' . _AM_MODULEADMIN_CONFIG_DB, $dbRequiredVersion, $dbCurrentVersion) . "</span><br>\n";
+                    $ret .= "<span style='color : red; font-weight : bold;'><img src='".$path."0.png' >".sprintf(XOOPS_DB_TYPE.' '._AM_MODULEADMIN_CONFIG_DB, $dbRequiredVersion, $dbCurrentVersion)."</span><br>\n";
                 } else {
-                    $ret .= "<span style='color : green;'><img src='" . $path . "1.png' >" . sprintf(strtoupper(XOOPS_DB_TYPE) . ' ' . _AM_MODULEADMIN_CONFIG_DB, $dbRequiredVersion, $dbCurrentVersion) . "</span><br>\n";
+                    $ret .= "<span style='color : green;'><img src='".$path."1.png' >".sprintf(strtoupper(XOOPS_DB_TYPE).' '._AM_MODULEADMIN_CONFIG_DB, $dbRequiredVersion, $dbCurrentVersion)."</span><br>\n";
                 }
             }
 
@@ -376,9 +376,9 @@ 
             if ($this->_obj->getInfo('min_xoops')) {
                 $currentXoopsVersion = strtolower(str_replace('XOOPS ', '', XOOPS_VERSION));
                 if (version_compare($currentXoopsVersion, $this->_obj->getInfo('min_xoops'), '<')) {
-                    $ret .= "<span style='color : red; font-weight : bold;'><img src='" . $path . "0.png' >" . sprintf(_AM_MODULEADMIN_CONFIG_XOOPS, $this->_obj->getInfo('min_xoops'), substr(XOOPS_VERSION, 6, strlen(XOOPS_VERSION) - 6)) . "</span>\n";
+                    $ret .= "<span style='color : red; font-weight : bold;'><img src='".$path."0.png' >".sprintf(_AM_MODULEADMIN_CONFIG_XOOPS, $this->_obj->getInfo('min_xoops'), substr(XOOPS_VERSION, 6, strlen(XOOPS_VERSION) - 6))."</span>\n";
                 } else {
-                    $ret .= "<span style='color : green;'><img src='" . $path . "1.png' >" . sprintf(_AM_MODULEADMIN_CONFIG_XOOPS, $this->_obj->getInfo('min_xoops'), substr(XOOPS_VERSION, 6)) . "</span>\n";
+                    $ret .= "<span style='color : green;'><img src='".$path."1.png' >".sprintf(_AM_MODULEADMIN_CONFIG_XOOPS, $this->_obj->getInfo('min_xoops'), substr(XOOPS_VERSION, 6))."</span>\n";
                 }
                 $ret .= '<br>';
             }
@@ -386,9 +386,9 @@ 
             // ModuleAdmin version
             if ($this->_obj->getInfo('min_admin')) {
                 if ($this->getVersion() < $this->_obj->getInfo('min_admin')) {
-                    $ret .= "<span style='color : red; font-weight : bold;'><img src='" . $path . "0.png' >" . sprintf(_AM_MODULEADMIN_CONFIG_ADMIN, $this->_obj->getInfo('min_admin'), $this->getVersion()) . "</span>\n";
+                    $ret .= "<span style='color : red; font-weight : bold;'><img src='".$path."0.png' >".sprintf(_AM_MODULEADMIN_CONFIG_ADMIN, $this->_obj->getInfo('min_admin'), $this->getVersion())."</span>\n";
                 } else {
-                    $ret .= "<span style='color : green;'><img src='" . $path . "1.png' >" . sprintf(_AM_MODULEADMIN_CONFIG_ADMIN, $this->_obj->getInfo('min_admin'), $this->getVersion()) . "</span>\n";
+                    $ret .= "<span style='color : green;'><img src='".$path."1.png' >".sprintf(_AM_MODULEADMIN_CONFIG_ADMIN, $this->_obj->getInfo('min_admin'), $this->getVersion())."</span>\n";
                 }
                 $ret .= '<br>';
             }
@@ -451,7 +451,7 @@ 
         switch ($type) {
             default:
             case 'default':
-                $line .= sprintf($text, "<span style='color : " . $color . "; font-weight : bold;'>" . $value . '</span>');
+                $line .= sprintf($text, "<span style='color : ".$color."; font-weight : bold;'>".$value.'</span>');
                 break;
 
             case 'information':
@@ -499,49 +499,49 @@ 
     public function renderAbout($business = '', $logo_xoops = true)
     {
         $this->addAssets();
-        $path         = XOOPS_URL . '/Frameworks/moduleclasses/icons/32/';
+        $path         = XOOPS_URL.'/Frameworks/moduleclasses/icons/32/';
         $date         = preg_replace('/-\\\/', '/', $this->_obj->getInfo('release_date')); // make format a little more forgiving
         $date         = explode('/', $date);
         $author       = explode(',', $this->_obj->getInfo('author'));
         $nickname     = explode(',', $this->_obj->getInfo('nickname'));
         $release_date = formatTimestamp(mktime(0, 0, 0, $date[1], $date[2], $date[0]), 's');
         $module_dir   = $this->_obj->getVar('dirname');
-        $module_info  = "<div id=\"about\"><label class=\"label_after\">" . _AM_MODULEADMIN_ABOUT_DESCRIPTION . "</label>\n"
-                      . "<text>" . $this->_obj->getInfo('description') . "</text><br>\n"
-                      . "<label class=\"label_after\">" . _AM_MODULEADMIN_ABOUT_UPDATEDATE . "</label>\n"
-                      . "<text class=\"bold\">" . formatTimestamp($this->_obj->getVar('last_update'), 'm') . "</text><br>\n"
-                      . "<label class=\"label_after\">" . _AM_MODULEADMIN_ABOUT_MODULESTATUS . "</label>\n"
-                      . "<text>" . $this->_obj->getInfo('module_status') . "</text><br>\n"
-                      . "<label class=\"label_after\">" . _AM_MODULEADMIN_ABOUT_WEBSITE . "</label>\n"
-                      . "<text><a class=\"tooltip\" href=\"http://" . $this->_obj->getInfo('module_website_url') . "\" rel=\"external\" title=\""
-                      . $this->_obj->getInfo('module_website_name') . " - " . $this->_obj->getInfo('module_website_url') . "\">"
-                      . $this->_obj->getInfo('module_website_name') . "</a></text>\n"
+        $module_info  = "<div id=\"about\"><label class=\"label_after\">"._AM_MODULEADMIN_ABOUT_DESCRIPTION."</label>\n"
+                      . "<text>".$this->_obj->getInfo('description')."</text><br>\n"
+                      . "<label class=\"label_after\">"._AM_MODULEADMIN_ABOUT_UPDATEDATE."</label>\n"
+                      . "<text class=\"bold\">".formatTimestamp($this->_obj->getVar('last_update'), 'm')."</text><br>\n"
+                      . "<label class=\"label_after\">"._AM_MODULEADMIN_ABOUT_MODULESTATUS."</label>\n"
+                      . "<text>".$this->_obj->getInfo('module_status')."</text><br>\n"
+                      . "<label class=\"label_after\">"._AM_MODULEADMIN_ABOUT_WEBSITE."</label>\n"
+                      . "<text><a class=\"tooltip\" href=\"http://".$this->_obj->getInfo('module_website_url')."\" rel=\"external\" title=\""
+                      . $this->_obj->getInfo('module_website_name')." - ".$this->_obj->getInfo('module_website_url')."\">"
+                      . $this->_obj->getInfo('module_website_name')."</a></text>\n"
                       . "</div>\n";
-        $authorArray  = array();
-        foreach ( $author as $k => $aName ) {
-            $authorArray[$k] = ( isset( $nickname[$k] ) && ( '' != $nickname[$k] ) ) ? "{$aName} ({$nickname[$k]})" : "{$aName}";
+        $authorArray = array();
+        foreach ($author as $k => $aName) {
+            $authorArray[$k] = (isset($nickname[$k]) && ('' != $nickname[$k])) ? "{$aName} ({$nickname[$k]})" : "{$aName}";
         }
         $license_url = $this->_obj->getInfo('license_url');
-        $license_url = preg_match('%^(https?:)?//%', $license_url) ? $license_url : 'http://' . $license_url;
+        $license_url = preg_match('%^(https?:)?//%', $license_url) ? $license_url : 'http://'.$license_url;
         $website = $this->_obj->getInfo('website');
-        $website = preg_match('%^(https?:)?//%', $website) ? $website : 'http://' . $website;
+        $website = preg_match('%^(https?:)?//%', $website) ? $website : 'http://'.$website;
 
         $ret = "<table>\n<tr>\n"
              . "<td width=\"50%\">\n"
              . "<table>\n<tr>\n<td style=\"width: 100px;\">\n"
-             . "<img src=\"" . XOOPS_URL . '/modules/' . $module_dir . '/' . $this->_obj->getInfo('image') . "\" alt=\"" . $module_dir . "\" style=\"float: left; margin-right: 10px;\">\n"
+             . "<img src=\"".XOOPS_URL.'/modules/'.$module_dir.'/'.$this->_obj->getInfo('image')."\" alt=\"".$module_dir."\" style=\"float: left; margin-right: 10px;\">\n"
              . "</td><td>\n"
              . "<div style=\"margin-top: 1px; margin-bottom: 4px; font-size: 18px; line-height: 18px; color: #2F5376; font-weight: bold;\">\n"
-             . $this->_obj->getInfo('name') . ' ' . $this->_obj->getInfo('version') . ' ' . $this->_obj->getInfo('module_status') . " ({$release_date})\n"
+             . $this->_obj->getInfo('name').' '.$this->_obj->getInfo('version').' '.$this->_obj->getInfo('module_status')." ({$release_date})\n"
              . "<br>\n"
              . "</div>\n"
              . "<div style=\"line-height: 16px; font-weight: bold;\">\n"
-             . _AM_MODULEADMIN_ABOUT_BY . implode(', ', $authorArray) . "\n"
+             . _AM_MODULEADMIN_ABOUT_BY.implode(', ', $authorArray)."\n"
              . "</div>\n"
              . "<div style=\"line-height: 16px;\">\n"
-             . "<a href=\"$license_url\" target=\"_blank\" rel=\"external\">" . $this->_obj->getInfo('license') . "</a>\n"
+             . "<a href=\"$license_url\" target=\"_blank\" rel=\"external\">".$this->_obj->getInfo('license')."</a>\n"
              . "<br>\n"
-             . "<a href=\"$website\" target=\"_blank\">" . $this->_obj->getInfo('website') . "</a>\n"
+             . "<a href=\"$website\" target=\"_blank\">".$this->_obj->getInfo('website')."</a>\n"
              . "<br>\n"
              . "<br>\n"
              . "</div>\n"
@@ -553,10 +553,10 @@ 
                   . "<form action=\"https://www.paypal.com/cgi-bin/webscr\" method=\"post\" target=\"_blank\" rel=\external\">\n"
                   . "<input name=\"cmd\" type=\"hidden\" value=\"_donations\">\n"
                   . "<input name=\"business\" type=\"hidden\" value=\"{$business}\">\n"
-                  . "<input name=\"currency_code\" type=\"hidden\" value=\"" . _AM_MODULEADMIN_ABOUT_AMOUNT_CURRENCY . "\">\n"
-                  . "<label class=\"label_after\" for=\"amount\">" . _AM_MODULEADMIN_ABOUT_AMOUNT . "</label><text><input class=\"donate_amount\" type=\"text\" name=\"amount\" value=\"" . _AM_MODULEADMIN_ABOUT_AMOUNT_SUGGESTED . "\" title=\"" . _AM_MODULEADMIN_ABOUT_AMOUNT_TTL . "\" pattern=\"" . _AM_MODULEADMIN_ABOUT_AMOUNT_PATTERN . "\"></text>\n"
+                  . "<input name=\"currency_code\" type=\"hidden\" value=\""._AM_MODULEADMIN_ABOUT_AMOUNT_CURRENCY."\">\n"
+                  . "<label class=\"label_after\" for=\"amount\">"._AM_MODULEADMIN_ABOUT_AMOUNT."</label><text><input class=\"donate_amount\" type=\"text\" name=\"amount\" value=\""._AM_MODULEADMIN_ABOUT_AMOUNT_SUGGESTED."\" title=\""._AM_MODULEADMIN_ABOUT_AMOUNT_TTL."\" pattern=\""._AM_MODULEADMIN_ABOUT_AMOUNT_PATTERN."\"></text>\n"
                   . "<br>\n"
-                  . "<text><input type=\"image\" name=\"submit\" class=\"donate_button\" src=\"https://www.paypal.com/en_US/i/btn/btn_donate_LG.gif\" alt=\"" . _AM_MODULEADMIN_ABOUT_DONATE_IMG_ALT . "\"></text>\n"
+                  . "<text><input type=\"image\" name=\"submit\" class=\"donate_button\" src=\"https://www.paypal.com/en_US/i/btn/btn_donate_LG.gif\" alt=\""._AM_MODULEADMIN_ABOUT_DONATE_IMG_ALT."\"></text>\n"
                   . "<img alt=\"\" height=\"1\" src=\"https://www.paypalobjects.com/en_US/i/scr/pixel.gif\" style=\"border-width: 0px;\" width=\"1\">\n"
                   . "</form>\n"
                   . "<br>\n"
@@ -565,24 +565,24 @@ 
                   . "</td>\n</tr>\n";
         }
         $ret .= "</table>\n";
-        $this->addInfoBox( _AM_MODULEADMIN_ABOUT_MODULEINFO );
-        $this->addInfoBoxLine( _AM_MODULEADMIN_ABOUT_MODULEINFO, $module_info, '', '', 'information' );
+        $this->addInfoBox(_AM_MODULEADMIN_ABOUT_MODULEINFO);
+        $this->addInfoBoxLine(_AM_MODULEADMIN_ABOUT_MODULEINFO, $module_info, '', '', 'information');
         $ret .= $this->renderInfoBox()
               . "</td>\n"
               . "<td width=\"50%\">\n"
-              . "<fieldset><legend class=\"label\">" . _AM_MODULEADMIN_ABOUT_CHANGELOG . "</legend><br>\n"
+              . "<fieldset><legend class=\"label\">"._AM_MODULEADMIN_ABOUT_CHANGELOG."</legend><br>\n"
               . "<div class=\"txtchangelog\">\n";
-        $language = empty( $GLOBALS['xoopsConfig']['language'] ) ? 'english' : $GLOBALS['xoopsConfig']['language'];
-        $file     = XOOPS_ROOT_PATH . "/modules/{$module_dir}/language/{$language}/changelog.txt";
-        if ( !is_file( $file ) && ( 'english' !== $language ) ) {
-            $file = XOOPS_ROOT_PATH . "/modules/{$module_dir}/language/english/changelog.txt";
+        $language = empty($GLOBALS['xoopsConfig']['language']) ? 'english' : $GLOBALS['xoopsConfig']['language'];
+        $file     = XOOPS_ROOT_PATH."/modules/{$module_dir}/language/{$language}/changelog.txt";
+        if (!is_file($file) && ('english' !== $language)) {
+            $file = XOOPS_ROOT_PATH."/modules/{$module_dir}/language/english/changelog.txt";
         }
-        if ( is_readable( $file ) ) {
-            $ret .= ( implode( '<br>', file( $file ) ) ) . "\n";
+        if (is_readable($file)) {
+            $ret .= (implode('<br>', file($file)))."\n";
         } else {
-            $file = XOOPS_ROOT_PATH . "/modules/{$module_dir}/docs/changelog.txt";
-            if ( is_readable( $file ) ) {
-                $ret .= implode( '<br>', file( $file ) ) . "\n";
+            $file = XOOPS_ROOT_PATH."/modules/{$module_dir}/docs/changelog.txt";
+            if (is_readable($file)) {
+                $ret .= implode('<br>', file($file))."\n";
             }
         }
         $ret .= "</div>\n"
@@ -590,7 +590,7 @@ 
               . "</td>\n"
               . "</tr>\n"
               . "</table>\n";
-        if ( true === $logo_xoops ) {
+        if (true === $logo_xoops) {
             $ret .= "<div class=\"center\">"
                   . "<a href=\"http://www.xoops.org\" target=\"_blank\"><img src=\"{$path}xoopsmicrobutton.gif\" alt=\"XOOPS\" title=\"XOOPS\"></a>"
                   . "</div>";
@@ -608,20 +608,20 @@ 
         $this->addAssets();
         $ret        = '';
         $navigation = '';
-        $path       = XOOPS_URL . '/modules/' . $this->_obj->getVar('dirname') . '/';
+        $path       = XOOPS_URL.'/modules/'.$this->_obj->getVar('dirname').'/';
         $this->_obj->loadAdminMenu();
         foreach (array_keys($this->_obj->adminmenu) as $i) {
-            if ($this->_obj->adminmenu[$i]['link'] == 'admin/' . $menu) {
-                $navigation .= $this->_obj->adminmenu[$i]['title'] . ' | ';
-                $ret = "<div class=\"CPbigTitle\" style=\"background-image: url(" . $path . $this->_obj->adminmenu[$i]['icon'] . "); background-repeat: no-repeat; background-position: left; padding-left: 50px;\">
-        <strong>" . $this->_obj->adminmenu[$i]['title'] . '</strong></div><br>';
+            if ($this->_obj->adminmenu[$i]['link'] == 'admin/'.$menu) {
+                $navigation .= $this->_obj->adminmenu[$i]['title'].' | ';
+                $ret = "<div class=\"CPbigTitle\" style=\"background-image: url(".$path.$this->_obj->adminmenu[$i]['icon']."); background-repeat: no-repeat; background-position: left; padding-left: 50px;\">
+        <strong>" . $this->_obj->adminmenu[$i]['title'].'</strong></div><br>';
             } else {
-                $navigation .= "<a href = '../" . $this->_obj->adminmenu[$i]['link'] . "'>" . $this->_obj->adminmenu[$i]['title'] . '</a> | ';
+                $navigation .= "<a href = '../".$this->_obj->adminmenu[$i]['link']."'>".$this->_obj->adminmenu[$i]['title'].'</a> | ';
             }
         }
         if (substr(XOOPS_VERSION, 0, 9) < 'XOOPS 2.5') {
-            $navigation .= "<a href = '../../system/admin.php?fct=preferences&op=showmod&mod=" . $this->_obj->getVar('mid') . "'>" . _MI_SYSTEM_ADMENU6 . '</a>';
-            $ret = $navigation . '<br><br>' . $ret;
+            $navigation .= "<a href = '../../system/admin.php?fct=preferences&op=showmod&mod=".$this->_obj->getVar('mid')."'>"._MI_SYSTEM_ADMENU6.'</a>';
+            $ret = $navigation.'<br><br>'.$ret;
         }
 
         return $ret;

htdocs/backend.php

Spacing +6 added lines, -6 removed lines

@@ -14,7 +14,7 @@ 
  * @since               2.0.0
  */
 
-include __DIR__ . '/mainfile.php';
+include __DIR__.'/mainfile.php';
 
 $GLOBALS['xoopsLogger']->activated = false;
 if (function_exists('mb_http_output')) {
@@ -29,7 +29,7 @@ 
 if (!$tpl->is_cached('db:system_rss.tpl')) {
     xoops_load('XoopsLocal');
     $tpl->assign('channel_title', XoopsLocal::convert_encoding(htmlspecialchars($xoopsConfig['sitename'], ENT_QUOTES)));
-    $tpl->assign('channel_link', XOOPS_URL . '/');
+    $tpl->assign('channel_link', XOOPS_URL.'/');
     $tpl->assign('channel_desc', XoopsLocal::convert_encoding(htmlspecialchars($xoopsConfig['slogan'], ENT_QUOTES)));
     $tpl->assign('channel_lastbuild', formatTimestamp(time(), 'rss'));
     $tpl->assign('channel_webmaster', checkEmail($xoopsConfig['adminmail'], true));
@@ -37,8 +37,8 @@ 
     $tpl->assign('channel_category', 'News');
     $tpl->assign('channel_generator', 'XOOPS');
     $tpl->assign('channel_language', _LANGCODE);
-    $tpl->assign('image_url', XOOPS_URL . '/images/logo.png');
-    $dimension = getimagesize(XOOPS_ROOT_PATH . '/images/logo.png');
+    $tpl->assign('image_url', XOOPS_URL.'/images/logo.png');
+    $dimension = getimagesize(XOOPS_ROOT_PATH.'/images/logo.png');
     if (empty($dimension[0])) {
         $width = 88;
     } else {
@@ -59,8 +59,8 @@ 
         foreach ($sarray as $story) {
             $tpl->append('items', array(
                 'title'       => XoopsLocal::convert_encoding(htmlspecialchars($story->title(), ENT_QUOTES)),
-                'link'        => XOOPS_URL . '/modules/news/article.php?storyid=' . $story->storyid(),
-                'guid'        => XOOPS_URL . '/modules/news/article.php?storyid=' . $story->storyid(),
+                'link'        => XOOPS_URL.'/modules/news/article.php?storyid='.$story->storyid(),
+                'guid'        => XOOPS_URL.'/modules/news/article.php?storyid='.$story->storyid(),
                 'pubdate'     => formatTimestamp($story->published(), 'rss'),
                 'description' => XoopsLocal::convert_encoding(htmlspecialchars($story->hometext(), ENT_QUOTES))));
         }

htdocs/banners.php

Spacing +36 added lines, -36 removed lines

@@ -19,7 +19,7 @@ 
  */
 
 $xoopsOption['pagetype'] = 'banners';
-include __DIR__ . '/mainfile.php';
+include __DIR__.'/mainfile.php';
 
 /********************************************/
 /* Function to let your client login to see */
@@ -76,16 +76,16 @@ 
         }
     ');
     echo "<div id='login_window'>
-          <h2 class='content_title'>" . _BANNERS_LOGIN_TITLE . "</h2>
+          <h2 class='content_title'>" . _BANNERS_LOGIN_TITLE."</h2>
           <form method='post' action='banners.php' class='login_form'>
           <div class='credentials'>
-          <label for='login_form-login'>" . _BANNERS_LOGIN_LOGIN . "</label>
+          <label for='login_form-login'>" . _BANNERS_LOGIN_LOGIN."</label>
           <input type='text' name='login' id='login_form-login' value='' /><br>
-          <label for='login_form-password'>" . _BANNERS_LOGIN_PASS . "</label>
+          <label for='login_form-password'>" . _BANNERS_LOGIN_PASS."</label>
           <input type='password' name='pass' id='login_form-password' value='' /><br>
           </div>
-          <div class='actions'><input type='hidden' name='op' value='Ok' /><button type='submit'>" . _BANNERS_LOGIN_OK . "</button></div>
-          <div class='login_info'>" . _BANNERS_LOGIN_INFO . '</div>' . $GLOBALS['xoopsSecurity']->getTokenHTML('BANNER_LOGIN') . '
+          <div class='actions'><input type='hidden' name='op' value='Ok' /><button type='submit'>" . _BANNERS_LOGIN_OK."</button></div>
+          <div class='login_info'>" . _BANNERS_LOGIN_INFO.'</div>'.$GLOBALS['xoopsSecurity']->getTokenHTML('BANNER_LOGIN').'
           </form></div>';
     include $GLOBALS['xoops']->path('footer.php');
 }
@@ -112,20 +112,20 @@ 
         ');
 
         echo "<div id='bannerstats'>
-              <h4 class='content_title'>" . sprintf(_BANNERS_TITLE, $name) . "</h4><hr />
+              <h4 class='content_title'>" . sprintf(_BANNERS_TITLE, $name)."</h4><hr />
               <table summary=''>
-              <caption>" . sprintf(_BANNERS_TITLE, $name) . '</caption>
+              <caption>" . sprintf(_BANNERS_TITLE, $name).'</caption>
               <thead><tr>
               <td>ID</td>
-              <td>' . _BANNERS_IMP_MADE . '</td>
-              <td>' . _BANNERS_IMP_TOTAL . '</td>
-              <td>' . _BANNERS_IMP_LEFT . '</td>
-              <td>' . _BANNERS_CLICKS . '</td>
-              <td>' . _BANNERS_PER_CLICKS . '</td>
-              <td>' . _BANNERS_FUNCTIONS . "</td></tr></thead>
+              <td>' . _BANNERS_IMP_MADE.'</td>
+              <td>' . _BANNERS_IMP_TOTAL.'</td>
+              <td>' . _BANNERS_IMP_LEFT.'</td>
+              <td>' . _BANNERS_CLICKS.'</td>
+              <td>' . _BANNERS_PER_CLICKS.'</td>
+              <td>' . _BANNERS_FUNCTIONS."</td></tr></thead>
               <tfoot><tr><td colspan='7'></td></tr></tfoot>";
 
-        $result = $xoopsDB->query('SELECT bid, imptotal, impmade, clicks, date FROM ' . $xoopsDB->prefix('banner') . " WHERE cid={$cid}");
+        $result = $xoopsDB->query('SELECT bid, imptotal, impmade, clicks, date FROM '.$xoopsDB->prefix('banner')." WHERE cid={$cid}");
         $i      = 0;
         while (false !== (list($bid, $imptotal, $impmade, $clicks, $date) = $xoopsDB->fetchRow($result))) {
             if ($impmade == 0) {
@@ -146,14 +146,14 @@ 
                   <td>{$left}</td>
                   <td>{$clicks}</td>
                   <td>{$percent}%</td>
-                  <td><a href='banners.php?op=EmailStats&amp;cid={$cid}&amp;bid={$bid}' title='" . _BANNERS_STATS . "'>" . _BANNERS_STATS . '</a></td></tr></tbody>';
+                  <td><a href='banners.php?op=EmailStats&amp;cid={$cid}&amp;bid={$bid}' title='"._BANNERS_STATS."'>"._BANNERS_STATS.'</a></td></tr></tbody>';
             ++$i;
         }
         echo "</table>
               <br><br>
-              <h4 class='content_title'>" . _BANNERS_FOW_IN . htmlspecialchars($xoopsConfig['sitename']) . '</h4><hr />';
+              <h4 class='content_title'>" . _BANNERS_FOW_IN.htmlspecialchars($xoopsConfig['sitename']).'</h4><hr />';
 
-        $result = $xoopsDB->query('SELECT bid, imageurl, clickurl, htmlbanner, htmlcode FROM ' . $xoopsDB->prefix('banner') . " WHERE cid={$cid}");
+        $result = $xoopsDB->query('SELECT bid, imageurl, clickurl, htmlbanner, htmlcode FROM '.$xoopsDB->prefix('banner')." WHERE cid={$cid}");
         while (false !== (list($bid, $imageurl, $clickurl, $htmlbanner, $htmlcode) = $xoopsDB->fetchRow($result))) {
             $numrows = $xoopsDB->getRowsNum($result);
             if ($numrows > 1) {
@@ -171,31 +171,31 @@ 
                     echo "<img src='{$imageurl}' alt='' />";
                 }
             }
-            echo '<br><strong>' . _BANNERS_ID . $bid . '</strong><br>' . sprintf(_BANNERS_SEND_STATS, 'banners.php?op=EmailStats&amp;cid=' . $cid . '&amp;bid=' . $bid) . '<br>';
+            echo '<br><strong>'._BANNERS_ID.$bid.'</strong><br>'.sprintf(_BANNERS_SEND_STATS, 'banners.php?op=EmailStats&amp;cid='.$cid.'&amp;bid='.$bid).'<br>';
             if (!$htmlbanner) {
                 $clickurl = htmlspecialchars($clickurl, ENT_QUOTES);
-                echo sprintf(_BANNERS_POINTS, $clickurl) . "<br>
-                <form action='banners.php' method='post'>" . _BANNERS_URL . "
+                echo sprintf(_BANNERS_POINTS, $clickurl)."<br>
+                <form action='banners.php' method='post'>" . _BANNERS_URL."
                 <input type='text' name='url' size='50' maxlength='200' value='{$clickurl}' />
                 <input type='hidden' name='bid' value='{$bid}' />
                 <input type='hidden' name='cid' value='{$cid}' />
-                <input type='submit' name='op' value='" . _BANNERS_CHANGE . "' />" . $GLOBALS['xoopsSecurity']->getTokenHTML('BANNER_EDIT') . '</form>';
+                <input type='submit' name='op' value='"._BANNERS_CHANGE."' />".$GLOBALS['xoopsSecurity']->getTokenHTML('BANNER_EDIT').'</form>';
             }
         }
 
         /* Finnished Banners */
         echo '<br>';
-        if ($result = $xoopsDB->query('SELECT bid, impressions, clicks, datestart, dateend FROM ' . $xoopsDB->prefix('bannerfinish') . " WHERE cid={$cid}")) {
-            echo "<h4 class='content_title'>" . sprintf(_BANNERS_FINISHED, $name) . "</h4><hr />
+        if ($result = $xoopsDB->query('SELECT bid, impressions, clicks, datestart, dateend FROM '.$xoopsDB->prefix('bannerfinish')." WHERE cid={$cid}")) {
+            echo "<h4 class='content_title'>".sprintf(_BANNERS_FINISHED, $name)."</h4><hr />
                   <table summary=''>
-                  <caption>" . sprintf(_BANNERS_FINISHED, $name) . '</caption>
+                  <caption>" . sprintf(_BANNERS_FINISHED, $name).'</caption>
                   <thead><tr>
                   <td>ID</td>
-                  <td>' . _BANNERS_IMP_MADE . '</td>
-                  <td>' . _BANNERS_CLICKS . '</td>
-                  <td>' . _BANNERS_PER_CLICKS . '</td>
-                  <td>' . _BANNERS_STARTED . '</td>
-                  <td>' . _BANNERS_ENDED . "</td></tr></thead>
+                  <td>' . _BANNERS_IMP_MADE.'</td>
+                  <td>' . _BANNERS_CLICKS.'</td>
+                  <td>' . _BANNERS_PER_CLICKS.'</td>
+                  <td>' . _BANNERS_STARTED.'</td>
+                  <td>' . _BANNERS_ENDED."</td></tr></thead>
                   <tfoot><tr><td colspan='6'></td></tr></tfoot>";
 
             $i = 0;
@@ -211,8 +211,8 @@ 
                       <td>{$impressions}</td>
                       <td>{$clicks}</td>
                       <td>{$percent}%</td>
-                      <td>" . formatTimestamp($datestart) . '</td>
-                      <td>' . formatTimestamp($dateend) . '</td></tr></tbody>';
+                      <td>".formatTimestamp($datestart).'</td>
+                      <td>' . formatTimestamp($dateend).'</td></tr></tbody>';
             }
             echo '</table></div>';
         }
@@ -242,7 +242,7 @@ 
                 if ($email == '') {
                     redirect_header('banners.php', 3, sprintf(_BANNERS_MAIL_ERROR, $name));
                 } else {
-                    if ($result = $xoopsDB->query('SELECT bid, imptotal, impmade, clicks, imageurl, clickurl, date FROM ' . $xoopsDB->prefix('banner') . " WHERE bid={$bid} AND cid={$cid}")) {
+                    if ($result = $xoopsDB->query('SELECT bid, imptotal, impmade, clicks, imageurl, clickurl, date FROM '.$xoopsDB->prefix('banner')." WHERE bid={$bid} AND cid={$cid}")) {
                         list($bid, $imptotal, $impmade, $clicks, $imageurl, $clickurl, $date) = $xoopsDB->fetchRow($result);
                         if ($impmade == 0) {
                             $percent = 0;
@@ -312,12 +312,12 @@ 
     global $xoopsDB;
     $bid = (int)$bid;
     if ($bid > 0) {
-        $bresult = $xoopsDB->query('SELECT clickurl FROM ' . $xoopsDB->prefix('banner') . " WHERE bid={$bid}");
+        $bresult = $xoopsDB->query('SELECT clickurl FROM '.$xoopsDB->prefix('banner')." WHERE bid={$bid}");
         list($clickurl) = $xoopsDB->fetchRow($bresult);
         if ($clickurl) {
             if ($GLOBALS['xoopsSecurity']->checkReferer()) {
-                $xoopsDB->queryF('UPDATE ' . $xoopsDB->prefix('banner') . " SET clicks=clicks+1 WHERE bid=$bid");
-                header('Location: ' . $clickurl);
+                $xoopsDB->queryF('UPDATE '.$xoopsDB->prefix('banner')." SET clicks=clicks+1 WHERE bid=$bid");
+                header('Location: '.$clickurl);
             } else {
                 //No valid referer found so some javascript error or direct access found
                 echo _BANNERS_NO_REFERER;

htdocs/edituser.php

Indentation +8 added lines, -8 removed lines

@@ -152,22 +152,22 @@
     $sig_tray->addElement($sig_cbox);
     $umode_select = new XoopsFormSelect(_US_CDISPLAYMODE, 'umode', $xoopsUser->getVar('umode'));
     $umode_select->addOptionArray(array(
-                                      'nest'   => _NESTED,
-                                      'flat'   => _FLAT,
-                                      'thread' => _THREADED));
+                                        'nest'   => _NESTED,
+                                        'flat'   => _FLAT,
+                                        'thread' => _THREADED));
     $uorder_select = new XoopsFormSelect(_US_CSORTORDER, 'uorder', $xoopsUser->getVar('uorder'));
     $uorder_select->addOptionArray(array(
-                                       XOOPS_COMMENT_OLD1ST => _OLDESTFIRST,
-                                       XOOPS_COMMENT_NEW1ST => _NEWESTFIRST));
+                                        XOOPS_COMMENT_OLD1ST => _OLDESTFIRST,
+                                        XOOPS_COMMENT_NEW1ST => _NEWESTFIRST));
     // RMV-NOTIFY
     // TODO: add this to admin user-edit functions...
     include_once $GLOBALS['xoops']->path('language/' . $xoopsConfig['language'] . '/notification.php');
     include_once $GLOBALS['xoops']->path('include/notification_constants.php');
     $notify_method_select = new XoopsFormSelect(_NOT_NOTIFYMETHOD, 'notify_method', $xoopsUser->getVar('notify_method'));
     $notify_method_select->addOptionArray(array(
-                                              XOOPS_NOTIFICATION_METHOD_DISABLE => _NOT_METHOD_DISABLE,
-                                              XOOPS_NOTIFICATION_METHOD_PM      => _NOT_METHOD_PM,
-                                              XOOPS_NOTIFICATION_METHOD_EMAIL   => _NOT_METHOD_EMAIL));
+                                                XOOPS_NOTIFICATION_METHOD_DISABLE => _NOT_METHOD_DISABLE,
+                                                XOOPS_NOTIFICATION_METHOD_PM      => _NOT_METHOD_PM,
+                                                XOOPS_NOTIFICATION_METHOD_EMAIL   => _NOT_METHOD_EMAIL));
     $notify_mode_select = new XoopsFormSelect(_NOT_NOTIFYMODE, 'notify_mode', $xoopsUser->getVar('notify_mode'));
     $notify_mode_select->addOptionArray(array(
                                             XOOPS_NOTIFICATION_MODE_SENDALWAYS         => _NOT_MODE_SENDALWAYS,

Spacing +24 added lines, -24 removed lines

@@ -15,7 +15,7 @@ 
  * @since               2.0.0
  */
 
-include __DIR__ . '/mainfile.php';
+include __DIR__.'/mainfile.php';
 
 XoopsLoad::load('XoopsRequest');
 
@@ -38,7 +38,7 @@ 
 $myts            = MyTextSanitizer::getInstance();
 if ($op === 'saveuser') {
     if (!$GLOBALS['xoopsSecurity']->check()) {
-        redirect_header('index.php', 3, _US_NOEDITRIGHT . '<br>' . implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
+        redirect_header('index.php', 3, _US_NOEDITRIGHT.'<br>'.implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
     }
     $uid = XoopsRequest::getInt('uid', 0);
     if (empty($uid) || $xoopsUser->getVar('uid') != $uid) {
@@ -66,7 +66,7 @@ 
         include $GLOBALS['xoops']->path('header.php');
         echo '<div>';
         foreach ($errors as $er) {
-            echo '<span class="red bold">' . $er . '</span><br>';
+            echo '<span class="red bold">'.$er.'</span><br>';
         }
         echo '</div><br>';
         $op = 'editprofile';
@@ -104,7 +104,7 @@ 
             echo $edituser->getHtmlErrors();
             include $GLOBALS['xoops']->path('footer.php');
         } else {
-            redirect_header('userinfo.php?uid=' . $uid, 1, _US_PROFUPDATED);
+            redirect_header('userinfo.php?uid='.$uid, 1, _US_PROFUPDATED);
         }
         exit();
     }
@@ -114,7 +114,7 @@ 
     include_once $GLOBALS['xoops']->path('header.php');
     include_once $GLOBALS['xoops']->path('include/comment_constants.php');
     include_once $GLOBALS['xoops']->path('include/xoopscodes.php');
-    echo '<a href="userinfo.php?uid=' . $xoopsUser->getVar('uid') . '" title="">' . _US_PROFILE . '</a>&nbsp;<span class="bold">&raquo;</span>&nbsp;' . _US_EDITPROFILE . '<br><br>';
+    echo '<a href="userinfo.php?uid='.$xoopsUser->getVar('uid').'" title="">'._US_PROFILE.'</a>&nbsp;<span class="bold">&raquo;</span>&nbsp;'._US_EDITPROFILE.'<br><br>';
     $form        = new XoopsThemeForm(_US_EDITPROFILE, 'userinfo', 'edituser.php', 'post', true);
     $uname_label = new XoopsFormLabel(_US_NICKNAME, $xoopsUser->getVar('uname'));
     $form->addElement($uname_label);
@@ -161,7 +161,7 @@ 
                                        XOOPS_COMMENT_NEW1ST => _NEWESTFIRST));
     // RMV-NOTIFY
     // TODO: add this to admin user-edit functions...
-    include_once $GLOBALS['xoops']->path('language/' . $xoopsConfig['language'] . '/notification.php');
+    include_once $GLOBALS['xoops']->path('language/'.$xoopsConfig['language'].'/notification.php');
     include_once $GLOBALS['xoops']->path('include/notification_constants.php');
     $notify_method_select = new XoopsFormSelect(_NOT_NOTIFYMETHOD, 'notify_method', $xoopsUser->getVar('notify_method'));
     $notify_method_select->addOptionArray(array(
@@ -176,7 +176,7 @@ 
     $bio_tarea          = new XoopsFormTextArea(_US_EXTRAINFO, 'bio', $xoopsUser->getVar('bio', 'E'));
     $pwd_text           = new XoopsFormPassword('', 'password', 10, 32);
     $pwd_text2          = new XoopsFormPassword('', 'vpass', 10, 32);
-    $pwd_tray           = new XoopsFormElementTray(_US_PASSWORD . '<br>' . _US_TYPEPASSTWICE);
+    $pwd_tray           = new XoopsFormElementTray(_US_PASSWORD.'<br>'._US_TYPEPASSTWICE);
     $pwd_tray->addElement($pwd_text);
     $pwd_tray->addElement($pwd_text2);
     $mailok_radio  = new XoopsFormRadioYN(_US_MAILOK, 'user_mailok', $xoopsUser->getVar('user_mailok'));
@@ -214,17 +214,17 @@ 
 
 if ($op === 'avatarform') {
     include $GLOBALS['xoops']->path('header.php');
-    echo '<a href="userinfo.php?uid=' . $xoopsUser->getVar('uid') . '">' . _US_PROFILE . '</a>&nbsp;<span class="bold">&raquo;</span>&nbsp;' . _US_UPLOADMYAVATAR . '<br><br>';
+    echo '<a href="userinfo.php?uid='.$xoopsUser->getVar('uid').'">'._US_PROFILE.'</a>&nbsp;<span class="bold">&raquo;</span>&nbsp;'._US_UPLOADMYAVATAR.'<br><br>';
     $oldavatar = $xoopsUser->getVar('user_avatar');
     if (!empty($oldavatar) && $oldavatar !== 'blank.gif') {
-        echo '<div class="pad10 txtcenter floatcenter0"><h4 class="red bold">' . _US_OLDDELETED . '</h4>';
-        echo '<img src="' . XOOPS_UPLOAD_URL . '/' . $oldavatar . '" alt="" /></div>';
+        echo '<div class="pad10 txtcenter floatcenter0"><h4 class="red bold">'._US_OLDDELETED.'</h4>';
+        echo '<img src="'.XOOPS_UPLOAD_URL.'/'.$oldavatar.'" alt="" /></div>';
     }
     if ($xoopsConfigUser['avatar_allow_upload'] == 1 && $xoopsUser->getVar('posts') >= $xoopsConfigUser['avatar_minposts']) {
         include_once $GLOBALS['xoops']->path('class/xoopsformloader.php');
         $form = new XoopsThemeForm(_US_UPLOADMYAVATAR, 'uploadavatar', 'edituser.php', 'post', true);
         $form->setExtra('enctype="multipart/form-data"');
-        $form->addElement(new XoopsFormLabel(_US_MAXPIXEL, $xoopsConfigUser['avatar_width'] . ' x ' . $xoopsConfigUser['avatar_height']));
+        $form->addElement(new XoopsFormLabel(_US_MAXPIXEL, $xoopsConfigUser['avatar_width'].' x '.$xoopsConfigUser['avatar_height']));
         $form->addElement(new XoopsFormLabel(_US_MAXIMGSZ, $xoopsConfigUser['avatar_maxsize']));
         $form->addElement(new XoopsFormFile(_US_SELFILE, 'avatarfile', $xoopsConfigUser['avatar_maxsize']), true);
         $form->addElement(new XoopsFormHidden('op', 'avatarupload'));
@@ -240,11 +240,11 @@ 
 //    $avatar_selected = in_array($avatar_selected, array_keys($avatar_list)) ? $avatar_selected : "blank.gif";
     $avatar_selected = array_key_exists($avatar_selected, $avatar_list) ? $avatar_selected : 'blank.gif';
     $avatar_select->addOptionArray($avatar_list);
-    $avatar_select->setExtra("onchange='showImgSelected(\"avatar\", \"user_avatar\", \"uploads\", \"\", \"" . XOOPS_URL . "\")'");
+    $avatar_select->setExtra("onchange='showImgSelected(\"avatar\", \"user_avatar\", \"uploads\", \"\", \"".XOOPS_URL."\")'");
     $avatar_tray = new XoopsFormElementTray(_US_AVATAR, '&nbsp;');
     $avatar_tray->addElement($avatar_select);
-    $avatar_tray->addElement(new XoopsFormLabel('', "<a href=\"javascript:openWithSelfMain('" . XOOPS_URL . "/misc.php?action=showpopups&amp;type=avatars','avatars',600,400);\">" . _LIST . '</a><br>'));
-    $avatar_tray->addElement(new XoopsFormLabel('', "<br><img src='" . XOOPS_UPLOAD_URL . '/' . $avatar_selected . "' name='avatar' id='avatar' alt='' />"));
+    $avatar_tray->addElement(new XoopsFormLabel('', "<a href=\"javascript:openWithSelfMain('".XOOPS_URL."/misc.php?action=showpopups&amp;type=avatars','avatars',600,400);\">"._LIST.'</a><br>'));
+    $avatar_tray->addElement(new XoopsFormLabel('', "<br><img src='".XOOPS_UPLOAD_URL.'/'.$avatar_selected."' name='avatar' id='avatar' alt='' />"));
     $form2->addElement($avatar_tray);
     $form2->addElement(new XoopsFormHidden('uid', $xoopsUser->getVar('uid')));
     $form2->addElement(new XoopsFormHidden('op', 'avatarchoose'));
@@ -255,7 +255,7 @@ 
 
 if ($op === 'avatarupload') {
     if (!$GLOBALS['xoopsSecurity']->check()) {
-        redirect_header('index.php', 3, _US_NOEDITRIGHT . '<br>' . implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
+        redirect_header('index.php', 3, _US_NOEDITRIGHT.'<br>'.implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
     }
     $xoops_upload_file = array();
     $uid               = 0;
@@ -270,7 +270,7 @@ 
     }
     if ($xoopsConfigUser['avatar_allow_upload'] == 1 && $xoopsUser->getVar('posts') >= $xoopsConfigUser['avatar_minposts']) {
         include_once $GLOBALS['xoops']->path('class/uploader.php');
-        $uploader = new XoopsMediaUploader(XOOPS_UPLOAD_PATH . '/avatars', array(
+        $uploader = new XoopsMediaUploader(XOOPS_UPLOAD_PATH.'/avatars', array(
             'image/gif',
             'image/jpeg',
             'image/pjpeg',
@@ -283,7 +283,7 @@ 
                 /* @var $avt_handler XoopsAvatarHandler */
                 $avt_handler = xoops_getHandler('avatar');
                 $avatar      = $avt_handler->create();
-                $avatar->setVar('avatar_file', 'avatars/' . $uploader->getSavedFileName());
+                $avatar->setVar('avatar_file', 'avatars/'.$uploader->getSavedFileName());
                 $avatar->setVar('avatar_name', $xoopsUser->getVar('uname'));
                 $avatar->setVar('avatar_mimetype', $uploader->getMediaType());
                 $avatar->setVar('avatar_display', 1);
@@ -296,16 +296,16 @@ 
                         $avatars = $avt_handler->getObjects(new Criteria('avatar_file', $oldavatar));
                         if (!empty($avatars) && count($avatars) == 1 && is_object($avatars[0])) {
                             $avt_handler->delete($avatars[0]);
-                            $oldavatar_path = realpath(XOOPS_UPLOAD_PATH . '/' . $oldavatar);
+                            $oldavatar_path = realpath(XOOPS_UPLOAD_PATH.'/'.$oldavatar);
                             if (0 === strpos($oldavatar_path, XOOPS_UPLOAD_PATH) && is_file($oldavatar_path)) {
                                 unlink($oldavatar_path);
                             }
                         }
                     }
-                    $sql = sprintf('UPDATE %s SET user_avatar = %s WHERE uid = %u', $xoopsDB->prefix('users'), $xoopsDB->quoteString('avatars/' . $uploader->getSavedFileName()), $xoopsUser->getVar('uid'));
+                    $sql = sprintf('UPDATE %s SET user_avatar = %s WHERE uid = %u', $xoopsDB->prefix('users'), $xoopsDB->quoteString('avatars/'.$uploader->getSavedFileName()), $xoopsUser->getVar('uid'));
                     $xoopsDB->query($sql);
                     $avt_handler->addUser($avatar->getVar('avatar_id'), $xoopsUser->getVar('uid'));
-                    redirect_header('userinfo.php?t=' . time() . '&amp;uid=' . $xoopsUser->getVar('uid'), 3, _US_PROFUPDATED);
+                    redirect_header('userinfo.php?t='.time().'&amp;uid='.$xoopsUser->getVar('uid'), 3, _US_PROFUPDATED);
                 }
             }
         }
@@ -315,7 +315,7 @@ 
 
 if ($op === 'avatarchoose') {
     if (!$GLOBALS['xoopsSecurity']->check()) {
-        redirect_header('index.php', 3, _US_NOEDITRIGHT . '<br>' . implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
+        redirect_header('index.php', 3, _US_NOEDITRIGHT.'<br>'.implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
     }
     $uid = 0;
     if (!empty($_POST['uid'])) {
@@ -336,7 +336,7 @@ 
         }
         unset($avatars, $criteria_avatar);
     }
-    $user_avatarpath = realpath(XOOPS_UPLOAD_PATH . '/' . $user_avatar);
+    $user_avatarpath = realpath(XOOPS_UPLOAD_PATH.'/'.$user_avatar);
     if (0 === strpos($user_avatarpath, realpath(XOOPS_UPLOAD_PATH)) && is_file($user_avatarpath)) {
         $oldavatar = $xoopsUser->getVar('user_avatar');
         $xoopsUser->setVar('user_avatar', $user_avatar);
@@ -353,7 +353,7 @@ 
             $avatars = $avt_handler->getObjects(new Criteria('avatar_file', $oldavatar));
             if (!empty($avatars) && count($avatars) == 1 && is_object($avatars[0])) {
                 $avt_handler->delete($avatars[0]);
-                $oldavatar_path = realpath(XOOPS_UPLOAD_PATH . '/' . $oldavatar);
+                $oldavatar_path = realpath(XOOPS_UPLOAD_PATH.'/'.$oldavatar);
                 if (0 === strpos($oldavatar_path, realpath(XOOPS_UPLOAD_PATH)) && is_file($oldavatar_path)) {
                     unlink($oldavatar_path);
                 }
@@ -366,5 +366,5 @@ 
             }
         }
     }
-    redirect_header('userinfo.php?uid=' . $uid, 0, _US_PROFUPDATED);
+    redirect_header('userinfo.php?uid='.$uid, 0, _US_PROFUPDATED);
 }

htdocs/class/pagenav.php

Spacing +15 added lines, -15 removed lines

@@ -54,9 +54,9 @@ 
         $this->current = (int)$current_start;
         $this->extra   = $extra_arg;
         if ($extra_arg != '' && (substr($extra_arg, -5) !== '&' || substr($extra_arg, -1) !== '&')) {
-            $this->extra = '&' . $extra_arg;
+            $this->extra = '&'.$extra_arg;
         }
-        $this->url = htmlspecialchars(Request::getString('PHP_SELF', '', 'SERVER'), ENT_QUOTES) . '?' . trim($start_name) . '=';
+        $this->url = htmlspecialchars(Request::getString('PHP_SELF', '', 'SERVER'), ENT_QUOTES).'?'.trim($start_name).'=';
     }
 
     /**
@@ -77,18 +77,18 @@ 
                 $ret .= '<div id="xo-pagenav">';
                 $prev = $this->current - $this->perpage;
                 if ($prev >= 0) {
-                    $ret .= '<a class="xo-pagarrow" href="' . $this->url . $prev . $this->extra . '"><u>&laquo;</u></a> ';
+                    $ret .= '<a class="xo-pagarrow" href="'.$this->url.$prev.$this->extra.'"><u>&laquo;</u></a> ';
                 }
                 $counter      = 1;
                 $current_page = (int)floor(($this->current + $this->perpage) / $this->perpage);
                 while ($counter <= $total_pages) {
                     if ($counter == $current_page) {
-                        $ret .= '<strong class="xo-pagact" >(' . $counter . ')</strong> ';
+                        $ret .= '<strong class="xo-pagact" >('.$counter.')</strong> ';
                     } elseif (($counter > $current_page - $offset && $counter < $current_page + $offset) || $counter == 1 || $counter == $total_pages) {
                         if ($counter == $total_pages && $current_page < $total_pages - $offset) {
                             $ret .= '... ';
                         }
-                        $ret .= '<a class="xo-counterpage" href="' . $this->url . (($counter - 1) * $this->perpage) . $this->extra . '">' . $counter . '</a> ';
+                        $ret .= '<a class="xo-counterpage" href="'.$this->url.(($counter - 1) * $this->perpage).$this->extra.'">'.$counter.'</a> ';
                         if ($counter == 1 && $current_page > 1 + $offset) {
                             $ret .= '... ';
                         }
@@ -97,7 +97,7 @@ 
                 }
                 $next = $this->current + $this->perpage;
                 if ($this->total > $next) {
-                    $ret .= '<a class="xo-pagarrow" href="' . $this->url . $next . $this->extra . '"><u>&raquo;</u></a> ';
+                    $ret .= '<a class="xo-pagarrow" href="'.$this->url.$next.$this->extra.'"><u>&raquo;</u></a> ';
                 }
                 $ret .= '</div> ';
             }
@@ -126,15 +126,15 @@ 
             $current_page = (int)floor(($this->current + $this->perpage) / $this->perpage);
             while ($counter <= $total_pages) {
                 if ($counter == $current_page) {
-                    $ret .= '<option value="' . $this->url . (($counter - 1) * $this->perpage) . $this->extra . '" selected>' . $counter . '</option>';
+                    $ret .= '<option value="'.$this->url.(($counter - 1) * $this->perpage).$this->extra.'" selected>'.$counter.'</option>';
                 } else {
-                    $ret .= '<option value="' . $this->url . (($counter - 1) * $this->perpage) . $this->extra . '">' . $counter . '</option>';
+                    $ret .= '<option value="'.$this->url.(($counter - 1) * $this->perpage).$this->extra.'">'.$counter.'</option>';
                 }
                 ++$counter;
             }
             $ret .= '</select>';
             if ($showbutton) {
-                $ret .= '&nbsp;<input type="submit" value="' . _GO . '" />';
+                $ret .= '&nbsp;<input type="submit" value="'._GO.'" />';
             }
             $ret .= '</form>';
         }
@@ -159,20 +159,20 @@ 
             $ret  = '<table><tr>';
             $prev = $this->current - $this->perpage;
             if ($prev >= 0) {
-                $ret .= '<td class="pagneutral"><a href="' . $this->url . $prev . $this->extra . '">&lt;</a></td><td><img src="' . XOOPS_URL . '/images/blank.gif" width="6" alt="" /></td>';
+                $ret .= '<td class="pagneutral"><a href="'.$this->url.$prev.$this->extra.'">&lt;</a></td><td><img src="'.XOOPS_URL.'/images/blank.gif" width="6" alt="" /></td>';
             } else {
-                $ret .= '<td class="pagno"></a></td><td><img src="' . XOOPS_URL . '/images/blank.gif" width="6" alt="" /></td>';
+                $ret .= '<td class="pagno"></a></td><td><img src="'.XOOPS_URL.'/images/blank.gif" width="6" alt="" /></td>';
             }
             $counter      = 1;
             $current_page = (int)floor(($this->current + $this->perpage) / $this->perpage);
             while ($counter <= $total_pages) {
                 if ($counter == $current_page) {
-                    $ret .= '<td class="pagact"><strong>' . $counter . '</strong></td>';
+                    $ret .= '<td class="pagact"><strong>'.$counter.'</strong></td>';
                 } elseif (($counter > $current_page - $offset && $counter < $current_page + $offset) || $counter == 1 || $counter == $total_pages) {
                     if ($counter == $total_pages && $current_page < $total_pages - $offset) {
                         $ret .= '<td class="paginact">...</td>';
                     }
-                    $ret .= '<td class="paginact"><a href="' . $this->url . (($counter - 1) * $this->perpage) . $this->extra . '">' . $counter . '</a></td>';
+                    $ret .= '<td class="paginact"><a href="'.$this->url.(($counter - 1) * $this->perpage).$this->extra.'">'.$counter.'</a></td>';
                     if ($counter == 1 && $current_page > 1 + $offset) {
                         $ret .= '<td class="paginact">...</td>';
                     }
@@ -181,9 +181,9 @@ 
             }
             $next = $this->current + $this->perpage;
             if ($this->total > $next) {
-                $ret .= '<td><img src="' . XOOPS_URL . '/images/blank.gif" width="6" alt="" /></td><td class="pagneutral"><a href="' . $this->url . $next . $this->extra . '">&gt;</a></td>';
+                $ret .= '<td><img src="'.XOOPS_URL.'/images/blank.gif" width="6" alt="" /></td><td class="pagneutral"><a href="'.$this->url.$next.$this->extra.'">&gt;</a></td>';
             } else {
-                $ret .= '<td><img src="' . XOOPS_URL . '/images/blank.gif" width="6" alt="" /></td><td class="pagno"></td>';
+                $ret .= '<td><img src="'.XOOPS_URL.'/images/blank.gif" width="6" alt="" /></td><td class="pagno"></td>';
             }
             $ret .= '</tr></table>';
         }