A lot double-quotes rewritten to single-quotes, some redirect URLs fixed

[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 0cc67e7c319658179078790b31910ce2f9456a59..0817993d288abbe32968de7f99f0f47981c6c344 100644 (file)
--- a/inc/modules/admin/what-theme_import.php
+++ b/inc/modules/admin/what-theme_import.php
@@ -38,18 +38,18 @@
 
 // Some security stuff...
 if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
-       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
+       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
        require($INC);
-} elseif (!EXT_IS_ACTIVE("theme")) {
-       addFatalMessage(__FILE__, __LINE__, getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), "theme");
+} elseif (!EXT_IS_ACTIVE('theme')) {
+       addFatalMessage(__FILE__, __LINE__, getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), 'theme');
        return;
 }
 
 // Add description as navigation point
-ADD_DESCR("admin", __FILE__);
+ADD_DESCR('admin', __FILE__);
 
 // Switch to testing mode
-$THEME_MODE = "test";
+$GLOBALS['theme_mode'] = 'test';
 
 // Import selected theme if not present
 if (REQUEST_ISSET_POST(('theme'))) {
@@ -64,7 +64,7 @@ if (REQUEST_ISSET_POST(('theme'))) {
                        // Register it ith the exchange
                        SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_themes` (`theme_path`,`theme_active`,`theme_ver`,`theme_name`)
 VALUES ('%s','N','%s','%s')",
-                               array(REQUEST_POST('theme'), $THEME_VERSION, $THEME_NAME), __FILE__, __LINE__);
+                               array(REQUEST_POST('theme'), $GLOBALS['theme_data']['version'], $GLOBALS['theme_data']['name']), __FILE__, __LINE__);
 
                        // Destroy cache
                        rebuildCacheFiles("themes", "them");
@@ -81,7 +81,7 @@ VALUES ('%s','N','%s','%s')",
        }
 
        // Output message
-       LOAD_TEMPLATE("admin_settings_saved", false, $msg);
+       LOAD_TEMPLATE('admin_settings_saved', false, $msg);
 } // END - if
 
 // Initialize array
@@ -107,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
 
@@ -122,7 +122,7 @@ closedir($handle);
 array_pk_sort($THEMES, array("theme_name"));
 
 // Generate output lines for the template
-$OUT = ""; $SW = 2;
+$OUT = ''; $SW = 2;
 foreach ($THEMES['theme_unix'] as $key => $unix) {
        // Already installed is default
        $FOUND = "<div class=\"admin_note\">{--ADMIN_THEME_ALREADY_INSTALLED--}</div>";
@@ -155,7 +155,7 @@ foreach ($THEMES['theme_unix'] as $key => $unix) {
 
 if (empty($OUT)) {
        // No themes found???
-       $OUT .= LOAD_TEMPLATE("admin_theme_import_none", true, LOAD_TEMPLATE("admin_settings_saved", true, getMessage('ADMIN_NO_THEMES_FOUND')));
+       $OUT .= LOAD_TEMPLATE("admin_theme_import_none", true, LOAD_TEMPLATE('admin_settings_saved', true, getMessage('ADMIN_NO_THEMES_FOUND')));
 } // END - if
 
 // Set the generated list