Marged fixes from ain trunk up to 2.2.11

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

diff --git a/includes/db/connect_db.inc b/includes/db/connect_db.inc
index 181651ffdeed9f9169deb37deea7da0384c78c22..5babac1bd4f3676bd5f6d2874df2e37cb6ca736f 100644 (file)
--- a/includes/db/connect_db.inc
+++ b/includes/db/connect_db.inc
@@ -9,16 +9,15 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
     See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
-set_global_connection();
 
 function set_global_connection()
 {
-       global $db;
+       global $db, $transaction_level;
+
+       cancel_transaction(); // cancel all aborted transactions if any
+       $transaction_level = 0;
 
-    if (isset($_SESSION["wa_current_user"]) && $_SESSION["wa_current_user"]->company !='')
-       $db = $_SESSION["wa_current_user"]->get_db_connection();
-    else
-       $db = null;
+       $db = $_SESSION["wa_current_user"]->get_db_connection();
 }
 
 $db_duplicate_error_code = 1062;
@@ -27,17 +26,13 @@ $db_duplicate_error_code = 1062;
 
 function db_query($sql, $err_msg=null)
 {
-       global $db, $show_sql, $sql_trail, $select_trail;
-
-       //echo "<br>$sql<br>";
+       global $db, $show_sql, $sql_trail, $select_trail, $go_debug, $sql_queries, $Ajax;
+       
        if ($show_sql)
        {
-               echo "<font face=arial size=2 color=000099><b>SQL..</b></font>";
-               echo "<pre>";
-               echo $sql;
-               echo "</pre>\n";
+               $Ajax->activate('footer_debug');
+               $sql_queries .= "<pre>$sql</pre>\n<hr>";
        }
-       
 
        $result = mysql_query($sql, $db);
        if($sql_trail) {
@@ -50,12 +45,13 @@ function db_query($sql, $err_msg=null)
                }
        }
 
-       if ($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);
-         else
-               check_db_error($err_msg, $sql);
-
+       if ($err_msg != null || $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);
+       }
        return $result;
 }
 
@@ -88,7 +84,7 @@ function db_free_result ($result)
                mysql_free_result($result);
 }
 
-function db_num_rows (&$result)
+function db_num_rows ($result)
 {
        return mysql_num_rows($result);
 }
@@ -100,7 +96,8 @@ function db_num_fields ($result)
 
 function db_escape($value = "", $nullify = false)
 {
-       $value = @htmlspecialchars($value, ENT_COMPAT, $_SESSION['language']->encoding);
+       $value = @html_entity_decode($value, ENT_QUOTES, $_SESSION['language']->encoding);
+       $value = @htmlspecialchars($value, ENT_QUOTES, $_SESSION['language']->encoding);
 
        //reset default if second parameter is skipped
        $nullify = ($nullify === null) ? (false) : ($nullify);