A lot has been rewritten, ext-teams added, ext-forced continued:

[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 84206c4a517a131bc89aa579f0ea9e286feef85f..c3665f9881913dd9487e66fb3db205dca33b5389 100644 (file)
--- a/inc/modules/admin/what-theme_import.php
+++ b/inc/modules/admin/what-theme_import.php
@@ -43,11 +43,6 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 // Add description as navigation point
 addYouAreHereLink('admin', __FILE__);
 
-if (!isExtensionActive('theme')) {
-       loadTemplate('admin_settings_saved', false, generateExtensionInactiveNotInstalledMessage('theme'));
-       return;
-} // END - if
-
 // Switch to testing mode
 $GLOBALS['theme_mode'] = 'test';
 
@@ -76,22 +71,22 @@ VALUES ('%s','N','%s','%s')",
                        rebuildCache('themes', 'them');
 
                        // Prepare message
-                       $message = getMaskedMessage('ADMIN_THEME_IMPORTED', postRequestParameter('theme'));
+                       $message = '{%message,ADMIN_THEME_IMPORTED=' . postRequestParameter('theme') . '%}';
                } else {
-                       // Include file not found!
-                       $message = getMaskedMessage('ADMIN_THEME_INC_404', postRequestParameter('theme'));
+                       // Include file not found
+                       $message = '{%message,ADMIN_THEME_INC_404=' . postRequestParameter('theme') . '%}';
                }
        } else {
                // Theme already imported
-               $message = getMaskedMessage('ADMIN_THEME_ALREADY_INSTALLED', postRequestParameter('theme'));
+               $message = '{%message,ADMIN_THEME_ALREADY_INSTALLED=' . postRequestParameter('theme') . '%}';
        }
 
        // Output message
-       loadTemplate('admin_settings_saved', false, $message);
+       displayMessage($message);
 } // END - if
 
 // Initialize array
-$THEMES = array(
+$themes = array(
        'theme_unix'    => array(), // Unix name from filesystem
        'theme_name'    => array(), // Title
        'theme_author'  => array(), // Theme author's name
@@ -112,22 +107,22 @@ foreach ($includes as $inc) {
        loadInclude($inc);
 
        // Add found theme to array
-       $THEMES['theme_unix'][]   = $dir;
-       $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_version'][]    = $GLOBALS['theme_data']['version'];
+       $themes['theme_unix'][]   = $dir;
+       $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_version'][]    = $GLOBALS['theme_data']['version'];
 } // END - while
 
 // Sort array by Uni* name
-array_pk_sort($THEMES, array('theme_name'));
+array_pk_sort($themes, array('theme_name'));
 
 // Generate output lines for the template
 $OUT = '';
-foreach ($THEMES['theme_unix'] as $key => $unix) {
+foreach ($themes['theme_unix'] as $key => $unix) {
        // Already installed is default
-       $formContent = '<div class="notice">' . getMaskedMessage('ADMIN_THEME_ALREADY_INSTALLED', $unix) . '</div>';
+       $formContent = '<div class="notice">{%message,ADMIN_THEME_ALREADY_INSTALLED=' . $unix . '%}</div>';
 
        // Check if current theme is already imported or not
        if (!ifThemeExists($unix)) {
@@ -138,11 +133,11 @@ foreach ($THEMES['theme_unix'] as $key => $unix) {
        // Prepare content
        $content = array(
                'unix'          => $unix,
-               'theme_name'    => $THEMES['theme_name'][$key],
-               'theme_email'   => $THEMES['theme_email'][$key],
-               'theme_author'  => $THEMES['theme_author'][$key],
-               'theme_url'     => $THEMES['theme_url'][$key],
-               'theme_version' => $THEMES['theme_version'][$key],
+               'theme_name'    => $themes['theme_name'][$key],
+               'theme_email'   => $themes['theme_email'][$key],
+               'theme_author'  => $themes['theme_author'][$key],
+               'theme_url'     => $themes['theme_url'][$key],
+               'theme_version' => $themes['theme_version'][$key],
                'form_content'  => $formContent
        );
 
@@ -152,7 +147,7 @@ foreach ($THEMES['theme_unix'] as $key => $unix) {
 
 if (empty($OUT)) {
        // No themes found???
-       $OUT .= loadTemplate('admin_import_theme_none', true, loadTemplate('admin_settings_saved', true, '{--ADMIN_NO_THEMES_FOUND--}'));
+       $OUT .= loadTemplate('admin_import_theme_none', true, displayMessage('{--ADMIN_NO_THEMES_FOUND--}', true));
 } // END - if
 
 // Load template