[geeklog-cvs] Geeklog-1.x/public_html/admin/plugins/calendar index.php, 1.28, 1.29

[Oliver]

Update of /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/public_html/admin/plugins/calendar
In directory qs1489.pair.com:/tmp/cvs-serv83260

Modified Files:
	index.php 
Log Message:
fix batchdelete for calendar
use COM_showMessage
cosmetics

Index: index.php
===================================================================
RCS file: /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/public_html/admin/plugins/calendar/index.php,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** index.php	9 Aug 2007 07:09:46 -0000	1.28
--- index.php	10 Oct 2007 01:57:30 -0000	1.29
***************
*** 650,655 ****
      $display .= COM_siteHeader ('menu', $LANG_CAL_ADMIN[11]);
      if (isset ($_REQUEST['msg'])) {
!         $display .= COM_showMessage (COM_applyFilter ($_REQUEST['msg'],
!                                                       true), 'calendar');
      }
      $display .= CALENDAR_listOld();
--- 650,657 ----
      $display .= COM_siteHeader ('menu', $LANG_CAL_ADMIN[11]);
      if (isset ($_REQUEST['msg'])) {
!         $display .= COM_showMessage (
!             COM_applyFilter ($_REQUEST['msg'], true),
!             'calendar'
!         );
      }
      $display .= CALENDAR_listOld();
***************
*** 657,671 ****
  } else if ($mode == 'batchdeleteexec') {
      $msg = CALENDAR_deleteOld();
!     $display .= COM_siteHeader ('menu', $LANG_CAL_ADMIN[11]);
!     $timestamp = strftime( $_CONF['daytime'] );
!     $display .= COM_startBlock( $MESSAGE[40] . ' - ' . $timestamp, '',
!                            COM_getBlockTemplate( '_msg_block', 'header' ))
!             . '<p style="padding:5px"><img src="' . $_CONF['layout_url']
!             . '/images/sysmessage.' . $_IMAGE_TYPE . '" align="left"'
!             . ' alt="" style="padding-right:5px; padding-bottom:3px">'
!             . $msg . '</p>'
!             . COM_endBlock( COM_getBlockTemplate( '_msg_block', 'footer' ));
!     $display .= CALENDAR_listOld();
!     $display .= COM_siteFooter();
  } else { // 'cancel' or no mode at all
      $display .= COM_siteHeader ('menu', $LANG_CAL_ADMIN[11]);
--- 659,666 ----
  } else if ($mode == 'batchdeleteexec') {
      $msg = CALENDAR_deleteOld();
!     $display .= COM_siteHeader ('menu', $LANG_CAL_ADMIN[11])
!         . COM_showMessage($msg)
!         . CALENDAR_listOld()
!         . COM_siteFooter();
  } else { // 'cancel' or no mode at all
      $display .= COM_siteHeader ('menu', $LANG_CAL_ADMIN[11]);