@@ -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 |
@@ -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 |
@@ -47,42 +47,42 @@ discard block |
||
| 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 |
||
| 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 ; |