Rewritten to use isExtensionInstalledAndNewer() to save some calls/bugfix

[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 f0ce2817cf4e141072914e34c9af1b17c67f90f4..070a64b4ad01549b743def280f98c8c38d61f8bf 100644 (file)
--- a/inc/modules/admin/what-theme_import.php
+++ b/inc/modules/admin/what-theme_import.php
@@ -18,6 +18,7 @@
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -53,11 +54,11 @@ if (!isExtensionActive('theme')) {
 $GLOBALS['theme_mode'] = 'test';
 
 // Import selected theme if not present
-if (isPostRequestElementSet('theme')) {
+if (isPostRequestParameterSet('theme')) {
        // Check if theme is there
-       if (!ifThemeExists(postRequestElement('theme'))) {
+       if (!ifThemeExists(postRequestParameter('theme'))) {
                // Import theme
-               $inc = sprintf("theme/%s/theme.php", SQL_ESCAPE(postRequestElement('theme')));
+               $inc = sprintf("theme/%s/theme.php", SQL_ESCAPE(postRequestParameter('theme')));
 
                // Is the theme readable?
                if (isIncludeReadable($inc)) {
@@ -68,23 +69,23 @@ if (isPostRequestElementSet('theme')) {
                        SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_themes` (`theme_path`,`theme_active`,`theme_ver`,`theme_name`)
 VALUES ('%s','N','%s','%s')",
                                array(
-                                       postRequestElement('theme'),
+                                       postRequestParameter('theme'),
                                        $GLOBALS['theme_data']['version'],
                                        $GLOBALS['theme_data']['name']
                                ), __FILE__, __LINE__);
 
                        // Destroy cache
-                       rebuildCacheFile('themes', 'them');
+                       rebuildCache('themes', 'them');
 
                        // Prepare message
-                       $message = sprintf(getMessage('ADMIN_THEME_IMPORTED'), postRequestElement('theme'));
+                       $message = getMaskedMessage('ADMIN_THEME_IMPORTED', postRequestParameter('theme'));
                } else {
                        // Include file not found!
-                       $message = sprintf(getMessage('ADMIN_THEME_INC_404'), postRequestElement('theme'));
+                       $message = getMaskedMessage('ADMIN_THEME_INC_404', postRequestParameter('theme'));
                }
        } else {
                // Theme already imported
-               $message = sprintf(getMessage('ADMIN_THEME_ALREADY_INSTALLED'), postRequestElement('theme'));
+               $message = getMaskedMessage('ADMIN_THEME_ALREADY_INSTALLED', postRequestParameter('theme'));
        }
 
        // Output message
@@ -128,7 +129,7 @@ array_pk_sort($THEMES, array('theme_name'));
 $OUT = ''; $SW = 2;
 foreach ($THEMES['theme_unix'] as $key => $unix) {
        // Already installed is default
-       $formContent = '<div class="admin_note">' . sprintf(getMessage('ADMIN_THEME_ALREADY_INSTALLED'), $unix) . '</div>';
+       $formContent = '<div class="admin_note">' . getMaskedMessage('ADMIN_THEME_ALREADY_INSTALLED', $unix) . '</div>';
 
        // Check if current theme is already imported or not
        if (!ifThemeExists($unix)) {