X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-theme_check.php;h=e29ae53c256ba77e9725dbad4bcd165312e95101;hp=b3368dd7796a757a90c988f463e71e1b32db2293;hb=3daede4c904e23905c3e48dd6749019deca0a0e0;hpb=0369c36aaab5af6ed44da1e13a53baef285f79b4

diff --git a/inc/modules/admin/what-theme_check.php b/inc/modules/admin/what-theme_check.php
index b3368dd779..e29ae53c25 100644
--- a/inc/modules/admin/what-theme_check.php
+++ b/inc/modules/admin/what-theme_check.php
@@ -32,13 +32,13 @@
  ************************************************************************/
 
 // Some security stuff...
-if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) || (!IS_ADMIN()))
-{
+if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
 	require($INC);
 }
+
 // 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
@@ -64,25 +63,20 @@ if (($response[sizeof($response) - 1] == "[EOF]") && ($response[0] != "[EOF]"))
 
 	// Get count of theme_check for validation
 	$count = trim($response[sizeof($response) - 2]);
-	foreach ($response as $idx => $value)
-	{
+	foreach ($response as $idx => $value) {
 		$value = str_replace("\n", "", $value); $ver = "";
 
 		// Leave loop when data is invalid or EOF?
-		if ((substr($value, 0, 6) == "theme-") && (substr($value, -4) == ".zip"))
-		{
+		if ((substr($value, 0, 6) == "theme-") && (substr($value, -4) == ".zip")) {
 			$name = substr($value, 6, -4);
 			$file = sprintf("%sthemes/%s/theme.php", PATH, $name);
-			$ver = trim(substr($response[$idx + 3], 4));
+			$ver  = trim(substr($response[$idx + 3], 4));
 
 			// Load version
-			$result = SQL_QUERY_ESC("SELECT theme_ver FROM "._MYSQL_PREFIX."_themes WHERE theme_path='%s' LIMIT 1",
-			 array($name), __FILE__, __LINE__);
-			list($cver) = SQL_FETCHROW($result);
-			if (empty($cver)) $cver = "-.-";
+			$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];
@@ -90,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;