Completed
Push — master ( 3a6ebc...3a5a05 )
by Michael
04:13
created
xoops_trust_path/libs/altsys/include/admin_in_theme_header.inc.php 2 patches
Switch Indentation   +35 added lines, -35 removed lines patch added patch discarded remove patch
@@ -201,41 +201,41 @@
 block discarded – undo
201 201
             }
202 202
         }
203 203
         switch ($block_arr[$i]->getVar('side')) {
204
-        case XOOPS_SIDEBLOCK_LEFT:
205
-            if (!isset($show_lblock)) {
206
-                $xoopsTpl->assign('xoops_showlblock', 1);
207
-                $show_lblock = 1;
208
-            }
209
-            $xoopsTpl->append('xoops_lblocks', array('title' => $block_arr[$i]->getVar('title'), 'content' => $bcontent, 'weight' => $block_arr[$i]->getVar('weight')));
210
-            break;
211
-        case XOOPS_CENTERBLOCK_LEFT:
212
-            if (!isset($show_cblock)) {
213
-                $xoopsTpl->assign('xoops_showcblock', 1);
214
-                $show_cblock = 1;
215
-            }
216
-            $xoopsTpl->append('xoops_clblocks', array('title' => $block_arr[$i]->getVar('title'), 'content' => $bcontent, 'weight' => $block_arr[$i]->getVar('weight')));
217
-            break;
218
-        case XOOPS_CENTERBLOCK_RIGHT:
219
-            if (!isset($show_cblock)) {
220
-                $xoopsTpl->assign('xoops_showcblock', 1);
221
-                $show_cblock = 1;
222
-            }
223
-            $xoopsTpl->append('xoops_crblocks', array('title' => $block_arr[$i]->getVar('title'), 'content' => $bcontent, 'weight' => $block_arr[$i]->getVar('weight')));
224
-            break;
225
-        case XOOPS_CENTERBLOCK_CENTER:
226
-            if (!isset($show_cblock)) {
227
-                $xoopsTpl->assign('xoops_showcblock', 1);
228
-                $show_cblock = 1;
229
-            }
230
-            $xoopsTpl->append('xoops_ccblocks', array('title' => $block_arr[$i]->getVar('title'), 'content' => $bcontent, 'weight' => $block_arr[$i]->getVar('weight')));
231
-            break;
232
-        case XOOPS_SIDEBLOCK_RIGHT:
233
-            if (!isset($show_rblock)) {
234
-                $xoopsTpl->assign('xoops_showrblock', 1);
235
-                $show_rblock = 1;
236
-            }
237
-            $xoopsTpl->append('xoops_rblocks', array('title' => $block_arr[$i]->getVar('title'), 'content' => $bcontent, 'weight' => $block_arr[$i]->getVar('weight')));
238
-            break;
204
+            case XOOPS_SIDEBLOCK_LEFT:
205
+                if (!isset($show_lblock)) {
206
+                    $xoopsTpl->assign('xoops_showlblock', 1);
207
+                    $show_lblock = 1;
208
+                }
209
+                $xoopsTpl->append('xoops_lblocks', array('title' => $block_arr[$i]->getVar('title'), 'content' => $bcontent, 'weight' => $block_arr[$i]->getVar('weight')));
210
+                break;
211
+            case XOOPS_CENTERBLOCK_LEFT:
212
+                if (!isset($show_cblock)) {
213
+                    $xoopsTpl->assign('xoops_showcblock', 1);
214
+                    $show_cblock = 1;
215
+                }
216
+                $xoopsTpl->append('xoops_clblocks', array('title' => $block_arr[$i]->getVar('title'), 'content' => $bcontent, 'weight' => $block_arr[$i]->getVar('weight')));
217
+                break;
218
+            case XOOPS_CENTERBLOCK_RIGHT:
219
+                if (!isset($show_cblock)) {
220
+                    $xoopsTpl->assign('xoops_showcblock', 1);
221
+                    $show_cblock = 1;
222
+                }
223
+                $xoopsTpl->append('xoops_crblocks', array('title' => $block_arr[$i]->getVar('title'), 'content' => $bcontent, 'weight' => $block_arr[$i]->getVar('weight')));
224
+                break;
225
+            case XOOPS_CENTERBLOCK_CENTER:
226
+                if (!isset($show_cblock)) {
227
+                    $xoopsTpl->assign('xoops_showcblock', 1);
228
+                    $show_cblock = 1;
229
+                }
230
+                $xoopsTpl->append('xoops_ccblocks', array('title' => $block_arr[$i]->getVar('title'), 'content' => $bcontent, 'weight' => $block_arr[$i]->getVar('weight')));
231
+                break;
232
+            case XOOPS_SIDEBLOCK_RIGHT:
233
+                if (!isset($show_rblock)) {
234
+                    $xoopsTpl->assign('xoops_showrblock', 1);
235
+                    $show_rblock = 1;
236
+                }
237
+                $xoopsTpl->append('xoops_rblocks', array('title' => $block_arr[$i]->getVar('title'), 'content' => $bcontent, 'weight' => $block_arr[$i]->getVar('weight')));
238
+                break;
239 239
         }
240 240
         unset($bcontent);
241 241
     }
Please login to merge, or discard this patch.
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -142,7 +142,7 @@
 block discarded – undo
142 142
     $block_arr = array() ;
143 143
     if (!empty($blockids)) {
144 144
         $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
145
-               . ' AND b.bid IN (' . implode(',', $blockids) . ') ORDER BY b.weight,b.bid' ;
145
+                . ' AND b.bid IN (' . implode(',', $blockids) . ') ORDER BY b.weight,b.bid' ;
146 146
         $result = $db->query($sql);
147 147
         while ($myrow = $db->fetchArray($result)) {
148 148
 
Please login to merge, or discard this patch.
xoops_trust_path/libs/altsys/include/Text_Diff.php 1 patch
Switch Indentation   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -281,17 +281,17 @@
 block discarded – undo
281 281
         $edits = array();
282 282
         foreach ($diff as $line) {
283 283
             switch ($line[0]) {
284
-            case ' ':
285
-                $edits[] = new Text_Diff_Op_copy(array(substr($line, 1)));
286
-                break;
284
+                case ' ':
285
+                    $edits[] = new Text_Diff_Op_copy(array(substr($line, 1)));
286
+                    break;
287 287
 
288
-            case '+':
289
-                $edits[] = new Text_Diff_Op_add(array(substr($line, 1)));
290
-                break;
288
+                case '+':
289
+                    $edits[] = new Text_Diff_Op_add(array(substr($line, 1)));
290
+                    break;
291 291
 
292
-            case '-':
293
-                $edits[] = new Text_Diff_Op_delete(array(substr($line, 1)));
294
-                break;
292
+                case '-':
293
+                    $edits[] = new Text_Diff_Op_delete(array(substr($line, 1)));
294
+                    break;
295 295
             }
296 296
         }
297 297
 
Please login to merge, or discard this patch.
xoops_trust_path/libs/altsys/include/Text_Diff_Renderer_inline.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -118,11 +118,11 @@
 block discarded – undo
118 118
          * preserve whitespace as well. Therefore we split on words,
119 119
          * but include all blocks of whitespace in the wordlist. */
120 120
         $diff = new Text_Diff($this->_splitOnWords($text1, $nl),
121
-                               $this->_splitOnWords($text2, $nl));
121
+                                $this->_splitOnWords($text2, $nl));
122 122
 
123 123
         /* Get the diff in inline format. */
124 124
         $renderer = new Text_Diff_Renderer_inline(array_merge($this->getParams(),
125
-                                                               array('split_level' => 'words')));
125
+                                                                array('split_level' => 'words')));
126 126
 
127 127
         /* Run the diff and get the output. */
128 128
         return str_replace($nl, "\n", $renderer->render($diff)) . "\n";
Please login to merge, or discard this patch.
xoops_trust_path/libs/altsys/include/Text_Diff_Renderer.php 2 patches
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -89,8 +89,8 @@  discard block
 block discarded – undo
89 89
                             $block[] = new Text_Diff_Op_copy($context);
90 90
                         }
91 91
                         $output .= $this->_block($x0, $ntrail + $xi - $x0,
92
-                                                 $y0, $ntrail + $yi - $y0,
93
-                                                 $block);
92
+                                                    $y0, $ntrail + $yi - $y0,
93
+                                                    $block);
94 94
                         $block = false;
95 95
                     }
96 96
                 }
@@ -118,8 +118,8 @@  discard block
 block discarded – undo
118 118
 
119 119
         if (is_array($block)) {
120 120
             $output .= $this->_block($x0, $xi - $x0,
121
-                                     $y0, $yi - $y0,
122
-                                     $block);
121
+                                        $y0, $yi - $y0,
122
+                                        $block);
123 123
         }
124 124
 
125 125
         return $output . $this->_endDiff();
Please login to merge, or discard this patch.
Switch Indentation   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -131,21 +131,21 @@
 block discarded – undo
131 131
 
132 132
         foreach ($edits as $edit) {
133 133
             switch (strtolower(get_class($edit))) {
134
-            case 'text_diff_op_copy':
135
-                $output .= $this->_context($edit->orig);
136
-                break;
134
+                case 'text_diff_op_copy':
135
+                    $output .= $this->_context($edit->orig);
136
+                    break;
137 137
 
138
-            case 'text_diff_op_add':
139
-                $output .= $this->_added($edit->final);
140
-                break;
138
+                case 'text_diff_op_add':
139
+                    $output .= $this->_added($edit->final);
140
+                    break;
141 141
 
142
-            case 'text_diff_op_delete':
143
-                $output .= $this->_deleted($edit->orig);
144
-                break;
142
+                case 'text_diff_op_delete':
143
+                    $output .= $this->_deleted($edit->orig);
144
+                    break;
145 145
 
146
-            case 'text_diff_op_change':
147
-                $output .= $this->_changed($edit->orig, $edit->final);
148
-                break;
146
+                case 'text_diff_op_change':
147
+                    $output .= $this->_changed($edit->orig, $edit->final);
148
+                    break;
149 149
             }
150 150
         }
151 151
 
Please login to merge, or discard this patch.
xoops_trust_path/libs/altsys/class/MyBlocksAdminForX25.class.php 1 patch
Switch Indentation   +61 added lines, -61 removed lines patch added patch discarded remove patch
@@ -47,42 +47,42 @@  discard block
 block discarded – undo
47 47
         $scoln = 'disabled';
48 48
     } else {
49 49
         switch ($side) {
50
-        case XOOPS_SIDEBLOCK_LEFT :
51
-            $ssel0 = " checked='checked'";
52
-            $scol0 = 'selected';
53
-            break ;
54
-        case XOOPS_SIDEBLOCK_RIGHT :
55
-            $ssel1 = " checked='checked'";
56
-            $scol1 = 'selected';
57
-            break ;
58
-        case XOOPS_CENTERBLOCK_LEFT :
59
-            $ssel3 = " checked='checked'";
60
-            $scol3 = 'selected';
61
-            break ;
62
-        case XOOPS_CENTERBLOCK_RIGHT :
63
-            $ssel4 = " checked='checked'";
64
-            $scol4 = 'selected';
65
-            break ;
66
-        case XOOPS_CENTERBLOCK_CENTER :
67
-            $ssel5 = " checked='checked'";
68
-            $scol5 = 'selected';
69
-            break ;
70
-        case XOOPS_CENTERBLOCK_BOTTOMLEFT :
71
-            $ssel7 = " checked='checked'";
72
-            $scol7 = 'selected';
73
-            break ;
74
-        case XOOPS_CENTERBLOCK_BOTTOMRIGHT :
75
-            $ssel8 = " checked='checked'";
76
-            $scol8 = 'selected';
77
-            break ;
78
-        case XOOPS_CENTERBLOCK_BOTTOM :
79
-            $ssel9 = " checked='checked'";
80
-            $scol9 = 'selected';
81
-            break ;
82
-        default :
83
-            $value4extra_side = $side ;
84
-            $stextbox = 'selected';
85
-            break ;
50
+            case XOOPS_SIDEBLOCK_LEFT :
51
+                $ssel0 = " checked='checked'";
52
+                $scol0 = 'selected';
53
+                break ;
54
+            case XOOPS_SIDEBLOCK_RIGHT :
55
+                $ssel1 = " checked='checked'";
56
+                $scol1 = 'selected';
57
+                break ;
58
+            case XOOPS_CENTERBLOCK_LEFT :
59
+                $ssel3 = " checked='checked'";
60
+                $scol3 = 'selected';
61
+                break ;
62
+            case XOOPS_CENTERBLOCK_RIGHT :
63
+                $ssel4 = " checked='checked'";
64
+                $scol4 = 'selected';
65
+                break ;
66
+            case XOOPS_CENTERBLOCK_CENTER :
67
+                $ssel5 = " checked='checked'";
68
+                $scol5 = 'selected';
69
+                break ;
70
+            case XOOPS_CENTERBLOCK_BOTTOMLEFT :
71
+                $ssel7 = " checked='checked'";
72
+                $scol7 = 'selected';
73
+                break ;
74
+            case XOOPS_CENTERBLOCK_BOTTOMRIGHT :
75
+                $ssel8 = " checked='checked'";
76
+                $scol8 = 'selected';
77
+                break ;
78
+            case XOOPS_CENTERBLOCK_BOTTOM :
79
+                $ssel9 = " checked='checked'";
80
+                $scol9 = 'selected';
81
+                break ;
82
+            default :
83
+                $value4extra_side = $side ;
84
+                $stextbox = 'selected';
85
+                break ;
86 86
     }
87 87
     }
88 88
 
@@ -166,31 +166,31 @@  discard block
 block discarded – undo
166 166
         }
167 167
 
168 168
         switch ($mode) {
169
-        case 'clone' :
170
-            $form_title = _MD_A_MYBLOCKSADMIN_CLONEFORM ;
171
-            $button_value = _MD_A_MYBLOCKSADMIN_BTN_CLONE ;
172
-            $next_op = 'clone_ok' ;
173
-            // breadcrumbs
174
-            $breadcrumbsObj =& AltsysBreadcrumbs::getInstance() ;
175
-            $breadcrumbsObj->appendPath('', _MD_A_MYBLOCKSADMIN_CLONEFORM) ;
176
-            break ;
177
-        case 'new' :
178
-            $form_title = _MD_A_MYBLOCKSADMIN_NEWFORM ;
179
-            $button_value = _MD_A_MYBLOCKSADMIN_BTN_NEW ;
180
-            $next_op = 'new_ok' ;
181
-            // breadcrumbs
182
-            $breadcrumbsObj =& AltsysBreadcrumbs::getInstance() ;
183
-            $breadcrumbsObj->appendPath('', _MD_A_MYBLOCKSADMIN_NEWFORM) ;
184
-            break ;
185
-        case 'edit' :
186
-        default :
187
-            $form_title = _MD_A_MYBLOCKSADMIN_EDITFORM ;
188
-            $button_value = _MD_A_MYBLOCKSADMIN_BTN_EDIT ;
189
-            $next_op = 'edit_ok' ;
190
-            // breadcrumbs
191
-            $breadcrumbsObj =& AltsysBreadcrumbs::getInstance() ;
192
-            $breadcrumbsObj->appendPath('', _MD_A_MYBLOCKSADMIN_EDITFORM) ;
193
-            break ;
169
+            case 'clone' :
170
+                $form_title = _MD_A_MYBLOCKSADMIN_CLONEFORM ;
171
+                $button_value = _MD_A_MYBLOCKSADMIN_BTN_CLONE ;
172
+                $next_op = 'clone_ok' ;
173
+                // breadcrumbs
174
+                $breadcrumbsObj =& AltsysBreadcrumbs::getInstance() ;
175
+                $breadcrumbsObj->appendPath('', _MD_A_MYBLOCKSADMIN_CLONEFORM) ;
176
+                break ;
177
+            case 'new' :
178
+                $form_title = _MD_A_MYBLOCKSADMIN_NEWFORM ;
179
+                $button_value = _MD_A_MYBLOCKSADMIN_BTN_NEW ;
180
+                $next_op = 'new_ok' ;
181
+                // breadcrumbs
182
+                $breadcrumbsObj =& AltsysBreadcrumbs::getInstance() ;
183
+                $breadcrumbsObj->appendPath('', _MD_A_MYBLOCKSADMIN_NEWFORM) ;
184
+                break ;
185
+            case 'edit' :
186
+            default :
187
+                $form_title = _MD_A_MYBLOCKSADMIN_EDITFORM ;
188
+                $button_value = _MD_A_MYBLOCKSADMIN_BTN_EDIT ;
189
+                $next_op = 'edit_ok' ;
190
+                // breadcrumbs
191
+                $breadcrumbsObj =& AltsysBreadcrumbs::getInstance() ;
192
+                $breadcrumbsObj->appendPath('', _MD_A_MYBLOCKSADMIN_EDITFORM) ;
193
+                break ;
194 194
     }
195 195
 
196 196
         $is_custom = in_array($block->getVar('block_type'), array( 'C', 'E' )) ? true : false ;
Please login to merge, or discard this patch.
xoops_trust_path/libs/altsys/mylangadmin.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -302,7 +302,7 @@
 block discarded – undo
302 302
     'use_my_language' => strlen($langman->my_language) > 0,
303 303
     'mylang_file_name' => htmlspecialchars($mylang_unique_path, ENT_QUOTES),
304 304
     'cache_file_name' => htmlspecialchars($cache_file_name, ENT_QUOTES),
305
-     'cache_file_mtime' => (int)$cache_file_mtime,
305
+        'cache_file_mtime' => (int)$cache_file_mtime,
306 306
     'timezone_offset' => xoops_getUserTimestamp(0),
307 307
     'notice' => $notice4disp,
308 308
     'already_read' => $already_read,
Please login to merge, or discard this patch.
xoops_trust_path/libs/altsys/include/tpls_functions.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -60,7 +60,7 @@
 block discarded – undo
60 60
 
61 61
     // get tplfile and tplsource
62 62
     $result = $db->query("SELECT tpl_refid,tpl_module,'".addslashes($tplset_to)."',tpl_file,tpl_desc,tpl_lastmodified,tpl_lastimported,tpl_type,tpl_source FROM ".$db->prefix('tplfile') . ' NATURAL LEFT JOIN '
63
-                         . $db->prefix('tplsource') . " WHERE tpl_tplset='" . addslashes($tplset_from) . "' AND ($whr_append)") ;
63
+                            . $db->prefix('tplsource') . " WHERE tpl_tplset='" . addslashes($tplset_from) . "' AND ($whr_append)") ;
64 64
 
65 65
     while ($row = $db->fetchArray($result)) {
66 66
         $tpl_source = array_pop($row) ;
Please login to merge, or discard this patch.
xoops_trust_path/libs/altsys/include/mygrouppermform.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -359,7 +359,7 @@  discard block
 block discarded – undo
359 359
     public function _renderOptionTree(&$tree, $option, $prefix, $parentIds = array())
360 360
     {
361 361
         $tree .= $prefix."<input type=\"checkbox\" name=\"".$this->getName() . '[groups][' . $this->_groupId . '][' . $option['id'] . "]\" id=\"" . $this->getName() . '[groups][' . $this->_groupId . ']['
362
-                 . $option['id'] . "]\" onclick=\"";
362
+                    . $option['id'] . "]\" onclick=\"";
363 363
         // If there are parent elements, add javascript that will
364 364
         // make them selecteded when this element is checked to make
365 365
         // sure permissions to parent items are added as well.
@@ -380,7 +380,7 @@  discard block
 block discarded – undo
380 380
             $tree .= ' checked="checked"';
381 381
         }
382 382
         $tree .= ' />' . $option['name'] . "<input type=\"hidden\" name=\"" . $this->getName() . '[parents][' . $option['id'] . "]\" value=\"" . implode(':', $parentIds) . "\" /><input type=\"hidden\" name=\"" . $this->getName() . '[itemname]['
383
-                 . $option['id'] . "]\" value=\"" . htmlspecialchars($option['name']) . "\" /><br />\n";
383
+                    . $option['id'] . "]\" value=\"" . htmlspecialchars($option['name']) . "\" /><br />\n";
384 384
         if (isset($option['children'])) {
385 385
             foreach ($option['children'] as $child) {
386 386
                 array_push($parentIds, $option['id']);
Please login to merge, or discard this patch.
xoops_trust_path/libs/altsys/language/pt_utf8/modinfo.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -13,7 +13,7 @@
 block discarded – undo
13 13
 define('_MI_ALTSYS_BNAME_ADMIN_MENU', 'Menu administrativo');
14 14
 define('_MI_ALTSYS_ENABLEFORCECLONE', 'Tornar todos os blocos clonáveis');
15 15
 define('_MI_ALTSYS_ENABLEFORCECLONEDSC',
16
-       'Esta opção permite que todos os blocos possam ser clonados. Antes de habilitar esta função, tenha em mente que alguns blocos causarão erros se forem mostrados mais de uma vez na mesma página.');
16
+        'Esta opção permite que todos os blocos possam ser clonados. Antes de habilitar esta função, tenha em mente que alguns blocos causarão erros se forem mostrados mais de uma vez na mesma página.');
17 17
 define('_MI_ALTSYS_IMAGES_DIR', 'Diretório para os arquivos de imagem');
18 18
 define('_MI_ALTSYS_IMAGES_DIRDSC', 'O caminho relativo deve ser configurado no diretório do módulo. O padrão é <q>images</q>.');
19 19
 define('_MI_ALTSYS_MENU_ADVANCEDLANGADMIN', 'Idiomas (avançado)');
Please login to merge, or discard this patch.