@@ -281,17 +281,17 @@ |
||
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 |
@@ -131,21 +131,21 @@ |
||
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 |
@@ -156,5 +156,4 @@ |
||
156 | 156 | <br /> |
157 | 157 | \n" ; |
158 | 158 | |
159 | - return $form; |
|
160 | -} |
|
159 | + return $form |
|
161 | 160 | \ No newline at end of file |
@@ -156,5 +156,4 @@ |
||
156 | 156 | <br /> |
157 | 157 | \n" ; |
158 | 158 | |
159 | - return $form; |
|
160 | -} |
|
159 | + return $form |
|
161 | 160 | \ No newline at end of file |
@@ -1085,8 +1085,4 @@ |
||
1085 | 1085 | // the first form (blocks) |
1086 | 1086 | $this->list_blocks() ; |
1087 | 1087 | // the second form (groups) |
1088 | - $this->list_groups() ; |
|
1089 | - break ; |
|
1090 | - } |
|
1091 | - } |
|
1092 | -} |
|
1088 | + $this->list_groups |
|
1093 | 1089 | \ No newline at end of file |
@@ -308,30 +308,30 @@ discard block |
||
308 | 308 | $scoln = 'disabled'; |
309 | 309 | } else { |
310 | 310 | switch ($side) { |
311 | - case XOOPS_SIDEBLOCK_LEFT : |
|
312 | - $ssel0 = " checked='checked'"; |
|
313 | - $scol0 = 'selected'; |
|
314 | - break ; |
|
315 | - case XOOPS_SIDEBLOCK_RIGHT : |
|
316 | - $ssel1 = " checked='checked'"; |
|
317 | - $scol1 = 'selected'; |
|
318 | - break ; |
|
319 | - case XOOPS_CENTERBLOCK_LEFT : |
|
320 | - $ssel2 = " checked='checked'"; |
|
321 | - $scol2 = 'selected'; |
|
322 | - break ; |
|
323 | - case XOOPS_CENTERBLOCK_RIGHT : |
|
324 | - $ssel4 = " checked='checked'"; |
|
325 | - $scol4 = 'selected'; |
|
326 | - break ; |
|
327 | - case XOOPS_CENTERBLOCK_CENTER : |
|
328 | - $ssel3 = " checked='checked'"; |
|
329 | - $scol3 = 'selected'; |
|
330 | - break ; |
|
331 | - default : |
|
332 | - $value4extra_side = $side ; |
|
333 | - $stextbox = 'selected'; |
|
334 | - break ; |
|
311 | + case XOOPS_SIDEBLOCK_LEFT : |
|
312 | + $ssel0 = " checked='checked'"; |
|
313 | + $scol0 = 'selected'; |
|
314 | + break ; |
|
315 | + case XOOPS_SIDEBLOCK_RIGHT : |
|
316 | + $ssel1 = " checked='checked'"; |
|
317 | + $scol1 = 'selected'; |
|
318 | + break ; |
|
319 | + case XOOPS_CENTERBLOCK_LEFT : |
|
320 | + $ssel2 = " checked='checked'"; |
|
321 | + $scol2 = 'selected'; |
|
322 | + break ; |
|
323 | + case XOOPS_CENTERBLOCK_RIGHT : |
|
324 | + $ssel4 = " checked='checked'"; |
|
325 | + $scol4 = 'selected'; |
|
326 | + break ; |
|
327 | + case XOOPS_CENTERBLOCK_CENTER : |
|
328 | + $ssel3 = " checked='checked'"; |
|
329 | + $scol3 = 'selected'; |
|
330 | + break ; |
|
331 | + default : |
|
332 | + $value4extra_side = $side ; |
|
333 | + $stextbox = 'selected'; |
|
334 | + break ; |
|
335 | 335 | } |
336 | 336 | } |
337 | 337 | |
@@ -1085,8 +1085,4 @@ discard block |
||
1085 | 1085 | // the first form (blocks) |
1086 | 1086 | $this->list_blocks() ; |
1087 | 1087 | // the second form (groups) |
1088 | - $this->list_groups() ; |
|
1089 | - break ; |
|
1090 | - } |
|
1091 | - } |
|
1092 | -} |
|
1088 | + $this->list_groups |
|
1093 | 1089 | \ No newline at end of file |
@@ -160,7 +160,4 @@ |
||
160 | 160 | $module_id = (int)(@$regs[0]); |
161 | 161 | $page_id = (int)(@$regs[1]); |
162 | 162 | $sql = "INSERT INTO `$table` (`block_id`,`module_id`,`page_id`) VALUES ($bid,$module_id,$page_id)" ; |
163 | - $this->db->query($sql) ; |
|
164 | - } |
|
165 | -} |
|
166 | -} |
|
163 | + $this->db->query($sql |
|
167 | 164 | \ No newline at end of file |
@@ -160,7 +160,4 @@ |
||
160 | 160 | $module_id = (int)(@$regs[0]); |
161 | 161 | $page_id = (int)(@$regs[1]); |
162 | 162 | $sql = "INSERT INTO `$table` (`block_id`,`module_id`,`page_id`) VALUES ($bid,$module_id,$page_id)" ; |
163 | - $this->db->query($sql) ; |
|
164 | - } |
|
165 | -} |
|
166 | -} |
|
163 | + $this->db->query($sql |
|
167 | 164 | \ No newline at end of file |
@@ -268,4 +268,4 @@ |
||
268 | 268 | $xoopsTpl->assign('xoops_showcblock', 0); |
269 | 269 | } |
270 | 270 | |
271 | - $xoopsTpl->xoops_setCaching(0); |
|
271 | + $xoopsTpl->xoops_setCaching |
|
272 | 272 | \ No newline at end of file |
@@ -268,4 +268,4 @@ |
||
268 | 268 | $xoopsTpl->assign('xoops_showcblock', 0); |
269 | 269 | } |
270 | 270 | |
271 | - $xoopsTpl->xoops_setCaching(0); |
|
271 | + $xoopsTpl->xoops_setCaching |
|
272 | 272 | \ No newline at end of file |
@@ -49,9 +49,4 @@ |
||
49 | 49 | >>>>>>> feature/intval |
50 | 50 | if ($count <= 0) { |
51 | 51 | include_once XOOPS_TRUST_PATH.'/libs/altsys/include/tpls_functions.php' ; |
52 | - tplsadmin_import_data($xoopsConfig['template_set'], $file, implode('', file($file_path)), $mtime) ; |
|
53 | - } |
|
54 | - } |
|
55 | - } |
|
56 | - } |
|
57 | -} |
|
52 | + tplsadmin_import_data($xoopsConfig['template_set'], $file, implode('', file($file_path)), $mtime |
|
58 | 53 | \ No newline at end of file |
@@ -49,9 +49,4 @@ |
||
49 | 49 | >>>>>>> feature/intval |
50 | 50 | if ($count <= 0) { |
51 | 51 | include_once XOOPS_TRUST_PATH.'/libs/altsys/include/tpls_functions.php' ; |
52 | - tplsadmin_import_data($xoopsConfig['template_set'], $file, implode('', file($file_path)), $mtime) ; |
|
53 | - } |
|
54 | - } |
|
55 | - } |
|
56 | - } |
|
57 | -} |
|
52 | + tplsadmin_import_data($xoopsConfig['template_set'], $file, implode('', file($file_path)), $mtime |
|
58 | 53 | \ No newline at end of file |
@@ -20,8 +20,4 @@ |
||
20 | 20 | >>>>>>> feature/intval |
21 | 21 | if ($count <= 0) { |
22 | 22 | include_once XOOPS_TRUST_PATH.'/libs/altsys/include/tpls_functions.php' ; |
23 | - tplsadmin_import_data($xoopsConfig['template_set'], $file, implode('', file($file_path)), $mtime) ; |
|
24 | - } |
|
25 | - } |
|
26 | - } |
|
27 | -} |
|
23 | + tplsadmin_import_data($xoopsConfig['template_set'], $file, implode('', file($file_path)), $mtime |
|
28 | 24 | \ No newline at end of file |
@@ -20,8 +20,4 @@ |
||
20 | 20 | >>>>>>> feature/intval |
21 | 21 | if ($count <= 0) { |
22 | 22 | include_once XOOPS_TRUST_PATH.'/libs/altsys/include/tpls_functions.php' ; |
23 | - tplsadmin_import_data($xoopsConfig['template_set'], $file, implode('', file($file_path)), $mtime) ; |
|
24 | - } |
|
25 | - } |
|
26 | - } |
|
27 | -} |
|
23 | + tplsadmin_import_data($xoopsConfig['template_set'], $file, implode('', file($file_path)), $mtime |
|
28 | 24 | \ No newline at end of file |
@@ -398,14 +398,4 @@ |
||
398 | 398 | <select name='copy_to[{$tplset4disp}]'> |
399 | 399 | ".str_replace('<option value=\''.$tplset4disp.'\'>'.$tplset4disp.'</option>', '', $tplset_options)." |
400 | 400 | </select> |
401 | - <input name='copy_do[{$tplset4disp}]' type='submit' value='"._MYTPLSADMIN_BTN_COPY."' onclick='return altsys_mytpladmin_check_copy_submit(\""._MYTPLSADMIN_CNF_COPY_SELECTED_TEMPLATES."\", \"{$tplset4disp}_\", true);' /> |
|
402 | - </td>\n" ; |
|
403 | - } |
|
404 | - |
|
405 | -echo " </tr>\n" ; |
|
406 | - |
|
407 | - |
|
408 | -echo '</table></form>'; |
|
409 | -// end of table & form |
|
410 | - |
|
411 | -xoops_cp_footer() ; |
|
401 | + <input name='copy_do[{$tplset4disp}]' type='submit' value='"._MYTPLSADMIN_BTN_COPY."' onclick='return altsys_mytpladmin_check_copy_submit(\""._MYTPLSADMIN_CNF_COPY_SELECTED_TEMPLATES."\", \"{$tplset4disp} |
|
412 | 402 | \ No newline at end of file |
@@ -398,14 +398,4 @@ |
||
398 | 398 | <select name='copy_to[{$tplset4disp}]'> |
399 | 399 | ".str_replace('<option value=\''.$tplset4disp.'\'>'.$tplset4disp.'</option>', '', $tplset_options)." |
400 | 400 | </select> |
401 | - <input name='copy_do[{$tplset4disp}]' type='submit' value='"._MYTPLSADMIN_BTN_COPY."' onclick='return altsys_mytpladmin_check_copy_submit(\""._MYTPLSADMIN_CNF_COPY_SELECTED_TEMPLATES."\", \"{$tplset4disp}_\", true);' /> |
|
402 | - </td>\n" ; |
|
403 | - } |
|
404 | - |
|
405 | -echo " </tr>\n" ; |
|
406 | - |
|
407 | - |
|
408 | -echo '</table></form>'; |
|
409 | -// end of table & form |
|
410 | - |
|
411 | -xoops_cp_footer() ; |
|
401 | + <input name='copy_do[{$tplset4disp}]' type='submit' value='"._MYTPLSADMIN_BTN_COPY."' onclick='return altsys_mytpladmin_check_copy_submit(\""._MYTPLSADMIN_CNF_COPY_SELECTED_TEMPLATES."\", \"{$tplset4disp} |
|
412 | 402 | \ No newline at end of file |