Email templates changed, surfbar extended (dummy) with member actions

[mailer.git] / inc / extensions.php

diff --git a/inc/extensions.php b/inc/extensions.php
index c6721cc0100bb50e4e4f16f94f0bbed1d8ed967d..3973f4132afb746d5403111617ac69ccaf6819dc 100644 (file)
--- a/inc/extensions.php
+++ b/inc/extensions.php
@@ -55,16 +55,17 @@ function EXTENSION_REGISTER ($ext_name, $id, $dry_run=false)
        $file = sprintf("%sinc/extensions/ext-%s.php", PATH, $ext_name);
 
        // Does this extension exists?
-       if (FILE_READABLE($file))
-       {
+       if (FILE_READABLE($file)) {
                // Extension was found so we can load it in registration mode
                require($file);
 
                // And run possible updates
                $EXT_LOAD_MODE = "update"; $EXT_UPDATE_DEPENDS = "";
-               foreach ($EXT_VER_HISTORY as $EXT_VER)
-               {
+               foreach ($EXT_VER_HISTORY as $EXT_VER) {
+                       // Load extension in update mode
                        require($file);
+
+                       // Do we have an update?
                        if (((GET_EXT_VERSION("sql_patches") != "") && ($_CONFIG['verbose_sql'] == "Y")) || (!EXT_IS_ACTIVE("sql_patches"))) {
                                if (!empty($UPDATE_NOTES)) {
                                        // Update notes found
@@ -77,24 +78,25 @@ function EXTENSION_REGISTER ($ext_name, $id, $dry_run=false)
                                        // No update notes found!
                                        $NOTES .= "<STRONG>v".$EXT_VER.":</STRONG><br /><I>".NO_UPDATE_NOTES."</I><br /><br />\n";
                                }
-                       }
-               }
+                       } // END - if
+               } // END - foreach
 
                // Does this extension depends on an outstanding update of another update?
-               if (!empty($EXT_UPDATE_DEPENDS))
-               {
+               if (!empty($EXT_UPDATE_DEPENDS)) {
                        // Backup SQL commands and clear current
-                       $SQLs2 = $SQLs;  $SQLs = array(); $test = false;
+                       $SQLs2 = $SQLs;
+                       $SQLs  = array();
+                       $test  = false;
 
                        // Backup language as well
-                       $LANG_BCK = $EXT_LANG_PREFIX; $EXT_ALWAYS_ACTIVE = "N";
+                       $LANG_BCK = $EXT_LANG_PREFIX;
+                       $EXT_ALWAYS_ACTIVE = "N";
 
                        // Load required extension also in update mode
                        $file = sprintf("%sinc/extensions/ext-%s.php", PATH, $EXT_UPDATE_DEPENDS);
 
                        // Check for required file
-                       if (FILE_READABLE($file))
-                       {
+                       if (FILE_READABLE($file)) {
                                // File exists so let's load it
                                $VER_BACKUP = $EXT_VERSION;
                                require($file);
@@ -102,35 +104,35 @@ function EXTENSION_REGISTER ($ext_name, $id, $dry_run=false)
 
                                // If versions mismatch update extension first
                                $ext_ver = GET_EXT_VERSION($EXT_UPDATE_DEPENDS);
-                               if (empty($ext_ver))
-                               {
+
+                               // Extension version set?
+                               if (empty($ext_ver)) {
                                        // Extension not registered so far so first load task's ID...
                                        $result = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_task_system WHERE task_type='EXTENSION' AND subject LIKE '[%s:]%%' LIMIT 1",
                                         array($EXT_UPDATE_DEPENDS), __FILE__, __LINE__);
-                                       if (SQL_NUMROWS($result) == 1)
-                                       {
+
+                                       // Entry found?
+                                       if (SQL_NUMROWS($result) == 1) {
                                                // Task found so load task's ID and register extension...
                                                list($task) = SQL_FETCHROW($result);
-                                               SQL_FREERESULT($result);
+
+                                               // Try to register the extension
                                                $test = EXTENSION_REGISTER($EXT_UPDATE_DEPENDS, $task, $dry_run);
-                                       }
-                               }
-                                elseif ($ext_ver != $EXT_VERSION)
-                               {
+                                       } // END - if
+
+                                       // Free result
+                                       SQL_FREERESULT($result);
+                               } elseif ($ext_ver != $EXT_VERSION) {
                                        // Ok, update this extension now
                                        EXTENSION_UPDATE(basename($file), $EXT_UPDATE_DEPENDS, $ext_ver, $dry_run);
 
                                        // All okay!
                                        $test = true;
-                               }
-                                else
-                               {
+                               } else {
                                        // Nothing to register / update before...
                                        $test = true;
                                }
-                       }
-                        else
-                       {
+                       } else {
                                // Required file for update does not exists!
                                $test = true;
                                // But this is fine for the first time...
@@ -139,9 +141,7 @@ function EXTENSION_REGISTER ($ext_name, $id, $dry_run=false)
                        // Finally restore previous SQLs
                        $SQLs = $SQLs2; unset($SQLs2);
                        $EXT_LANG_PREFIX = $LANG_BCK;
-               }
-                else
-               {
+               } else {
                        // Does not depend on an other extension
                        $test = true;
                }
@@ -258,7 +258,7 @@ function EXTENSION_RUN_SQLS($id, $EXT_LOAD_MODE) {
        if (FILE_READABLE($file)) {
                // Load the include
                require($file);
-       }
+       } // END - if
 
        //* DEBUG: */ echo __FUNCTION__.":SQLs::count=".count($SQLs)."<br />\n";
        if ((is_array($SQLs) && (sizeof($SQLs) > 0))) {
@@ -403,9 +403,11 @@ function EXTENSION_UPDATE($file, $ext, $EXT_VER, $dry_run=false)
 
        // Load extension in update mode
        $EXT_LOAD_MODE = "update"; $EXT_UPDATE_DEPENDS = ""; $NOTES = "";
-       include(PATH."inc/extensions/".$file);
-       if (!empty($EXT_UPDATE_DEPENDS))
-       {
+
+       // Load extension file
+       include(sprintf("%sinc/extensions/%s", PATH, $file));
+
+       if (!empty($EXT_UPDATE_DEPENDS)) {
                // Update another extension first!
                $test = EXTENSION_UPDATE(("ext-".$EXT_UPDATE_DEPENDS.".php"), $EXT_UPDATE_DEPENDS, GET_EXT_VERSION($EXT_UPDATE_DEPENDS), $dry_run);
        }