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 4bff9196435abef74e0e5d849900e5e5e0794ffe..5babac1bd4f3676bd5f6d2874df2e37cb6ca736f 100644 (file)
--- a/includes/db/connect_db.inc
+++ b/includes/db/connect_db.inc
@@ -1,15 +1,23 @@
 <?php
-
-set_global_connection();
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+       Released under the terms of the GNU General Public License, GPL, 
+       as published by the Free Software Foundation, either version 3 
+       of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
+***********************************************************************/
 
 function set_global_connection()
 {
-       global $db;
+       global $db, $transaction_level;
 
-    if (isset($_SESSION["wa_current_user"]) && $_SESSION["wa_current_user"]->company !='')
-       $db = $_SESSION["wa_current_user"]->get_db_connection();
-    else
-       $db = null;
+       cancel_transaction(); // cancel all aborted transactions if any
+       $transaction_level = 0;
+
+       $db = $_SESSION["wa_current_user"]->get_db_connection();
 }
 
 $db_duplicate_error_code = 1062;
@@ -18,23 +26,32 @@ $db_duplicate_error_code = 1062;
 
 function db_query($sql, $err_msg=null)
 {
-       global $db, $show_sql;
-
-       //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) {
+               if ($select_trail || (strstr($sql, 'SELECT') === false)) {
+                       mysql_query(
+                       "INSERT INTO ".TB_PREF."sql_trail
+                               (`sql`, `result`, `msg`)
+                               VALUES(".db_escape($sql).",".($result ? 1 : 0).",
+                               ".db_escape($err_msg).")", $db);
+               }
+       }
 
-       if ($err_msg != null)
-               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;
 }
 
@@ -44,6 +61,12 @@ function db_fetch_row ($result)
        return mysql_fetch_row($result);
 }
 
+function db_fetch_assoc ($result)
+{
+
+       return mysql_fetch_assoc($result);
+}
+
 function db_fetch ($result)
 {
 
@@ -52,7 +75,7 @@ function db_fetch ($result)
 
 function db_seek (&$result,$record)
 {
-       mysql_data_seek($result, $record);
+       return mysql_data_seek($result, $record);
 }
 
 function db_free_result ($result)
@@ -61,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);
 }
@@ -71,9 +94,33 @@ function db_num_fields ($result)
        return mysql_num_fields($result);
 }
 
-function db_escape ($result)
+function db_escape($value = "", $nullify = false)
 {
-       return mysql_escape_string($result);
+       $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);
+
+       //check for null/unset/empty strings
+       if ((!isset($value)) || (is_null($value)) || ($value === "")) {
+               $value = ($nullify) ? ("NULL") : ("''");
+       } else {
+               if (is_string($value)) {
+               //value is a string and should be quoted; determine best method based on available extensions
+                       if (function_exists('mysql_real_escape_string')) {
+                               $value = "'" . mysql_real_escape_string($value) . "'";
+                       } else {
+                         $value = "'" . mysql_escape_string($value) . "'";
+                       }
+               } else if (!is_numeric($value)) {
+                       //value is not a string nor numeric
+                       display_error("ERROR: incorrect data type send to sql query");
+                       echo '<br><br>';
+                       exit();
+               }
+       }
+       return $value;
 }
 
 function db_error_no ()