Security line in all includes changed

[mailer.git] / inc / modules / admin / what-theme_check.php

diff --git a/inc/modules/admin/what-theme_check.php b/inc/modules/admin/what-theme_check.php
index b3368dd7796a757a90c988f463e71e1b32db2293..1c9d7f0684ecc8eef85fb387a9a29380c1913a5f 100644 (file)
--- a/inc/modules/admin/what-theme_check.php
+++ b/inc/modules/admin/what-theme_check.php
@@ -32,11 +32,11 @@
  ************************************************************************/
 
 // 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__));
 
@@ -64,22 +64,17 @@ 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)) {