little bug fixes in calendar app

diff --git a/apps/calendar/ajax/neweventform.php b/apps/calendar/ajax/neweventform.php
index 7a4c6f469e55dd11e67bd83e7f717ded5ccf3833..7099ea718e97a9ba27322a30e52cba1849ecc87d 100644 (file)
--- a/apps/calendar/ajax/neweventform.php
+++ b/apps/calendar/ajax/neweventform.php
@@ -29,6 +29,9 @@ if($starttime != 'undefined' && !is_nan($starttime) && !$allday){
        $startminutes = '00';
 }else{
        $starttime = date('H');
+       if(strlen($starttime) == 2 && $starttime <= 9){
+               $starttime = substr($starttime, 1, 1);
+       }
        $startminutes = date('i');
 }
 
@@ -38,7 +41,18 @@ $endyear     = $startyear;
 $endtime     = $starttime;
 $endminutes  = $startminutes;
 if($endtime == 23) {
-       $endday++;
+       if($startday == date(t, mktime($starttime, $startminutes, 0, $startmonth, $startday, $startyear))){
+               $datetimestamp = mktime(0, 0, 0, $startmonth, $startday, $startyear);
+               $datetimestamp = $datetimestamp + 86400;
+               $endmonth = date("m", $datetimestamp);
+               $endday = date("d", $datetimestamp);
+               $endyear = date("Y", $datetimestamp);
+       }else{
+               $endday++;
+               if($endday <= 9){
+                       $endday = "0" . $endday;
+               }
+       }
        $endtime = 0;
 } else {
        $endtime++;