\n";
}
/* Show days after the current month (next month) */
@@ -463,7 +494,7 @@ if ($_GET["action"] != 'show_day') // View by month
{
$style='cal_other_month';
echo '
\n";
echo '';
@@ -506,13 +537,13 @@ llxFooter('$Date$ - $Revision$');
* @param $year Year
* @param $monthshown Current month shown in calendar view
* @param $style Style to use for this day
- * @param $actionarray Array of actions
+ * @param $eventarray Array of events
* @param $maxPrint Nb of actions to show each day on month view (0 means non limit)
* @param $maxnbofchar Nb of characters to show for event line
* @param $newparam Parameters on current URL
* @param $showinfo Add extended information (used by day view)
*/
-function show_day_events($db, $day, $month, $year, $monthshown, $style, &$actionarray, $maxPrint=0, $maxnbofchar=14, $newparam='', $showinfo=0)
+function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventarray, $maxPrint=0, $maxnbofchar=14, $newparam='', $showinfo=0)
{
global $user, $conf, $langs;
global $filter, $filtera, $filtert, $filterd, $status;
@@ -527,7 +558,10 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$action
print '
';
if ($canedit || $conf->projet->enabled)
{
diff --git a/htdocs/lib/date.lib.php b/htdocs/lib/date.lib.php
index ea7042e2cf1..03a461755c7 100644
--- a/htdocs/lib/date.lib.php
+++ b/htdocs/lib/date.lib.php
@@ -104,6 +104,34 @@ function ConvertSecondToTime($iSecond,$format='all',$lengthOfDay=86400)
}
+/** Return previous day
+ * @param day Day
+ * @param month Month
+ * @param year Year
+ * @return array Previous year,month,day
+ */
+function dol_get_prev_day($day, $month, $year)
+{
+ $time=dol_mktime(12,0,0,$month,$day,$year,1,0);
+ $time-=24*60*60;
+ $tmparray=dol_getdate($time,true);
+ return array('year' => $tmparray['year'], 'month' => $tmparray['mon'], 'day' => $tmparray['mday']);
+}
+
+/** Return next day
+ * @param day Day
+ * @param month Month
+ * @param year Year
+ * @return array Next year,month,day
+ */
+function dol_get_next_day($day, $month, $year)
+{
+ $time=dol_mktime(12,0,0,$month,$day,$year,1,0);
+ $time+=24*60*60;
+ $tmparray=dol_getdate($time,true);
+ return array('year' => $tmparray['year'], 'month' => $tmparray['mon'], 'day' => $tmparray['mday']);
+}
+
/** Return previous month
* @param month Month
* @param year Year
diff --git a/htdocs/lib/functions.lib.php b/htdocs/lib/functions.lib.php
index 48193d95405..ae5dd4c3d22 100644
--- a/htdocs/lib/functions.lib.php
+++ b/htdocs/lib/functions.lib.php
@@ -517,7 +517,7 @@ function dolibarr_print_date($time,$format='',$to_gmt=false,$outputlangs='',$enc
* 'tzuser'=output string is for local browser TZ usage
* @param outputlangs Object lang that contains language for text translation.
* @return string Formated date or '' if time is null
- * @see dol_mktime, dol_stringtotime
+ * @see dol_mktime, dol_stringtotime, dol_getdate
*/
function dol_print_date($time,$format='',$tzoutput='tzserver',$outputlangs='',$encodetooutput=false)
{
@@ -657,7 +657,7 @@ function dol_print_date($time,$format='',$tzoutput='tzserver',$outputlangs='',$e
* 19700101020000 -> 7200
* @param gm 1=Input date is GM date, 0=Input date is local date
* @return date Date
- * @see dol_print_date, dol_mktime
+ * @see dol_print_date, dol_mktime, dol_getdate
*/
function dol_stringtotime($string, $gm=1)
{
@@ -686,10 +686,11 @@ function dol_stringtotime($string, $gm=1)
/**
- * \brief Return an array with date info
- * \param timestamp Timestamp
- * \param fast Fast mode
- * \return array Array of informations
+ * Return an array with date info
+ * PHP getdate is restricted to the years 1901-2038 on Unix and 1970-2038 on Windows.
+ * @param timestamp Timestamp
+ * @param fast Fast mode
+ * @return array Array of informations
* If no fast mode:
* 'seconds' => $secs,
* 'minutes' => $min,
@@ -701,7 +702,6 @@ function dol_stringtotime($string, $gm=1)
* 'yday' => floor($secsInYear/$_day_power),
* 'weekday' => gmdate('l',$_day_power*(3+$dow)),
* 'month' => gmdate('F',mktime(0,0,0,$month,2,1971)),
- * 0 => $origd
* If fast mode:
* 'seconds' => $secs,
* 'minutes' => $min,
@@ -712,7 +712,6 @@ function dol_stringtotime($string, $gm=1)
* 'yday' => floor($secsInYear/$_day_power),
* 'leap' => $leaf,
* 'ndays' => $ndays
- * \remarks PHP getdate is restricted to the years 1901-2038 on Unix and 1970-2038 on Windows
*/
function dol_getdate($timestamp,$fast=false)
{
@@ -832,11 +831,11 @@ function dol_date($fmt, $timestamp, $gm=false)
/**
- * \brief Return string with formated size
- * \param size Size to print
- * \param shortvalue Tell if we want long value to use another unit (Ex: 1.5Kb instead of 1500b)
- * \param shortunit Use short value of size unit
- * \return string Link
+ * Return string with formated size
+ * @param size Size to print
+ * @param shortvalue Tell if we want long value to use another unit (Ex: 1.5Kb instead of 1500b)
+ * @param shortunit Use short value of size unit
+ * @return string Link
*/
function dol_print_size($size,$shortvalue=0,$shortunit=0)
{