X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-theme_import.php;h=df118063b96f88e5eca1c0b6b987cdc35410ed37;hb=d016e24dd4686f613a17733b96bc28fac936a4ac;hp=41ac3d296f58f8cb838ba2603bffb83e004f1b04;hpb=c47144dd555bbab4acdf9085e4623900dedb0e7c;p=mailer.git

diff --git a/inc/modules/admin/what-theme_import.php b/inc/modules/admin/what-theme_import.php
index 41ac3d296f..df118063b9 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(getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), "theme");
 	return;
 }
 
@@ -52,7 +52,7 @@ if (!empty($_POST['theme'])) {
 	if (!THEME_CHECK_EXIST($_POST['theme'])) {
 		// Import theme
 		$INC = sprintf("theme/%s/theme.php", SQL_ESCAPE($_POST['theme']));
-		if (FILE_READABLE($INC)) {
+		if (INCLUDE_READABLE($INC)) {
 			// Load the theme header file
 			LOAD_INC($INC);
 
@@ -90,13 +90,13 @@ $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
 	$INC = sprintf("theme/%s/theme.php", $dir);
 
 	// Test it...
-	if (($dir != ".") && ($dir != "..") && (FILE_READABLE($INC))) {
+	if (($dir != ".") && ($dir != "..") && (INCLUDE_READABLE($INC))) {
 		// Found a valid directory so let's load it's theme.php file
 		LOAD_INC($INC);
 
@@ -119,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, getMessage('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