[Fmsystem-commits] [15042] Syncromind: Merge 14936:15027 from trunk

[sigurdne]

Revision: 15042
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15042
Author:   sigurdne
Date:     2016-05-13 12:04:52 +0000 (Fri, 13 May 2016)
Log Message:
-----------
Syncromind: Merge 14936:15027 from trunk

Modified Paths:
--------------
    branches/dev-syncromind-2/booking/inc/class.uiallocation.inc.php

Modified: branches/dev-syncromind-2/booking/inc/class.uiallocation.inc.php
===================================================================
--- branches/dev-syncromind-2/booking/inc/class.uiallocation.inc.php    
2016-05-13 12:04:49 UTC (rev 15041)
+++ branches/dev-syncromind-2/booking/inc/class.uiallocation.inc.php    
2016-05-13 12:04:52 UTC (rev 15042)
@@ -287,42 +287,13 @@
                                $allocation['active'] = '1';
                                $allocation['completed'] = '0';
 
-                               if (phpgw::get_var('weekday', 'string') != '')
-                               {
-                                       $from_date = phpgw::get_var('from_', 
'string');
-                                       $to_date = phpgw::get_var('to_', 
'string');
-                                       $weekday = phpgw::get_var('weekday', 
'string');
-                                       $datef = explode(' ', $from_date[0]);
-                                       $timef = $_POST['from_'];
-                                       $datet = explode(' ', $to_date[0]);
-                                       $timet = $_POST['to_'];
+                               $from_date = $_POST['from_'];
+                               $to_date = $_POST['to_'];
+                               $weekday = $_POST['weekday'];
 
-                                       if (strlen($_POST['from_']) < 14)
-                                       {
-                                               $allocation['from_'] = 
$datef[0] . " " . $timef;
-                                               $allocation['to_'] = $datet[0] 
. " " . $timet;
-                                               $from_date = 
$allocation['from_'];
-                                               $to_date = $allocation['to_'];
-                                       }
-                                       else
-                                       {
-                                               $allocation['from_'] = 
$_POST['from_'];
-                                               $allocation['to_'] = 
$_POST['to_'];
-                                               $from_date = 
$allocation['from_'];
-                                               $to_date = $allocation['to_'];
-                                       }
-                               }
-                               else
-                               {
-                                       $from_date = $_POST['from_'];
-                                       $to_date = $_POST['to_'];
-                                       $weekday = $_POST['weekday'];
+                               $allocation['from_'] = strftime("%Y-%m-%d 
%H:%M", strtotime($_POST['weekday'] . " " . $_POST['from_']));
+                               $allocation['to_'] = strftime("%Y-%m-%d %H:%M", 
strtotime($_POST['weekday'] . " " . $_POST['to_']));
 
-                                       $allocation['from_'] = 
strftime("%Y-%m-%d %H:%M", strtotime($_POST['weekday'] . " " . 
$_POST['from_']));
-                                       $allocation['to_'] = strftime("%Y-%m-%d 
%H:%M", strtotime($_POST['weekday'] . " " . $_POST['to_']));
-                               }
-
-
                                if (($_POST['weekday'] != 'sunday' && date('w') 
> date('w', strtotime($_POST['weekday']))) || (date('w') == 'sunday' && 
date('w') < date('w', strtotime($_POST['weekday']))))
                                {
                                        if (phpgw::get_var('weekday', 'string') 
== '')