Rewritten all THEME_FOO variables to GLOBALS

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

diff --git a/inc/modules/admin/what-theme_import.php b/inc/modules/admin/what-theme_import.php
index df118063b96f88e5eca1c0b6b987cdc35410ed37..6d27c505d7c2dd2b1e8a1d3f1609aae91f1c7987 100644 (file)
--- a/inc/modules/admin/what-theme_import.php
+++ b/inc/modules/admin/what-theme_import.php
@@ -10,7 +10,12 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Importieren von neuen Themes                     *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $Revision::                                                        $ *
+ * $Date::                                                            $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author::                                                          $ *
+ * Needs to be in all Files and every File needs "svn propset           *
+ * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2008 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
@@ -36,7 +41,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
 } elseif (!EXT_IS_ACTIVE("theme")) {
-       addFatalMessage(getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), "theme");
+       addFatalMessage(__FILE__, __LINE__, getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), "theme");
        return;
 }
 
@@ -44,35 +49,35 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 ADD_DESCR("admin", __FILE__);
 
 // Switch to testing mode
-$THEME_MODE = "test";
+$GLOBALS['theme_mode'] = "test";
 
 // Import selected theme if not present
-if (!empty($_POST['theme'])) {
+if (REQUEST_ISSET_POST(('theme'))) {
        // Check if theme is there
-       if (!THEME_CHECK_EXIST($_POST['theme'])) {
+       if (!THEME_CHECK_EXIST(REQUEST_POST('theme'))) {
                // Import theme
-               $INC = sprintf("theme/%s/theme.php", SQL_ESCAPE($_POST['theme']));
+               $INC = sprintf("theme/%s/theme.php", SQL_ESCAPE(REQUEST_POST('theme')));
                if (INCLUDE_READABLE($INC)) {
                        // Load the theme header file
                        LOAD_INC($INC);
 
                        // Register it ith the exchange
-                       SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_themes` (`theme_path`, `theme_active`, `theme_ver`, `theme_name`)
+                       SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_themes` (`theme_path`,`theme_active`,`theme_ver`,`theme_name`)
 VALUES ('%s','N','%s','%s')",
-                               array($_POST['theme'], $THEME_VERSION, $THEME_NAME), __FILE__, __LINE__);
+                               array(REQUEST_POST('theme'), $GLOBALS['theme_data']['version'], $GLOBALS['theme_data']['name']), __FILE__, __LINE__);
 
                        // Destroy cache
-                       REBUILD_CACHE("themes", "them");
+                       rebuildCacheFiles("themes", "them");
 
                        // Prepare message
-                       $msg = ADMIN_THEME_IMPORTED_1.$_POST['theme'].ADMIN_THEME_IMPORTED_2;
+                       $msg = sprintf(getMessage('ADMIN_THEME_IMPORTED'), REQUEST_POST('theme'));
                } else {
                        // Include file not found!
-                       $msg = ADMIN_THEME_INC_404_1.$_POST['theme'].ADMIN_THEME_INC_404_2;
+                       $msg = sprintf(getMessage('ADMIN_THEME_INC_404'), REQUEST_POST('theme'));
                }
        } else {
                // Theme already imported
-               $msg = ADMIN_THEME_ALREADY_1.$_POST['theme'].ADMIN_THEME_ALREADY_2;
+               $msg = sprintf(getMessage('ADMIN_THEME_ALREADY_INSTALLED'), REQUEST_POST('theme'));
        }
 
        // Output message
@@ -90,7 +95,7 @@ $THEMES = array(
 );
 
 // Read directory "themes"
-$handle = opendir(constant('PATH')."theme/") or mxchange_die("Cannot read themes dir!");
+$handle = opendir(constant('PATH')."theme/") or app_die(__FILE__, __LINE__, "Cannot read themes dir!");
 while ($dir = readdir($handle)) {
        // Construct absolute theme.php file name
        $INC = sprintf("theme/%s/theme.php", $dir);
@@ -102,11 +107,11 @@ while ($dir = readdir($handle)) {
 
                // Add found theme to array
                $THEMES['theme_unix'][]   = $dir;
-               $THEMES['theme_name'][]   = $THEME_NAME;
-               $THEMES['theme_author'][] = $THEME_AUTHOR;
-               $THEMES['theme_email'][]  = $THEME_EMAIL;
-               $THEMES['theme_url'][]    = $THEME_URL;
-               $THEMES['theme_ver'][]    = $THEME_VERSION;
+               $THEMES['theme_name'][]   = $GLOBALS['theme_data']['name'];
+               $THEMES['theme_author'][] = $GLOBALS['theme_data']['author'];
+               $THEMES['theme_email'][]  = $GLOBALS['theme_data']['email'];
+               $THEMES['theme_url'][]    = $GLOBALS['theme_data']['url'];
+               $THEMES['theme_ver'][]    = $GLOBALS['theme_data']['version'];
        } // END - if
 } // END - while