[geeklog-cvs] Geeklog-1.x/plugins/calendar functions.inc, 1.73, 1.74

[Oliver]

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

Modified Files:
	functions.inc 
Log Message:
fix batchdelete for calendar
use COM_showMessage
cosmetics

Index: functions.inc
===================================================================
RCS file: /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/plugins/calendar/functions.inc,v
retrieving revision 1.73
retrieving revision 1.74
diff -C2 -d -r1.73 -r1.74
*** functions.inc	29 Aug 2007 09:33:13 -0000	1.73
--- functions.inc	10 Oct 2007 01:57:15 -0000	1.74
***************
*** 819,825 ****
          'has_menu' =>  true,
          'has_extras'   => true,
!         'title' => $LANG_CAL_ADMIN[11],
          'instructions' => $LANG_CAL_ADMIN[27] . $usr_time . "$desc",
-         'icon' => plugin_geticon_calendar(),
          'form_url' => $_CONF['site_admin_url'] . "/plugins/calendar/index.php?mode=batchdelete"
      );
--- 819,824 ----
          'has_menu' =>  true,
          'has_extras'   => true,
!         'title'=> $LANG_CAL_ADMIN[11],
          'instructions' => $LANG_CAL_ADMIN[27] . $usr_time . "$desc",
          'form_url' => $_CONF['site_admin_url'] . "/plugins/calendar/index.php?mode=batchdelete"
      );
***************
*** 841,849 ****
  
      $listoptions = array('chkdelete' => true, 'chkfield' => 'eid');
! 
      $retval .= ADMIN_list (
          'calendar', 'plugin_getListField_calendar',
          $header_arr, $text_arr, $query_arr, $menu_arr,
!         $defsort_arr, '', '', $listoptions
      );
  
--- 840,848 ----
  
      $listoptions = array('chkdelete' => true, 'chkfield' => 'eid');
!     $retval .= ADMIN_createMenu($menu_arr, $LANG_CAL_ADMIN[27] . $usr_time . "$desc", plugin_geticon_calendar());
      $retval .= ADMIN_list (
          'calendar', 'plugin_getListField_calendar',
          $header_arr, $text_arr, $query_arr, $menu_arr,
!         $defsort_arr, '', $listoptions
      );
  
***************
*** 881,885 ****
      }
      // Since this function is used for deletion only, its necessary to say that
!     // zero where deleted instead of just leaving this message away.
      COM_numberFormat($c); // just in case we have more than 999)..
      $msg .= "{$LANG_CAL_ADMIN[36]}: $c<br>\n";
--- 880,884 ----
      }
      // Since this function is used for deletion only, its necessary to say that
!     // zero were deleted instead of just leaving this message away.
      COM_numberFormat($c); // just in case we have more than 999)..
      $msg .= "{$LANG_CAL_ADMIN[36]}: $c<br>\n";
***************
*** 1509,1513 ****
          $sql .= "OR description LIKE '%$mysearchterm%' ";
          $sql .= "OR title LIKE '%$mysearchterm%') ";
!     } elseif ($keyType == 'all') {
          //must contain ALL of the keywords
          $mywords = explode(' ', $query);
--- 1508,1512 ----
          $sql .= "OR description LIKE '%$mysearchterm%' ";
          $sql .= "OR title LIKE '%$mysearchterm%') ";
!     } else if ($keyType == 'all') {
          //must contain ALL of the keywords
          $mywords = explode(' ', $query);
***************
*** 1521,1525 ****
          $tmp = substr($tmp, 0, strlen($tmp) - 4);
          $sql .= $tmp;
!     } elseif ($keyType == 'any') {
          //must contain ANY of the keywords
          $mywords = explode(' ', $query);
--- 1520,1524 ----
          $tmp = substr($tmp, 0, strlen($tmp) - 4);
          $sql .= $tmp;
!     } else if ($keyType == 'any') {
          //must contain ANY of the keywords
          $mywords = explode(' ', $query);