Surfbar continued:

[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 04caa4616b17d34a45a320d7c31527ebc78a9cf5..53ef7809ca23f50bc7c6e975c54b043d3ef47c1a 100644 (file)
--- a/inc/modules/admin/what-theme_check.php
+++ b/inc/modules/admin/what-theme_check.php
@@ -32,22 +32,22 @@
  ************************************************************************/
 
 // 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 $CACHE, $KEEP_ACTIVE, $CACHE_FILE;
+global $cacheInstance, $cacheArray, $cacheMode;
 
 // Normally we want the overview of all registered theme_check
 $mode = "overview";
-$SEL = "0";
+$SEL = 0;
 
 // Get response from our server
-$response = MXCHANGE_OPEN("check-themes.php");
+$response = GET_URL("check-themes.php");
 
 // Are theme_check found?
 if (($response[sizeof($response) - 1] == "[EOF]") && ($response[0] != "[EOF]"))
@@ -64,26 +64,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 = PATH."themes/".$name."/theme.php";
-                       $ver = trim(substr($response[$idx + 3], 4));
+                       $file = sprintf("%sthemes/%s/theme.php", PATH, $name);
+                       $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_exists($file))) || ($ver != $cver))
-                       {
+                       if (((SQL_NUMROWS($result) == 0) && (!FILE_READABLE($file))) || ($ver != $cver)) {
                                // No, it isn't. So let's add this one!
                                $THEMES['fname'][]  = $name;
                                $THEMES['fsize'][]  = $response[$idx + 1];
@@ -96,37 +90,33 @@ if (($response[sizeof($response) - 1] == "[EOF]") && ($response[0] != "[EOF]"))
                                $INFO = ADMIN_EXT_NO_INFO_FOUND;
 
                                // Trim every data line
-                               foreach ($LANG_DUMMY as $k=>$v)
-                               {
+                               foreach ($LANG_DUMMY as $k => $v) {
                                        $v = trim($v);
                                        if (substr($v, 3) == "") $v = "---";
                                        $LANG_DUMMY[$k] = $v;
                                        if ($v == "xx:xx") break;
                                        $LANG[] = $v;
-                               }
+                               } // END - foreach
 
                                // If language is found stop searching on matching line
-                               foreach($LANG as $search)
-                               {
+                               foreach($LANG as $search) {
                                        if (substr($search, 0, 3) == (GET_LANGUAGE().":")) { $INFO = substr($search, 3); break; }
-                               }
+                               } // END - foreach
 
                                // Add informations to array
                                $THEMES['infos'][] = $INFO;
-                       }
-               }
-       }
+                       } // END - if
+               } // END - if
+       } // END - foreach
 
        // Ok, themes are on our server but maybe you have already installed them?
-       if (sizeof($THEMES['fname']) > 0)
-       {
+       if (sizeof($THEMES['fname']) > 0) {
                // Sort array (I missed ver and cver here)
                array_pk_sort($THEMES, array("cver", "fname"), 0, 1);
 
                // Extensions where found which are not downloaded and installed
                $SW = 2; $OUT = ""; $TSIZE = 0;
-               foreach ($THEMES['fname'] as $idx=>$name)
-               {
+               foreach ($THEMES['fname'] as $idx => $name) {
                        // Generate download link
                        $LINK = SERVER_URL."/themes/theme-".$name.".zip";
                        $OUT .= "<TR>
@@ -151,17 +141,14 @@ if (($response[sizeof($response) - 1] == "[EOF]") && ($response[0] != "[EOF]"))
 
                // Load template
                LOAD_TEMPLATE("admin_theme_list");
-       }
-        else
-       {
+       } else {
                // All Themes are downloaded and installed
                LOAD_TEMPLATE("admin_theme_installed", false, $count);
        }
-}
- else
-{
+} else {
        // No theme where found
        LOAD_TEMPLATE("admin_theme_404");
 }
+
 //
 ?>