@@ -118,11 +118,11 @@ |
||
| 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"; |
@@ -89,8 +89,8 @@ discard block |
||
| 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 |
||
| 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(); |
@@ -255,15 +255,4 @@ |
||
| 255 | 255 | // create form |
| 256 | 256 | echo " |
| 257 | 257 | <label for='tpl_file'>"._MD_A_MYTPLSFORM_LABEL_TPLFILE."</label> |
| 258 | - <input type='text' name='tpl_file' id='tpl_file' value='".htmlspecialchars($tpl['tpl_file'], ENT_QUOTES)."' size='64' /><br /> |
|
| 259 | - <input type='submit' name='do_create' id='do_create' value='"._MD_A_MYTPLSFORM_BTN_CREATE."' />\n" ; |
|
| 260 | -} else { |
|
| 261 | - // modify form |
|
| 262 | - echo " |
|
| 263 | - <input type='submit' name='do_modifycont' id='do_modifycont' value='"._MD_A_MYTPLSFORM_BTN_MODIFYCONT."' /> |
|
| 264 | - <input type='submit' name='do_modify' id='do_modify' value='"._MD_A_MYTPLSFORM_BTN_MODIFYEND."' /> |
|
| 265 | - <input type='reset' name='reset' value='"._MD_A_MYTPLSFORM_BTN_RESET."' /> |
|
| 266 | -</form>\n" ; |
|
| 267 | -} |
|
| 268 | - |
|
| 269 | -xoops_cp_footer() ; |
|
| 258 | + <input type='text' name='tpl_file' id='tpl_file' value='".htmlspecialchars($tpl[ |
|
| 270 | 259 | \ No newline at end of file |
@@ -255,15 +255,4 @@ |
||
| 255 | 255 | // create form |
| 256 | 256 | echo " |
| 257 | 257 | <label for='tpl_file'>"._MD_A_MYTPLSFORM_LABEL_TPLFILE."</label> |
| 258 | - <input type='text' name='tpl_file' id='tpl_file' value='".htmlspecialchars($tpl['tpl_file'], ENT_QUOTES)."' size='64' /><br /> |
|
| 259 | - <input type='submit' name='do_create' id='do_create' value='"._MD_A_MYTPLSFORM_BTN_CREATE."' />\n" ; |
|
| 260 | -} else { |
|
| 261 | - // modify form |
|
| 262 | - echo " |
|
| 263 | - <input type='submit' name='do_modifycont' id='do_modifycont' value='"._MD_A_MYTPLSFORM_BTN_MODIFYCONT."' /> |
|
| 264 | - <input type='submit' name='do_modify' id='do_modify' value='"._MD_A_MYTPLSFORM_BTN_MODIFYEND."' /> |
|
| 265 | - <input type='reset' name='reset' value='"._MD_A_MYTPLSFORM_BTN_RESET."' /> |
|
| 266 | -</form>\n" ; |
|
| 267 | -} |
|
| 268 | - |
|
| 269 | -xoops_cp_footer() ; |
|
| 258 | + <input type='text' name='tpl_file' id='tpl_file' value='".htmlspecialchars($tpl[ |
|
| 270 | 259 | \ 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 |
@@ -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 |
@@ -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 |
@@ -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 |
@@ -302,7 +302,7 @@ |
||
| 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, |
@@ -60,7 +60,7 @@ |
||
| 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) ; |
@@ -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 |