Security line in all includes changed

[mailer.git] / inc / modules / admin / what-theme_edit.php

diff --git a/inc/modules/admin/what-theme_edit.php b/inc/modules/admin/what-theme_edit.php
index 71a9296528c21d752628fc6b999501bea70e61d5..747957986a5f889936e1fc46ad411ece53820a8c 100644 (file)
--- a/inc/modules/admin/what-theme_edit.php
+++ b/inc/modules/admin/what-theme_edit.php
@@ -32,7 +32,7 @@
  ************************************************************************/
 
 // 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);
 }
@@ -40,8 +40,6 @@ if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) || (!is_admin())) {
 // Add description as navigation point
 ADD_DESCR("admin", basename(__FILE__));
 
-global $currTheme;
-
 // Check for selected themes
 $SEL = 0;
 if (!empty($_POST['sel'])) $SEL = SELECTION_COUNT($_POST['sel']);
@@ -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 = "<A href=\"".URL."/modules.php?module=admin&amp;what=theme_edit&amp;default_theme=".$unix."\" title=\"".ADMIN_SET_AS_NEW_THEME."\">".$unix."</A>";
+               if ($unix != GET_CURR_THEME()) $LINK = "<A href=\"".URL."/modules.php?module=admin&amp;what=theme_edit&amp;default_theme=".$unix."\" title=\"".ADMIN_SET_AS_NEW_THEME."\">".$unix."</A>";
 
                // 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'     => "<A href=\"mailto:".$THEME_EMAIL."?Subject=[Theme:] ".$THEME_NAME." (".$unix.")"."\">".$THEME_AUTHOR."</A>",
                        'url_link'  => DEREFERER($THEME_URL),