Fixed a comparison problem like string1 < string2

[mailer.git] / inc / extensions.php

diff --git a/inc/extensions.php b/inc/extensions.php
index 969d8617098e9d2986b63d28b083e9a2e63f6721..c6721cc0100bb50e4e4f16f94f0bbed1d8ed967d 100644 (file)
--- a/inc/extensions.php
+++ b/inc/extensions.php
@@ -65,21 +65,16 @@ function EXTENSION_REGISTER ($ext_name, $id, $dry_run=false)
                foreach ($EXT_VER_HISTORY as $EXT_VER)
                {
                        require($file);
-                       if (((GET_EXT_VERSION("sql_patches") != '') && ($_CONFIG['verbose_sql'] == "Y")) || (!EXT_IS_ACTIVE("sql_patches")))
-                       {
-                               if (!empty($UPDATE_NOTES))
-                               {
+                       if (((GET_EXT_VERSION("sql_patches") != "") && ($_CONFIG['verbose_sql'] == "Y")) || (!EXT_IS_ACTIVE("sql_patches"))) {
+                               if (!empty($UPDATE_NOTES)) {
                                        // Update notes found
                                        $NOTES .= "<STRONG>v".$EXT_VER.":</STRONG><br />".$UPDATE_NOTES."<br /><br />\n";
                                        $UPDATE_NOTES = "";
-                               }
-                                elseif (($EXT_VER == "0.0") || ($EXT_VER == "0.0.0"))
-                               {
+                               } elseif (($EXT_VER == "0.0") || ($EXT_VER == "0.0.0")) {
                                        // Initial release
                                        $NOTES .= "<STRONG>v".$EXT_VER.":</STRONG><br />".INITIAL_RELEASE."<br /><br />\n";
-                               }
-                                else
-                               {
+                               } else {
+                                       // No update notes found!
                                        $NOTES .= "<STRONG>v".$EXT_VER.":</STRONG><br /><I>".NO_UPDATE_NOTES."</I><br /><br />\n";
                                }
                        }
@@ -320,22 +315,17 @@ function EXTENSION_RUN_SQLS($id, $EXT_LOAD_MODE) {
        } // END - if
 }
 // Check if given extension is active
-function EXT_IS_ACTIVE ($ext_name, $ignore_admin = false, $ignore_cache = false) {
+function EXT_IS_ACTIVE ($ext_name) {
        global $cacheArray, $_CONFIG;
 
        // Extensions are all inactive during installation
        if ((!isBooleanConstantAndTrue('mxchange_installed')) || (isBooleanConstantAndTrue('mxchange_installing')) || (empty($ext_name))) return false;
 
-       // Extension's file name will also be checked
-       $file = sprintf("%sinc/extensions/ext-%s.php", PATH, $ext_name);
-       if (!FILE_READABLE($file)) return false;
-       //* DEBUG: */ echo "*".$ext_name."(".count($cacheArray).")<br />";
-
        // Not active is the default
        $active = "N";
 
        // Check cache
-       if ((!empty($cacheArray['extensions']['ext_active'][$ext_name])) && (!$ignore_cache)) {
+       if (!empty($cacheArray['extensions']['ext_active'][$ext_name])) {
                // Load from cache
                //* DEBUG: */ echo "CACHE! ext_name={$ext_name}<br />\n";
                $active = $cacheArray['extensions']['ext_active'][$ext_name];
@@ -370,13 +360,7 @@ function EXT_IS_ACTIVE ($ext_name, $ignore_admin = false, $ignore_cache = false)
        //DEBUG_LOG(__FUNCTION__.": ext_name={$ext_name},active={$active}");
 
        // Is this extension activated? (For admins we always have active extensions...)
-       return (
-               (
-                       $active == "Y"
-               ) && (
-                       FILE_READABLE($inc)
-               )
-       );
+       return ($active == "Y");
 }
 // Get version from extensions
 function GET_EXT_VERSION ($ext_name) {
@@ -524,7 +508,7 @@ function EXTENSION_VERBOSE_TABLE($SQLs, $title = ADMIN_SQLS_EXECUTED_ON_REMOVAL,
 
        $S = false; $SW = 2; $i = 1;
        $OUT = "";
-       if ((is_array($SQLs)) && (GET_EXT_VERSION("sql_patches")) && ($_CONFIG['verbose_sql'] == "Y")) {
+       if ((is_array($SQLs)) && (GET_EXT_VERSION("sql_patches") >= "0.0.7") && ($_CONFIG['verbose_sql'] == "Y")) {
                $OUT  = "<DIV align=\"center\">
 <TABLE border=\"0\" cellspacing=\"0\" cellpadding=\"0\" width=\"".$WIDTH."\" align=\"center\"".$dashed.">
 <TR>
@@ -548,7 +532,7 @@ function EXTENSION_VERBOSE_TABLE($SQLs, $title = ADMIN_SQLS_EXECUTED_ON_REMOVAL,
                }
        }
 
-       if ((!$S) && (GET_EXT_VERSION("sql_patches")) && ($_CONFIG['verbose_sql'] == "Y")) {
+       if ((!$S) && (GET_EXT_VERSION("sql_patches") >= "0.0.7") && ($_CONFIG['verbose_sql'] == "Y")) {
                // No addional SQL commands to run
                $OUT .= "<TR>
   <TD colspan=\"2\" align=\"center\" class=\"switch_sw2 bottom2\" height=\"24\">
@@ -606,5 +590,29 @@ function GET_EXT_ID($name) {
        // Return value
        return $ret;
 }
+// Activate given extension
+function ACTIVATE_EXTENSION($ext_name) {
+       // Activate the extension
+       $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_extensions SET ext_active='Y' WHERE ext_name='%s' LIMIT 1",
+               array($ext_name), __FILE__, __LINE__);
+
+       // Extension has been activated?
+       if (SQL_AFFECTEDROWS() == 1) {
+               // Then run all queries
+               EXTENSION_RUN_SQLS(GET_EXT_ID($ext_name), "activate");
+       } // END - if
+}
+// Checks wether the extension is older than given
+function EXT_VERSION_IS_OLDER ($ext_name, $ext_ver) {
+       // Get current extension version
+       $currVersion = GET_EXT_VERSION($ext_name);
+
+       // Remove all dots from both versions
+       $currVersion = str_replace(".", "", $currVersion);
+       $ext_ver = str_replace(".", "", $ext_ver);
+
+       // Now compare both and return the result
+       return ($currVersion < $ext_ver);
+}
 //
 ?>