[Phpgroupware-cvs] calendar/inc class.bocalendar.inc.php

[Dave Hall]

CVSROOT:        /cvsroot/phpgroupware
Module name:    calendar
Changes by:     Dave Hall <skwashd>     06/08/21 03:58:02

Modified files:
        inc            : class.bocalendar.inc.php 

Log message:
        enable getting events via json new json interface and fixed week month 
display when using M for month format

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/calendar/inc/class.bocalendar.inc.php?cvsroot=phpgroupware&r1=1.105&r2=1.106

Patches:
Index: class.bocalendar.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/class.bocalendar.inc.php,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -b -r1.105 -r1.106
--- class.bocalendar.inc.php    28 Jul 2006 03:21:07 -0000      1.105
+++ class.bocalendar.inc.php    21 Aug 2006 03:58:01 -0000      1.106
@@ -12,7 +12,7 @@
   *  option) any later version.                                              *
   \**************************************************************************/
 
-       /* $Id: class.bocalendar.inc.php,v 1.105 2006/07/28 03:21:07 skwashd 
Exp $ */
+       /* $Id: class.bocalendar.inc.php,v 1.106 2006/08/21 03:58:01 skwashd 
Exp $ */
 
        class bocalendar
        {
@@ -508,8 +508,13 @@
                        $this->return_to = $data['return_to'];
                }
 
-               function read_entry($id)
+               function read_entry($id = 0)
                {
+                       if ( !(int)$id && isset($_GET['id']) )
+                       {
+                               $id = (int) $_GET['id'];
+                       }
+
                        if($this->check_perms(PHPGW_ACL_READ,$id))
                        {
                                $event = $this->so->read_entry($id);
@@ -1590,6 +1595,7 @@
                                                $range .= ' ' . $last['day'] . 
($datefmt[1] == '.' ? '.' : '');
                                                break;
                                        case 'm':
+                                       case 'M':
                                                $range .= ' 
'.lang(strftime('%B',$month_before_day ? $first['raw'] : $last['raw'])) . ' ';
                                                break;
                                        case 'Y':