Fixed multipart email structure.

[fa-stable.git] / admin / inst_upgrade.php

diff --git a/admin/inst_upgrade.php b/admin/inst_upgrade.php
index aa0d28388d35fad0459fb12a2277725ed2512c0d..bd9e1b4ba4f6a610b639e52944ed548177a06e91 100644 (file)
--- a/admin/inst_upgrade.php
+++ b/admin/inst_upgrade.php
@@ -13,7 +13,7 @@ $page_security = 'SA_SOFTWAREUPGRADE';
 $path_to_root="..";
 include_once($path_to_root . "/includes/session.inc");
 
-page(_("Software Upgrade"));
+page(_($help_context = "Software Upgrade"));
 
 include_once($path_to_root . "/includes/date_functions.inc");
 include_once($path_to_root . "/admin/db/company_db.inc");
@@ -69,7 +69,7 @@ function get_installers()
                while(false !== ($fname = readdir($datadir)))
                { // check all php files but index.php
                        if (!is_dir($patchdir . $fname) && ($fname != 'index.php')
-                               && stristr($fname, '.php') != false)
+                               && stristr($fname, '.php') != false && $fname[0] != '.')
                        {
                                unset($install);
                                include_once($patchdir . $fname);
@@ -102,10 +102,16 @@ function upgrade_step($index, $conn)
                        if (!$inst->pre_check($pref, $force)) return false;
                        $sql = $inst->sql;
 
+                       error_log(sprintf(_("Database upgrade for company '%s' (%s:%s*) started..."),
+                               $conn['name'], $conn['dbname'], $conn['tbpref']));
+                               
                        if ($sql != '')
                                $ret &= db_import($path_to_root.'/sql/'.$sql, $conn, $force);
 
                        $ret &= $inst->install($pref, $force);
+
+                       error_log(_("Database upgrade finished."));
+
                } else
                        if ($state!==true) {
                                display_error(_("Upgrade cannot be done because database has been already partially upgraded. Please downgrade database to clean previous version or try forced upgrade."));
@@ -115,26 +121,16 @@ function upgrade_step($index, $conn)
        return $ret;
 }
 
-function db_open($conn)
-{
-       $db = mysql_connect($conn["host"] ,$conn["dbuser"], $conn["dbpassword"]);
-       if (!$db)
-               return false;
-       if (!mysql_select_db($conn["dbname"], $db))
-               return false;
-       return $db;
-}
-
 $installers = get_installers();
 
 if (get_post('Upgrade')) 
 {
 
        $ret = true;
-       foreach ($db_connections as $conn) 
+       foreach ($db_connections as $comp => $conn) 
        {
        // connect to database
-               if (!($db = db_open($conn))) 
+               if (!(set_global_connection($comp))) 
                {
                        display_error(_("Cannot connect to database for company")
                                ." '".$conn['name']."'");
@@ -156,6 +152,7 @@ if (get_post('Upgrade'))
 //             db_close($conn); ?
                if (!$ret) break;
        }
+       set_global_connection();
        if($ret)
        {       // re-read the prefs
                global $path_to_root;
@@ -164,11 +161,13 @@ if (get_post('Upgrade'))
                $_SESSION["wa_current_user"]->prefs = new user_prefs($user);
                display_notification(_('All companies data has been successfully updated'));
        }       
+       unset($_SESSION['SysPrefs']); // re-read system setup
+       $_SESSION['SysPrefs'] = new sys_prefs();
        $Ajax->activate('_page_body');
 }
 
 start_form();
-start_table($table_style);
+start_table(TABLESTYLE);
 $th = array(_("Version"), _("Description"), _("Sql file"), _("Install"),
        _("Force upgrade"));
 table_header($th);