X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-theme_import.php;h=ff47824ed7dd058923744ca6658ca384d3c1e733;hp=aeda0eed62e0a06d16384982ef3b6536a465cc3e;hb=7967841ac94cdcbd10b4d5c011a1e0a9982ec600;hpb=75ad748a68473ace540251427a74fb781b1145e9

diff --git a/inc/modules/admin/what-theme_import.php b/inc/modules/admin/what-theme_import.php
index aeda0eed62..ff47824ed7 100644
--- a/inc/modules/admin/what-theme_import.php
+++ b/inc/modules/admin/what-theme_import.php
@@ -52,23 +52,21 @@ if (!empty($_POST['theme']))
 	if (SQL_NUMROWS($result) == 0)
 	{
 		// Import theme
-		$file = PATH."theme/".$_POST['theme']."/theme.php";
-		if (file_exists($file))
-		{
+		$file = sprintf("%stheme/%s/theme.php", PATH, SQL_ESCAPE($_POST['theme']));
+		if (FILE_READABLE($file)) {
+			// Load the theme header file
 			include($file);
+
+			// Register it ith the exchange
 			$result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_themes (theme_path, theme_active, theme_ver)
 VALUES ('%s', 'N', '%s')",
  array($_POST['theme'], $THEME_VERSION), __FILE__, __LINE__);
 			$msg = ADMIN_THEME_IMPORTED_1.$_POST['theme'].ADMIN_THEME_IMPORTED_2;
-		}
-		 else
-		{
+		} else {
 			// Include file not found!
 			$msg = ADMIN_THEME_INC_404_1.$_POST['theme'].ADMIN_THEME_INC_404_2;
 		}
-	}
-	 else
-	{
+	} else {
 		// Free memory
 		SQL_FREERESULT($result);
 
@@ -78,7 +76,7 @@ VALUES ('%s', 'N', '%s')",
 
 	// Output message
 	LOAD_TEMPLATE("admin_settings_saved", false, $msg);
-	OUTPUT_HTML ("<BR>");
+	OUTPUT_HTML("<br />");
 }
 
 // Initialize array
@@ -93,14 +91,12 @@ $THEMES = array(
 
 // Read directory "themes"
 $handle = opendir(PATH."theme/") or mxchange_die("Cannot read themes dir!");
-while ($dir = readdir($handle))
-{
+while ($dir = readdir($handle)) {
 	// Construct absolute theme.php file name
-	$theme = PATH."theme/".$dir."/"."theme.php";
+	$theme = sprintf("%stheme/%s/theme.php", PATH, $dir);
 
 	// Test it...
-	if (($dir != ".") && ($dir != "..") && (file_exists($theme)))
-	{
+	if (($dir != ".") && ($dir != "..") && (FILE_READABLE($theme))) {
 		// Found a valid directory so let's load it's theme.php file
 		include($theme);
 
@@ -111,8 +107,10 @@ while ($dir = readdir($handle))
 		$THEMES['theme_email'][]  = $THEME_EMAIL;
 		$THEMES['theme_url'][]    = $THEME_URL;
 		$THEMES['theme_ver'][]    = $THEME_VERSION;
-	}
-}
+	} // END - if
+} // END - while
+
+// Close directory
 closedir($handle);
 
 // Sort array by Uni* name
@@ -120,21 +118,17 @@ array_pk_sort($THEMES, array("theme_name"));
 
 // Generate output lines for the template
 $OUT = ""; $SW = 2;
-foreach ($THEMES['theme_unix'] as $key=>$unix)
-{
+foreach ($THEMES['theme_unix'] as $key => $unix) {
 	// Check if current theme is already imported or not
 	$result = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_themes WHERE theme_path='%s' LIMIT 1",
 	 array($unix), __FILE__, __LINE__);
-	if (SQL_NUMROWS($result) == 1)
-	{
+	if (SQL_NUMROWS($result) == 1) {
 		// Free memory
 		SQL_FREERESULT($result);
 
 		// Already installed
 		$FOUND = "<FONT class=\"admin_note\">".ADMIN_THEME_ALREADY_INSTALLED."</FONT>";
-	}
-	 else
-	{
+	} else {
 		// Theme not installed
 		$FOUND = "<FORM action=\"".URL."/modules.php?module=admin&amp;what=theme_import\" method=\"POST\">
   <INPUT type=\"submit\" name=\"ok\" class=\"admin_submit\" value=\"".ADMIN_INSTALL_THEME."\">
@@ -159,8 +153,8 @@ foreach ($THEMES['theme_unix'] as $key=>$unix)
 </TR>\n";
 	$SW = 3 - $SW;
 }
-if (empty($OUT))
-{
+
+if (empty($OUT)) {
  	// No themes found???
 	$OUT .= "<TR>
   <TD colspan=\"6\" class=\"bottom2\" height=\"80\">