X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fmodules%2Fadmin%2Fwhat-theme_import.php;h=ca02e9e2d94d5fe4bf763a064cb605ef7a9ec692;hb=b8c86fa12322603c24a88ea2b0fd3dbeba612752;hp=c56245e4ee4f731c51e71212d86dce776f3f9864;hpb=56156f6c4392510cdbe0eb4f2ccefc23b43e2672;p=mailer.git

diff --git a/inc/modules/admin/what-theme_import.php b/inc/modules/admin/what-theme_import.php
index c56245e4ee..ca02e9e2d9 100644
--- a/inc/modules/admin/what-theme_import.php
+++ b/inc/modules/admin/what-theme_import.php
@@ -36,7 +36,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
 	require($INC);
 } elseif (!EXT_IS_ACTIVE("theme")) {
-	addFatalMessage(sprintf(EXTENSION_PROBLEM_NOT_INSTALLED, "theme"));
+	addFatalMessage(__FILE__, __LINE__, getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), "theme");
 	return;
 }
 
@@ -47,37 +47,36 @@ ADD_DESCR("admin", __FILE__);
 $THEME_MODE = "test";
 
 // Import selected theme if not present
-if (!empty($_POST['theme'])) {
+if (REQUEST_ISSET_POST(('theme'))) {
 	// Check if theme is there
-	if (!THEME_CHECK_EXIST($_POST['theme'])) {
+	if (!THEME_CHECK_EXIST(REQUEST_POST('theme'))) {
 		// Import theme
-		$file = sprintf("%stheme/%s/theme.php", PATH, SQL_ESCAPE($_POST['theme']));
-		if (FILE_READABLE($file)) {
+		$INC = sprintf("theme/%s/theme.php", SQL_ESCAPE(REQUEST_POST('theme')));
+		if (INCLUDE_READABLE($INC)) {
 			// Load the theme header file
-			include($file);
+			LOAD_INC($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($_POST['theme'], $THEME_VERSION, $THEME_NAME), __FILE__, __LINE__);
+				array(REQUEST_POST('theme'), $THEME_VERSION, $THEME_NAME), __FILE__, __LINE__);
 
 			// Destroy cache
 			REBUILD_CACHE("themes", "them");
 
 			// Prepare message
-			$msg = ADMIN_THEME_IMPORTED_1.$_POST['theme'].ADMIN_THEME_IMPORTED_2;
+			$msg = ADMIN_THEME_IMPORTED_1.REQUEST_POST('theme').ADMIN_THEME_IMPORTED_2;
 		} else {
 			// Include file not found!
-			$msg = ADMIN_THEME_INC_404_1.$_POST['theme'].ADMIN_THEME_INC_404_2;
+			$msg = ADMIN_THEME_INC_404_1.REQUEST_POST('theme').ADMIN_THEME_INC_404_2;
 		}
 	} else {
 		// Theme already imported
-		$msg = ADMIN_THEME_ALREADY_1.$_POST['theme'].ADMIN_THEME_ALREADY_2;
+		$msg = ADMIN_THEME_ALREADY_1.REQUEST_POST('theme').ADMIN_THEME_ALREADY_2;
 	}
 
 	// Output message
 	LOAD_TEMPLATE("admin_settings_saved", false, $msg);
-	OUTPUT_HTML("<br />");
 } // END - if
 
 // Initialize array
@@ -91,15 +90,15 @@ $THEMES = array(
 );
 
 // Read directory "themes"
-$handle = opendir(PATH."theme/") or mxchange_die("Cannot read themes dir!");
+$handle = opendir(constant('PATH')."theme/") or mxchange_die("Cannot read themes dir!");
 while ($dir = readdir($handle)) {
 	// Construct absolute theme.php file name
-	$theme = sprintf("%stheme/%s/theme.php", PATH, $dir);
+	$INC = sprintf("theme/%s/theme.php", $dir);
 
 	// Test it...
-	if (($dir != ".") && ($dir != "..") && (FILE_READABLE($theme))) {
+	if (($dir != ".") && ($dir != "..") && (INCLUDE_READABLE($INC))) {
 		// Found a valid directory so let's load it's theme.php file
-		include($theme);
+		LOAD_INC($INC);
 
 		// Add found theme to array
 		$THEMES['theme_unix'][]   = $dir;
@@ -120,46 +119,41 @@ 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>";
+
 	// Check if current theme is already imported or not
-	if (THEME_CHECK_EXIST($unix)) {
-		// Already installed
-		$FOUND = "<div class=\"admin_note\">".ADMIN_THEME_ALREADY_INSTALLED."</div>";
-	} else {
+	if (!THEME_CHECK_EXIST($unix)) {
 		// 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."\">
-  <INPUT type=\"hidden\" name=\"theme\" value=\"".$unix."\">
-</form>";
-	}
+		$FOUND = LOAD_TEMPLATE("admin_theme_import_form", true, $unix);
+	} // END - if
 
-	// Add row
-	$OUT .= "<TR>
-  <TD class=\"switch_sw".$SW." bottom2 right2\" align=\"center\" height=\"30\">".$unix."</TD>
-  <TD class=\"switch_sw".$SW." bottom2 right2\" align=\"center\">".$THEMES['theme_name'][$key]."</TD>
-  <TD class=\"switch_sw".$SW." bottom2 right2\" align=\"center\">
-    <a href=\"mailto:".$THEMES['theme_email'][$key]."?Subject=[Theme:] ".$THEMES['theme_name'][$key]." (".$unix.")"."\">".$THEMES['theme_author'][$key]."</a>
-  </TD>
-  <TD class=\"switch_sw".$SW." bottom2 right2\" align=\"center\">
-    <a href=\"".DEREFERER($THEMES['theme_url'][$key])."\" target=\"_blank\">".$THEMES['theme_url'][$key]."</a>
-  </TD>
-  <TD class=\"switch_sw".$SW." bottom2 right2\" align=\"center\">v".$THEMES['theme_ver'][$key]."</TD>
-  <TD class=\"switch_sw".$SW." bottom2\" align=\"center\">
-    ".$FOUND."
-  </TD>
-</TR>\n";
+	// Prepare content
+	$content = array(
+		'sw'      => $SW,
+		'unix'    => $unix,
+		'name'    => $THEMES['theme_name'][$key],
+		'email'   => $THEMES['theme_email'][$key],
+		'author'  => $THEMES['theme_author'][$key],
+		'link'    => DEREFERER($THEMES['theme_url'][$key]),
+		'url'     => $THEMES['theme_url'][$key],
+		'version' => $THEMES['theme_ver'][$key],
+		'form'    => $FOUND
+	);
+
+	// Add row template
+	$OUT .= LOAD_TEMPLATE("admin_theme_import_row", true, $content);
 
 	// Switch color
 	$SW = 3 - $SW;
-}
+} // END - foreach
 
 if (empty($OUT)) {
 	// No themes found???
-	$OUT .= "<TR>
-  <TD colspan=\"6\" class=\"bottom2\" height=\"80\">
-    ".LOAD_TEMPLATE("admin_settings_saved", true, ADMIN_NO_THEMES_FOUND)."
-  </TD>
-</TR>\n";
+	$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