@@ -184,16 +184,16 @@ |
||
| 184 | 184 | } |
| 185 | 185 | |
| 186 | 186 | $sql = 'INSERT INTO ' |
| 187 | - . $db->prefix('tplfile') |
|
| 188 | - . " SET tpl_file='" |
|
| 189 | - . addslashes(($_POST['tpl_file'])) |
|
| 190 | - . "',tpl_refid=0,tpl_module='" |
|
| 191 | - . addslashes($tpl['tpl_module']) |
|
| 192 | - . "',tpl_tplset='" |
|
| 193 | - . addslashes($tpl['tpl_tplset']) |
|
| 194 | - . "',tpl_lastmodified=UNIX_TIMESTAMP(),tpl_type='" |
|
| 195 | - . addslashes($tpl['tpl_type']) |
|
| 196 | - . "'"; |
|
| 187 | + . $db->prefix('tplfile') |
|
| 188 | + . " SET tpl_file='" |
|
| 189 | + . addslashes(($_POST['tpl_file'])) |
|
| 190 | + . "',tpl_refid=0,tpl_module='" |
|
| 191 | + . addslashes($tpl['tpl_module']) |
|
| 192 | + . "',tpl_tplset='" |
|
| 193 | + . addslashes($tpl['tpl_tplset']) |
|
| 194 | + . "',tpl_lastmodified=UNIX_TIMESTAMP(),tpl_type='" |
|
| 195 | + . addslashes($tpl['tpl_type']) |
|
| 196 | + . "'"; |
|
| 197 | 197 | |
| 198 | 198 | if (!$db->query($sql)) { |
| 199 | 199 | die('SQL Error' . __LINE__); |
@@ -106,14 +106,14 @@ discard block |
||
| 106 | 106 | // write back |
| 107 | 107 | |
| 108 | 108 | altsys_adminmenu_save_x20([ |
| 109 | - 'xoops_admin_menu_js' => $xoops_admin_menu_js, |
|
| 110 | - 'xoops_admin_menu_ml' => $xoops_admin_menu_ml, |
|
| 111 | - 'xoops_admin_menu_sd' => $xoops_admin_menu_sd, |
|
| 112 | - 'xoops_admin_menu_ft' => $xoops_admin_menu_ft, |
|
| 113 | - 'xoops_admin_menu_dv' => $xoops_admin_menu_dv, |
|
| 114 | - 'altsys_adminmenu_ft_hacked' => (int)(@$altsys_adminmenu_ft_hacked), |
|
| 115 | - 'altsys_adminmenu_dv_updated' => true, |
|
| 116 | - ]); |
|
| 109 | + 'xoops_admin_menu_js' => $xoops_admin_menu_js, |
|
| 110 | + 'xoops_admin_menu_ml' => $xoops_admin_menu_ml, |
|
| 111 | + 'xoops_admin_menu_sd' => $xoops_admin_menu_sd, |
|
| 112 | + 'xoops_admin_menu_ft' => $xoops_admin_menu_ft, |
|
| 113 | + 'xoops_admin_menu_dv' => $xoops_admin_menu_dv, |
|
| 114 | + 'altsys_adminmenu_ft_hacked' => (int)(@$altsys_adminmenu_ft_hacked), |
|
| 115 | + 'altsys_adminmenu_dv_updated' => true, |
|
| 116 | + ]); |
|
| 117 | 117 | } |
| 118 | 118 | |
| 119 | 119 | // |
@@ -223,13 +223,13 @@ discard block |
||
| 223 | 223 | // write back |
| 224 | 224 | |
| 225 | 225 | altsys_adminmenu_save_x20([ |
| 226 | - 'xoops_admin_menu_js' => $xoops_admin_menu_js, |
|
| 227 | - 'xoops_admin_menu_ml' => $xoops_admin_menu_ml, |
|
| 228 | - 'xoops_admin_menu_sd' => $xoops_admin_menu_sd, |
|
| 229 | - 'xoops_admin_menu_ft' => $xoops_admin_menu_ft, |
|
| 230 | - 'xoops_admin_menu_dv' => $xoops_admin_menu_dv, |
|
| 231 | - 'altsys_adminmenu_ft_hacked' => ALTSYS_ADMINMENU_HACK_2COL, |
|
| 232 | - ]); |
|
| 226 | + 'xoops_admin_menu_js' => $xoops_admin_menu_js, |
|
| 227 | + 'xoops_admin_menu_ml' => $xoops_admin_menu_ml, |
|
| 228 | + 'xoops_admin_menu_sd' => $xoops_admin_menu_sd, |
|
| 229 | + 'xoops_admin_menu_ft' => $xoops_admin_menu_ft, |
|
| 230 | + 'xoops_admin_menu_dv' => $xoops_admin_menu_dv, |
|
| 231 | + 'altsys_adminmenu_ft_hacked' => ALTSYS_ADMINMENU_HACK_2COL, |
|
| 232 | + ]); |
|
| 233 | 233 | } |
| 234 | 234 | |
| 235 | 235 | function altsys_adminmenu_hack_ft_noimg_x20() |
@@ -291,13 +291,13 @@ discard block |
||
| 291 | 291 | // write back |
| 292 | 292 | |
| 293 | 293 | altsys_adminmenu_save_x20([ |
| 294 | - 'xoops_admin_menu_js' => $xoops_admin_menu_js, |
|
| 295 | - 'xoops_admin_menu_ml' => $xoops_admin_menu_ml, |
|
| 296 | - 'xoops_admin_menu_sd' => $xoops_admin_menu_sd, |
|
| 297 | - 'xoops_admin_menu_ft' => $xoops_admin_menu_ft, |
|
| 298 | - 'xoops_admin_menu_dv' => $xoops_admin_menu_dv, |
|
| 299 | - 'altsys_adminmenu_ft_hacked' => ALTSYS_ADMINMENU_HACK_NOIMG, |
|
| 300 | - ]); |
|
| 294 | + 'xoops_admin_menu_js' => $xoops_admin_menu_js, |
|
| 295 | + 'xoops_admin_menu_ml' => $xoops_admin_menu_ml, |
|
| 296 | + 'xoops_admin_menu_sd' => $xoops_admin_menu_sd, |
|
| 297 | + 'xoops_admin_menu_ft' => $xoops_admin_menu_ft, |
|
| 298 | + 'xoops_admin_menu_dv' => $xoops_admin_menu_dv, |
|
| 299 | + 'altsys_adminmenu_ft_hacked' => ALTSYS_ADMINMENU_HACK_NOIMG, |
|
| 300 | + ]); |
|
| 301 | 301 | } |
| 302 | 302 | |
| 303 | 303 | function altsys_adminmenu_hack_ft_xcsty_x20() |
@@ -426,13 +426,13 @@ discard block |
||
| 426 | 426 | // write back |
| 427 | 427 | |
| 428 | 428 | altsys_adminmenu_save_x20([ |
| 429 | - 'xoops_admin_menu_js' => $xoops_admin_menu_js, |
|
| 430 | - 'xoops_admin_menu_ml' => [], |
|
| 431 | - 'xoops_admin_menu_sd' => [], |
|
| 432 | - 'xoops_admin_menu_ft' => $xoops_admin_menu_ft, |
|
| 433 | - 'xoops_admin_menu_dv' => $xoops_admin_menu_dv, |
|
| 434 | - 'altsys_adminmenu_ft_hacked' => ALTSYS_ADMINMENU_HACK_XCSTY, |
|
| 435 | - ]); |
|
| 429 | + 'xoops_admin_menu_js' => $xoops_admin_menu_js, |
|
| 430 | + 'xoops_admin_menu_ml' => [], |
|
| 431 | + 'xoops_admin_menu_sd' => [], |
|
| 432 | + 'xoops_admin_menu_ft' => $xoops_admin_menu_ft, |
|
| 433 | + 'xoops_admin_menu_dv' => $xoops_admin_menu_dv, |
|
| 434 | + 'altsys_adminmenu_ft_hacked' => ALTSYS_ADMINMENU_HACK_XCSTY, |
|
| 435 | + ]); |
|
| 436 | 436 | } |
| 437 | 437 | |
| 438 | 438 | // |
@@ -100,14 +100,14 @@ discard block |
||
| 100 | 100 | // get tplfile and tplsource |
| 101 | 101 | |
| 102 | 102 | $result = $db->query("SELECT tpl_refid,tpl_module,'" |
| 103 | - . addslashes($tplset_to) |
|
| 104 | - . "',tpl_file,tpl_desc,tpl_lastmodified,tpl_lastimported,tpl_type,tpl_source FROM " |
|
| 105 | - . $db->prefix('tplfile') |
|
| 106 | - . ' NATURAL LEFT JOIN ' |
|
| 107 | - . $db->prefix('tplsource') |
|
| 108 | - . " WHERE tpl_tplset='" |
|
| 109 | - . addslashes($tplset_from) |
|
| 110 | - . "' AND ($whr_append)"); |
|
| 103 | + . addslashes($tplset_to) |
|
| 104 | + . "',tpl_file,tpl_desc,tpl_lastmodified,tpl_lastimported,tpl_type,tpl_source FROM " |
|
| 105 | + . $db->prefix('tplfile') |
|
| 106 | + . ' NATURAL LEFT JOIN ' |
|
| 107 | + . $db->prefix('tplsource') |
|
| 108 | + . " WHERE tpl_tplset='" |
|
| 109 | + . addslashes($tplset_from) |
|
| 110 | + . "' AND ($whr_append)"); |
|
| 111 | 111 | |
| 112 | 112 | while (false !== ($row = $db->fetchArray($result))) { |
| 113 | 113 | $tpl_source = array_pop($row); |
@@ -135,18 +135,18 @@ discard block |
||
| 135 | 135 | // UPDATE mode |
| 136 | 136 | |
| 137 | 137 | $db->query('UPDATE ' |
| 138 | - . $db->prefix('tplfile') |
|
| 139 | - . " SET tpl_refid='" |
|
| 140 | - . addslashes($row['tpl_refid']) |
|
| 141 | - . "',tpl_desc='" |
|
| 142 | - . addslashes($row['tpl_desc']) |
|
| 143 | - . "',tpl_lastmodified='" |
|
| 144 | - . addslashes($row['tpl_lastmodified']) |
|
| 145 | - . "',tpl_lastimported='" |
|
| 146 | - . addslashes($row['tpl_lastimported']) |
|
| 147 | - . "',tpl_type='" |
|
| 148 | - . addslashes($row['tpl_type']) |
|
| 149 | - . "' WHERE tpl_id='$tpl_id'"); |
|
| 138 | + . $db->prefix('tplfile') |
|
| 139 | + . " SET tpl_refid='" |
|
| 140 | + . addslashes($row['tpl_refid']) |
|
| 141 | + . "',tpl_desc='" |
|
| 142 | + . addslashes($row['tpl_desc']) |
|
| 143 | + . "',tpl_lastmodified='" |
|
| 144 | + . addslashes($row['tpl_lastmodified']) |
|
| 145 | + . "',tpl_lastimported='" |
|
| 146 | + . addslashes($row['tpl_lastimported']) |
|
| 147 | + . "',tpl_type='" |
|
| 148 | + . addslashes($row['tpl_type']) |
|
| 149 | + . "' WHERE tpl_id='$tpl_id'"); |
|
| 150 | 150 | |
| 151 | 151 | $db->query('UPDATE ' . $db->prefix('tplsource') . " SET tpl_source='" . addslashes($tpl_source) . "' WHERE tpl_id='$tpl_id'"); |
| 152 | 152 | |
@@ -181,22 +181,22 @@ discard block |
||
| 181 | 181 | // INSERT mode |
| 182 | 182 | |
| 183 | 183 | $sql = 'INSERT INTO ' |
| 184 | - . $db->prefix('tplfile') |
|
| 185 | - . " SET tpl_refid='" |
|
| 186 | - . addslashes($row['tpl_refid']) |
|
| 187 | - . "',tpl_desc='" |
|
| 188 | - . addslashes($row['tpl_desc']) |
|
| 189 | - . "',tpl_lastmodified='" |
|
| 190 | - . addslashes($lastmodified) |
|
| 191 | - . "',tpl_type='" |
|
| 192 | - . addslashes($row['tpl_type']) |
|
| 193 | - . "',tpl_tplset='" |
|
| 194 | - . addslashes($tplset_to) |
|
| 195 | - . "',tpl_file='" |
|
| 196 | - . addslashes($row['tpl_file']) |
|
| 197 | - . "',tpl_module='" |
|
| 198 | - . addslashes($row['tpl_module']) |
|
| 199 | - . "'"; |
|
| 184 | + . $db->prefix('tplfile') |
|
| 185 | + . " SET tpl_refid='" |
|
| 186 | + . addslashes($row['tpl_refid']) |
|
| 187 | + . "',tpl_desc='" |
|
| 188 | + . addslashes($row['tpl_desc']) |
|
| 189 | + . "',tpl_lastmodified='" |
|
| 190 | + . addslashes($lastmodified) |
|
| 191 | + . "',tpl_type='" |
|
| 192 | + . addslashes($row['tpl_type']) |
|
| 193 | + . "',tpl_tplset='" |
|
| 194 | + . addslashes($tplset_to) |
|
| 195 | + . "',tpl_file='" |
|
| 196 | + . addslashes($row['tpl_file']) |
|
| 197 | + . "',tpl_module='" |
|
| 198 | + . addslashes($row['tpl_module']) |
|
| 199 | + . "'"; |
|
| 200 | 200 | |
| 201 | 201 | $db->query($sql); |
| 202 | 202 | |
@@ -29,13 +29,13 @@ |
||
| 29 | 29 | $xoopsTpl->xoops_setDebugging(true); |
| 30 | 30 | } |
| 31 | 31 | $xoopsTpl->assign([ |
| 32 | - 'xoops_theme' => $xoopsConfig['theme_set'], |
|
| 33 | - 'xoops_imageurl' => XOOPS_THEME_URL . '/' . $xoopsConfig['theme_set'] . '/', |
|
| 34 | - 'xoops_themecss' => xoops_getcss($xoopsConfig['theme_set']), |
|
| 35 | - 'xoops_requesturi' => htmlspecialchars($GLOBALS['xoopsRequestUri'], ENT_QUOTES), |
|
| 36 | - 'xoops_sitename' => htmlspecialchars($xoopsConfig['sitename'], ENT_QUOTES), |
|
| 37 | - 'xoops_slogan' => htmlspecialchars($xoopsConfig['slogan'], ENT_QUOTES), |
|
| 38 | - ]); |
|
| 32 | + 'xoops_theme' => $xoopsConfig['theme_set'], |
|
| 33 | + 'xoops_imageurl' => XOOPS_THEME_URL . '/' . $xoopsConfig['theme_set'] . '/', |
|
| 34 | + 'xoops_themecss' => xoops_getcss($xoopsConfig['theme_set']), |
|
| 35 | + 'xoops_requesturi' => htmlspecialchars($GLOBALS['xoopsRequestUri'], ENT_QUOTES), |
|
| 36 | + 'xoops_sitename' => htmlspecialchars($xoopsConfig['sitename'], ENT_QUOTES), |
|
| 37 | + 'xoops_slogan' => htmlspecialchars($xoopsConfig['slogan'], ENT_QUOTES), |
|
| 38 | + ]); |
|
| 39 | 39 | // Meta tags |
| 40 | 40 | $configHandler = xoops_getHandler('config'); |
| 41 | 41 | $criteria = new CriteriaCompo(new Criteria('conf_modid', 0)); |
@@ -162,20 +162,20 @@ |
||
| 162 | 162 | // assignment |
| 163 | 163 | |
| 164 | 164 | $xoopsTpl->assign([ |
| 165 | - 'xoops_theme' => $xoopsConfig['theme_set'], |
|
| 166 | - 'xoops_imageurl' => XOOPS_THEME_URL . '/' . $xoopsConfig['theme_set'] . '/', |
|
| 167 | - 'xoops_themecss' => xoops_getcss($xoopsConfig['theme_set']), |
|
| 168 | - 'xoops_requesturi' => htmlspecialchars($GLOBALS['xoopsRequestUri'], ENT_QUOTES), |
|
| 169 | - 'xoops_sitename' => htmlspecialchars($xoopsConfig['sitename'], ENT_QUOTES), |
|
| 170 | - 'xoops_showlblock' => 1, |
|
| 171 | - // 'xoops_js' => '//--></script><script type="text/javascript" src="'.XOOPS_URL.'/include/xoops.js"></script><script type="text/javascript" src="'.XOOPS_URL.'/include/layersmenu.js"></script><script type="text/javascript"><!--'."\n".$xoops_admin_menu_js , |
|
| 172 | - 'xoops_js' => '//--></script><script type="text/javascript" src="' . XOOPS_URL . '/include/xoops.js"></script><script type="text/javascript"><!--' . "\n", |
|
| 173 | - 'xoops_runs_admin_side' => 1, |
|
| 174 | - 'xoops_breadcrumbs' => $xoops_breadcrumbs, |
|
| 175 | - 'xoops_slogan' => htmlspecialchars($xoopsConfig['slogan'], ENT_QUOTES), |
|
| 176 | - 'xoops_contents' => $xoops_admin_contents, //. '<div id="adminmenu_layers">' . $xoops_admin_menu_dv . '</div>' , |
|
| 177 | - 'xoops_module_header' => $xoops_module_header, |
|
| 178 | - ]); |
|
| 165 | + 'xoops_theme' => $xoopsConfig['theme_set'], |
|
| 166 | + 'xoops_imageurl' => XOOPS_THEME_URL . '/' . $xoopsConfig['theme_set'] . '/', |
|
| 167 | + 'xoops_themecss' => xoops_getcss($xoopsConfig['theme_set']), |
|
| 168 | + 'xoops_requesturi' => htmlspecialchars($GLOBALS['xoopsRequestUri'], ENT_QUOTES), |
|
| 169 | + 'xoops_sitename' => htmlspecialchars($xoopsConfig['sitename'], ENT_QUOTES), |
|
| 170 | + 'xoops_showlblock' => 1, |
|
| 171 | + // 'xoops_js' => '//--></script><script type="text/javascript" src="'.XOOPS_URL.'/include/xoops.js"></script><script type="text/javascript" src="'.XOOPS_URL.'/include/layersmenu.js"></script><script type="text/javascript"><!--'."\n".$xoops_admin_menu_js , |
|
| 172 | + 'xoops_js' => '//--></script><script type="text/javascript" src="' . XOOPS_URL . '/include/xoops.js"></script><script type="text/javascript"><!--' . "\n", |
|
| 173 | + 'xoops_runs_admin_side' => 1, |
|
| 174 | + 'xoops_breadcrumbs' => $xoops_breadcrumbs, |
|
| 175 | + 'xoops_slogan' => htmlspecialchars($xoopsConfig['slogan'], ENT_QUOTES), |
|
| 176 | + 'xoops_contents' => $xoops_admin_contents, //. '<div id="adminmenu_layers">' . $xoops_admin_menu_dv . '</div>' , |
|
| 177 | + 'xoops_module_header' => $xoops_module_header, |
|
| 178 | + ]); |
|
| 179 | 179 | |
| 180 | 180 | // rendering |
| 181 | 181 | |
@@ -486,20 +486,20 @@ |
||
| 486 | 486 | } |
| 487 | 487 | |
| 488 | 488 | $tree .= ' />' |
| 489 | - . $option['name'] |
|
| 490 | - . '<input type="hidden" name="' |
|
| 491 | - . $this->getName() |
|
| 492 | - . '[parents][' |
|
| 493 | - . $option['id'] |
|
| 494 | - . ']" value="' |
|
| 495 | - . implode(':', $parentIds) |
|
| 496 | - . '" /><input type="hidden" name="' |
|
| 497 | - . $this->getName() |
|
| 498 | - . '[itemname][' |
|
| 499 | - . $option['id'] |
|
| 500 | - . ']" value="' |
|
| 501 | - . htmlspecialchars($option['name'], ENT_QUOTES | ENT_HTML5) |
|
| 502 | - . "\" /><br />\n"; |
|
| 489 | + . $option['name'] |
|
| 490 | + . '<input type="hidden" name="' |
|
| 491 | + . $this->getName() |
|
| 492 | + . '[parents][' |
|
| 493 | + . $option['id'] |
|
| 494 | + . ']" value="' |
|
| 495 | + . implode(':', $parentIds) |
|
| 496 | + . '" /><input type="hidden" name="' |
|
| 497 | + . $this->getName() |
|
| 498 | + . '[itemname][' |
|
| 499 | + . $option['id'] |
|
| 500 | + . ']" value="' |
|
| 501 | + . htmlspecialchars($option['name'], ENT_QUOTES | ENT_HTML5) |
|
| 502 | + . "\" /><br />\n"; |
|
| 503 | 503 | |
| 504 | 504 | if (isset($option['children'])) { |
| 505 | 505 | foreach ($option['children'] as $child) { |
@@ -435,18 +435,18 @@ discard block |
||
| 435 | 435 | } |
| 436 | 436 | |
| 437 | 437 | echo "<td class='{$evenodd}{$class}'>" |
| 438 | - . formatTimestamp($tpl['tpl_lastmodified'], 'm') |
|
| 439 | - . '<br />' |
|
| 440 | - . mb_substr($fingerprint, 0, 16) |
|
| 441 | - . "<br /><input type='checkbox' name='{$tplset4disp}_check[{$tpl_file}]' value='1' /> <a href='?mode=admin&lib=altsys&page=mytplsform&tpl_file=" |
|
| 442 | - . htmlspecialchars($tpl['tpl_file'], ENT_QUOTES) |
|
| 443 | - . '&tpl_tplset=' |
|
| 444 | - . htmlspecialchars($tpl['tpl_tplset'], ENT_QUOTES) |
|
| 445 | - . '&dirname=' |
|
| 446 | - . htmlspecialchars($target_dirname, ENT_QUOTES) |
|
| 447 | - . "'>" |
|
| 448 | - . _EDIT |
|
| 449 | - . "</a> ($numrows)</td>\n"; |
|
| 438 | + . formatTimestamp($tpl['tpl_lastmodified'], 'm') |
|
| 439 | + . '<br />' |
|
| 440 | + . mb_substr($fingerprint, 0, 16) |
|
| 441 | + . "<br /><input type='checkbox' name='{$tplset4disp}_check[{$tpl_file}]' value='1' /> <a href='?mode=admin&lib=altsys&page=mytplsform&tpl_file=" |
|
| 442 | + . htmlspecialchars($tpl['tpl_file'], ENT_QUOTES) |
|
| 443 | + . '&tpl_tplset=' |
|
| 444 | + . htmlspecialchars($tpl['tpl_tplset'], ENT_QUOTES) |
|
| 445 | + . '&dirname=' |
|
| 446 | + . htmlspecialchars($target_dirname, ENT_QUOTES) |
|
| 447 | + . "'>" |
|
| 448 | + . _EDIT |
|
| 449 | + . "</a> ($numrows)</td>\n"; |
|
| 450 | 450 | } |
| 451 | 451 | } |
| 452 | 452 | |
@@ -481,10 +481,10 @@ discard block |
||
| 481 | 481 | |
| 482 | 482 | echo "\t\t<td class='head'> |
| 483 | 483 | " . ('default' == $tplset && '_custom' != $target_dirname ? '' : "<input name='del_do[{$tplset4disp}]' type='submit' value='" |
| 484 | - . _DELETE |
|
| 485 | - . "' onclick='return altsys_mytpladmin_check_copy_submit(\"" |
|
| 486 | - . _MYTPLSADMIN_CNF_DELETE_SELECTED_TEMPLATES |
|
| 487 | - . "\", \"{$tplset4disp}_\", false);' /><br /><br />") . ' |
|
| 484 | + . _DELETE |
|
| 485 | + . "' onclick='return altsys_mytpladmin_check_copy_submit(\"" |
|
| 486 | + . _MYTPLSADMIN_CNF_DELETE_SELECTED_TEMPLATES |
|
| 487 | + . "\", \"{$tplset4disp}_\", false);' /><br /><br />") . ' |
|
| 488 | 488 | ' . _MYTPLSADMIN_CAPTION_COPYTO . ": |
| 489 | 489 | <select name='copy_to[{$tplset4disp}]'> |
| 490 | 490 | " . str_replace('<option value=\'' . $tplset4disp . '\'>' . $tplset4disp . '</option>', '', $tplset_options) . " |
@@ -117,7 +117,7 @@ discard block |
||
| 117 | 117 | |
| 118 | 118 | $moduleHandler = xoops_getHandler('module'); |
| 119 | 119 | |
| 120 | - if (! empty($_GET['dirname'])) { |
|
| 120 | + if (! empty($_GET['dirname'])) { |
|
| 121 | 121 | $dirname = preg_replace('/[^0-9a-zA-Z_-]/', '', \Xmf\Request::getString('dirname', '', 'GET')); |
| 122 | 122 | |
| 123 | 123 | $target_module = $moduleHandler->getByDirname($dirname); |
@@ -558,12 +558,12 @@ discard block |
||
| 558 | 558 | ]; |
| 559 | 559 | |
| 560 | 560 | $blocks4assign[] = [ |
| 561 | - 'name_raw' => $block_data['name'], |
|
| 562 | - 'title_raw' => $block_data['title'], |
|
| 563 | - 'cell_position' => $this->renderCell4BlockPosition($block_data), |
|
| 564 | - 'cell_module_link' => $this->renderCell4BlockModuleLink($block_data), |
|
| 565 | - 'cell_group_perm' => $this->renderCell4BlockReadGroupPerm($block_data), |
|
| 566 | - ] + $block_data; |
|
| 561 | + 'name_raw' => $block_data['name'], |
|
| 562 | + 'title_raw' => $block_data['title'], |
|
| 563 | + 'cell_position' => $this->renderCell4BlockPosition($block_data), |
|
| 564 | + 'cell_module_link' => $this->renderCell4BlockModuleLink($block_data), |
|
| 565 | + 'cell_group_perm' => $this->renderCell4BlockReadGroupPerm($block_data), |
|
| 566 | + ] + $block_data; |
|
| 567 | 567 | } |
| 568 | 568 | |
| 569 | 569 | // display |
@@ -573,14 +573,14 @@ discard block |
||
| 573 | 573 | $tpl = new D3Tpl(); |
| 574 | 574 | |
| 575 | 575 | $tpl->assign([ |
| 576 | - 'target_mid' => $this->target_mid, |
|
| 577 | - 'target_dirname' => $this->target_dirname, |
|
| 578 | - 'target_mname' => $this->target_mname, |
|
| 579 | - 'language' => $this->lang, |
|
| 580 | - 'cachetime_options' => $this->cachetime_options, |
|
| 581 | - 'blocks' => $blocks4assign, |
|
| 582 | - 'gticket_hidden' => $xoopsGTicket->getTicketHtml(__LINE__, 1800, 'myblocksadmin'), |
|
| 583 | - ]); |
|
| 576 | + 'target_mid' => $this->target_mid, |
|
| 577 | + 'target_dirname' => $this->target_dirname, |
|
| 578 | + 'target_mname' => $this->target_mname, |
|
| 579 | + 'language' => $this->lang, |
|
| 580 | + 'cachetime_options' => $this->cachetime_options, |
|
| 581 | + 'blocks' => $blocks4assign, |
|
| 582 | + 'gticket_hidden' => $xoopsGTicket->getTicketHtml(__LINE__, 1800, 'myblocksadmin'), |
|
| 583 | + ]); |
|
| 584 | 584 | |
| 585 | 585 | $tpl->display('db:altsys_main_myblocksadmin_list.html'); |
| 586 | 586 | } |
@@ -1274,18 +1274,18 @@ discard block |
||
| 1274 | 1274 | } |
| 1275 | 1275 | |
| 1276 | 1276 | $tpl->assign([ |
| 1277 | - 'target_dirname' => $this->target_dirname, |
|
| 1278 | - 'target_mname' => $this->target_mname, |
|
| 1279 | - 'language' => $this->lang, |
|
| 1280 | - 'cachetime_options' => $this->cachetime_options, |
|
| 1281 | - 'ctype_options' => $this->ctype_options, |
|
| 1282 | - 'block' => $block4assign, |
|
| 1283 | - 'op' => $next_op, |
|
| 1284 | - 'form_title' => $form_title, |
|
| 1285 | - 'submit_button' => $button_value, |
|
| 1286 | - 'common_fck_installed' => $this->checkFck(), |
|
| 1287 | - 'gticket_hidden' => $GLOBALS['xoopsSecurity']->getTokenHTML('myblocksadmin'), |
|
| 1288 | - ]); |
|
| 1277 | + 'target_dirname' => $this->target_dirname, |
|
| 1278 | + 'target_mname' => $this->target_mname, |
|
| 1279 | + 'language' => $this->lang, |
|
| 1280 | + 'cachetime_options' => $this->cachetime_options, |
|
| 1281 | + 'ctype_options' => $this->ctype_options, |
|
| 1282 | + 'block' => $block4assign, |
|
| 1283 | + 'op' => $next_op, |
|
| 1284 | + 'form_title' => $form_title, |
|
| 1285 | + 'submit_button' => $button_value, |
|
| 1286 | + 'common_fck_installed' => $this->checkFck(), |
|
| 1287 | + 'gticket_hidden' => $GLOBALS['xoopsSecurity']->getTokenHTML('myblocksadmin'), |
|
| 1288 | + ]); |
|
| 1289 | 1289 | |
| 1290 | 1290 | if (defined('XOOPS_CUBE_LEGACY')) { |
| 1291 | 1291 | $tpl->display('db:altsys_main_myblocksadmin_edit_4legacy.html'); |
@@ -321,18 +321,18 @@ |
||
| 321 | 321 | } |
| 322 | 322 | |
| 323 | 323 | $tpl->assign([ |
| 324 | - 'target_dirname' => $this->target_dirname, |
|
| 325 | - 'target_mname' => $this->target_mname, |
|
| 326 | - 'language' => $this->lang, |
|
| 327 | - 'cachetime_options' => $this->cachetime_options, |
|
| 328 | - 'ctype_options' => $this->ctype_options, |
|
| 329 | - 'block' => $block4assign, |
|
| 330 | - 'op' => $next_op, |
|
| 331 | - 'form_title' => $form_title, |
|
| 332 | - 'submit_button' => $button_value, |
|
| 333 | - 'common_fck_installed' => file_exists(XOOPS_ROOT_PATH . '/common/fckeditor/fckeditor.js'), |
|
| 334 | - 'gticket_hidden' => $GLOBALS['xoopsSecurity']->getTokenHTML('myblocksadmin'), |
|
| 335 | - ]); |
|
| 324 | + 'target_dirname' => $this->target_dirname, |
|
| 325 | + 'target_mname' => $this->target_mname, |
|
| 326 | + 'language' => $this->lang, |
|
| 327 | + 'cachetime_options' => $this->cachetime_options, |
|
| 328 | + 'ctype_options' => $this->ctype_options, |
|
| 329 | + 'block' => $block4assign, |
|
| 330 | + 'op' => $next_op, |
|
| 331 | + 'form_title' => $form_title, |
|
| 332 | + 'submit_button' => $button_value, |
|
| 333 | + 'common_fck_installed' => file_exists(XOOPS_ROOT_PATH . '/common/fckeditor/fckeditor.js'), |
|
| 334 | + 'gticket_hidden' => $GLOBALS['xoopsSecurity']->getTokenHTML('myblocksadmin'), |
|
| 335 | + ]); |
|
| 336 | 336 | |
| 337 | 337 | //HACK by domifara |
| 338 | 338 | |