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

[Oliver]

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

Modified Files:
	functions.inc 
Log Message:
display the menu by itself instead of piping it through the admin-list-functions

Index: functions.inc
===================================================================
RCS file: /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/plugins/calendar/functions.inc,v
retrieving revision 1.72
retrieving revision 1.73
diff -C2 -d -r1.72 -r1.73
*** functions.inc	29 Aug 2007 06:54:32 -0000	1.72
--- functions.inc	29 Aug 2007 09:33:13 -0000	1.73
***************
*** 897,907 ****
  
      $header_arr = array(      # dislay 'text' and use table field 'field'
!                     array('text' => $LANG_ADMIN['edit'], 'field' => 'edit', 'sort' => false),
!                     array('text' => $LANG_ADMIN['copy'], 'field' => 'copy', 'sort' => false),
!                     array('text' => $LANG_ADMIN['title'], 'field' => 'title', 'sort' => true),
!                     array('text' => $LANG_CAL_ADMIN[13], 'field' => 'username', 'sort' => true),
!                     array('text' => $LANG_ACCESS['access'], 'field' => 'access', 'sort' => false),
!                     array('text' => $LANG_CAL_ADMIN[14], 'field' => 'datestart', 'sort' => true),
!                     array('text' => $LANG_CAL_ADMIN[15], 'field' => 'dateend', 'sort' => true)
      );
  
--- 897,907 ----
  
      $header_arr = array(      # dislay 'text' and use table field 'field'
!         array('text' => $LANG_ADMIN['edit'], 'field' => 'edit', 'sort' => false),
!         array('text' => $LANG_ADMIN['copy'], 'field' => 'copy', 'sort' => false),
!         array('text' => $LANG_ADMIN['title'], 'field' => 'title', 'sort' => true),
!         array('text' => $LANG_CAL_ADMIN[13], 'field' => 'username', 'sort' => true),
!         array('text' => $LANG_ACCESS['access'], 'field' => 'access', 'sort' => false),
!         array('text' => $LANG_CAL_ADMIN[14], 'field' => 'datestart', 'sort' => true),
!         array('text' => $LANG_CAL_ADMIN[15], 'field' => 'dateend', 'sort' => true)
      );
  
***************
*** 916,920 ****
                'text' => $LANG_ADMIN['admin_home'])
      );
!     $menu = ADMIN_createMenu($menu_arr, $LANG_CAL_ADMIN[12], plugin_geticon_calendar());
  
      $text_arr = array(
--- 916,920 ----
                'text' => $LANG_ADMIN['admin_home'])
      );
!     $retval .= ADMIN_createMenu($menu_arr, $LANG_CAL_ADMIN[12], plugin_geticon_calendar());
  
      $text_arr = array(
***************
*** 930,937 ****
            ."WHERE 1=1 ";
  
!     $query_arr = array('table' => 'events',
!                        'sql' => $sql,
!                        'query_fields' => array('title', 'datestart', 'dateend'),
!                        'default_filter' => COM_getPermSQL('AND'));
  
      $retval .= ADMIN_list ('calendar', 'plugin_getListField_calendar',
--- 930,939 ----
            ."WHERE 1=1 ";
  
!     $query_arr = array(
!         'table' => 'events',
!         'sql' => $sql,
!         'query_fields' => array('title', 'datestart', 'dateend'),
!         'default_filter' => COM_getPermSQL('AND')
!     );
  
      $retval .= ADMIN_list ('calendar', 'plugin_getListField_calendar',