X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-theme_edit.php;h=b5a697ffcc3f34e5d018a38491e23c9cb49dd116;hb=2142149f3f72f1a2476f95a87937c044d63bbaf2;hp=71a9296528c21d752628fc6b999501bea70e61d5;hpb=0c030e7ade850b0e42a434f4b02ca69fbffd504f;p=mailer.git
diff --git a/inc/modules/admin/what-theme_edit.php b/inc/modules/admin/what-theme_edit.php
index 71a9296528..b5a697ffcc 100644
--- a/inc/modules/admin/what-theme_edit.php
+++ b/inc/modules/admin/what-theme_edit.php
@@ -32,15 +32,13 @@
************************************************************************/
// Some security stuff...
-if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) || (!is_admin())) {
+if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
require($INC);
}
// Add description as navigation point
-ADD_DESCR("admin", basename(__FILE__));
-
-global $currTheme;
+ADD_DESCR("admin", __FILE__);
// Check for selected themes
$SEL = 0;
@@ -65,7 +63,13 @@ if ($SEL > 0) {
}
// Run SQL command?
- if (!empty($SQL)) $result = SQL_QUERY($SQL, __FILE__, __LINE__);
+ if (!empty($SQL)) {
+ // Run it
+ $result = SQL_QUERY($SQL, __FILE__, __LINE__);
+
+ // Rebuild cache
+ REBUILD_CACHE("themes", "them");
+ }
}
// Output generated?
@@ -78,6 +82,7 @@ if ($SEL > 0) {
set_session("mxchange_theme", $POST['default_theme']);
// Set it in config and current theme as well
+ global $currTheme;
$currTheme = $POST['default_theme'];
$_CONFIG['default_theme'] = $POST['default_theme'];
@@ -90,17 +95,17 @@ $THEME_MODE = "test";
// Generate output lines for the template
$OUT = ""; $SW = 2;
-$result = SQL_QUERY("SELECT id, theme_path, theme_active, theme_ver FROM "._MYSQL_PREFIX."_themes ORDER BY theme_path", __FILE__, __LINE__);
+$result = SQL_QUERY("SELECT id, theme_path, theme_active, theme_ver, theme_name FROM "._MYSQL_PREFIX."_themes ORDER BY theme_path", __FILE__, __LINE__);
if (SQL_NUMROWS($result) > 0)
{
- while(list($id, $unix, $active, $ver) = SQL_FETCHROW($result))
+ while(list($id, $unix, $active, $ver, $name) = SQL_FETCHROW($result))
{
// Load theme in test mode
require(PATH."theme/".$unix."/theme.php");
// Is the loaded theme name != current theme name?
$LINK = $unix;
- if ($unix != $currTheme) $LINK = "".$unix."";
+ if ($unix != GET_CURR_THEME()) $LINK = "".$unix."";
// Prepare data for the row template
$content = array(
@@ -108,7 +113,7 @@ if (SQL_NUMROWS($result) > 0)
'id' => $id,
'active' => $active,
'link' => $LINK,
- 'name' => $THEME_NAME,
+ 'name' => $name,
'is_act' => TRANSLATE_YESNO($active),
'email' => "".$THEME_AUTHOR."",
'url_link' => DEREFERER($THEME_URL),