X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Ftheme-manager.php;h=5a3f843988c85669372c6ec052b5f12a8c1d195f;hb=7b8e99bea1bd896d7d984bb5a04fdbf974890a7c;hp=a0145518ab90056ad03fc9f8b375763fadc40423;hpb=f7a9e86e802fd2860efd375c1b71107fd761387e;p=mailer.git

diff --git a/inc/theme-manager.php b/inc/theme-manager.php
index a0145518ab..5a3f843988 100644
--- a/inc/theme-manager.php
+++ b/inc/theme-manager.php
@@ -94,8 +94,7 @@ function GET_CURR_THEME() {
 	return $ret;
 }
 
-function THEME_SELECTION_BOX($mod, $act, $wht, $result)
-{
+function THEME_SELECTION_BOX($mod, $act, $wht, $result) {
 	// Construction URL
 	global $currTheme;
 	$FORM = URL."/modules.php?module=".$mod;
@@ -110,30 +109,27 @@ function THEME_SELECTION_BOX($mod, $act, $wht, $result)
 	);
 
 	// Load all themes
-	while(list($theme) = SQL_FETCHROW($result))
-	{
+	while(list($theme) = SQL_FETCHROW($result)) {
 		// Load it's theme.php file
-		$INC = PATH."theme/".$theme."/theme.php";
-		if (file_exists($INC))
-		{
+		$INC = sprintf("%stheme/%s/theme.php", PATH, SQL_ESCAPE($theme));
+		if ((file_exists($INC)) && (is_readable($INC))) {
 			// And save all data in array
-			include($INC);
+			require($INC);
 			$THEMES['theme_unix'][] = $theme;
 			$THEMES['theme_name'][] = $THEME_NAME;
-		}
-	}
+		} // END - if
+	} // END - while
 
 	// Sort whole array by title
 	array_pk_sort($THEMES, array("theme_name"));
 
 	// Construct selection form for the box template
 	$OUT = "";
-	foreach ($THEMES['theme_unix'] as $key=>$theme)
-	{
+	foreach ($THEMES['theme_unix'] as $key => $theme) {
 		$OUT .= "  <OPTION value=\"".$theme."\"";
 		if ($theme == $currTheme) $OUT .= " selected=\"selected\"";
 		$OUT .= ">".$THEMES['theme_name'][$key]."</OPTION>\n";
-	}
+	} // END - foreach
 
 	// Return generated selection
 	define('__THEME_SELECTION_OPTIONS', $OUT);
@@ -146,8 +142,7 @@ $currTheme = GET_CURR_THEME();
 if (empty($_POST['new_theme'])) $_POST['new_theme'] = "";
 
 // Check if new theme is selcted
-if ((!empty($_POST['new_theme'])) && ($_POST['new_theme'] != $currTheme))
-{
+if ((!empty($_POST['new_theme'])) && ($_POST['new_theme'] != $currTheme)) {
 	// Set new theme for guests
 	$NewTheme = $_POST['new_theme'];
 
@@ -155,10 +150,10 @@ if ((!empty($_POST['new_theme'])) && ($_POST['new_theme'] != $currTheme))
 	set_session("mxchange_theme", $NewTheme);
 
 	// Remove current from array and set new
-	$theme = PATH."theme/".$currTheme."/theme.php";
+	$theme = sprintf("%stheme/%s/theme.php", PATH, $currTheme);
 	unset($INC_POOL[array_search($theme, $INC_POOL)]);
-	$INC_POOL[] = PATH."theme/".$NewTheme."/theme.php";
-}
+	$INC_POOL[] = sprintf("%stheme/%s/theme.php", PATH, $NewTheme);
+} // END - if
 
 // Remove variable again
 unset($_POST['new_theme']);