X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fmodules%2Fadmin%2Fwhat-theme_import.php;h=11fd8829f6896f048147189adf088519a06fb4a3;hb=61621983cc6d7195fcc7eab29b5f6080ff283b34;hp=3a9bed37d0696064db6ca87c0fd1731fb1de64ea;hpb=f4dc6da7feace372175a07fcc437a7ebcb49f0be;p=mailer.git

diff --git a/inc/modules/admin/what-theme_import.php b/inc/modules/admin/what-theme_import.php
index 3a9bed37d0..11fd8829f6 100644
--- a/inc/modules/admin/what-theme_import.php
+++ b/inc/modules/admin/what-theme_import.php
@@ -14,12 +14,10 @@
  * $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 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2016 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -39,61 +37,53 @@
 
 // Some security stuff...
 if ((!defined('__SECURITY')) || (!isAdmin())) {
-	die();
+	exit();
 } // END - if
 
 // Add description as navigation point
-addMenuDescription('admin', __FILE__);
-
-if (!isExtensionActive('theme')) {
-	loadTemplate('admin_settings_saved', false, generateExtensionInactiveNotInstalledMessage('theme'));
-	return;
-} // END - if
+addYouAreHereLink('admin', __FILE__);
 
 // Switch to testing mode
 $GLOBALS['theme_mode'] = 'test';
 
 // Import selected theme if not present
-if (isPostRequestParameterSet('theme')) {
+if (isPostRequestElementSet('theme')) {
 	// Check if theme is there
-	if (!ifThemeExists(postRequestParameter('theme'))) {
-		// Import theme
-		$inc = sprintf("theme/%s/theme.php", SQL_ESCAPE(postRequestParameter('theme')));
-
+	if (!ifThemeExists(postRequestElement('theme'))) {
 		// Is the theme readable?
-		if (isIncludeReadable($inc)) {
+		if (isThemeReadable(postRequestElement('theme'))) {
 			// Load the theme header file
-			loadInclude($inc);
+			loadInclude(sprintf('theme/%s/theme.php', sqlEscapeString(postRequestElement('theme'))));
 
 			// Register it ith the exchange
-			SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_themes` (`theme_path`,`theme_active`,`theme_ver`,`theme_name`)
+			sqlQueryEscaped("INSERT INTO `{?_MYSQL_PREFIX?}_themes` (`theme_path`, `theme_active`, `theme_ver`, `theme_name`)
 VALUES ('%s','N','%s','%s')",
 				array(
-					postRequestParameter('theme'),
+					postRequestElement('theme'),
 					$GLOBALS['theme_data']['version'],
 					$GLOBALS['theme_data']['name']
 				), __FILE__, __LINE__);
 
 			// Destroy cache
-			rebuildCache('themes', 'them');
+			rebuildCache('themes', 'themes');
 
 			// Prepare message
-			$message = getMaskedMessage('ADMIN_THEME_IMPORTED', postRequestParameter('theme'));
+			$message = '{%message,ADMIN_THEME_IMPORTED=' . postRequestElement('theme') . '%}';
 		} else {
-			// Include file not found!
-			$message = getMaskedMessage('ADMIN_THEME_INC_404', postRequestParameter('theme'));
+			// Include file not found
+			$message = '{%message,ADMIN_THEME_INC_404=' . postRequestElement('theme') . '%}';
 		}
 	} else {
 		// Theme already imported
-		$message = getMaskedMessage('ADMIN_THEME_ALREADY_INSTALLED', postRequestParameter('theme'));
+		$message = '{%message,ADMIN_THEME_ALREADY_INSTALLED=' . postRequestElement('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
@@ -103,7 +93,7 @@ $THEMES = array(
 );
 
 // Read directory "themes"
-$includes = getArrayFromDirectory('theme/', '', false, true, array('css', 'images'));
+$includes = getArrayFromDirectory('theme/', '', FALSE, TRUE, array('css', 'images'));
 
 // Walk through all entries and add it
 foreach ($includes as $inc) {
@@ -114,51 +104,51 @@ 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'];
+	array_push($themes['theme_unix']   , $dir);
+	array_push($themes['theme_name']   , $GLOBALS['theme_data']['name']);
+	array_push($themes['theme_author'] , $GLOBALS['theme_data']['author']);
+	array_push($themes['theme_email']  , $GLOBALS['theme_data']['email']);
+	array_push($themes['theme_url']    , $GLOBALS['theme_data']['url']);
+	array_push($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)) {
 		// Theme not installed
-		$formContent = loadTemplate('admin_import_theme_form', true, $unix);
+		$formContent = loadTemplate('admin_import_theme_form', TRUE, $unix);
 	} // END - if
 
 	// 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
 	);
 
 	// Add row template
-	$OUT .= loadTemplate('admin_import_theme_row', true, $content);
+	$OUT .= loadTemplate('admin_import_theme_row', TRUE, $content);
 } // END - foreach
 
 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
-loadTemplate('admin_import_theme', false, $OUT);
+loadTemplate('admin_import_theme', FALSE, $OUT);
 
 // [EOF]
 ?>