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);
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."));
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']."'");
// db_close($conn); ?
if (!$ret) break;
}
+ set_global_connection();
if($ret)
{ // re-read the prefs
global $path_to_root;
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');
}