[Fmsystem-commits] [6721] bkbooking: bugfix error checking event cost and contact info name

[Kjell Arne Espedal]

Revision: 6721
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=6721
Author:   kjell
Date:     2011-01-03 13:06:10 +0000 (Mon, 03 Jan 2011)
Log Message:
-----------
bkbooking: bugfix error checking event cost and contact info name

Modified Paths:
--------------
    trunk/booking/inc/class.soevent.inc.php
    trunk/booking/inc/class.uievent.inc.php

Modified: trunk/booking/inc/class.soevent.inc.php
===================================================================
--- trunk/booking/inc/class.soevent.inc.php     2011-01-03 10:21:34 UTC (rev 
6720)
+++ trunk/booking/inc/class.soevent.inc.php     2011-01-03 13:06:10 UTC (rev 
6721)
@@ -174,6 +174,10 @@
                        {
                                $errors['from_'] = lang('Invalid from date');
                        }
+                       if(strlen($entity['contact_name']) > 50)
+                       {
+                               $errors['contact_name'] = lang('Contact 
information name is to long. max 50 characters');
+                       }
                        if($entity['resources'])
                        {
                                $rids = join(',', array_map("intval", 
$entity['resources']));

Modified: trunk/booking/inc/class.uievent.inc.php
===================================================================
--- trunk/booking/inc/class.uievent.inc.php     2011-01-03 10:21:34 UTC (rev 
6720)
+++ trunk/booking/inc/class.uievent.inc.php     2011-01-03 13:06:10 UTC (rev 
6721)
@@ -334,7 +334,7 @@
                                if ($_POST['cost'] != 0 and 
!$event['customer_organization_number'] and !$event['customer_ssn']) {
                                        $errors['invoice_data'] = lang('There 
is set a cost, but no invoice data is filled inn');
                                } 
-                               if(!$errors['event'] && !$errors['from_'] && 
!$errors['time'] && !$errors['invoice_data'] && !$errors['resource_number'] && 
!$errors['organization_number'])
+                               if(!$errors['event'] && !$errors['from_'] && 
!$errors['time'] && !$errors['invoice_data'] && !$errors['resource_number'] && 
!$errors['organization_number'] && !$errors['contact_name'] && !$errors['cost'])
                                {
                                        if (!$_POST['application_id'])
                                        {
@@ -483,7 +483,7 @@
                                        $errors['invoice_data'] = lang('There 
is set a cost, but no invoice data is filled inn');
                                } 
 
-                               if(!$errors['event'] and 
!$errors['resource_number'] and !$errors['organization_number'] and 
!$errors['invoice_data'])
+                               if(!$errors['event'] and 
!$errors['resource_number'] and !$errors['organization_number'] and 
!$errors['invoice_data']  && !$errors['contact_name'] && !$errors['cost'])
                                {
                                        if (phpgw::get_var('mail', 'POST') || 
phpgw::get_var('sendtorbuilding', 'POST'))
                                        {