[Fmsystem-commits] [6723] Merge 6720:6722 from trunk

[Sigurd Nes]

Revision: 6723
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=6723
Author:   sigurdne
Date:     2011-01-03 13:24:34 +0000 (Mon, 03 Jan 2011)
Log Message:
-----------
Merge 6720:6722 from trunk

Modified Paths:
--------------
    branches/Version-1_0-branch/booking/inc/class.soevent.inc.php
    branches/Version-1_0-branch/booking/inc/class.uievent.inc.php
    branches/Version-1_0-branch/phpgwapi/inc/class.datetime.inc.php

Property Changed:
----------------
    branches/Version-1_0-branch/


Property changes on: branches/Version-1_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
   - 
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719
   + 
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722

Modified: branches/Version-1_0-branch/booking/inc/class.soevent.inc.php
===================================================================
--- branches/Version-1_0-branch/booking/inc/class.soevent.inc.php       
2011-01-03 13:23:45 UTC (rev 6722)
+++ branches/Version-1_0-branch/booking/inc/class.soevent.inc.php       
2011-01-03 13:24:34 UTC (rev 6723)
@@ -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: branches/Version-1_0-branch/booking/inc/class.uievent.inc.php
===================================================================
--- branches/Version-1_0-branch/booking/inc/class.uievent.inc.php       
2011-01-03 13:23:45 UTC (rev 6722)
+++ branches/Version-1_0-branch/booking/inc/class.uievent.inc.php       
2011-01-03 13:24:34 UTC (rev 6723)
@@ -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'))
                                        {

Modified: branches/Version-1_0-branch/phpgwapi/inc/class.datetime.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/class.datetime.inc.php     
2011-01-03 13:23:45 UTC (rev 6722)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.datetime.inc.php     
2011-01-03 13:24:34 UTC (rev 6723)
@@ -851,7 +851,7 @@
                                return 0;
                        }
 
-                       $date_array     = self::date_array($date);
+                       $date_array     = self::date_array($datestr);
                        return mktime (13, 0, 0, $date_array['month'], 
$date_array['day'], $date_array['year']);
                }