ADMIN_MEMBER_SELECTION_BOX() does now return a select-tag with the member list

[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 7b2afc072f296eec2ddf8ca82ce039dd3bbf973d..4c8efdaf4c47a313464a0dafd0803b86f12bfcc6 100644 (file)
--- a/inc/modules/admin/what-theme_edit.php
+++ b/inc/modules/admin/what-theme_edit.php
@@ -32,41 +32,33 @@
  ************************************************************************/
 
 // Some security stuff...
-if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) || (!is_admin()))
-{
+if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) || (!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;
+global $currTheme;
 
 // Check for selected themes
 $SEL = 0;
 if (!empty($_POST['sel'])) $SEL = SELECTION_COUNT($_POST['sel']);
-if ($SEL > 0)
-{
+if ($SEL > 0) {
        $OUT = "";
-       foreach ($_POST['sel'] as $id=>$sel)
-       {
+       foreach ($_POST['sel'] as $id=>$sel) {
                $SQL = "";
                // Shall I de-/activate or delete themes?
-               if (isset($_POST['status']))
-               {
+               if (isset($_POST['status'])) {
                        // Change status
-                       if ($_POST['active'][$id] == 'Y')
-                       {
+                       if ($_POST['active'][$id] == "Y") {
                                $SQL = "UPDATE "._MYSQL_PREFIX."_themes SET theme_active='N' WHERE id='".$id."' LIMIT 1";
-                       }
-                        else
-                       {
+                       } else {
                                $SQL = "UPDATE "._MYSQL_PREFIX."_themes SET theme_active='Y' WHERE id='".$id."' LIMIT 1";
                        }
                        $OUT = ADMIN_THEMES_UPDATED;
-               }
-                elseif (isset($_POST['del']))
-               {
+               } elseif (isset($_POST['del'])) {
                        // Delete themes
                        $SQL = "DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_themes WHERE id='".$id."' LIMIT 1";
                        $OUT = ADMIN_THEMES_DELETED;
@@ -78,13 +70,18 @@ if ($SEL > 0)
 
        // Output generated?
        if (empty($OUT)) ADMIN_THEME_NO_OUTPUT;
-}
- elseif (!empty($_GET['default_theme']))
-{
+} elseif (!empty($_GET['default_theme'])) {
+       // Escape string from input
+       $POST['default_theme'] = SQL_ESCAPE($_GET['default_theme']);
+
+       // Set session
+       set_session("mxchange_theme", $POST['default_theme']);
+
+       // Set it in config and current theme as well
+       $currTheme = $POST['default_theme'];
+       $_CONFIG['default_theme'] = $POST['default_theme'];
+
        // Save theme
-       $POST['default_theme'] = $_GET['default_theme'];
-       @setcookie("mxchange_theme", $POST['default_theme'], (time() + 60*60*24*365), COOKIE_PATH);
-       $_COOKIE['mxchange_theme'] = $POST['default_theme'];
        ADMIN_SAVE_SETTINGS($POST);
 }
 
@@ -103,7 +100,7 @@ if (SQL_NUMROWS($result) > 0)
 
                // 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 != $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>";
 
                // Prepare data for the row template
                $content = array(
@@ -126,9 +123,7 @@ if (SQL_NUMROWS($result) > 0)
 
        // Free memory
        SQL_FREERESULT($result);
-}
- else
-{
+} else {
                // No themes found???
        $OUT .= "<TR>
   <TD colspan=\"7\" class=\"bottom2\" height=\"60\">