From 211058a32ac0f0eaa69987158f41d8102663ec4d Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Wed, 29 Jul 2009 21:41:54 +0000
Subject: [PATCH 1/1] Double->single converted and fixed a display bug when
 theme is already installed

---
 inc/modules/admin/what-theme_import.php | 34 +++++++++++++++----------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/inc/modules/admin/what-theme_import.php b/inc/modules/admin/what-theme_import.php
index 31b565a7c9..b5a13b47db 100644
--- a/inc/modules/admin/what-theme_import.php
+++ b/inc/modules/admin/what-theme_import.php
@@ -57,6 +57,8 @@ if (REQUEST_ISSET_POST('theme')) {
 	if (!ifThemeExists(REQUEST_POST('theme'))) {
 		// Import theme
 		$INC = sprintf("theme/%s/theme.php", SQL_ESCAPE(REQUEST_POST('theme')));
+
+		// Is the theme readable?
 		if (isIncludeReadable($INC)) {
 			// Load the theme header file
 			loadInclude($INC);
@@ -64,24 +66,28 @@ 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'), $GLOBALS['theme_data']['version'], $GLOBALS['theme_data']['name']), __FILE__, __LINE__);
+				array(
+					REQUEST_POST('theme'),
+					$GLOBALS['theme_data']['version'],
+					$GLOBALS['theme_data']['name']
+				), __FILE__, __LINE__);
 
 			// Destroy cache
-			rebuildCacheFiles("themes", "them");
+			rebuildCacheFiles('themes', 'them');
 
 			// Prepare message
-			$msg = sprintf(getMessage('ADMIN_THEME_IMPORTED'), REQUEST_POST('theme'));
+			$message = sprintf(getMessage('ADMIN_THEME_IMPORTED'), REQUEST_POST('theme'));
 		} else {
 			// Include file not found!
-			$msg = sprintf(getMessage('ADMIN_THEME_INC_404'), REQUEST_POST('theme'));
+			$message = sprintf(getMessage('ADMIN_THEME_INC_404'), REQUEST_POST('theme'));
 		}
 	} else {
 		// Theme already imported
-		$msg = sprintf(getMessage('ADMIN_THEME_ALREADY_INSTALLED'), REQUEST_POST('theme'));
+		$message = sprintf(getMessage('ADMIN_THEME_ALREADY_INSTALLED'), REQUEST_POST('theme'));
 	}
 
 	// Output message
-	LOAD_TEMPLATE('admin_settings_saved', false, $msg);
+	LOAD_TEMPLATE('admin_settings_saved', false, $message);
 } // END - if
 
 // Initialize array
@@ -95,7 +101,7 @@ $THEMES = array(
 );
 
 // Read directory "themes"
-$handle = opendir(constant('PATH')."theme/") or app_die(__FILE__, __LINE__, "Cannot read themes dir!");
+$handle = opendir(constant('PATH') . 'theme/') or app_die(__FILE__, __LINE__, 'Cannot read themes dir!');
 while ($dir = readdir($handle)) {
 	// Construct absolute theme.php file name
 	$INC = sprintf("theme/%s/theme.php", $dir);
@@ -119,18 +125,18 @@ while ($dir = readdir($handle)) {
 closedir($handle);
 
 // 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 = ''; $SW = 2;
 foreach ($THEMES['theme_unix'] as $key => $unix) {
 	// Already installed is default
-	$FOUND = "<div class=\"admin_note\">{--ADMIN_THEME_ALREADY_INSTALLED--}</div>";
+	$formContent = '<div class="admin_note">' . sprintf(getMessage('ADMIN_THEME_ALREADY_INSTALLED'), $unix) . '</div>';
 
 	// Check if current theme is already imported or not
 	if (!ifThemeExists($unix)) {
 		// Theme not installed
-		$FOUND = LOAD_TEMPLATE("admin_theme_import_form", true, $unix);
+		$formContent = LOAD_TEMPLATE('admin_theme_import_form', true, $unix);
 	} // END - if
 
 	// Prepare content
@@ -143,11 +149,11 @@ foreach ($THEMES['theme_unix'] as $key => $unix) {
 		'link'    => DEREFERER($THEMES['theme_url'][$key]),
 		'url'     => $THEMES['theme_url'][$key],
 		'version' => $THEMES['theme_ver'][$key],
-		'form'    => $FOUND
+		'form'    => $formContent
 	);
 
 	// Add row template
-	$OUT .= LOAD_TEMPLATE("admin_theme_import_row", true, $content);
+	$OUT .= LOAD_TEMPLATE('admin_theme_import_row', true, $content);
 
 	// Switch color
 	$SW = 3 - $SW;
@@ -155,14 +161,14 @@ 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
 define('__THEME_LIST', $OUT);
 
 // Load template
-LOAD_TEMPLATE("admin_theme_import");
+LOAD_TEMPLATE('admin_theme_import');
 
 //
 ?>
-- 
2.39.2