Completed
Push — master ( b4f428...a74d38 )
by Michael
02:21
created
xoops_trust_path/libs/altsys/include/admin_in_theme.inc.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -7,12 +7,12 @@
 block discarded – undo
7 7
     if (preg_match('#(^/admin.php|^/modules/system/|^/modules/[a-zA-Z0-9_.-]+/admin/)#', $xoops_subpath)) {
8 8
         // The request looks like admin
9 9
 
10
-        require_once __DIR__ . '/altsys_functions.php';
10
+        require_once __DIR__.'/altsys_functions.php';
11 11
 
12
-        if (!empty($GLOBALS['altsysModuleConfig']['admin_in_theme']) && file_exists(XOOPS_THEME_PATH . '/' . $GLOBALS['altsysModuleConfig']['admin_in_theme'] . '/theme.html')) {
12
+        if (!empty($GLOBALS['altsysModuleConfig']['admin_in_theme']) && file_exists(XOOPS_THEME_PATH.'/'.$GLOBALS['altsysModuleConfig']['admin_in_theme'].'/theme.html')) {
13 13
             // configs OK
14 14
 
15
-            require_once __DIR__ . '/admin_in_theme_functions.php';
15
+            require_once __DIR__.'/admin_in_theme_functions.php';
16 16
 
17 17
             // for security with register_globals=1
18 18
 
Please login to merge, or discard this patch.
xoops_trust_path/libs/altsys/include/altsys_functions.php 1 patch
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -45,17 +45,17 @@  discard block
 block discarded – undo
45 45
     global $xoopsModule, $xoopsConfig, $mydirname, $mydirpath, $mytrustdirname, $mytrustdirpath, $mymenu_fake_uri;
46 46
 
47 47
     $mymenu_find_paths = [
48
-        $mydirpath . '/admin/mymenu.php',
49
-        $mydirpath . '/mymenu.php',
50
-        $mytrustdirpath . '/admin/mymenu.php',
51
-        $mytrustdirpath . '/mymenu.php',
48
+        $mydirpath.'/admin/mymenu.php',
49
+        $mydirpath.'/mymenu.php',
50
+        $mytrustdirpath.'/admin/mymenu.php',
51
+        $mytrustdirpath.'/mymenu.php',
52 52
     ];
53 53
 
54 54
     foreach ($mymenu_find_paths as $mymenu_find_path) {
55 55
         if (is_file($mymenu_find_path)) {
56 56
             include $mymenu_find_path;
57 57
 
58
-            include_once __DIR__ . '/adminmenu_functions.php';
58
+            include_once __DIR__.'/adminmenu_functions.php';
59 59
 
60 60
             altsys_adminmenu_insert_mymenu($xoopsModule);
61 61
 
@@ -73,14 +73,14 @@  discard block
 block discarded – undo
73 73
 {
74 74
     $mylang = $GLOBALS['xoopsConfig']['language'];
75 75
 
76
-    if (is_file(XOOPS_ROOT_PATH . '/modules/altsys/language/' . $mylang . '/' . $type . '.php')) {
77
-        include_once XOOPS_ROOT_PATH . '/modules/altsys/language/' . $mylang . '/' . $type . '.php';
78
-    } elseif (is_file(XOOPS_TRUST_PATH . '/libs/altsys/language/' . $mylang . '/' . $type . '.php')) {
79
-        include_once XOOPS_TRUST_PATH . '/libs/altsys/language/' . $mylang . '/' . $type . '.php';
80
-    } elseif (is_file(XOOPS_ROOT_PATH . '/modules/altsys/language/english/' . $type . '.php')) {
81
-        include_once XOOPS_ROOT_PATH . '/modules/altsys/language/english/' . $type . '.php';
82
-    } elseif (is_file(XOOPS_TRUST_PATH . '/libs/altsys/language/english/' . $type . '.php')) {
83
-        include_once XOOPS_TRUST_PATH . '/libs/altsys/language/english/' . $type . '.php';
76
+    if (is_file(XOOPS_ROOT_PATH.'/modules/altsys/language/'.$mylang.'/'.$type.'.php')) {
77
+        include_once XOOPS_ROOT_PATH.'/modules/altsys/language/'.$mylang.'/'.$type.'.php';
78
+    } elseif (is_file(XOOPS_TRUST_PATH.'/libs/altsys/language/'.$mylang.'/'.$type.'.php')) {
79
+        include_once XOOPS_TRUST_PATH.'/libs/altsys/language/'.$mylang.'/'.$type.'.php';
80
+    } elseif (is_file(XOOPS_ROOT_PATH.'/modules/altsys/language/english/'.$type.'.php')) {
81
+        include_once XOOPS_ROOT_PATH.'/modules/altsys/language/english/'.$type.'.php';
82
+    } elseif (is_file(XOOPS_TRUST_PATH.'/libs/altsys/language/english/'.$type.'.php')) {
83
+        include_once XOOPS_TRUST_PATH.'/libs/altsys/language/english/'.$type.'.php';
84 84
     }
85 85
 }
86 86
 
@@ -144,9 +144,9 @@  discard block
 block discarded – undo
144 144
         case ALTSYS_CORE_TYPE_X23P:
145 145
         case ALTSYS_CORE_TYPE_ICMS:
146 146
         default:
147
-            return XOOPS_URL . '/modules/system/admin.php?fct=preferences&op=showmod&mod=' . $mid;
147
+            return XOOPS_URL.'/modules/system/admin.php?fct=preferences&op=showmod&mod='.$mid;
148 148
         case ALTSYS_CORE_TYPE_XCL21:
149
-            return XOOPS_URL . '/modules/legacy/admin/index.php?action=PreferenceEdit&confmod_id=' . $mid;
149
+            return XOOPS_URL.'/modules/legacy/admin/index.php?action=PreferenceEdit&confmod_id='.$mid;
150 150
     }
151 151
 }
152 152
 
@@ -179,7 +179,7 @@  discard block
 block discarded – undo
179 179
             continue;
180 180
         }
181 181
 
182
-        @unlink(XOOPS_COMPILE_PATH . '/' . $file);
182
+        @unlink(XOOPS_COMPILE_PATH.'/'.$file);
183 183
     }
184 184
 
185 185
     closedir($dh);
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
@@ -34,11 +34,11 @@  discard block
 block discarded – undo
34 34
     public function _blockHeader($xbeg, $xlen, $ybeg, $ylen)
35 35
     {
36 36
         if (1 != $xlen) {
37
-            $xbeg .= ',' . $xlen;
37
+            $xbeg .= ','.$xlen;
38 38
         }
39 39
 
40 40
         if (1 != $ylen) {
41
-            $ybeg .= ',' . $ylen;
41
+            $ybeg .= ','.$ylen;
42 42
         }
43 43
 
44 44
         return "@@ -$xbeg +$ybeg @@";
@@ -72,6 +72,6 @@  discard block
 block discarded – undo
72 72
 
73 73
     public function _changed($orig, $final)
74 74
     {
75
-        return $this->_deleted($orig) . $this->_added($final);
75
+        return $this->_deleted($orig).$this->_added($final);
76 76
     }
77 77
 }
Please login to merge, or discard this patch.
xoops_trust_path/libs/altsys/include/formcheckboxgroup.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -29,7 +29,7 @@  discard block
 block discarded – undo
29 29
 /**
30 30
  * Parent
31 31
  */
32
-include_once XOOPS_ROOT_PATH . '/class/xoopsform/formcheckbox.php';
32
+include_once XOOPS_ROOT_PATH.'/class/xoopsform/formcheckbox.php';
33 33
 
34 34
 /**
35 35
  * A checkbox field with a choice of available groups
@@ -64,7 +64,7 @@  discard block
 block discarded – undo
64 64
         }
65 65
 
66 66
         foreach ($options as $k => $v) {
67
-            $options[$k] = $v . '<br />';
67
+            $options[$k] = $v.'<br />';
68 68
         }
69 69
 
70 70
         $this->addOptionArray($options);
Please login to merge, or discard this patch.
xoops_trust_path/libs/altsys/include/mygrouppermform.php 1 patch
Spacing   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -18,11 +18,11 @@  discard block
 block discarded – undo
18 18
     exit;
19 19
 }
20 20
 
21
-require_once XOOPS_ROOT_PATH . '/class/xoopsform/formelement.php';
22
-require_once XOOPS_ROOT_PATH . '/class/xoopsform/formhidden.php';
23
-require_once XOOPS_ROOT_PATH . '/class/xoopsform/formbutton.php';
24
-require_once XOOPS_ROOT_PATH . '/class/xoopsform/formelementtray.php';
25
-require_once XOOPS_ROOT_PATH . '/class/xoopsform/form.php';
21
+require_once XOOPS_ROOT_PATH.'/class/xoopsform/formelement.php';
22
+require_once XOOPS_ROOT_PATH.'/class/xoopsform/formhidden.php';
23
+require_once XOOPS_ROOT_PATH.'/class/xoopsform/formbutton.php';
24
+require_once XOOPS_ROOT_PATH.'/class/xoopsform/formelementtray.php';
25
+require_once XOOPS_ROOT_PATH.'/class/xoopsform/form.php';
26 26
 
27 27
 /**
28 28
  * Renders a form for setting module specific group permissions
@@ -188,13 +188,13 @@  discard block
 block discarded – undo
188 188
 
189 189
             $selected = $grouppermHandler->getItemIds($this->_permName, $i, $this->_modid);
190 190
 
191
-            $ele = new MyXoopsGroupFormCheckBox($glist[$i], 'perms[' . $this->_permName . ']', $i, $selected);
191
+            $ele = new MyXoopsGroupFormCheckBox($glist[$i], 'perms['.$this->_permName.']', $i, $selected);
192 192
 
193 193
             $ele->setOptionTree($this->_itemTree);
194 194
 
195 195
             // GIJ start
196 196
 
197
-            $ele->setDescription('<input type="checkbox" onclick="with(document.groupperm_form){for(i=0;i<length;i++){if(elements[i].name.match(/^perms\[(module_admin|module_read|block_read)\]\[groups\]\[' . $i . '\]/)){elements[i].checked=this.checked;}}};">');
197
+            $ele->setDescription('<input type="checkbox" onclick="with(document.groupperm_form){for(i=0;i<length;i++){if(elements[i].name.match(/^perms\[(module_admin|module_read|block_read)\]\[groups\]\['.$i.'\]/)){elements[i].checked=this.checked;}}};">');
198 198
 
199 199
             // GIJ_end
200 200
 
@@ -237,9 +237,9 @@  discard block
 block discarded – undo
237 237
 
238 238
         $this->addElement($tray);
239 239
 
240
-        $ret = '<h4>' . $this->getTitle() . '</h4>' . $this->_permDesc . '<br />';
240
+        $ret = '<h4>'.$this->getTitle().'</h4>'.$this->_permDesc.'<br />';
241 241
 
242
-        $ret .= "<form name='" . $this->getName() . "' id='" . $this->getName() . "' action='" . $this->getAction() . "' method='" . $this->getMethod() . "'" . $this->getExtra() . ">\n<table width='100%' class='outer' cellspacing='1'>\n";
242
+        $ret .= "<form name='".$this->getName()."' id='".$this->getName()."' action='".$this->getAction()."' method='".$this->getMethod()."'".$this->getExtra().">\n<table width='100%' class='outer' cellspacing='1'>\n";
243 243
 
244 244
         $elements = &$this->getElements();
245 245
 
@@ -249,21 +249,21 @@  discard block
 block discarded – undo
249 249
             } elseif (!$elements[$i]->isHidden()) {
250 250
                 // group name
251 251
 
252
-                $ret .= "<tr valign='top' align='" . _GLOBAL_LEFT . "'><td class='head'>" . $elements[$i]->getCaption();
252
+                $ret .= "<tr valign='top' align='"._GLOBAL_LEFT."'><td class='head'>".$elements[$i]->getCaption();
253 253
 
254 254
                 // group description
255 255
 
256 256
                 if ('' != $elements[$i]->getDescription()) {
257
-                    $ret .= '<br /><br /><span style="font-weight: normal;">' . $elements[$i]->getDescription() . '</span>';
257
+                    $ret .= '<br /><br /><span style="font-weight: normal;">'.$elements[$i]->getDescription().'</span>';
258 258
                 }
259 259
 
260
-                $ret .= "</td>\n<td class='even'>\n" . $elements[$i]->render() . "\n</td></tr>\n";
260
+                $ret .= "</td>\n<td class='even'>\n".$elements[$i]->render()."\n</td></tr>\n";
261 261
             } else {
262 262
                 $ret .= $elements[$i]->render();
263 263
             }
264 264
         }
265 265
 
266
-        $ret .= '</table>' . $xoopsGTicket->getTicketHtml(__LINE__, 1800, 'myblocksadmin') . '</form>';
266
+        $ret .= '</table>'.$xoopsGTicket->getTicketHtml(__LINE__, 1800, 'myblocksadmin').'</form>';
267 267
 
268 268
         return $ret;
269 269
     }
@@ -396,7 +396,7 @@  discard block
 block discarded – undo
396 396
 
397 397
                 $checked = $append['selected'] ? 'checked="checked"' : '';
398 398
 
399
-                $name = 'perms[' . $append['permname'] . ']';
399
+                $name = 'perms['.$append['permname'].']';
400 400
 
401 401
                 $itemid = $append['itemid'];
402 402
 
@@ -428,7 +428,7 @@  discard block
 block discarded – undo
428 428
 
429 429
                 $this->_renderOptionTree($tree, $this->_optionTree[$topitem], $prefix);
430 430
 
431
-                $ret .= $tree . '</td>';
431
+                $ret .= $tree.'</td>';
432 432
 
433 433
                 $cols++;
434 434
             }
@@ -451,7 +451,7 @@  discard block
 block discarded – undo
451 451
 
452 452
     public function _renderOptionTree(&$tree, $option, $prefix, $parentIds = [])
453 453
     {
454
-        $tree .= $prefix . '<input type="checkbox" name="' . $this->getName() . '[groups][' . $this->_groupId . '][' . $option['id'] . ']" id="' . $this->getName() . '[groups][' . $this->_groupId . '][' . $option['id'] . ']" onclick="';
454
+        $tree .= $prefix.'<input type="checkbox" name="'.$this->getName().'[groups]['.$this->_groupId.']['.$option['id'].']" id="'.$this->getName().'[groups]['.$this->_groupId.']['.$option['id'].']" onclick="';
455 455
 
456 456
         // If there are parent elements, add javascript that will
457 457
 
@@ -460,9 +460,9 @@  discard block
 block discarded – undo
460 460
         // sure permissions to parent items are added as well.
461 461
 
462 462
         foreach ($parentIds as $pid) {
463
-            $parent_ele = $this->getName() . '[groups][' . $this->_groupId . '][' . $pid . ']';
463
+            $parent_ele = $this->getName().'[groups]['.$this->_groupId.']['.$pid.']';
464 464
 
465
-            $tree .= "var ele = xoopsGetElementById('" . $parent_ele . "'); if(ele.checked != true) {ele.checked = this.checked;}";
465
+            $tree .= "var ele = xoopsGetElementById('".$parent_ele."'); if(ele.checked != true) {ele.checked = this.checked;}";
466 466
         }
467 467
 
468 468
         // If there are child elements, add javascript that will
@@ -474,9 +474,9 @@  discard block
 block discarded – undo
474 474
         // is no permission to this item.
475 475
 
476 476
         foreach ($option['allchild'] as $cid) {
477
-            $child_ele = $this->getName() . '[groups][' . $this->_groupId . '][' . $cid . ']';
477
+            $child_ele = $this->getName().'[groups]['.$this->_groupId.']['.$cid.']';
478 478
 
479
-            $tree .= "var ele = xoopsGetElementById('" . $child_ele . "'); if(this.checked != true) {ele.checked = false;}";
479
+            $tree .= "var ele = xoopsGetElementById('".$child_ele."'); if(this.checked != true) {ele.checked = false;}";
480 480
         }
481 481
 
482 482
         $tree .= '" value="1"';
@@ -505,7 +505,7 @@  discard block
 block discarded – undo
505 505
             foreach ($option['children'] as $child) {
506 506
                 array_push($parentIds, $option['id']);
507 507
 
508
-                $this->_renderOptionTree($tree, $this->_optionTree[$child], $prefix . '&nbsp;-', $parentIds);
508
+                $this->_renderOptionTree($tree, $this->_optionTree[$child], $prefix.'&nbsp;-', $parentIds);
509 509
             }
510 510
         }
511 511
     }
Please login to merge, or discard this patch.
libs/altsys/include/Legacy_AltsysAdminRenderSystem.class.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -1,8 +1,8 @@
 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
 /**
8 8
  * Class Legacy_AltsysAdminRenderSystem
Please login to merge, or discard this patch.
xoops_trust_path/libs/altsys/include/Archive_Zip.php 1 patch
Spacing   +44 added lines, -44 removed lines patch added patch discarded remove patch
@@ -151,7 +151,7 @@  discard block
 block discarded – undo
151 151
               }*/ // GIJ
152 152
 
153 153
         if (!extension_loaded('zlib')) {
154
-            die("The extension 'zlib' couldn't be found.\n" . 'Please make sure your version of PHP was built ' . "with 'zlib' support.\n");
154
+            die("The extension 'zlib' couldn't be found.\n".'Please make sure your version of PHP was built '."with 'zlib' support.\n");
155 155
 
156 156
             return false;
157 157
         }
@@ -533,7 +533,7 @@  discard block
 block discarded – undo
533 533
             && ('' == $p_params['by_index'])
534 534
             && ('' == $p_params['by_ereg'])
535 535
             && ('' == $p_params['by_preg'])) {
536
-            $this->_errorLog(ARCHIVE_ZIP_ERR_INVALID_PARAMETER, 'At least one filtering rule must' . ' be set as parameter');
536
+            $this->_errorLog(ARCHIVE_ZIP_ERR_INVALID_PARAMETER, 'At least one filtering rule must'.' be set as parameter');
537 537
 
538 538
             return 0;
539 539
         }
@@ -593,7 +593,7 @@  discard block
 block discarded – undo
593 593
             // ----- Open the zip file
594 594
 
595 595
             if (0 == ($this->_zip_fd = @fopen($this->_zipname, 'rb'))) {
596
-                $this->_errorLog(ARCHIVE_ZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \'' . $this->_zipname . '\' in binary read mode');
596
+                $this->_errorLog(ARCHIVE_ZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \''.$this->_zipname.'\' in binary read mode');
597 597
 
598 598
                 return 0;
599 599
             }
@@ -652,7 +652,7 @@  discard block
 block discarded – undo
652 652
             // TBC : Should also check the archive format
653 653
 
654 654
             if (!is_file($p_archive)) {
655
-                $this->_errorLog(ARCHIVE_ZIP_ERR_MISSING_FILE, "No file with filename '" . $p_archive . "'");
655
+                $this->_errorLog(ARCHIVE_ZIP_ERR_MISSING_FILE, "No file with filename '".$p_archive."'");
656 656
 
657 657
                 $v_result = ARCHIVE_ZIP_ERR_MISSING_FILE;
658 658
             } else {
@@ -774,7 +774,7 @@  discard block
 block discarded – undo
774 774
         }
775 775
 
776 776
         if ($p_with_code) {
777
-            return ($v_value . ' (' . $this->_error_code . ')');
777
+            return ($v_value.' ('.$this->_error_code.')');
778 778
         }
779 779
 
780 780
         return $v_value;
@@ -798,10 +798,10 @@  discard block
 block discarded – undo
798 798
     public function errorInfo($p_full = false)
799 799
     {
800 800
         if ($p_full) {
801
-            return ($this->errorName(true) . ' : ' . $this->_error_string);
801
+            return ($this->errorName(true).' : '.$this->_error_string);
802 802
         }
803 803
 
804
-        return ($this->_error_string . ' [code ' . $this->_error_code . ']');
804
+        return ($this->_error_string.' [code '.$this->_error_code.']');
805 805
     }
806 806
 
807 807
     // }}}
@@ -866,7 +866,7 @@  discard block
 block discarded – undo
866 866
         if (!is_file($this->_zipname)) {
867 867
             // ----- Error log
868 868
 
869
-            $this->_errorLog(ARCHIVE_ZIP_ERR_MISSING_FILE, "Missing archive file '" . $this->_zipname . "'");
869
+            $this->_errorLog(ARCHIVE_ZIP_ERR_MISSING_FILE, "Missing archive file '".$this->_zipname."'");
870 870
 
871 871
             return false;
872 872
         }
@@ -876,7 +876,7 @@  discard block
 block discarded – undo
876 876
         if (!is_readable($this->_zipname)) {
877 877
             // ----- Error log
878 878
 
879
-            $this->_errorLog(ARCHIVE_ZIP_ERR_READ_OPEN_FAIL, "Unable to read archive '" . $this->_zipname . "'");
879
+            $this->_errorLog(ARCHIVE_ZIP_ERR_READ_OPEN_FAIL, "Unable to read archive '".$this->_zipname."'");
880 880
 
881 881
             return false;
882 882
         }
@@ -1021,14 +1021,14 @@  discard block
 block discarded – undo
1021 1021
 
1022 1022
         // ----- Creates a temporay file
1023 1023
 
1024
-        $v_zip_temp_name = ARCHIVE_ZIP_TEMPORARY_DIR . uniqid('archive_zip-') . '.tmp';
1024
+        $v_zip_temp_name = ARCHIVE_ZIP_TEMPORARY_DIR.uniqid('archive_zip-').'.tmp';
1025 1025
 
1026 1026
         // ----- Open the temporary file in write mode
1027 1027
 
1028 1028
         if (0 == ($v_zip_temp_fd = @fopen($v_zip_temp_name, 'wb'))) {
1029 1029
             $this->_closeFd();
1030 1030
 
1031
-            $this->_errorLog(ARCHIVE_ZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \'' . $v_zip_temp_name . '\' in binary write mode');
1031
+            $this->_errorLog(ARCHIVE_ZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_zip_temp_name.'\' in binary write mode');
1032 1032
 
1033 1033
             return self::errorCode();
1034 1034
         }
@@ -1205,7 +1205,7 @@  discard block
 block discarded – undo
1205 1205
         // ----- Look if already open
1206 1206
 
1207 1207
         if (0 != $this->_zip_fd) {
1208
-            $this->_errorLog(ARCHIVE_ZIP_ERR_READ_OPEN_FAIL, 'Zip file \'' . $this->_zipname . '\' already open');
1208
+            $this->_errorLog(ARCHIVE_ZIP_ERR_READ_OPEN_FAIL, 'Zip file \''.$this->_zipname.'\' already open');
1209 1209
 
1210 1210
             return self::errorCode();
1211 1211
         }
@@ -1213,7 +1213,7 @@  discard block
 block discarded – undo
1213 1213
         // ----- Open the zip file
1214 1214
 
1215 1215
         if (0 == ($this->_zip_fd = @fopen($this->_zipname, $p_mode))) {
1216
-            $this->_errorLog(ARCHIVE_ZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \'' . $this->_zipname . '\' in ' . $p_mode . ' mode');
1216
+            $this->_errorLog(ARCHIVE_ZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \''.$this->_zipname.'\' in '.$p_mode.' mode');
1217 1217
 
1218 1218
             return self::errorCode();
1219 1219
         }
@@ -1462,7 +1462,7 @@  discard block
 block discarded – undo
1462 1462
                 // ----- Look for path
1463 1463
 
1464 1464
                 if ('.' != $p_filename) {
1465
-                    $v_path = $p_filename . '/';
1465
+                    $v_path = $p_filename.'/';
1466 1466
                 } else {
1467 1467
                     $v_path = '';
1468 1468
                 }
@@ -1476,10 +1476,10 @@  discard block
 block discarded – undo
1476 1476
                 while ($p_hitem = readdir($p_hdir)) {
1477 1477
                     // ----- Look for a file
1478 1478
 
1479
-                    if (is_file($v_path . $p_hitem)) {
1479
+                    if (is_file($v_path.$p_hitem)) {
1480 1480
                         // ----- Add the file
1481 1481
 
1482
-                        if (1 != ($v_result = $this->_addFile($v_path . $p_hitem, $v_header, $p_add_dir, $p_remove_dir, $p_remove_all_dir, $p_params))) {
1482
+                        if (1 != ($v_result = $this->_addFile($v_path.$p_hitem, $v_header, $p_add_dir, $p_remove_dir, $p_remove_all_dir, $p_params))) {
1483 1483
                             // ----- Return status
1484 1484
 
1485 1485
                             return $v_result;
@@ -1493,7 +1493,7 @@  discard block
 block discarded – undo
1493 1493
                     else {
1494 1494
                         // ----- Need an array as parameter
1495 1495
 
1496
-                        $p_temp_list[0] = $v_path . $p_hitem;
1496
+                        $p_temp_list[0] = $v_path.$p_hitem;
1497 1497
 
1498 1498
                         $v_result = $this->_addFileList($p_temp_list, $p_result_list, $p_add_dir, $p_remove_dir, $p_remove_all_dir, $p_params);
1499 1499
 
@@ -1570,7 +1570,7 @@  discard block
 block discarded – undo
1570 1570
 
1571 1571
             if (('./' == mb_substr($p_filename, 0, 2)) || ('./' == mb_substr($p_remove_dir, 0, 2))) {
1572 1572
                 if (('./' == mb_substr($p_filename, 0, 2)) && ('./' != mb_substr($p_remove_dir, 0, 2))) {
1573
-                    $p_remove_dir = './' . $p_remove_dir;
1573
+                    $p_remove_dir = './'.$p_remove_dir;
1574 1574
                 }
1575 1575
 
1576 1576
                 if (('./' != mb_substr($p_filename, 0, 2)) && ('./' == mb_substr($p_remove_dir, 0, 2))) {
@@ -1595,9 +1595,9 @@  discard block
 block discarded – undo
1595 1595
 
1596 1596
         if ('' != $p_add_dir) {
1597 1597
             if ('/' == mb_substr($p_add_dir, -1)) {
1598
-                $v_stored_filename = $p_add_dir . $v_stored_filename;
1598
+                $v_stored_filename = $p_add_dir.$v_stored_filename;
1599 1599
             } else {
1600
-                $v_stored_filename = $p_add_dir . '/' . $v_stored_filename;
1600
+                $v_stored_filename = $p_add_dir.'/'.$v_stored_filename;
1601 1601
             }
1602 1602
         }
1603 1603
 
@@ -1679,7 +1679,7 @@  discard block
 block discarded – undo
1679 1679
 
1680 1680
             // header.
1681 1681
 
1682
-            eval('$v_result = ' . $p_params[ARCHIVE_ZIP_PARAM_PRE_ADD] . '(ARCHIVE_ZIP_PARAM_PRE_ADD, $v_local_header);');
1682
+            eval('$v_result = '.$p_params[ARCHIVE_ZIP_PARAM_PRE_ADD].'(ARCHIVE_ZIP_PARAM_PRE_ADD, $v_local_header);');
1683 1683
 
1684 1684
             if (0 == $v_result) {
1685 1685
                 // ----- Change the file status
@@ -1762,7 +1762,7 @@  discard block
 block discarded – undo
1762 1762
 
1763 1763
                 // ----- Write the compressed content
1764 1764
 
1765
-                $v_binary_data = pack('a' . $p_header['compressed_size'], $v_content_compressed);
1765
+                $v_binary_data = pack('a'.$p_header['compressed_size'], $v_content_compressed);
1766 1766
 
1767 1767
                 @fwrite($this->_zip_fd, $v_binary_data, $p_header['compressed_size']);
1768 1768
 
@@ -1780,7 +1780,7 @@  discard block
 block discarded – undo
1780 1780
 
1781 1781
                 $p_header['size'] = 0;
1782 1782
 
1783
-                $p_header['external'] = 0x41FF0010;   // Value for a folder : to be checked
1783
+                $p_header['external'] = 0x41FF0010; // Value for a folder : to be checked
1784 1784
 
1785 1785
                 // ----- Call the header generation
1786 1786
 
@@ -1806,7 +1806,7 @@  discard block
 block discarded – undo
1806 1806
 
1807 1807
             // header.
1808 1808
 
1809
-            eval('$v_result = ' . $p_params[ARCHIVE_ZIP_PARAM_POST_ADD] . '(ARCHIVE_ZIP_PARAM_POST_ADD, $v_local_header);');
1809
+            eval('$v_result = '.$p_params[ARCHIVE_ZIP_PARAM_POST_ADD].'(ARCHIVE_ZIP_PARAM_POST_ADD, $v_local_header);');
1810 1810
 
1811 1811
             if (0 == $v_result) {
1812 1812
                 // ----- Ignored
@@ -2055,7 +2055,7 @@  discard block
 block discarded – undo
2055 2055
         if (0 == ($this->_zip_fd = @fopen($this->_zipname, 'rb'))) {
2056 2056
             // ----- Error log
2057 2057
 
2058
-            $this->_errorLog(ARCHIVE_ZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \'' . $this->_zipname . '\' in binary read mode');
2058
+            $this->_errorLog(ARCHIVE_ZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \''.$this->_zipname.'\' in binary read mode');
2059 2059
 
2060 2060
             // ----- Return
2061 2061
 
@@ -2246,7 +2246,7 @@  discard block
 block discarded – undo
2246 2246
             || (('/' != mb_substr($p_path, 0, 1))
2247 2247
                 && ('../' != mb_substr($p_path, 0, 3))
2248 2248
                 && (':/' != mb_substr($p_path, 1, 2)))) {
2249
-            $p_path = './' . $p_path;
2249
+            $p_path = './'.$p_path;
2250 2250
         }
2251 2251
 
2252 2252
         // ----- Reduce the path last (and duplicated) '/'
@@ -2549,7 +2549,7 @@  discard block
 block discarded – undo
2549 2549
         // ----- Add the path
2550 2550
 
2551 2551
         if ('' != $p_path) {
2552
-            $p_entry['filename'] = $p_path . '/' . $p_entry['filename'];
2552
+            $p_entry['filename'] = $p_path.'/'.$p_entry['filename'];
2553 2553
         }
2554 2554
 
2555 2555
         // ----- Look for pre-extract callback
@@ -2568,7 +2568,7 @@  discard block
 block discarded – undo
2568 2568
 
2569 2569
             // header.
2570 2570
 
2571
-            eval('$v_result = ' . $p_params[ARCHIVE_ZIP_PARAM_PRE_EXTRACT] . '(ARCHIVE_ZIP_PARAM_PRE_EXTRACT, $v_local_header);');
2571
+            eval('$v_result = '.$p_params[ARCHIVE_ZIP_PARAM_PRE_EXTRACT].'(ARCHIVE_ZIP_PARAM_PRE_EXTRACT, $v_local_header);');
2572 2572
 
2573 2573
             if (0 == $v_result) {
2574 2574
                 // ----- Change the file status
@@ -2674,7 +2674,7 @@  discard block
 block discarded – undo
2674 2674
 
2675 2675
                         $v_buffer = fread($this->_zip_fd, $v_read_size);
2676 2676
 
2677
-                        $v_binary_data = pack('a' . $v_read_size, $v_buffer);
2677
+                        $v_binary_data = pack('a'.$v_read_size, $v_buffer);
2678 2678
 
2679 2679
                         @fwrite($v_dest_file, $v_binary_data, $v_read_size);
2680 2680
 
@@ -2753,7 +2753,7 @@  discard block
 block discarded – undo
2753 2753
 
2754 2754
             // header.
2755 2755
 
2756
-            eval('$v_result = ' . $p_params[ARCHIVE_ZIP_PARAM_POST_EXTRACT] . '(ARCHIVE_ZIP_PARAM_POST_EXTRACT, $v_local_header);');
2756
+            eval('$v_result = '.$p_params[ARCHIVE_ZIP_PARAM_POST_EXTRACT].'(ARCHIVE_ZIP_PARAM_POST_EXTRACT, $v_local_header);');
2757 2757
         }
2758 2758
 
2759 2759
         // ----- Return
@@ -2894,7 +2894,7 @@  discard block
 block discarded – undo
2894 2894
 
2895 2895
             // ----- Error log
2896 2896
 
2897
-            $this->_errorLog(ARCHIVE_ZIP_ERR_BAD_FORMAT, 'Invalid block size : ' . mb_strlen($v_binary_data));
2897
+            $this->_errorLog(ARCHIVE_ZIP_ERR_BAD_FORMAT, 'Invalid block size : '.mb_strlen($v_binary_data));
2898 2898
 
2899 2899
             // ----- Return
2900 2900
 
@@ -3037,7 +3037,7 @@  discard block
 block discarded – undo
3037 3037
 
3038 3038
             // ----- Error log
3039 3039
 
3040
-            $this->_errorLog(ARCHIVE_ZIP_ERR_BAD_FORMAT, 'Invalid block size : ' . mb_strlen($v_binary_data));
3040
+            $this->_errorLog(ARCHIVE_ZIP_ERR_BAD_FORMAT, 'Invalid block size : '.mb_strlen($v_binary_data));
3041 3041
 
3042 3042
             // ----- Return
3043 3043
 
@@ -3152,7 +3152,7 @@  discard block
 block discarded – undo
3152 3152
         @fseek($this->_zip_fd, $v_size);
3153 3153
 
3154 3154
         if (@ftell($this->_zip_fd) != $v_size) {
3155
-            $this->_errorLog(ARCHIVE_ZIP_ERR_BAD_FORMAT, 'Unable to go to the end of the archive \'' . $this->_zipname . '\'');
3155
+            $this->_errorLog(ARCHIVE_ZIP_ERR_BAD_FORMAT, 'Unable to go to the end of the archive \''.$this->_zipname.'\'');
3156 3156
 
3157 3157
             return self::errorCode();
3158 3158
         }
@@ -3169,7 +3169,7 @@  discard block
 block discarded – undo
3169 3169
             @fseek($this->_zip_fd, $v_size - 22);
3170 3170
 
3171 3171
             if (($v_pos = @ftell($this->_zip_fd)) != ($v_size - 22)) {
3172
-                $this->_errorLog(ARCHIVE_ZIP_ERR_BAD_FORMAT, 'Unable to seek back to the middle of the archive \'' . $this->_zipname . '\'');
3172
+                $this->_errorLog(ARCHIVE_ZIP_ERR_BAD_FORMAT, 'Unable to seek back to the middle of the archive \''.$this->_zipname.'\'');
3173 3173
 
3174 3174
                 return self::errorCode();
3175 3175
             }
@@ -3201,7 +3201,7 @@  discard block
 block discarded – undo
3201 3201
             @fseek($this->_zip_fd, $v_size - $v_maximum_size);
3202 3202
 
3203 3203
             if (@ftell($this->_zip_fd) != ($v_size - $v_maximum_size)) {
3204
-                $this->_errorLog(ARCHIVE_ZIP_ERR_BAD_FORMAT, 'Unable to seek back to the middle of the archive \'' . $this->_zipname . '\'');
3204
+                $this->_errorLog(ARCHIVE_ZIP_ERR_BAD_FORMAT, 'Unable to seek back to the middle of the archive \''.$this->_zipname.'\'');
3205 3205
 
3206 3206
                 return self::errorCode();
3207 3207
             }
@@ -3248,7 +3248,7 @@  discard block
 block discarded – undo
3248 3248
         // ----- Look for invalid block size
3249 3249
 
3250 3250
         if (18 != mb_strlen($v_binary_data)) {
3251
-            $this->_errorLog(ARCHIVE_ZIP_ERR_BAD_FORMAT, 'Invalid End of Central Dir Record size : ' . mb_strlen($v_binary_data));
3251
+            $this->_errorLog(ARCHIVE_ZIP_ERR_BAD_FORMAT, 'Invalid End of Central Dir Record size : '.mb_strlen($v_binary_data));
3252 3252
 
3253 3253
             return self::errorCode();
3254 3254
         }
@@ -3405,7 +3405,7 @@  discard block
 block discarded – undo
3405 3405
                             && (mb_substr($v_header_list[$v_nb_extracted]['stored_filename'], 0, mb_strlen($p_params[ARCHIVE_ZIP_PARAM_BY_NAME][$j])) == $p_params[ARCHIVE_ZIP_PARAM_BY_NAME][$j])) {
3406 3406
                             $v_found = true;
3407 3407
                         } elseif ((0x00000010 == ($v_header_list[$v_nb_extracted]['external'] & 0x00000010)) /* Indicates a folder */
3408
-                                  && ($v_header_list[$v_nb_extracted]['stored_filename'] . '/' == $p_params[ARCHIVE_ZIP_PARAM_BY_NAME][$j])) {
3408
+                                  && ($v_header_list[$v_nb_extracted]['stored_filename'].'/' == $p_params[ARCHIVE_ZIP_PARAM_BY_NAME][$j])) {
3409 3409
                             $v_found = true;
3410 3410
                         }
3411 3411
                     } // ----- Look for a filename
@@ -3465,7 +3465,7 @@  discard block
 block discarded – undo
3465 3465
         if ($v_nb_extracted > 0) {
3466 3466
             // ----- Creates a temporay file
3467 3467
 
3468
-            $v_zip_temp_name = ARCHIVE_ZIP_TEMPORARY_DIR . uniqid('archive_zip-') . '.tmp';
3468
+            $v_zip_temp_name = ARCHIVE_ZIP_TEMPORARY_DIR.uniqid('archive_zip-').'.tmp';
3469 3469
 
3470 3470
             // ----- Creates a temporary zip archive
3471 3471
 
@@ -3807,7 +3807,7 @@  discard block
 block discarded – undo
3807 3807
 
3808 3808
         // ----- Creates a temporay file
3809 3809
 
3810
-        $v_zip_temp_name = ARCHIVE_ZIP_TEMPORARY_DIR . uniqid('archive_zip-') . '.tmp';
3810
+        $v_zip_temp_name = ARCHIVE_ZIP_TEMPORARY_DIR.uniqid('archive_zip-').'.tmp';
3811 3811
 
3812 3812
         // ----- Open the temporary file in write mode
3813 3813
 
@@ -3816,7 +3816,7 @@  discard block
 block discarded – undo
3816 3816
 
3817 3817
             $p_archive_to_add->_closeFd();
3818 3818
 
3819
-            $this->_errorLog(ARCHIVE_ZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \'' . $v_zip_temp_name . '\' in binary write mode');
3819
+            $this->_errorLog(ARCHIVE_ZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_zip_temp_name.'\' in binary write mode');
3820 3820
 
3821 3821
             return self::errorCode();
3822 3822
         }
@@ -4015,7 +4015,7 @@  discard block
 block discarded – undo
4015 4015
         if (0 == ($v_zip_temp_fd = @fopen($p_archive_filename, 'rb'))) {
4016 4016
             $this->_closeFd();
4017 4017
 
4018
-            $this->_errorLog(ARCHIVE_ZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive file \'' . $p_archive_filename . '\' in binary write mode');
4018
+            $this->_errorLog(ARCHIVE_ZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive file \''.$p_archive_filename.'\' in binary write mode');
4019 4019
 
4020 4020
             return self::errorCode();
4021 4021
         }
@@ -4077,7 +4077,7 @@  discard block
 block discarded – undo
4077 4077
 
4078 4078
         for (reset($p_params); list($v_key, $v_value) = each($p_params);) {
4079 4079
             if (!isset($p_default[$v_key])) {
4080
-                $this->_errorLog(ARCHIVE_ZIP_ERR_INVALID_PARAMETER, 'Unsupported parameter with key \'' . $v_key . '\'');
4080
+                $this->_errorLog(ARCHIVE_ZIP_ERR_INVALID_PARAMETER, 'Unsupported parameter with key \''.$v_key.'\'');
4081 4081
 
4082 4082
                 return self::errorCode();
4083 4083
             }
@@ -4105,7 +4105,7 @@  discard block
 block discarded – undo
4105 4105
 
4106 4106
             if (isset($p_params[$v_key]) && ('' != $p_params[$v_key])) {
4107 4107
                 if (!function_exists($p_params[$v_key])) {
4108
-                    $this->_errorLog(ARCHIVE_ZIP_ERR_INVALID_PARAM_VALUE, "Callback '" . $p_params[$v_key] . "()' is not an existing function for " . "parameter '" . $v_key . "'");
4108
+                    $this->_errorLog(ARCHIVE_ZIP_ERR_INVALID_PARAM_VALUE, "Callback '".$p_params[$v_key]."()' is not an existing function for "."parameter '".$v_key."'");
4109 4109
 
4110 4110
                     return self::errorCode();
4111 4111
                 }
@@ -4217,7 +4217,7 @@  discard block
 block discarded – undo
4217 4217
                     // ----- Ignore only the double '//' in path,
4218 4218
                     // but not the first and last '/'
4219 4219
                 } else {
4220
-                    $v_result = $v_list[$i] . ($i != (count($v_list) - 1) ? '/' . $v_result : '');
4220
+                    $v_result = $v_list[$i].($i != (count($v_list) - 1) ? '/'.$v_result : '');
4221 4221
                 }
4222 4222
             }
4223 4223
         }
Please login to merge, or discard this patch.
xoops_trust_path/libs/altsys/include/lang_functions.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -15,7 +15,7 @@  discard block
 block discarded – undo
15 15
 
16 16
     $already_read = false;
17 17
 
18
-    $langfile_fingerprint = '_MYLANGADMIN_' . md5($langfile_unique_path);
18
+    $langfile_fingerprint = '_MYLANGADMIN_'.md5($langfile_unique_path);
19 19
 
20 20
     // for debug
21 21
 
@@ -41,7 +41,7 @@  discard block
 block discarded – undo
41 41
 
42 42
     // modinfo.php of D3 module
43 43
 
44
-    if (empty($langfile_names) && file_exists(XOOPS_ROOT_PATH . '/modules/' . $mydirname . '/mytrustdirname.php') /* && substr( $langfile_unique_path , -11 ) == 'modinfo.php' */) {
44
+    if (empty($langfile_names) && file_exists(XOOPS_ROOT_PATH.'/modules/'.$mydirname.'/mytrustdirname.php') /* && substr( $langfile_unique_path , -11 ) == 'modinfo.php' */) {
45 45
         // get $constpref
46 46
 
47 47
         $constpref = '';
@@ -122,13 +122,13 @@  discard block
 block discarded – undo
122 122
 
123 123
     $breadcrumbsObj = AltsysBreadcrumbs::getInstance();
124 124
 
125
-    $breadcrumbsObj->appendPath(XOOPS_URL . '/modules/altsys/admin/index.php?mode=admin&amp;lib=altsys&amp;page=mylangadmin', _MI_ALTSYS_MENU_MYLANGADMIN);
125
+    $breadcrumbsObj->appendPath(XOOPS_URL.'/modules/altsys/admin/index.php?mode=admin&amp;lib=altsys&amp;page=mylangadmin', _MI_ALTSYS_MENU_MYLANGADMIN);
126 126
 
127 127
     $breadcrumbsObj->appendPath('', $target_mname);
128 128
 
129
-    echo '<h3>' . _MYLANGADMIN_H3_MODULE . ' : ' . $target_mname . '</h3>';
129
+    echo '<h3>'._MYLANGADMIN_H3_MODULE.' : '.$target_mname.'</h3>';
130 130
 
131
-    echo '<p>' . $message4disp . '</p>';
131
+    echo '<p>'.$message4disp.'</p>';
132 132
 
133 133
     xoops_cp_footer();
134 134
 
Please login to merge, or discard this patch.
xoops_trust_path/libs/altsys/language/german/blocks_each.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -3,10 +3,10 @@
 block discarded – undo
3 3
 if (defined('FOR_XOOPS_LANG_CHECKER')) {
4 4
     $mydirname = 'd3forum';
5 5
 }
6
-$constpref = '_MB_' . mb_strtoupper($mydirname);
6
+$constpref = '_MB_'.mb_strtoupper($mydirname);
7 7
 
8
-if (defined('FOR_XOOPS_LANG_CHECKER') || !defined($constpref . '_LOADED')) {
9
-    define($constpref . '_LOADED', 1);
8
+if (defined('FOR_XOOPS_LANG_CHECKER') || !defined($constpref.'_LOADED')) {
9
+    define($constpref.'_LOADED', 1);
10 10
 
11 11
     // definitions for displaying blocks
12 12
     // Since altsys is a singleton moudle, this file has non-sense.
Please login to merge, or discard this patch.