X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-theme_import.php;h=c2a407f2bb99ea39ef790cb72fa1229f1bdbda5c;hb=cc59ea1cce3e0fafc2cc6c9e36142698cf2b58ef;hp=84206c4a517a131bc89aa579f0ea9e286feef85f;hpb=2e715eb7f3f8ca8d259aacb4cbbddde7d9d18e01;p=mailer.git diff --git a/inc/modules/admin/what-theme_import.php b/inc/modules/admin/what-theme_import.php index 84206c4a51..c2a407f2bb 100644 --- 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'; @@ -64,7 +59,7 @@ if (isPostRequestParameterSet('theme')) { loadInclude($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( postRequestParameter('theme'), @@ -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 = '