Merged changes form main trunk since 2.1RC

[fa-stable.git] / includes / data_checks.inc

diff --git a/includes/data_checks.inc b/includes/data_checks.inc
index ef33acfdfd4d329412a7461586c07488f20b526a..95bcb2ca68e5c5f16f29417e63769a99232cec8e 100644 (file)
--- a/includes/data_checks.inc
+++ b/includes/data_checks.inc
@@ -1,5 +1,14 @@
 <?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 db_has_customers()
 {
        return check_empty_result("SELECT COUNT(*) FROM ".TB_PREF."debtors_master");
@@ -112,25 +121,9 @@ function check_db_has_movement_types($msg)
     }  
 }
 
-function db_has_bank_trans_types()
-{
-       return check_empty_result("SELECT COUNT(*) FROM ".TB_PREF."bank_trans_types");
-}
-
-function check_db_has_bank_trans_types($msg)
-{
-       global $path_to_root;
-    if (!db_has_bank_trans_types()) 
-    {
-       display_error($msg, true);
-       end_page();
-       exit;   
-    }  
-}
-
 function db_customer_has_branches($customer_id)
 {
-       return check_empty_result("SELECT COUNT(*) FROM ".TB_PREF."cust_branch WHERE debtor_no=$customer_id");
+       return check_empty_result("SELECT COUNT(*) FROM ".TB_PREF."cust_branch WHERE debtor_no='$customer_id'");
 }
 
 function db_has_customer_branches()
@@ -392,6 +385,7 @@ function db_has_bank_accounts()
 function check_db_has_bank_accounts($msg)
 {
        global $path_to_root;
+
     if (!db_has_bank_accounts()) 
     {
        display_error($msg, true);
@@ -400,6 +394,12 @@ function check_db_has_bank_accounts($msg)
     }  
 }
 
+function db_has_cash_accounts()
+{
+       return check_empty_result("SELECT COUNT(*) FROM ".TB_PREF."bank_accounts
+               WHERE account_type=3");
+}
+
 function db_has_gl_accounts()
 {
        return check_empty_result("SELECT COUNT(*) FROM ".TB_PREF."chart_master");
@@ -421,6 +421,11 @@ function check_db_has_gl_account_groups($msg)
     }  
 }
 
+function db_has_quick_entries()
+{
+       return check_empty_result("SELECT COUNT(*) FROM ".TB_PREF."quick_entries");
+}
+
 function check_empty_result($sql)
 {
        $result = db_query($sql, "could not do check empty query");     
@@ -428,5 +433,38 @@ function check_empty_result($sql)
        $myrow = db_fetch_row($result);
        return $myrow[0] > 0;           
 }
+//
+//     Integer input check 
+//     Return 1 if number has proper form and is within <min, max> range
+//
+function check_int($postname, $min=null, $max=null) {
+       if(!isset($_POST[$postname]))
+         return 0;
+    $num = input_num($postname);
+    if(!is_int($num)) 
+         return 0;
+    if (isset($min) && ($num<$min)) 
+         return 0;
+    if (isset($max) && ($num>$max)) 
+         return 0;
+    return 1;
+}
+//
+//     Numeric input check.
+//     Return 1 if number has proper form and is within <min, max> range
+//
+function check_num($postname, $min=null, $max=null) {
+       if(!isset($_POST[$postname]))
+         return 0;
+    $num = input_num($postname);
+    if ($num === false) 
+         return 0;
+    if (isset($min) && ($num<$min)) 
+         return 0;
+    if (isset($max) && ($num>$max)) 
+         return 0;
+    return 1;
+}
+
 
 ?>
\ No newline at end of file