New files from unstable branch

[fa-stable.git] / includes / ui / ui_msgs.inc

diff --git a/includes/ui/ui_msgs.inc b/includes/ui/ui_msgs.inc
index 0120b7f88f8ee7880f774ee5861eef3825b55152..5c28c8939ba5d65ef3a25f3e89fd182b8e6efaea 100644 (file)
--- a/includes/ui/ui_msgs.inc
+++ b/includes/ui/ui_msgs.inc
@@ -1,23 +1,30 @@
 <?php
-
+/**********************************************************************
+    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 display_error($msg, $center=true)
 {
-    echo "<center><table border='1' cellpadding='3' cellspacing='0' style='border-collapse: collapse' bordercolor='#CC3300' width='98%'>
-      <tr>
-        <td  " . ($center?"align='center' ":"") . " width='100%' bgcolor='#ffcccc'><font color='#dd2200'>$msg</font></td>
-      </tr>
-    </table></center><br>\n";  
-       
-       //echo "<span class='errortext'><B>" . _("ERROR :") . "</B> $msg</span><BR>";
+       global $go_debug;
+
+       $bt = $go_debug>1 ? ('<hr>'.get_backtrace(true)) : '';
+       trigger_error($msg.$bt, E_USER_ERROR);
 }
 
 function display_notification($msg, $center=true)
 {
-    echo "<center><table border='1' cellpadding='3' cellspacing='0' style='border-collapse: collapse' bordercolor='#33cc00' width='98%'>
-      <tr>
-        <td " . ($center?"align='center' ":"") . " width='100%' bgcolor='#ccffcc'><font color='#007700'>$msg</font></td>
-      </tr>
-    </table></center><br>\n";  
+       trigger_error($msg, E_USER_NOTICE);
+}
+
+function display_warning($msg, $center=true)
+{
+       trigger_error($msg, E_USER_WARNING);
 }
 
 function display_notification_centered($msg)
@@ -51,7 +58,7 @@ function stock_item_heading($stock_id)
 {
        if ($stock_id != "") 
        {
-               $result = db_query("SELECT description, units FROM ".TB_PREF."stock_master WHERE stock_id='$stock_id'");                
+               $result = db_query("SELECT description, units FROM ".TB_PREF."stock_master WHERE stock_id=".db_escape($stock_id));
         $myrow = db_fetch_row($result);
         
        display_heading("$stock_id - $myrow[0]");