Added missing company settings to upgrade script, fixed company settings refreshing...

[fa-stable.git] / includes / db / connect_db_mysql.inc

diff --git a/includes/db/connect_db_mysql.inc b/includes/db/connect_db_mysql.inc
index 2f30aef0fa75ec24a3891b70fcb70477231cc553..f6417e4547fd03ea117a27893aeb0beb2543652c 100644 (file)
--- a/includes/db/connect_db_mysql.inc
+++ b/includes/db/connect_db_mysql.inc
@@ -14,7 +14,7 @@ define('SQL_MODE', ''); // STRICT_ALL_TABLES,NO_ZERO_IN_DATE ?
 
 function set_global_connection($company=-1)
 {
-       global $db, $path_to_root, $db_connections;
+       global $db, $path_to_root, $db_connections, $SysPrefs;
 
        include ($path_to_root . "/config_db.php");
        if ($company == -1) 
@@ -35,6 +35,7 @@ function set_global_connection($company=-1)
        ///// We are, however, investigating the existing code to be compatible in the future.
                db_query("SET sql_mode = '".SQL_MODE."'");
        /////
+       $SysPrefs->refresh();
        return $db;
 }
 
@@ -42,7 +43,7 @@ function set_global_connection($company=-1)
 
 function db_query($sql, $err_msg=null)
 {
-       global $db, $SysPres, $sql_queries, $Ajax, $db_connections, $db_last_inserted_id;
+       global $db, $SysPrefs, $sql_queries, $Ajax, $db_connections, $db_last_inserted_id;
 
        // set current db prefix
        $comp = isset($_SESSION["wa_current_user"]->cur_con) ? $_SESSION["wa_current_user"]->cur_con : 0;
@@ -57,7 +58,14 @@ function db_query($sql, $err_msg=null)
 
        db_profile(); // mysql profiling
 
-       $result = mysql_query($sql, $db);
+       $retry = MAX_DEADLOCK_RETRY;
+       do {
+               $result = mysql_query($db, $sql);
+               if (mysql_errno($db) == 1213)   { // deadlock detected
+                       sleep(1); $retry--;
+               } else
+                       $retry = 0;
+       } while ($retry);
 
        db_profile($sql);
 
@@ -75,48 +83,47 @@ function db_query($sql, $err_msg=null)
        if ($err_msg != null || $SysPrefs->go_debug) {
                $exit = $err_msg != null;
                if (function_exists('xdebug_call_file'))
-                       check_db_error('<br>At file '.xdebug_call_file().':'.xdebug_call_line().':<br>'.$err_msg, $sql, $exit);
-               else
-                       check_db_error($err_msg, $sql, $exit);
+                       $err_msg = '<br>At file '.xdebug_call_file().':'.xdebug_call_line().':<br>'.$err_msg;
+               check_db_error($err_msg, $sql, $exit);
        }
        return $result;
 }
 
-function db_fetch_row ($result)
+function db_fetch_row($result)
 {
 
        return mysql_fetch_row($result);
 }
 
-function db_fetch_assoc ($result)
+function db_fetch_assoc($result)
 {
 
        return mysql_fetch_assoc($result);
 }
 
-function db_fetch ($result)
+function db_fetch($result)
 {
 
        return mysql_fetch_array($result);
 }
 
-function db_seek (&$result,$record)
+function db_seek(&$result,$record)
 {
        return mysql_data_seek($result, $record);
 }
 
-function db_free_result ($result)
+function db_free_result($result)
 {
        if ($result)
                mysql_free_result($result);
 }
 
-function db_num_rows ($result)
+function db_num_rows($result)
 {
        return mysql_num_rows($result);
 }
 
-function db_num_fields ($result)
+function db_num_fields($result)
 {
        return mysql_num_fields($result);
 }
@@ -124,7 +131,7 @@ function db_num_fields ($result)
 function db_escape($value = "", $nullify = false)
 {
        $value = @html_entity_decode($value, ENT_QUOTES, $_SESSION['language']->encoding);
-       $value = @htmlspecialchars($value, ENT_QUOTES, $_SESSION['language']->encoding);
+       $value = html_specials_encode($value);
 
        //reset default if second parameter is skipped
        $nullify = ($nullify === null) ? (false) : ($nullify);
@@ -150,7 +157,7 @@ function db_escape($value = "", $nullify = false)
        return $value;
 }
 
-function db_error_no ()
+function db_error_no()
 {
        global $db;
        return mysql_errno($db);
@@ -183,8 +190,7 @@ function db_create_db($connection)
 {
        $db = mysql_connect($connection["host"] ,
                $connection["dbuser"], $connection["dbpassword"]);
-       if (strncmp(db_get_version(), "5.6", 3) >= 0) 
-               db_query("SET sql_mode = ''");
+
        if (!mysql_select_db($connection["dbname"], $db))
        {
                $sql = "CREATE DATABASE IF NOT EXISTS " . $connection["dbname"] . "";