mambax7 / altsys

xoops_trust_path/libs/altsys/include/Text_Diff_Renderer.php

Doc Comments +9 added lines

@@ -125,6 +125,12 @@ 
         return $output . $this->_endDiff();
     }
 
+    /**
+     * @param integer $xbeg
+     * @param integer $xlen
+     * @param integer $ybeg
+     * @param integer $ylen
+     */
     public function _block($xbeg, $xlen, $ybeg, $ylen, &$edits)
     {
         $output = $this->_startBlock($this->_blockHeader($xbeg, $xlen, $ybeg, $ylen));
@@ -174,6 +180,9 @@ 
         return $xbeg . ($xlen ? ($ylen ? 'c' : 'd') : 'a') . $ybeg;
     }
 
+    /**
+     * @param string $header
+     */
     public function _startBlock($header)
     {
         return $header . "\n";

Indentation +4 added lines, -4 removed lines

@@ -89,8 +89,8 @@ 
                             $block[] = new Text_Diff_Op_copy($context);
                         }
                         $output .= $this->_block($x0, $ntrail + $xi - $x0,
-                                                 $y0, $ntrail + $yi - $y0,
-                                                 $block);
+                                                    $y0, $ntrail + $yi - $y0,
+                                                    $block);
                         $block = false;
                     }
                 }
@@ -118,8 +118,8 @@ 
 
         if (is_array($block)) {
             $output .= $this->_block($x0, $xi - $x0,
-                                     $y0, $yi - $y0,
-                                     $block);
+                                        $y0, $yi - $y0,
+                                        $block);
         }
 
         return $output . $this->_endDiff();

Switch Indentation +12 added lines, -12 removed lines

@@ -131,21 +131,21 @@
 
         foreach ($edits as $edit) {
             switch (strtolower(get_class($edit))) {
-            case 'text_diff_op_copy':
-                $output .= $this->_context($edit->orig);
-                break;
+                case 'text_diff_op_copy':
+                    $output .= $this->_context($edit->orig);
+                    break;
 
-            case 'text_diff_op_add':
-                $output .= $this->_added($edit->final);
-                break;
+                case 'text_diff_op_add':
+                    $output .= $this->_added($edit->final);
+                    break;
 
-            case 'text_diff_op_delete':
-                $output .= $this->_deleted($edit->orig);
-                break;
+                case 'text_diff_op_delete':
+                    $output .= $this->_deleted($edit->orig);
+                    break;
 
-            case 'text_diff_op_change':
-                $output .= $this->_changed($edit->orig, $edit->final);
-                break;
+                case 'text_diff_op_change':
+                    $output .= $this->_changed($edit->orig, $edit->final);
+                    break;
             }
         }
 

Spacing +9 added lines, -9 removed lines

@@ -36,7 +36,7 @@ 
     public function __construct($params = array())
     {
         foreach ($params as $param => $value) {
-            $v = '_' . $param;
+            $v = '_'.$param;
             if (isset($this->$v)) {
                 $this->$v = $value;
             }
@@ -122,7 +122,7 @@ 
                                      $block);
         }
 
-        return $output . $this->_endDiff();
+        return $output.$this->_endDiff();
     }
 
     public function _block($xbeg, $xlen, $ybeg, $ylen, &$edits)
@@ -149,7 +149,7 @@ 
             }
         }
 
-        return $output . $this->_endBlock();
+        return $output.$this->_endBlock();
     }
 
     public function _startDiff()
@@ -165,18 +165,18 @@ 
     public function _blockHeader($xbeg, $xlen, $ybeg, $ylen)
     {
         if ($xlen > 1) {
-            $xbeg .= ',' . ($xbeg + $xlen - 1);
+            $xbeg .= ','.($xbeg + $xlen - 1);
         }
         if ($ylen > 1) {
-            $ybeg .= ',' . ($ybeg + $ylen - 1);
+            $ybeg .= ','.($ybeg + $ylen - 1);
         }
 
-        return $xbeg . ($xlen ? ($ylen ? 'c' : 'd') : 'a') . $ybeg;
+        return $xbeg.($xlen ? ($ylen ? 'c' : 'd') : 'a').$ybeg;
     }
 
     public function _startBlock($header)
     {
-        return $header . "\n";
+        return $header."\n";
     }
 
     public function _endBlock()
@@ -186,7 +186,7 @@ 
 
     public function _lines($lines, $prefix = ' ')
     {
-        return $prefix . implode("\n$prefix", $lines) . "\n";
+        return $prefix.implode("\n$prefix", $lines)."\n";
     }
 
     public function _context($lines)
@@ -206,6 +206,6 @@ 
 
     public function _changed($orig, $final)
     {
-        return $this->_deleted($orig) . "---\n" . $this->_added($final);
+        return $this->_deleted($orig)."---\n".$this->_added($final);
     }
 }

xoops_trust_path/libs/altsys/include/Text_Diff_Renderer_inline.php

Doc Comments +6 added lines

@@ -63,6 +63,9 @@ 
         return $header;
     }
 
+    /**
+     * @param string[] $lines
+     */
     public function _lines($lines, $prefix = ' ', $encode = true)
     {
         if ($encode) {
@@ -128,6 +131,9 @@ 
         return str_replace($nl, "\n", $renderer->render($diff)) . "\n";
     }
 
+    /**
+     * @param string $string
+     */
     public function _splitOnWords($string, $newlineEscape = "\n")
     {
         $words = array();

Indentation +2 added lines, -2 removed lines

@@ -118,11 +118,11 @@
          * preserve whitespace as well. Therefore we split on words,
          * but include all blocks of whitespace in the wordlist. */
         $diff = new Text_Diff($this->_splitOnWords($text1, $nl),
-                               $this->_splitOnWords($text2, $nl));
+                                $this->_splitOnWords($text2, $nl));
 
         /* Get the diff in inline format. */
         $renderer = new Text_Diff_Renderer_inline(array_merge($this->getParams(),
-                                                               array('split_level' => 'words')));
+                                                                array('split_level' => 'words')));
 
         /* Run the diff and get the output. */
         return str_replace($nl, "\n", $renderer->render($diff)) . "\n";

Spacing +5 added lines, -5 removed lines

@@ -72,14 +72,14 @@ 
         if ($this->_split_level == 'words') {
             return implode('', $lines);
         } else {
-            return implode("\n", $lines) . "\n";
+            return implode("\n", $lines)."\n";
         }
     }
 
     public function _added($lines)
     {
         array_walk($lines, array(&$this, '_encode'));
-        $lines[0] = $this->_ins_prefix . $lines[0];
+        $lines[0] = $this->_ins_prefix.$lines[0];
         $lines[count($lines) - 1] .= $this->_ins_suffix;
         return $this->_lines($lines, ' ', false);
     }
@@ -87,7 +87,7 @@ 
     public function _deleted($lines, $words = false)
     {
         array_walk($lines, array(&$this, '_encode'));
-        $lines[0] = $this->_del_prefix . $lines[0];
+        $lines[0] = $this->_del_prefix.$lines[0];
         $lines[count($lines) - 1] .= $this->_del_suffix;
         return $this->_lines($lines, ' ', false);
     }
@@ -105,7 +105,7 @@ 
                 $orig[0] = substr($orig[0], 1);
                 $final[0] = substr($final[0], 1);
             }
-            return $prefix . $this->_deleted($orig) . $this->_added($final);
+            return $prefix.$this->_deleted($orig).$this->_added($final);
         }
 
         $text1 = implode("\n", $orig);
@@ -125,7 +125,7 @@ 
                                                                array('split_level' => 'words')));
 
         /* Run the diff and get the output. */
-        return str_replace($nl, "\n", $renderer->render($diff)) . "\n";
+        return str_replace($nl, "\n", $renderer->render($diff))."\n";
     }
 
     public function _splitOnWords($string, $newlineEscape = "\n")

html/modules/altsys/setup_xoops_trust_path.php

Spacing +17 added lines, -17 removed lines

@@ -1,45 +1,45 @@
 <?php
 
-$xoopsOption['nocommon'] = 1 ;
-define('_LEGACY_PREVENT_LOAD_CORE_', 1) ;
+$xoopsOption['nocommon'] = 1;
+define('_LEGACY_PREVENT_LOAD_CORE_', 1);
 
-include '../../mainfile.php' ;
+include '../../mainfile.php';
 
 if (defined('XOOPS_TRUST_PATH') && XOOPS_TRUST_PATH != '' && file_exists(XOOPS_TRUST_PATH.'/libs/altsys')) {
-    die('No problem with your XOOPS_TRUST_PATH') ;
+    die('No problem with your XOOPS_TRUST_PATH');
 }
 
 
 // show the hint if password mathes
-$hint = '' ;
+$hint = '';
 if (@$_POST['dbpassword'] == XOOPS_DB_PASS) {
     // find XOOPS_TRUST_PATH
-    $xoops_trust_path = '' ;
-    $base_dirs = array( XOOPS_ROOT_PATH , dirname(XOOPS_ROOT_PATH) , dirname(dirname(XOOPS_ROOT_PATH)) ) ;
+    $xoops_trust_path = '';
+    $base_dirs = array(XOOPS_ROOT_PATH, dirname(XOOPS_ROOT_PATH), dirname(dirname(XOOPS_ROOT_PATH)));
     foreach ($base_dirs as $base_dir) {
-        $dh = @opendir($base_dir) ;
-        if (! empty($dh)) {
+        $dh = @opendir($base_dir);
+        if (!empty($dh)) {
             while (($file = readdir($dh)) !== false) {
                 if (substr($file, 0, 1) == '.') {
-                    continue ;
+                    continue;
                 }
-                $fullpath = $base_dir . '/' . $file ;
-                if (! is_dir($fullpath)) {
-                    continue ;
+                $fullpath = $base_dir.'/'.$file;
+                if (!is_dir($fullpath)) {
+                    continue;
                 }
                 if (is_dir($fullpath.'/libs/altsys')) {
-                    $xoops_trust_path = $fullpath ;
-                    break 2 ;
+                    $xoops_trust_path = $fullpath;
+                    break 2;
                 }
             }
         }
     }
     // fall back
     if (empty($xoops_trust_path)) {
-        $xoops_trust_path = dirname(XOOPS_ROOT_PATH).'/xoops_trust_path' ;
+        $xoops_trust_path = dirname(XOOPS_ROOT_PATH).'/xoops_trust_path';
     }
     // create the hint
-    if (! defined('XOOPS_TRUST_PATH')) {
+    if (!defined('XOOPS_TRUST_PATH')) {
         $hint = "Insert the red line.<br />define('XOOPS_ROOT_PATH', '".htmlspecialchars(XOOPS_ROOT_PATH, ENT_QUOTES)."');<br /><ins style='color:red;'>define('XOOPS_TRUST_PATH', '".htmlspecialchars($xoops_trust_path, ENT_QUOTES)."');</ins>";
     } else {
         $hint = "<del>define('XOOPS_TRUST_PATH', '');</del><br /><ins style='color:red;'>define('XOOPS_TRUST_PATH', '".htmlspecialchars($xoops_trust_path, ENT_QUOTES)."');</ins>";

html/modules/altsys/index.php

Spacing +4 added lines, -4 removed lines

@@ -1,7 +1,7 @@
 <?php
 
-$xoopsOption['nocommon'] = 1 ;
-define('_LEGACY_PREVENT_LOAD_CORE_', true) ;
-require '../../mainfile.php' ;
+$xoopsOption['nocommon'] = 1;
+define('_LEGACY_PREVENT_LOAD_CORE_', true);
+require '../../mainfile.php';
 
-header('Location: '.XOOPS_URL.'/user.php') ;
+header('Location: '.XOOPS_URL.'/user.php');

html/modules/altsys/mytrustdirname.php

Spacing +1 added lines, -1 removed lines

@@ -1,2 +1,2 @@
 <?php
-    $mytrustdirname = 'altsys' ;
+    $mytrustdirname = 'altsys';

html/preload/SetupAltsysLangMgr.class.php

Spacing +33 added lines, -33 removed lines

@@ -1,15 +1,15 @@ 
 <?php
 
-if (! defined('XOOPS_ROOT_PATH')) {
-    exit ;
+if (!defined('XOOPS_ROOT_PATH')) {
+    exit;
 }
 
-if (! defined('XOOPS_TRUST_PATH') || XOOPS_TRUST_PATH == '') {
-    header('Location: '.XOOPS_URL.'/modules/altsys/setup_xoops_trust_path.php') ;
-    exit ;
+if (!defined('XOOPS_TRUST_PATH') || XOOPS_TRUST_PATH == '') {
+    header('Location: '.XOOPS_URL.'/modules/altsys/setup_xoops_trust_path.php');
+    exit;
 }
 
-define('ALTSYS_MYLANGUAGE_ROOT_PATH', XOOPS_ROOT_PATH . '/my_language');
+define('ALTSYS_MYLANGUAGE_ROOT_PATH', XOOPS_ROOT_PATH.'/my_language');
 
 
 class SetupAltsysLangMgr extends XCube_ActionFilter
@@ -26,23 +26,23 @@ 
 }
 
 
-require_once XOOPS_ROOT_PATH . "/core/XCube_LanguageManager.class.php";
-require_once XOOPS_ROOT_PATH . "/modules/legacy/kernel/Legacy_LanguageManager.class.php";
+require_once XOOPS_ROOT_PATH."/core/XCube_LanguageManager.class.php";
+require_once XOOPS_ROOT_PATH."/modules/legacy/kernel/Legacy_LanguageManager.class.php";
 
 class AltsysLangMgr_LanguageManager extends Legacy_LanguageManager
 {
-    public $langman = null ;
-    public $theme_lang_checked = false ;
+    public $langman = null;
+    public $theme_lang_checked = false;
 
     public function prepare()
     {
-        $langmanpath = XOOPS_TRUST_PATH.'/libs/altsys/class/D3LanguageManager.class.php' ;
-        if (! file_exists($langmanpath)) {
-            die('install the latest altsys') ;
+        $langmanpath = XOOPS_TRUST_PATH.'/libs/altsys/class/D3LanguageManager.class.php';
+        if (!file_exists($langmanpath)) {
+            die('install the latest altsys');
         }
-        require_once($langmanpath) ;
-        $this->langman =& D3LanguageManager::getInstance() ;
-        $this->langman->language = $this->mLanguageName ;
+        require_once($langmanpath);
+        $this->langman = & D3LanguageManager::getInstance();
+        $this->langman->language = $this->mLanguageName;
 
         parent::prepare();
     }
@@ -50,40 +50,40 @@ 
     public function _loadLanguage($dirname, $fileBodyName)
     {
         // read/check once (selected_theme)/language/(lang).php
-        if (! $this->theme_lang_checked) {
-            $root =& XCube_Root::getSingleton() ;
-            if (! empty($root->mContext->mXoopsConfig['theme_set'])) {
-                $langdir = XOOPS_THEME_PATH.'/'.$root->mContext->mXoopsConfig['theme_set'].'/language' ;
+        if (!$this->theme_lang_checked) {
+            $root = & XCube_Root::getSingleton();
+            if (!empty($root->mContext->mXoopsConfig['theme_set'])) {
+                $langdir = XOOPS_THEME_PATH.'/'.$root->mContext->mXoopsConfig['theme_set'].'/language';
                 if (file_exists($langdir)) {
-                    $langfile = $langdir.'/'.$this->mLanguageName.'.php' ;
-                    $engfile = $langdir.'/english.php' ;
+                    $langfile = $langdir.'/'.$this->mLanguageName.'.php';
+                    $engfile = $langdir.'/english.php';
                     if (file_exists($langfile)) {
-                        require_once $langfile ;
+                        require_once $langfile;
                     } elseif (file_exists($engfile)) {
-                        require_once $engfile ;
+                        require_once $engfile;
                     }
                 }
-                $this->theme_lang_checked = true ;
+                $this->theme_lang_checked = true;
             }
         }
         
         // read normal
-        $this->langman->read($fileBodyName.'.php', $dirname) ;
+        $this->langman->read($fileBodyName.'.php', $dirname);
     }
 
     public function loadPageTypeMessageCatalog($type)
     {
         // I dare not to use langman...
         if (strpos($type, '.') === false && $this->langman->my_language) {
-            $mylang_file = $this->langman->my_language.'/'.$this->mLanguageName.'/'.$type.'.php' ;
+            $mylang_file = $this->langman->my_language.'/'.$this->mLanguageName.'/'.$type.'.php';
             if (file_exists($mylang_file)) {
-                require_once $mylang_file ;
+                require_once $mylang_file;
             }
         }
-        $original_error_level = error_reporting() ;
-        error_reporting($original_error_level & ~ E_NOTICE) ;
+        $original_error_level = error_reporting();
+        error_reporting($original_error_level & ~ E_NOTICE);
         parent::loadPageTypeMessageCatalog($type);
-        error_reporting($original_error_level) ;
+        error_reporting($original_error_level);
     }
 
     public function loadGlobalMessageCatalog()
@@ -91,8 +91,8 @@ 
         /* if (!$this->_loadFile(XOOPS_ROOT_PATH . "/modules/legacy/language/" . $this->mLanguageName . "/global.php")) {
             $this->_loadFile(XOOPS_ROOT_PATH . "/modules/legacy/language/english/global.php");
         } */
-        $this->_loadLanguage('legacy', 'global') ;
-        $this->_loadLanguage('legacy', 'setting') ;
+        $this->_loadLanguage('legacy', 'global');
+        $this->_loadLanguage('legacy', 'setting');
 
         //
         // Now, if XOOPS_USE_MULTIBYTES isn't defined, set zero to it.

xoops_trust_path/libs/altsys/include/admin_in_theme_header.inc.php

Switch Indentation +35 added lines, -35 removed lines

@@ -201,41 +201,41 @@
             }
         }
         switch ($block_arr[$i]->getVar('side')) {
-        case XOOPS_SIDEBLOCK_LEFT:
-            if (!isset($show_lblock)) {
-                $xoopsTpl->assign('xoops_showlblock', 1);
-                $show_lblock = 1;
-            }
-            $xoopsTpl->append('xoops_lblocks', array('title' => $block_arr[$i]->getVar('title'), 'content' => $bcontent, 'weight' => $block_arr[$i]->getVar('weight')));
-            break;
-        case XOOPS_CENTERBLOCK_LEFT:
-            if (!isset($show_cblock)) {
-                $xoopsTpl->assign('xoops_showcblock', 1);
-                $show_cblock = 1;
-            }
-            $xoopsTpl->append('xoops_clblocks', array('title' => $block_arr[$i]->getVar('title'), 'content' => $bcontent, 'weight' => $block_arr[$i]->getVar('weight')));
-            break;
-        case XOOPS_CENTERBLOCK_RIGHT:
-            if (!isset($show_cblock)) {
-                $xoopsTpl->assign('xoops_showcblock', 1);
-                $show_cblock = 1;
-            }
-            $xoopsTpl->append('xoops_crblocks', array('title' => $block_arr[$i]->getVar('title'), 'content' => $bcontent, 'weight' => $block_arr[$i]->getVar('weight')));
-            break;
-        case XOOPS_CENTERBLOCK_CENTER:
-            if (!isset($show_cblock)) {
-                $xoopsTpl->assign('xoops_showcblock', 1);
-                $show_cblock = 1;
-            }
-            $xoopsTpl->append('xoops_ccblocks', array('title' => $block_arr[$i]->getVar('title'), 'content' => $bcontent, 'weight' => $block_arr[$i]->getVar('weight')));
-            break;
-        case XOOPS_SIDEBLOCK_RIGHT:
-            if (!isset($show_rblock)) {
-                $xoopsTpl->assign('xoops_showrblock', 1);
-                $show_rblock = 1;
-            }
-            $xoopsTpl->append('xoops_rblocks', array('title' => $block_arr[$i]->getVar('title'), 'content' => $bcontent, 'weight' => $block_arr[$i]->getVar('weight')));
-            break;
+            case XOOPS_SIDEBLOCK_LEFT:
+                if (!isset($show_lblock)) {
+                    $xoopsTpl->assign('xoops_showlblock', 1);
+                    $show_lblock = 1;
+                }
+                $xoopsTpl->append('xoops_lblocks', array('title' => $block_arr[$i]->getVar('title'), 'content' => $bcontent, 'weight' => $block_arr[$i]->getVar('weight')));
+                break;
+            case XOOPS_CENTERBLOCK_LEFT:
+                if (!isset($show_cblock)) {
+                    $xoopsTpl->assign('xoops_showcblock', 1);
+                    $show_cblock = 1;
+                }
+                $xoopsTpl->append('xoops_clblocks', array('title' => $block_arr[$i]->getVar('title'), 'content' => $bcontent, 'weight' => $block_arr[$i]->getVar('weight')));
+                break;
+            case XOOPS_CENTERBLOCK_RIGHT:
+                if (!isset($show_cblock)) {
+                    $xoopsTpl->assign('xoops_showcblock', 1);
+                    $show_cblock = 1;
+                }
+                $xoopsTpl->append('xoops_crblocks', array('title' => $block_arr[$i]->getVar('title'), 'content' => $bcontent, 'weight' => $block_arr[$i]->getVar('weight')));
+                break;
+            case XOOPS_CENTERBLOCK_CENTER:
+                if (!isset($show_cblock)) {
+                    $xoopsTpl->assign('xoops_showcblock', 1);
+                    $show_cblock = 1;
+                }
+                $xoopsTpl->append('xoops_ccblocks', array('title' => $block_arr[$i]->getVar('title'), 'content' => $bcontent, 'weight' => $block_arr[$i]->getVar('weight')));
+                break;
+            case XOOPS_SIDEBLOCK_RIGHT:
+                if (!isset($show_rblock)) {
+                    $xoopsTpl->assign('xoops_showrblock', 1);
+                    $show_rblock = 1;
+                }
+                $xoopsTpl->append('xoops_rblocks', array('title' => $block_arr[$i]->getVar('title'), 'content' => $bcontent, 'weight' => $block_arr[$i]->getVar('weight')));
+                break;
         }
         unset($bcontent);
     }

Indentation +1 added lines, -1 removed lines

@@ -142,7 +142,7 @@
     $block_arr = array() ;
     if (!empty($blockids)) {
         $sql = 'SELECT b.* FROM '.$db->prefix('newblocks').' b, '.$db->prefix('block_module_link').' m WHERE m.block_id=b.bid AND b.isactive=1 AND b.visible=1 AND m.module_id=' . (int)$altsysModuleId
-               . ' AND b.bid IN (' . implode(',', $blockids) . ') ORDER BY b.weight,b.bid' ;
+                . ' AND b.bid IN (' . implode(',', $blockids) . ') ORDER BY b.weight,b.bid' ;
         $result = $db->query($sql);
         while ($myrow = $db->fetchArray($result)) {
 

Spacing +47 added lines, -47 removed lines

@@ -29,7 +29,7 @@ 
 //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA //
 //  ------------------------------------------------------------------------ //
 
-require_once dirname(__DIR__).'/class/AltsysBreadcrumbs.class.php' ;
+require_once dirname(__DIR__).'/class/AltsysBreadcrumbs.class.php';
 include_once XOOPS_ROOT_PATH.'/class/xoopsblock.php';
 
     $xoopsOption['theme_use_smarty'] = 1;
@@ -58,7 +58,7 @@ 
 //HACK by domifara
     if (defined('XOOPS_CUBE_LEGACY')) {
         $handler = xoops_gethandler('block');
-        $xoopsblock =& $handler->create(false) ;
+        $xoopsblock = & $handler->create(false);
     } else {
         $xoopsblock = new XoopsBlock();
     }
@@ -68,46 +68,46 @@ 
     if (is_object($xoopsUser)) {
         $xoopsTpl->assign(array('xoops_isuser' => true, 'xoops_userid' => $xoopsUser->getVar('uid'), 'xoops_uname' => $xoopsUser->getVar('uname'), 'xoops_isadmin' => $xoopsUserIsAdmin));
         if (is_object(@$xoopsModule)) {
-            if ($xoopsModule->getVar('mid') == 1 && @$_GET['fct'] == 'preferences' && @$_GET['op'] == 'showmod' && ! empty($_GET['mod'])) {
-                $module_handler = xoops_gethandler('module') ;
-                $target_module = $module_handler->get((int)$_GET['mod']) ;
+            if ($xoopsModule->getVar('mid') == 1 && @$_GET['fct'] == 'preferences' && @$_GET['op'] == 'showmod' && !empty($_GET['mod'])) {
+                $module_handler = xoops_gethandler('module');
+                $target_module = $module_handler->get((int)$_GET['mod']);
             } else {
-                $target_module =& $xoopsModule ;
+                $target_module = & $xoopsModule;
             }
 
             // set page title
             $xoopsTpl->assign(array('xoops_pagetitle' => $target_module->getVar('name'), 'xoops_modulename' => $target_module->getVar('name'), 'xoops_dirname' => $target_module->getVar('dirname')));
 
             // xoops_breadcrumbs
-            $breadcrumbsObj =& AltsysBreadcrumbs::getInstance() ;
+            $breadcrumbsObj = & AltsysBreadcrumbs::getInstance();
             if ($breadcrumbsObj->hasPaths()) {
-                $xoops_breadcrumbs = $breadcrumbsObj->getXoopsBreadcrumbs() ;
+                $xoops_breadcrumbs = $breadcrumbsObj->getXoopsBreadcrumbs();
             } else {
-                $mod_url = XOOPS_URL.'/modules/'.$target_module->getVar('dirname') ;
-                $mod_path = XOOPS_ROOT_PATH.'/modules/'.$target_module->getVar('dirname') ;
-                $modinfo = $target_module->getInfo() ;
-                $xoops_breadcrumbs = array() ;
-                if (! empty($modinfo['hasMain'])) {
+                $mod_url = XOOPS_URL.'/modules/'.$target_module->getVar('dirname');
+                $mod_path = XOOPS_ROOT_PATH.'/modules/'.$target_module->getVar('dirname');
+                $modinfo = $target_module->getInfo();
+                $xoops_breadcrumbs = array();
+                if (!empty($modinfo['hasMain'])) {
                     $xoops_breadcrumbs[] = array(
-                        'url' => $mod_url.'/' ,
+                        'url' => $mod_url.'/',
                         'name' => sprintf(_MD_A_AINTHEME_FMT_PUBLICTOP, $target_module->getVar('name'))
-                    ) ;
+                    );
                 }
-                if (! empty($modinfo['adminindex'])) {
+                if (!empty($modinfo['adminindex'])) {
                     $xoops_breadcrumbs[] = array(
-                        'url' => $mod_url.'/'.$modinfo['adminindex'] ,
+                        'url' => $mod_url.'/'.$modinfo['adminindex'],
                         'name' => sprintf(_MD_A_AINTHEME_FMT_ADMINTOP, $target_module->getVar('name'))
-                    ) ;
+                    );
                 }
-                if (! empty($GLOBALS['altsysAdminPageTitle'])) {
-                    $xoops_breadcrumbs[] = array( 'name' => htmlspecialchars($GLOBALS['altsysAdminPageTitle'], ENT_QUOTES) ) ;
-                } elseif (! empty($modinfo['adminmenu'])) {
-                    @include $mod_path.'/'.$modinfo['adminmenu'] ;
+                if (!empty($GLOBALS['altsysAdminPageTitle'])) {
+                    $xoops_breadcrumbs[] = array('name' => htmlspecialchars($GLOBALS['altsysAdminPageTitle'], ENT_QUOTES));
+                } elseif (!empty($modinfo['adminmenu'])) {
+                    @include $mod_path.'/'.$modinfo['adminmenu'];
                     if (is_array(@$adminmenu)) {
                         foreach ($adminmenu as $eachmenu) {
                             if (strstr($_SERVER['REQUEST_URI'], $eachmenu['link'])) {
-                                $xoops_breadcrumbs[] = array( 'name' => $eachmenu['title'] ) ;
-                                break ;
+                                $xoops_breadcrumbs[] = array('name' => $eachmenu['title']);
+                                break;
                             }
                         }
                     }
@@ -116,21 +116,21 @@ 
 
             //$block_arr =& $xoopsblock->getAllByGroupModule($xoopsUser->getGroups(), $target_module->getVar('mid'), false, XOOPS_BLOCK_VISIBLE);
         } else {
-            $xoopsTpl->assign(array( 'xoops_pagetitle' => _CPHOME )) ;
+            $xoopsTpl->assign(array('xoops_pagetitle' => _CPHOME));
             $xoops_breadcrumbs = array(
                 array(
-                    'url' => XOOPS_URL.'/admin.php' ,
+                    'url' => XOOPS_URL.'/admin.php',
                     'name' => _CPHOME
                 )
-            ) ;
+            );
         }
     } else {
-        exit ;
+        exit;
     }
 
     // get block_arr
-    $db = XoopsDatabaseFactory::getDatabaseConnection() ;
-    $sql = 'SELECT DISTINCT gperm_itemid FROM ' . $db->prefix('group_permission') . " WHERE gperm_name = 'block_read' AND gperm_modid = 1 AND gperm_groupid IN (" . implode(',', $xoopsUser->getGroups()) . ')';
+    $db = XoopsDatabaseFactory::getDatabaseConnection();
+    $sql = 'SELECT DISTINCT gperm_itemid FROM '.$db->prefix('group_permission')." WHERE gperm_name = 'block_read' AND gperm_modid = 1 AND gperm_groupid IN (".implode(',', $xoopsUser->getGroups()).')';
     $result = $db->query($sql);
 
     $blockids = array();
@@ -138,30 +138,30 @@ 
         $blockids[] = (int)$blockid;
     }
 
-    global $block_arr , $i ; // for piCal :-)
-    $block_arr = array() ;
+    global $block_arr, $i; // for piCal :-)
+    $block_arr = array();
     if (!empty($blockids)) {
-        $sql = 'SELECT b.* FROM '.$db->prefix('newblocks').' b, '.$db->prefix('block_module_link').' m WHERE m.block_id=b.bid AND b.isactive=1 AND b.visible=1 AND m.module_id=' . (int)$altsysModuleId
-               . ' AND b.bid IN (' . implode(',', $blockids) . ') ORDER BY b.weight,b.bid' ;
+        $sql = 'SELECT b.* FROM '.$db->prefix('newblocks').' b, '.$db->prefix('block_module_link').' m WHERE m.block_id=b.bid AND b.isactive=1 AND b.visible=1 AND m.module_id='.(int)$altsysModuleId
+               . ' AND b.bid IN ('.implode(',', $blockids).') ORDER BY b.weight,b.bid';
         $result = $db->query($sql);
         while ($myrow = $db->fetchArray($result)) {
 
 //HACK by domifara
             if (defined('XOOPS_CUBE_LEGACY')) {
-                $block =& $handler->create(false) ;
+                $block = & $handler->create(false);
                 $block->assignVars($myrow);
             } else {
-                $block = new XoopsBlock($myrow) ;
+                $block = new XoopsBlock($myrow);
             }
 
-            $block_arr[ $myrow['bid'] ] = $block ;
+            $block_arr[$myrow['bid']] = $block;
         }
     }
 
-    $adminmenublock_exists = false ;
+    $adminmenublock_exists = false;
     foreach (array_keys($block_arr) as $i) {
         if ($block_arr[$i]->getVar('show_func') == 'b_altsys_admin_menu_show') {
-            $adminmenublock_exists = true ;
+            $adminmenublock_exists = true;
         }
         $bcachetime = $block_arr[$i]->getVar('bcachetime');
         if (empty($bcachetime)) {
@@ -242,15 +242,15 @@ 
     }
 
     // FALLBACK inserting admin_menu_block in admin side
-    if (! $adminmenublock_exists) {
-        require_once XOOPS_ROOT_PATH.'/modules/altsys/blocks/blocks.php' ;
-        $admin_menu_block = array( b_altsys_admin_menu_show(array( 'altsys' )) ) ;
-        $admin_menu_block[0]['title'] = 'Admin Menu' ;
-        $lblocks =& $xoopsTpl->get_template_vars('xoops_lblocks') ;
-        if (! is_array($lblocks)) {
-            $lblocks = array() ;
+    if (!$adminmenublock_exists) {
+        require_once XOOPS_ROOT_PATH.'/modules/altsys/blocks/blocks.php';
+        $admin_menu_block = array(b_altsys_admin_menu_show(array('altsys')));
+        $admin_menu_block[0]['title'] = 'Admin Menu';
+        $lblocks = & $xoopsTpl->get_template_vars('xoops_lblocks');
+        if (!is_array($lblocks)) {
+            $lblocks = array();
         }
-        $xoopsTpl->assign('xoops_lblocks', array_merge($admin_menu_block, $lblocks)) ;
+        $xoopsTpl->assign('xoops_lblocks', array_merge($admin_menu_block, $lblocks));
     }
 
     //unset($block_arr);

xoops_trust_path/libs/altsys/include/compilehook.inc.php

Spacing +9 added lines, -9 removed lines

@@ -5,20 +5,20 @@
 // save assigned variables for the template
 function tplsadmin_save_tplsvars($file, $smarty)
 {
-    $tplsvars_file = 'tplsvars_' ;
-    $tplsvars_file .= substr(md5(substr(XOOPS_DB_PASS, 0, 4)), 0, 4) . '_' ;
+    $tplsvars_file = 'tplsvars_';
+    $tplsvars_file .= substr(md5(substr(XOOPS_DB_PASS, 0, 4)), 0, 4).'_';
     if (strncmp($file, 'db:', 3) === 0) {
-        $tplsvars_file .= substr($file, 3) ;
+        $tplsvars_file .= substr($file, 3);
     } elseif (strncmp($file, 'file:', 5) === 0) {
-        $tplsvars_file .= strtr(substr($file, 5), '/', '%') ;
+        $tplsvars_file .= strtr(substr($file, 5), '/', '%');
     } else {
-        $tplsvars_file .= strtr($file, '/', '%') ;
+        $tplsvars_file .= strtr($file, '/', '%');
     }
 
     if ($fw = @fopen(XOOPS_COMPILE_PATH.'/'.$tplsvars_file, 'x')) {
-        fwrite($fw, serialize($smarty->_tpl_vars)) ;
-        fclose($fw) ;
-        return true ;
+        fwrite($fw, serialize($smarty->_tpl_vars));
+        fclose($fw);
+        return true;
     }
-    return false ;
+    return false;
 }

xoops_trust_path/libs/altsys/include/lang_functions.php

Spacing +39 added lines, -39 removed lines

@@ -2,91 +2,91 @@
 
 function altsys_mylangadmin_get_constant_names($langfile_unique_path, $mydirname)
 {
-    $constpref = '' ;
-    $langfile_names = array() ;
-    $reqonce_ret = 0 ;
-    $already_read = false ;
-    $langfile_fingerprint = '_MYLANGADMIN_'.md5($langfile_unique_path) ;
+    $constpref = '';
+    $langfile_names = array();
+    $reqonce_ret = 0;
+    $already_read = false;
+    $langfile_fingerprint = '_MYLANGADMIN_'.md5($langfile_unique_path);
 
     // for debug
     //require_once XOOPS_TRUST_PATH.'/modules/pico/language/japanese/modinfo.php' ;
 
     // get constant_names by "require"
-    if (! defined($langfile_fingerprint)) {
-        $system_constants = array_keys(get_defined_constants()) ;
-        $reqonce_ret = require_once($langfile_unique_path) ;
-        $langfile_names = array_diff(array_keys(get_defined_constants()), $system_constants) ;
+    if (!defined($langfile_fingerprint)) {
+        $system_constants = array_keys(get_defined_constants());
+        $reqonce_ret = require_once($langfile_unique_path);
+        $langfile_names = array_diff(array_keys(get_defined_constants()), $system_constants);
     }
 
     // We have to parse the file if it has been already included ...
     if (empty($langfile_names) && ($reqonce_ret === true || defined($langfile_fingerprint))) {
-        $already_read = true ;
-        $langfile_names = altsys_mylangadmin_get_constant_names_by_pcre($langfile_unique_path) ;
+        $already_read = true;
+        $langfile_names = altsys_mylangadmin_get_constant_names_by_pcre($langfile_unique_path);
     }
 
     // modinfo.php of D3 module
     if (empty($langfile_names) && file_exists(XOOPS_ROOT_PATH.'/modules/'.$mydirname.'/mytrustdirname.php') /* && substr( $langfile_unique_path , -11 ) == 'modinfo.php' */) {
         // get $constpref
-        $constpref = '' ;
-        require $langfile_unique_path ;
-        $langfile_names = array() ;
+        $constpref = '';
+        require $langfile_unique_path;
+        $langfile_names = array();
         if ($constpref) {
             foreach (array_keys(get_defined_constants()) as $name) {
                 if (strncmp($name, $constpref, strlen($constpref)) == 0) {
-                    $langfile_names[] = $name ;
+                    $langfile_names[] = $name;
                 }
             }
         }
     }
 
 
-    return array( $langfile_names , $constpref , $already_read ) ;
+    return array($langfile_names, $constpref, $already_read);
 }
 
 
 function altsys_mylangadmin_get_constant_names_by_pcre($langfile_path)
 {
-    if (! file_exists($langfile_path)) {
-        return array() ;
+    if (!file_exists($langfile_path)) {
+        return array();
     }
-    $file_contents = file_get_contents($langfile_path) ;
-    preg_match_all('/\n\s*define\(\s*(["\'])([0-9a-zA-Z_]+)\\1/iU', $file_contents, $matches) ;
-    $langfile_names = array() ;
+    $file_contents = file_get_contents($langfile_path);
+    preg_match_all('/\n\s*define\(\s*(["\'])([0-9a-zA-Z_]+)\\1/iU', $file_contents, $matches);
+    $langfile_names = array();
     foreach ($matches[2] as $name) {
         // if( defined( $name ) )
-        $langfile_names[] = $name ;
+        $langfile_names[] = $name;
     }
 
-    return $langfile_names ;
+    return $langfile_names;
 }
 
 
 function altsys_mylangadmin_get_constants_by_pcre($langfile_path)
 {
-    if (! file_exists($langfile_path)) {
-        return array() ;
+    if (!file_exists($langfile_path)) {
+        return array();
     }
 
-    $file_contents = file_get_contents($langfile_path) ;
-    preg_match_all('/\n\s*define\(\s*(["\'])([0-9a-zA-Z_]+)\\1\s*\,\s*(["\'])([^\\3]+)\\3/iU', $file_contents, $matches) ;
-    $constants = array() ;
+    $file_contents = file_get_contents($langfile_path);
+    preg_match_all('/\n\s*define\(\s*(["\'])([0-9a-zA-Z_]+)\\1\s*\,\s*(["\'])([^\\3]+)\\3/iU', $file_contents, $matches);
+    $constants = array();
     foreach ($matches[2] as $i => $name) {
-        $constants[ $name ] = $matches[4][$i] ;
+        $constants[$name] = $matches[4][$i];
     }
 
-    return $constants ;
+    return $constants;
 }
 
 
 function altsys_mylangadmin_errordie($target_mname, $message4disp)
 {
-    xoops_cp_header() ;
-    altsys_include_mymenu() ;
-    $breadcrumbsObj =& AltsysBreadcrumbs::getInstance() ;
-    $breadcrumbsObj->appendPath(XOOPS_URL.'/modules/altsys/admin/index.php?mode=admin&lib=altsys&page=mylangadmin', _MI_ALTSYS_MENU_MYLANGADMIN) ;
-    $breadcrumbsObj->appendPath('', $target_mname) ;
-    echo '<h3>' . _MYLANGADMIN_H3_MODULE . ' : ' . $target_mname . '</h3>' ;
-    echo '<p>'.$message4disp.'</p>' ;
-    xoops_cp_footer() ;
-    exit ;
+    xoops_cp_header();
+    altsys_include_mymenu();
+    $breadcrumbsObj = & AltsysBreadcrumbs::getInstance();
+    $breadcrumbsObj->appendPath(XOOPS_URL.'/modules/altsys/admin/index.php?mode=admin&amp;lib=altsys&amp;page=mylangadmin', _MI_ALTSYS_MENU_MYLANGADMIN);
+    $breadcrumbsObj->appendPath('', $target_mname);
+    echo '<h3>'._MYLANGADMIN_H3_MODULE.' : '.$target_mname.'</h3>';
+    echo '<p>'.$message4disp.'</p>';
+    xoops_cp_footer();
+    exit;
 }