[geeklog-cvs] Geeklog-1.x/public_html/admin/plugins/polls index.php, 1.46, 1.47

[Oliver]

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

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

Index: index.php
===================================================================
RCS file: /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/public_html/admin/plugins/polls/index.php,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** index.php	29 Aug 2007 06:55:04 -0000	1.46
--- index.php	29 Aug 2007 09:33:54 -0000	1.47
***************
*** 70,84 ****
  
      $retval = '';
! 
!     $header_arr = array(      # dislay 'text' and use table field 'field'
!                     array('text' => $LANG_ADMIN['edit'], 'field' => 'edit', 'sort' => false),
!                     array('text' => $LANG25[9], 'field' => 'topic', 'sort' => true),
!                     array('text' => $LANG25[20], 'field' => 'voters', 'sort' => true),
!                     array('text' => $LANG_ACCESS['access'], 'field' => 'access', 'sort' => false),
!                     array('text' => $LANG25[3], 'field' => 'unixdate', 'sort' => true),
!                     array('text' => $LANG25[8], 'field' => 'display', 'sort' => true));
! 
!     $defsort_arr = array('field' => 'unixdate', 'direction' => 'desc');
! 
      $menu_arr = array (
          array('url' => $_CONF['site_admin_url'] . '/plugins/polls/index.php?mode=edit',
--- 70,74 ----
  
      $retval = '';
!     // writing the menu on top
      $menu_arr = array (
          array('url' => $_CONF['site_admin_url'] . '/plugins/polls/index.php?mode=edit',
***************
*** 86,90 ****
          array('url' => $_CONF['site_admin_url'],
                'text' => $LANG_ADMIN['admin_home']));
!     $menu = ADMIN_createMenu(
          $menu_arr,
          $LANG25[19],
--- 76,81 ----
          array('url' => $_CONF['site_admin_url'],
                'text' => $LANG_ADMIN['admin_home']));
! 
!     $retval .= ADMIN_createMenu(
          $menu_arr,
          $LANG25[19],
***************
*** 92,107 ****
      );
  
!     $text_arr = array('has_extras' => true,
!                       'title' => $LANG25[18], 'instructions' => $LANG25[19],
!                       'icon' => plugin_geticon_polls(),
!                       'form_url' => $_CONF['site_admin_url'] . "/plugins/polls/index.php");
  
!     $query_arr = array('table' => 'polltopics',
!                        'sql' => "SELECT *,UNIX_TIMESTAMP(date) AS unixdate FROM {$_TABLES['polltopics']} WHERE 1=1",
!                        'query_fields' => array('topic'),
!                        'default_filter' => COM_getPermSql ('AND'));
  
!     $retval = ADMIN_list ('polls', 'plugin_getListField_polls', $header_arr,
!                           $text_arr, $query_arr, $defsort_arr, $menu);
  
      return $retval;
--- 83,116 ----
      );
  
!     // writing the actual list
!     $header_arr = array(      # dislay 'text' and use table field 'field'
!         array('text' => $LANG_ADMIN['edit'], 'field' => 'edit', 'sort' => false),
!         array('text' => $LANG25[9], 'field' => 'topic', 'sort' => true),
!         array('text' => $LANG25[20], 'field' => 'voters', 'sort' => true),
!         array('text' => $LANG_ACCESS['access'], 'field' => 'access', 'sort' => false),
!         array('text' => $LANG25[3], 'field' => 'unixdate', 'sort' => true),
!         array('text' => $LANG25[8], 'field' => 'display', 'sort' => true)
!     );
  
!     $defsort_arr = array('field' => 'unixdate', 'direction' => 'desc');
  
!     $text_arr = array(
!         'has_extras' => true,
!         'title' => $LANG25[18], 'instructions' => $LANG25[19],
!         'form_url' => $_CONF['site_admin_url'] . "/plugins/polls/index.php"
!     );
! 
!     $query_arr = array(
!         'table' => 'polltopics',
!         'sql' => "SELECT *,UNIX_TIMESTAMP(date) AS unixdate "
!             . "FROM {$_TABLES['polltopics']} WHERE 1=1",
!         'query_fields' => array('topic'),
!         'default_filter' => COM_getPermSql ('AND')
!     );
! 
!     $retval .= ADMIN_list (
!         'polls', 'plugin_getListField_polls', $header_arr,
!         $text_arr, $query_arr, $defsort_arr
!     );
  
      return $retval;