X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-theme_check.php;h=04a93543836571900ed1cbfa87193cadaac62332;hp=1c9d7f0684ecc8eef85fb387a9a29380c1913a5f;hb=7989ec603971c0dc8dc35d8be4e72f8098b83baa;hpb=963e55ca1ea79e255f235e359cde9f7862191dc5

diff --git a/inc/modules/admin/what-theme_check.php b/inc/modules/admin/what-theme_check.php
index 1c9d7f0684..04a9354383 100644
--- a/inc/modules/admin/what-theme_check.php
+++ b/inc/modules/admin/what-theme_check.php
@@ -38,7 +38,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 }
 
 // Add description as navigation point
-ADD_DESCR("admin", basename(__FILE__));
+ADD_DESCR("admin", __FILE__);
 
 global $cacheInstance, $cacheArray, $cacheMode;
 
@@ -50,8 +50,7 @@ $SEL = 0;
 $response = GET_URL("check-themes.php");
 
 // Are theme_check found?
-if (($response[sizeof($response) - 1] == "[EOF]") && ($response[0] != "[EOF]"))
-{
+if (($response[sizeof($response) - 1] == "[EOF]") && ($response[0] != "[EOF]")) {
 	// Ok, mark found and create the array
 	$THEMES = array(
 		'fname'  => array(), // File names
@@ -70,14 +69,14 @@ if (($response[sizeof($response) - 1] == "[EOF]") && ($response[0] != "[EOF]"))
 		// Leave loop when data is invalid or EOF?
 		if ((substr($value, 0, 6) == "theme-") && (substr($value, -4) == ".zip")) {
 			$name = substr($value, 6, -4);
-			$file = sprintf("%sthemes/%s/theme.php", PATH, $name);
+			$file = sprintf("%sthemes/%s/theme.php", constant('PATH'), $name);
 			$ver  = trim(substr($response[$idx + 3], 4));
 
 			// Load version
 			$cver = THEME_GET_VERSION($name);
 
 			// Is the extension already installed or not?
-			if (((SQL_NUMROWS($result) == 0) && (!FILE_READABLE($file))) || ($ver != $cver)) {
+			if (($ver != $cver) && ($cver != "?") && ($cver != "!")) {
 				// No, it isn't. So let's add this one!
 				$THEMES['fname'][]  = $name;
 				$THEMES['fsize'][]  = $response[$idx + 1];
@@ -85,6 +84,7 @@ if (($response[sizeof($response) - 1] == "[EOF]") && ($response[0] != "[EOF]"))
 				$THEMES['ver'][]    = $ver;
 				$THEMES['cver'][]   = $cver;
 
+				// Extract language strings from reponse
 				$LANG_DUMMY = explode("[nl]", $response[$idx + 4]);
 				$LANG = array();
 				$INFO = ADMIN_EXT_NO_INFO_FOUND;
@@ -119,19 +119,21 @@ if (($response[sizeof($response) - 1] == "[EOF]") && ($response[0] != "[EOF]"))
 		foreach ($THEMES['fname'] as $idx => $name) {
 			// Generate download link
 			$LINK = SERVER_URL."/themes/theme-".$name.".zip";
-			$OUT .= "<TR>
-  <TD align=\"center\" class=\"switch_sw".$SW." bottom2 right2\">".($idx + 1).".</TD>
-  <TD align=\"center\" class=\"switch_sw".$SW." bottom2 right2\"><A href=\"".$LINK."\">".$name."</A></TD>
-  <TD align=\"center\" class=\"switch_sw".$SW." bottom2 right2\">".MAKE_DATETIME($THEMES['fctime'][$idx], "2")."</TD>
-  <TD align=\"center\" class=\"switch_sw".$SW." bottom2 right2\">".TRANSLATE_COMMA(round($THEMES['fsize'][$idx] / 1.024) / 1000)." ".KBYTES."</TD>
-  <TD align=\"center\" class=\"switch_sw".$SW." bottom2\">".$THEMES['ver'][$idx]." (".$THEMES['cver'][$idx].")</TD>
-</TR>
-<TR>
-  <TD class=\"switch_sw".$SW." bottom2\">&nbsp;</TD>
-  <TD colspan=\"4\" class=\"switch_sw".$SW." bottom2\">
-    <FONT class=\"tiny\">".$THEMES['infos'][$idx]."</FONT>
-  </TD>
-</TR>\n";
+
+			// @TODO Move this HTML code to a template "admin_theme_row"
+			$OUT .= "<tr>
+  <td align=\"center\" class=\"switch_sw".$SW." bottom2 right2\">".($idx + 1).".</td>
+  <td align=\"center\" class=\"switch_sw".$SW." bottom2 right2\"><a href=\"".$LINK."\">".$name."</a></td>
+  <td align=\"center\" class=\"switch_sw".$SW." bottom2 right2\">".MAKE_DATETIME($THEMES['fctime'][$idx], "2")."</td>
+  <td align=\"center\" class=\"switch_sw".$SW." bottom2 right2\">".TRANSLATE_COMMA(round($THEMES['fsize'][$idx] / 1.024) / 1000)." ".KBYTES."</td>
+  <td align=\"center\" class=\"switch_sw".$SW." bottom2\">".$THEMES['ver'][$idx]." (".$THEMES['cver'][$idx].")</td>
+</tr>
+<tr>
+  <td class=\"switch_sw".$SW." bottom2\">&nbsp;</td>
+  <td colspan=\"4\" class=\"switch_sw".$SW." bottom2\">
+    <div class=\"tiny\">".$THEMES['infos'][$idx]."</div>
+  </td>
+</tr>\n";
 			$TSIZE += $THEMES['fsize'][$idx];
 			$SW = 3 - $SW;
 		}
@@ -147,7 +149,7 @@ if (($response[sizeof($response) - 1] == "[EOF]") && ($response[0] != "[EOF]"))
 	}
 } else {
 	// No theme where found
-	LOAD_TEMPLATE("admin_theme_404");
+	LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_THEME_NOTHING_FOUND'));
 }
 
 //