[eGroupWare-svn] r56034 - /trunk/calendar/sitemgr/

Author: ralfbecker
Date: Thu May  5 13:38:28 2016
New Revision: 56034

URL: http://svn.stylite.de/viewvc/egroupware?rev=56034&view=rev
Log:
fix PHP Fatal because for removed datetime from calendar_ui

Modified:
    trunk/calendar/sitemgr/class.module_calendar_list.inc.php
    trunk/calendar/sitemgr/class.module_calendar_month.inc.php
    trunk/calendar/sitemgr/class.module_calendar_planner.inc.php

Modified: trunk/calendar/sitemgr/class.module_calendar_list.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/calendar/sitemgr/class.module_calendar_list.inc.php?rev=56034&r1=56033&r2=56034&view=diff
==============================================================================
--- trunk/calendar/sitemgr/class.module_calendar_list.inc.php (original)
+++ trunk/calendar/sitemgr/class.module_calendar_list.inc.php Thu May  5 13:38:28 2016
@@ -254,20 +254,19 @@
 
 		if (($arguments['acceptDateParam']) && (get_var('date',array('POST','GET'))))
 		{
-			$first = $start = (int) (strtotime(get_var('date',array('POST','GET'))) +
+			$first = (int) (strtotime(get_var('date',array('POST','GET'))) +
 					(60 * 60 * 24 * 7 * $dateOffset));
 		}
 		else
 		{
-			$first = $start = (int) ($this->bo->now_su +
+			$first = (int) ($this->bo->now_su +
 					(60 * 60 * 24 * 7 * $dateOffset));
 		}
 		if ($arguments['useWeekStart'])
 		{
-			$first = $this->ui->datetime->get_weekday_start(
-				adodb_date('Y',$start),
-				adodb_date('m',$start),
-				adodb_date('d',$start));
+			$start = Api\DateTime($first);
+			$start->setWeekStart();
+			$first = $start->format('ts');
 		}
 
 		$last = (int) ($first +

Modified: trunk/calendar/sitemgr/class.module_calendar_month.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/calendar/sitemgr/class.module_calendar_month.inc.php?rev=56034&r1=56033&r2=56034&view=diff
==============================================================================
--- trunk/calendar/sitemgr/class.module_calendar_month.inc.php (original)
+++ trunk/calendar/sitemgr/class.module_calendar_month.inc.php Thu May  5 13:38:28 2016
@@ -239,10 +239,9 @@
 			$start = (int) ($this->bo->now_su +
 					(60 * 60 * 24 * 7 * $dateOffset));
 		}
-		$first = $this->ui->datetime->get_weekday_start(
-					adodb_date('Y',$start),
-					adodb_date('m',$start),
-					adodb_date('d',$start));
+		$start = new Api\DateTime($start);
+		$start->setWeekstart();
+		$first = $start->format('ts');
 		$last = strtotime("+$weeks weeks",$first) - 1;
 
 		if ($arguments['showTitle'])

Modified: trunk/calendar/sitemgr/class.module_calendar_planner.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/calendar/sitemgr/class.module_calendar_planner.inc.php?rev=56034&r1=56033&r2=56034&view=diff
==============================================================================
--- trunk/calendar/sitemgr/class.module_calendar_planner.inc.php (original)
+++ trunk/calendar/sitemgr/class.module_calendar_planner.inc.php Thu May  5 13:38:28 2016
@@ -198,7 +198,7 @@
 		}
 		$this->arguments['resources']['options'] = array_unique($this->arguments['resources']['options']);
 		$this->arguments['resources']['multiple'] = count($this->arguments['resources']['options']) ? 4 : 0;
-		
+
 
 		return parent::get_user_interface();
 	}
@@ -281,7 +281,9 @@
 			}
 			elseif ($ui->planner_view == 'week' || $ui->planner_view == 'weekN')	// weeekview
 			{
-				$ui->first = $ui->datetime->get_weekday_start($ui->year,$ui->month,$ui->day);
+				$start = new Api\DateTime($ui->date);
+				$start->setWeekstart();
+				$ui->first = $start->format('ts');
 				$ui->last = $ui->bo->date2array($this->first);
 				$ui->last['day'] += ($ui->planner_view == 'week' ? 7 : 7 * $ui->cal_prefs['multiple_weeks'])-1;
 				$ui->last['hour'] = 23; $ui->last['minute'] = $ui->last['sec'] = 59;


------------------------------------------------------------------------------
Find and fix application performance issues faster with Applications Manager
Applications Manager provides deep performance insights into multiple tiers of
your business applications. It resolves application problems quickly and
reduces your MTTR. Get your free trial!
https://ad.doubleclick.net/ddm/clk/302982198;130105516;z