Completed
Push — master ( 4d9699...f6489b )
by Michael
03:33
created
html/modules/altsys/index.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -1,7 +1,7 @@
 block discarded – undo
1 1
 <?php
2 2
 
3
-$xoopsOption['nocommon'] = 1 ;
4
-define('_LEGACY_PREVENT_LOAD_CORE_', true) ;
5
-require '../../mainfile.php' ;
3
+$xoopsOption['nocommon'] = 1;
4
+define('_LEGACY_PREVENT_LOAD_CORE_', true);
5
+require '../../mainfile.php';
6 6
 
7
-header('Location: '.XOOPS_URL.'/user.php') ;
7
+header('Location: '.XOOPS_URL.'/user.php');
Please login to merge, or discard this patch.
html/modules/altsys/mytrustdirname.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,2 +1,2 @@
 block discarded – undo
1 1
 <?php
2
-    $mytrustdirname = 'altsys' ;
2
+    $mytrustdirname = 'altsys';
Please login to merge, or discard this patch.
html/preload/SetupAltsysLangMgr.class.php 1 patch
Spacing   +33 added lines, -33 removed lines patch added patch discarded remove patch
@@ -1,15 +1,15 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-if (! defined('XOOPS_ROOT_PATH')) {
4
-    exit ;
3
+if (!defined('XOOPS_ROOT_PATH')) {
4
+    exit;
5 5
 }
6 6
 
7
-if (! defined('XOOPS_TRUST_PATH') || XOOPS_TRUST_PATH == '') {
8
-    header('Location: '.XOOPS_URL.'/modules/altsys/setup_xoops_trust_path.php') ;
9
-    exit ;
7
+if (!defined('XOOPS_TRUST_PATH') || XOOPS_TRUST_PATH == '') {
8
+    header('Location: '.XOOPS_URL.'/modules/altsys/setup_xoops_trust_path.php');
9
+    exit;
10 10
 }
11 11
 
12
-define('ALTSYS_MYLANGUAGE_ROOT_PATH', XOOPS_ROOT_PATH . '/my_language');
12
+define('ALTSYS_MYLANGUAGE_ROOT_PATH', XOOPS_ROOT_PATH.'/my_language');
13 13
 
14 14
 
15 15
 class SetupAltsysLangMgr extends XCube_ActionFilter
@@ -26,23 +26,23 @@  discard block
 block discarded – undo
26 26
 }
27 27
 
28 28
 
29
-require_once XOOPS_ROOT_PATH . "/core/XCube_LanguageManager.class.php";
30
-require_once XOOPS_ROOT_PATH . "/modules/legacy/kernel/Legacy_LanguageManager.class.php";
29
+require_once XOOPS_ROOT_PATH."/core/XCube_LanguageManager.class.php";
30
+require_once XOOPS_ROOT_PATH."/modules/legacy/kernel/Legacy_LanguageManager.class.php";
31 31
 
32 32
 class AltsysLangMgr_LanguageManager extends Legacy_LanguageManager
33 33
 {
34
-    public $langman = null ;
35
-    public $theme_lang_checked = false ;
34
+    public $langman = null;
35
+    public $theme_lang_checked = false;
36 36
 
37 37
     public function prepare()
38 38
     {
39
-        $langmanpath = XOOPS_TRUST_PATH.'/libs/altsys/class/D3LanguageManager.class.php' ;
40
-        if (! file_exists($langmanpath)) {
41
-            die('install the latest altsys') ;
39
+        $langmanpath = XOOPS_TRUST_PATH.'/libs/altsys/class/D3LanguageManager.class.php';
40
+        if (!file_exists($langmanpath)) {
41
+            die('install the latest altsys');
42 42
         }
43
-        require_once($langmanpath) ;
44
-        $this->langman =& D3LanguageManager::getInstance() ;
45
-        $this->langman->language = $this->mLanguageName ;
43
+        require_once($langmanpath);
44
+        $this->langman = & D3LanguageManager::getInstance();
45
+        $this->langman->language = $this->mLanguageName;
46 46
 
47 47
         parent::prepare();
48 48
     }
@@ -50,40 +50,40 @@  discard block
 block discarded – undo
50 50
     public function _loadLanguage($dirname, $fileBodyName)
51 51
     {
52 52
         // read/check once (selected_theme)/language/(lang).php
53
-        if (! $this->theme_lang_checked) {
54
-            $root =& XCube_Root::getSingleton() ;
55
-            if (! empty($root->mContext->mXoopsConfig['theme_set'])) {
56
-                $langdir = XOOPS_THEME_PATH.'/'.$root->mContext->mXoopsConfig['theme_set'].'/language' ;
53
+        if (!$this->theme_lang_checked) {
54
+            $root = & XCube_Root::getSingleton();
55
+            if (!empty($root->mContext->mXoopsConfig['theme_set'])) {
56
+                $langdir = XOOPS_THEME_PATH.'/'.$root->mContext->mXoopsConfig['theme_set'].'/language';
57 57
                 if (file_exists($langdir)) {
58
-                    $langfile = $langdir.'/'.$this->mLanguageName.'.php' ;
59
-                    $engfile = $langdir.'/english.php' ;
58
+                    $langfile = $langdir.'/'.$this->mLanguageName.'.php';
59
+                    $engfile = $langdir.'/english.php';
60 60
                     if (file_exists($langfile)) {
61
-                        require_once $langfile ;
61
+                        require_once $langfile;
62 62
                     } elseif (file_exists($engfile)) {
63
-                        require_once $engfile ;
63
+                        require_once $engfile;
64 64
                     }
65 65
                 }
66
-                $this->theme_lang_checked = true ;
66
+                $this->theme_lang_checked = true;
67 67
             }
68 68
         }
69 69
         
70 70
         // read normal
71
-        $this->langman->read($fileBodyName.'.php', $dirname) ;
71
+        $this->langman->read($fileBodyName.'.php', $dirname);
72 72
     }
73 73
 
74 74
     public function loadPageTypeMessageCatalog($type)
75 75
     {
76 76
         // I dare not to use langman...
77 77
         if (strpos($type, '.') === false && $this->langman->my_language) {
78
-            $mylang_file = $this->langman->my_language.'/'.$this->mLanguageName.'/'.$type.'.php' ;
78
+            $mylang_file = $this->langman->my_language.'/'.$this->mLanguageName.'/'.$type.'.php';
79 79
             if (file_exists($mylang_file)) {
80
-                require_once $mylang_file ;
80
+                require_once $mylang_file;
81 81
             }
82 82
         }
83
-        $original_error_level = error_reporting() ;
84
-        error_reporting($original_error_level & ~ E_NOTICE) ;
83
+        $original_error_level = error_reporting();
84
+        error_reporting($original_error_level & ~ E_NOTICE);
85 85
         parent::loadPageTypeMessageCatalog($type);
86
-        error_reporting($original_error_level) ;
86
+        error_reporting($original_error_level);
87 87
     }
88 88
 
89 89
     public function loadGlobalMessageCatalog()
@@ -91,8 +91,8 @@  discard block
 block discarded – undo
91 91
         /* if (!$this->_loadFile(XOOPS_ROOT_PATH . "/modules/legacy/language/" . $this->mLanguageName . "/global.php")) {
92 92
             $this->_loadFile(XOOPS_ROOT_PATH . "/modules/legacy/language/english/global.php");
93 93
         } */
94
-        $this->_loadLanguage('legacy', 'global') ;
95
-        $this->_loadLanguage('legacy', 'setting') ;
94
+        $this->_loadLanguage('legacy', 'global');
95
+        $this->_loadLanguage('legacy', 'setting');
96 96
 
97 97
         //
98 98
         // Now, if XOOPS_USE_MULTIBYTES isn't defined, set zero to it.
Please login to merge, or discard this patch.
xoops_trust_path/libs/altsys/include/Text_Diff.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -465,7 +465,7 @@  discard block
 block discarded – undo
465 465
         }
466 466
 
467 467
         $this->lcs = 0;
468
-        $this->seq[0]= $yoff - 1;
468
+        $this->seq[0] = $yoff - 1;
469 469
         $this->in_seq = array();
470 470
         $ymids[0] = array();
471 471
 
@@ -478,7 +478,7 @@  discard block
 block discarded – undo
478 478
                 }
479 479
             }
480 480
 
481
-            $x1 = $xoff + (int)(($numer + ($xlim-$xoff)*$chunk) / $nchunks);
481
+            $x1 = $xoff + (int)(($numer + ($xlim - $xoff) * $chunk) / $nchunks);
482 482
             for (; $x < $x1; $x++) {
483 483
                 $line = $flip ? $this->yv[$x] : $this->xv[$x];
484 484
                 if (empty($ymatches[$line])) {
@@ -646,7 +646,7 @@  discard block
 block discarded – undo
646 646
                 $j++;
647 647
             }
648 648
 
649
-            while ($i < $len && ! $changed[$i]) {
649
+            while ($i < $len && !$changed[$i]) {
650 650
                 assert('$j < $other_len && ! $other_changed[$j]');
651 651
                 $i++;
652 652
                 $j++;
Please login to merge, or discard this patch.
xoops_trust_path/libs/altsys/include/compilehook.inc.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -5,20 +5,20 @@
 block discarded – undo
5 5
 // save assigned variables for the template
6 6
 function tplsadmin_save_tplsvars($file, $smarty)
7 7
 {
8
-    $tplsvars_file = 'tplsvars_' ;
9
-    $tplsvars_file .= substr(md5(substr(XOOPS_DB_PASS, 0, 4)), 0, 4) . '_' ;
8
+    $tplsvars_file = 'tplsvars_';
9
+    $tplsvars_file .= substr(md5(substr(XOOPS_DB_PASS, 0, 4)), 0, 4).'_';
10 10
     if (strncmp($file, 'db:', 3) === 0) {
11
-        $tplsvars_file .= substr($file, 3) ;
11
+        $tplsvars_file .= substr($file, 3);
12 12
     } elseif (strncmp($file, 'file:', 5) === 0) {
13
-        $tplsvars_file .= strtr(substr($file, 5), '/', '%') ;
13
+        $tplsvars_file .= strtr(substr($file, 5), '/', '%');
14 14
     } else {
15
-        $tplsvars_file .= strtr($file, '/', '%') ;
15
+        $tplsvars_file .= strtr($file, '/', '%');
16 16
     }
17 17
 
18 18
     if ($fw = @fopen(XOOPS_COMPILE_PATH.'/'.$tplsvars_file, 'x')) {
19
-        fwrite($fw, serialize($smarty->_tpl_vars)) ;
20
-        fclose($fw) ;
21
-        return true ;
19
+        fwrite($fw, serialize($smarty->_tpl_vars));
20
+        fclose($fw);
21
+        return true;
22 22
     }
23
-    return false ;
23
+    return false;
24 24
 }
Please login to merge, or discard this patch.
xoops_trust_path/libs/altsys/include/Text_Diff_Renderer_unified.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -24,10 +24,10 @@  discard block
 block discarded – undo
24 24
     public function _blockHeader($xbeg, $xlen, $ybeg, $ylen)
25 25
     {
26 26
         if ($xlen != 1) {
27
-            $xbeg .= ',' . $xlen;
27
+            $xbeg .= ','.$xlen;
28 28
         }
29 29
         if ($ylen != 1) {
30
-            $ybeg .= ',' . $ylen;
30
+            $ybeg .= ','.$ylen;
31 31
         }
32 32
         return "@@ -$xbeg +$ybeg @@";
33 33
     }
@@ -44,6 +44,6 @@  discard block
 block discarded – undo
44 44
 
45 45
     public function _changed($orig, $final)
46 46
     {
47
-        return $this->_deleted($orig) . $this->_added($final);
47
+        return $this->_deleted($orig).$this->_added($final);
48 48
     }
49 49
 }
Please login to merge, or discard this patch.
libs/altsys/include/Legacy_AltsysAdminRenderSystem.class.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -1,21 +1,21 @@
 block discarded – undo
1 1
 <?php
2 2
 
3
-require_once XOOPS_ROOT_PATH.'/modules/legacyRender/kernel/Legacy_AdminRenderSystem.class.php' ;
4
-require_once XOOPS_TRUST_PATH.'/libs/altsys/include/altsys_functions.php' ;
5
-require_once XOOPS_TRUST_PATH.'/libs/altsys/include/admin_in_theme_functions.php' ;
3
+require_once XOOPS_ROOT_PATH.'/modules/legacyRender/kernel/Legacy_AdminRenderSystem.class.php';
4
+require_once XOOPS_TRUST_PATH.'/libs/altsys/include/altsys_functions.php';
5
+require_once XOOPS_TRUST_PATH.'/libs/altsys/include/admin_in_theme_functions.php';
6 6
 
7 7
 class Legacy_AltsysAdminRenderSystem extends Legacy_AdminRenderSystem
8 8
 {
9 9
     public function renderTheme(&$target)
10 10
     {
11
-        global $altsysModuleConfig ;
11
+        global $altsysModuleConfig;
12 12
     
13 13
         if (empty($altsysModuleConfig['admin_in_theme'])) {
14
-            parent::renderTheme($target) ;
14
+            parent::renderTheme($target);
15 15
         } else {
16
-            $attributes = $target->getAttributes() ;
17
-            altsys_admin_in_theme_in_last($attributes['xoops_contents']) ;
18
-            exit ;
16
+            $attributes = $target->getAttributes();
17
+            altsys_admin_in_theme_in_last($attributes['xoops_contents']);
18
+            exit;
19 19
         }
20 20
     }
21 21
 }
Please login to merge, or discard this patch.
xoops_trust_path/libs/altsys/include/Text_Diff_Renderer_inline.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -72,14 +72,14 @@  discard block
 block discarded – undo
72 72
         if ($this->_split_level == 'words') {
73 73
             return implode('', $lines);
74 74
         } else {
75
-            return implode("\n", $lines) . "\n";
75
+            return implode("\n", $lines)."\n";
76 76
         }
77 77
     }
78 78
 
79 79
     public function _added($lines)
80 80
     {
81 81
         array_walk($lines, array(&$this, '_encode'));
82
-        $lines[0] = $this->_ins_prefix . $lines[0];
82
+        $lines[0] = $this->_ins_prefix.$lines[0];
83 83
         $lines[count($lines) - 1] .= $this->_ins_suffix;
84 84
         return $this->_lines($lines, ' ', false);
85 85
     }
@@ -87,7 +87,7 @@  discard block
 block discarded – undo
87 87
     public function _deleted($lines, $words = false)
88 88
     {
89 89
         array_walk($lines, array(&$this, '_encode'));
90
-        $lines[0] = $this->_del_prefix . $lines[0];
90
+        $lines[0] = $this->_del_prefix.$lines[0];
91 91
         $lines[count($lines) - 1] .= $this->_del_suffix;
92 92
         return $this->_lines($lines, ' ', false);
93 93
     }
@@ -105,7 +105,7 @@  discard block
 block discarded – undo
105 105
                 $orig[0] = substr($orig[0], 1);
106 106
                 $final[0] = substr($final[0], 1);
107 107
             }
108
-            return $prefix . $this->_deleted($orig) . $this->_added($final);
108
+            return $prefix.$this->_deleted($orig).$this->_added($final);
109 109
         }
110 110
 
111 111
         $text1 = implode("\n", $orig);
@@ -125,7 +125,7 @@  discard block
 block discarded – undo
125 125
                                                                array('split_level' => 'words')));
126 126
 
127 127
         /* Run the diff and get the output. */
128
-        return str_replace($nl, "\n", $renderer->render($diff)) . "\n";
128
+        return str_replace($nl, "\n", $renderer->render($diff))."\n";
129 129
     }
130 130
 
131 131
     public function _splitOnWords($string, $newlineEscape = "\n")
Please login to merge, or discard this patch.
xoops_trust_path/libs/altsys/include/Text_Diff_Renderer.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -36,7 +36,7 @@  discard block
 block discarded – undo
36 36
     public function __construct($params = array())
37 37
     {
38 38
         foreach ($params as $param => $value) {
39
-            $v = '_' . $param;
39
+            $v = '_'.$param;
40 40
             if (isset($this->$v)) {
41 41
                 $this->$v = $value;
42 42
             }
@@ -122,7 +122,7 @@  discard block
 block discarded – undo
122 122
                                      $block);
123 123
         }
124 124
 
125
-        return $output . $this->_endDiff();
125
+        return $output.$this->_endDiff();
126 126
     }
127 127
 
128 128
     public function _block($xbeg, $xlen, $ybeg, $ylen, &$edits)
@@ -149,7 +149,7 @@  discard block
 block discarded – undo
149 149
             }
150 150
         }
151 151
 
152
-        return $output . $this->_endBlock();
152
+        return $output.$this->_endBlock();
153 153
     }
154 154
 
155 155
     public function _startDiff()
@@ -165,18 +165,18 @@  discard block
 block discarded – undo
165 165
     public function _blockHeader($xbeg, $xlen, $ybeg, $ylen)
166 166
     {
167 167
         if ($xlen > 1) {
168
-            $xbeg .= ',' . ($xbeg + $xlen - 1);
168
+            $xbeg .= ','.($xbeg + $xlen - 1);
169 169
         }
170 170
         if ($ylen > 1) {
171
-            $ybeg .= ',' . ($ybeg + $ylen - 1);
171
+            $ybeg .= ','.($ybeg + $ylen - 1);
172 172
         }
173 173
 
174
-        return $xbeg . ($xlen ? ($ylen ? 'c' : 'd') : 'a') . $ybeg;
174
+        return $xbeg.($xlen ? ($ylen ? 'c' : 'd') : 'a').$ybeg;
175 175
     }
176 176
 
177 177
     public function _startBlock($header)
178 178
     {
179
-        return $header . "\n";
179
+        return $header."\n";
180 180
     }
181 181
 
182 182
     public function _endBlock()
@@ -186,7 +186,7 @@  discard block
 block discarded – undo
186 186
 
187 187
     public function _lines($lines, $prefix = ' ')
188 188
     {
189
-        return $prefix . implode("\n$prefix", $lines) . "\n";
189
+        return $prefix.implode("\n$prefix", $lines)."\n";
190 190
     }
191 191
 
192 192
     public function _context($lines)
@@ -206,6 +206,6 @@  discard block
 block discarded – undo
206 206
 
207 207
     public function _changed($orig, $final)
208 208
     {
209
-        return $this->_deleted($orig) . "---\n" . $this->_added($final);
209
+        return $this->_deleted($orig)."---\n".$this->_added($final);
210 210
     }
211 211
 }
Please login to merge, or discard this patch.