X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-theme_import.php;h=0ca4421b141cb6bf435d9b55b2cdf2a2d4d2446d;hp=d075327bfec9d4ec9a051f00afbc4add61b7ed84;hb=1fe7cf281be6832ba105934537aba5127892c576;hpb=7f104f6fe558bb56b4205241435a2357c2feece1

diff --git a/inc/modules/admin/what-theme_import.php b/inc/modules/admin/what-theme_import.php
index d075327bfe..0ca4421b14 100644
--- a/inc/modules/admin/what-theme_import.php
+++ b/inc/modules/admin/what-theme_import.php
@@ -32,13 +32,16 @@
  ************************************************************************/
 
 // Some security stuff...
-if ((!defined('__SECURITY')) || (!is_admin())) {
+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"));
+	return;
 }
 
 // Add description as navigation point
-ADD_DESCR("admin", basename(__FILE__));
+ADD_DESCR("admin", __FILE__);
 
 // Switch to testing mode
 $THEME_MODE = "test";
@@ -48,13 +51,13 @@ if (!empty($_POST['theme'])) {
 	// Check if theme is there
 	if (!THEME_CHECK_EXIST($_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($_POST['theme']));
+		if (FILE_READABLE($INC)) {
 			// Load the theme header file
-			include($file);
+			LOAD_INC($INC);
 
 			// Register it ith the exchange
-			$result = 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__);
 
@@ -74,7 +77,6 @@ VALUES ('%s','N','%s','%s')",
 
 	// Output message
 	LOAD_TEMPLATE("admin_settings_saved", false, $msg);
-	OUTPUT_HTML("<br />");
 } // END - if
 
 // Initialize array
@@ -91,12 +93,12 @@ $THEMES = array(
 $handle = opendir(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 != "..") && (FILE_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;
@@ -117,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 = "<FONT class=\"admin_note\">".ADMIN_THEME_ALREADY_INSTALLED."</FONT>";
-	} 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