[geeklog-cvs] Geeklog-1.x/public_html/admin block.php, 1.114, 1.115 database.php, 1.41, 1.42 group.php, 1.94, 1.95 plugins.php, 1.74, 1.75 story.php, 1.261, 1.262 syndication.php, 1.51, 1.52 trackback.php, 1.46, 1.47 user.php, 1.190, 1.191

Oliver ospiess at qs1489.pair.com
Wed Aug 29 05:33:56 EDT 2007


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

Modified Files:
	block.php database.php group.php plugins.php story.php 
	syndication.php trackback.php user.php 
Log Message:
display the menu by itself instead of piping it through the admin-list-functions

Index: syndication.php
===================================================================
RCS file: /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/public_html/admin/syndication.php,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -d -r1.51 -r1.52
*** syndication.php	29 Aug 2007 06:55:04 -0000	1.51
--- syndication.php	29 Aug 2007 09:33:54 -0000	1.52
***************
*** 151,155 ****
                            'text' => $LANG_ADMIN['admin_home'])
      );
!     $menu = ADMIN_createMenu(
          $menu_arr,
          $LANG33[13],
--- 151,155 ----
                            'text' => $LANG_ADMIN['admin_home'])
      );
!     $retval .= ADMIN_createMenu(
          $menu_arr,
          $LANG33[13],
***************
*** 172,176 ****
  
      $retval .= ADMIN_list ("syndication", "ADMIN_getListField_syndication", $header_arr, $text_arr,
!                             $query_arr, $defsort_arr, $menu,  '', '', '', $form_arr);
      return $retval;
  }
--- 172,176 ----
  
      $retval .= ADMIN_list ("syndication", "ADMIN_getListField_syndication", $header_arr, $text_arr,
!                             $query_arr, $defsort_arr, '', '', '', $form_arr);
      return $retval;
  }

Index: user.php
===================================================================
RCS file: /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/public_html/admin/user.php,v
retrieving revision 1.190
retrieving revision 1.191
diff -C2 -d -r1.190 -r1.191
*** user.php	29 Aug 2007 06:55:04 -0000	1.190
--- user.php	29 Aug 2007 09:33:54 -0000	1.191
***************
*** 360,364 ****
      require_once( $_CONF['path_system'] . 'lib-admin.php' );
  
!     $display = '';
  
      if ($_CONF['lastlogin']) {
--- 360,364 ----
      require_once( $_CONF['path_system'] . 'lib-admin.php' );
  
!     $retval = '';
  
      if ($_CONF['lastlogin']) {
***************
*** 393,397 ****
                'text' => $LANG_ADMIN['admin_home'])
      );
!     $menu = ADMIN_createMenu(
          $menu_arr,
          $LANG28[12],
--- 393,397 ----
                'text' => $LANG_ADMIN['admin_home'])
      );
!     $retval .= ADMIN_createMenu(
          $menu_arr,
          $LANG28[12],
***************
*** 418,424 ****
                         'default_filter' => "AND {$_TABLES['users']}.uid > 1");
  
!     $display .= ADMIN_list ("user", "ADMIN_getListField_users", $header_arr, $text_arr,
!                             $query_arr, $defsort_arr, $menu);
!     return $display;
  }
  
--- 418,424 ----
                         'default_filter' => "AND {$_TABLES['users']}.uid > 1");
  
!     $retval .= ADMIN_list ("user", "ADMIN_getListField_users", $header_arr, $text_arr,
!                             $query_arr, $defsort_arr);
!     return $retval;
  }
  

Index: block.php
===================================================================
RCS file: /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/public_html/admin/block.php,v
retrieving revision 1.114
retrieving revision 1.115
diff -C2 -d -r1.114 -r1.115
*** block.php	29 Aug 2007 06:55:04 -0000	1.114
--- block.php	29 Aug 2007 09:33:54 -0000	1.115
***************
*** 365,392 ****
      require_once( $_CONF['path_system'] . 'lib-admin.php' );
  
!     $retval = '';
! 
!     reorderblocks();
! 
!     $header_arr = array(      # display 'text' and use table field 'field'
!                     array('text' => $LANG_ADMIN['edit'], 'field' => 'edit', 'sort' => false),
!                     array('text' => $LANG21[65], 'field' => 'blockorder', 'sort' => true),
!                     array('text' => $LANG21[46], 'field' => 'move', 'sort' => false),
!                     array('text' => $LANG_ADMIN['title'], 'field' => 'title', 'sort' => true),
!                     array('text' => $LANG_ADMIN['type'], 'field' => 'type', 'sort' => true),
!                     array('text' => $LANG_ADMIN['topic'], 'field' => 'tid', 'sort' => true),
!                     array('text' => $LANG_ADMIN['enabled'], 'field' => 'is_enabled', 'sort' => true)
! 
!     );
! 
!     $defsort_arr = array('field' => 'blockorder', 'direction' => 'asc');
! 
      $menu_arr = array (
!                     array('url' => $_CONF['site_admin_url'] . '/block.php?mode=edit',
!                           'text' => $LANG_ADMIN['create_new']),
!                     array('url' => $_CONF['site_admin_url'],
!                           'text' => $LANG_ADMIN['admin_home'])
      );
!     $menu = ADMIN_createMenu(
          $menu_arr,
          $LANG21[25],
--- 365,377 ----
      require_once( $_CONF['path_system'] . 'lib-admin.php' );
  
!     // writing the menu on top
      $menu_arr = array (
!         array('url' => $_CONF['site_admin_url'] . '/block.php?mode=edit',
!               'text' => $LANG_ADMIN['create_new']),
!         array('url' => $_CONF['site_admin_url'],
!               'text' => $LANG_ADMIN['admin_home'])
      );
! 
!     $retval = ADMIN_createMenu(
          $menu_arr,
          $LANG21[25],
***************
*** 394,397 ****
--- 379,397 ----
      );
  
+     reorderblocks();
+     
+     // writing the list
+     $header_arr = array(      # display 'text' and use table field 'field'
+         array('text' => $LANG_ADMIN['edit'], 'field' => 'edit', 'sort' => false),
+         array('text' => $LANG21[65], 'field' => 'blockorder', 'sort' => true),
+         array('text' => $LANG21[46], 'field' => 'move', 'sort' => false),
+         array('text' => $LANG_ADMIN['title'], 'field' => 'title', 'sort' => true),
+         array('text' => $LANG_ADMIN['type'], 'field' => 'type', 'sort' => true),
+         array('text' => $LANG_ADMIN['topic'], 'field' => 'tid', 'sort' => true),
+         array('text' => $LANG_ADMIN['enabled'], 'field' => 'is_enabled', 'sort' => true)
+     );
+ 
+     $defsort_arr = array('field' => 'blockorder', 'direction' => 'asc');
+ 
      $text_arr = array(
          'has_extras'   => true,
***************
*** 400,423 ****
      );
  
!     $query_arr = array('table' => 'blocks',
!                        'sql' => "SELECT * FROM {$_TABLES['blocks']} WHERE onleft = 1",
!                        'query_fields' => array('title', 'content'),
!                        'default_filter' => COM_getPermSql ('AND'));
      // this is a dummy-variable so we know the form has been used if all blocks should be disabled
      // on one side in order to disable the last one. The value is the onleft var
      $form_arr = array('bottom' => '<input type="hidden" name="blockenabler" value="1">');
  
!     $retval .= ADMIN_list ("blocks", "ADMIN_getListField_blocks", $header_arr, $text_arr,
!                             $query_arr, $defsort_arr, $menu, '', '', '', $form_arr);
  
!     $query_arr = array('table' => 'blocks',
!                        'sql' => "SELECT * FROM {$_TABLES['blocks']} WHERE onleft = 0",
!                        'query_fields' => array('title', 'content'),
!                        'default_filter' => COM_getPermSql ('AND'));
  
      $text_arr = array(
          'has_extras'   => true,
          'title' => "$LANG21[19] ($LANG21[41])",
!         'form_url' => $_CONF['site_admin_url'] . '/block.php');
  
      // this is a dummy-variable so we know the form has been used if all blocks should be disabled
--- 400,431 ----
      );
  
!     $query_arr = array(
!         'table' => 'blocks',
!         'sql' => "SELECT * FROM {$_TABLES['blocks']} WHERE onleft = 1",
!         'query_fields' => array('title', 'content'),
!         'default_filter' => COM_getPermSql ('AND')
!     );
! 
      // this is a dummy-variable so we know the form has been used if all blocks should be disabled
      // on one side in order to disable the last one. The value is the onleft var
      $form_arr = array('bottom' => '<input type="hidden" name="blockenabler" value="1">');
  
!     $retval .= ADMIN_list (
!         "blocks", "ADMIN_getListField_blocks", $header_arr, $text_arr,
!         $query_arr, $defsort_arr, '', '', '', $form_arr
!     );
  
!     $query_arr = array(
!         'table' => 'blocks',
!         'sql' => "SELECT * FROM {$_TABLES['blocks']} WHERE onleft = 0",
!         'query_fields' => array('title', 'content'),
!         'default_filter' => COM_getPermSql ('AND')
!     );
  
      $text_arr = array(
          'has_extras'   => true,
          'title' => "$LANG21[19] ($LANG21[41])",
!         'form_url' => $_CONF['site_admin_url'] . '/block.php'
!     );
  
      // this is a dummy-variable so we know the form has been used if all blocks should be disabled
***************
*** 425,430 ****
      $form_arr = array('bottom' => '<input type="hidden" name="blockenabler" value="0">');
  
!     $retval .= ADMIN_list ('blocks', 'ADMIN_getListField_blocks', $header_arr, $text_arr,
!                             $query_arr, $defsort_arr, '', '', '', '', $form_arr);
  
      return $retval;
--- 433,440 ----
      $form_arr = array('bottom' => '<input type="hidden" name="blockenabler" value="0">');
  
!     $retval .= ADMIN_list (
!         'blocks', 'ADMIN_getListField_blocks', $header_arr, $text_arr,
!         $query_arr, $defsort_arr, '', '', '', $form_arr
!     );
  
      return $retval;

Index: database.php
===================================================================
RCS file: /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/public_html/admin/database.php,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** database.php	29 Aug 2007 06:55:04 -0000	1.41
--- database.php	29 Aug 2007 09:33:54 -0000	1.42
***************
*** 111,121 ****
  
          $menu_arr = array(
!                         array('url' => $_CONF['site_admin_url']
!                                        . '/database.php?mode=backup',
!                               'text' => $LANG_ADMIN['create_new']),
!                         array('url' => $_CONF['site_admin_url'],
!                               'text' => $LANG_ADMIN['admin_home'])
          );
!         $menu = ADMIN_createMenu(
              $menu_arr,
              "<p>{$LANG_DB_BACKUP['db_explanation']}</p><p>" . sprintf($LANG_DB_BACKUP['total_number'], $index) . '</p>',
--- 111,121 ----
  
          $menu_arr = array(
!             array('url' => $_CONF['site_admin_url']
!                            . '/database.php?mode=backup',
!                   'text' => $LANG_ADMIN['create_new']),
!             array('url' => $_CONF['site_admin_url'],
!                   'text' => $LANG_ADMIN['admin_home'])
          );
!         $retval .= ADMIN_createMenu(
              $menu_arr,
              "<p>{$LANG_DB_BACKUP['db_explanation']}</p><p>" . sprintf($LANG_DB_BACKUP['total_number'], $index) . '</p>',
***************
*** 138,142 ****
          $listoptions = array('chkdelete' => true, 'chkminimum' => 0,
                               'chkfield' => 'filename');
!         $retval .= ADMIN_simpleList('', $header_arr, $text_arr, $data_arr, $menu, $listoptions, $form_arr);
      } else {
          $retval .= COM_startBlock($LANG08[06], '',
--- 138,142 ----
          $listoptions = array('chkdelete' => true, 'chkminimum' => 0,
                               'chkfield' => 'filename');
!         $retval .= ADMIN_simpleList('', $header_arr, $text_arr, $data_arr, $listoptions, $form_arr);
      } else {
          $retval .= COM_startBlock($LANG08[06], '',

Index: story.php
===================================================================
RCS file: /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/public_html/admin/story.php,v
retrieving revision 1.261
retrieving revision 1.262
diff -C2 -d -r1.261 -r1.262
*** story.php	29 Aug 2007 06:55:04 -0000	1.261
--- story.php	29 Aug 2007 09:33:54 -0000	1.262
***************
*** 184,188 ****
      $menu_arr[] = array('url' => $_CONF['site_admin_url'],
                            'text' => $LANG_ADMIN['admin_home']);
!     $menu = ADMIN_createMenu(
          $menu_arr,
          $LANG24[23],
--- 184,188 ----
      $menu_arr[] = array('url' => $_CONF['site_admin_url'],
                            'text' => $LANG_ADMIN['admin_home']);
!     $retval .= ADMIN_createMenu(
          $menu_arr,
          $LANG24[23],
***************
*** 203,213 ****
          $excludetopics = 'AND ' . $excludetopics;
      }
!     $query_arr = array('table' => 'stories',
!                        'sql' => $sql,
!                        'query_fields' => array('title', 'introtext', 'bodytext', 'sid', 'tid'),
!                        'default_filter' => $excludetopics . COM_getPermSQL ('AND'),);
  
      $retval .= ADMIN_list ("story", "ADMIN_getListField_stories", $header_arr, $text_arr,
!                             $query_arr, $defsort_arr, $menu, $filter);
      return $retval;
  }
--- 203,215 ----
          $excludetopics = 'AND ' . $excludetopics;
      }
!     $query_arr = array(
!         'table' => 'stories',
!         'sql' => $sql,
!         'query_fields' => array('title', 'introtext', 'bodytext', 'sid', 'tid'),
!         'default_filter' => $excludetopics . COM_getPermSQL ('AND')
!     );
  
      $retval .= ADMIN_list ("story", "ADMIN_getListField_stories", $header_arr, $text_arr,
!                             $query_arr, $defsort_arr, $filter);
      return $retval;
  }

Index: plugins.php
===================================================================
RCS file: /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/public_html/admin/plugins.php,v
retrieving revision 1.74
retrieving revision 1.75
diff -C2 -d -r1.74 -r1.75
*** plugins.php	29 Aug 2007 06:55:04 -0000	1.74
--- plugins.php	29 Aug 2007 09:33:54 -0000	1.75
***************
*** 397,406 ****
      require_once( $_CONF['path_system'] . 'lib-admin.php' );
  
      $header_arr = array(      # display 'text' and use table field 'field'
!                     array('text' => $LANG_ADMIN['edit'], 'field' => 'edit', 'sort' => false),
!                     array('text' => $LANG32[16], 'field' => 'pi_name', 'sort' => true),
!                     array('text' => $LANG32[17], 'field' => 'pi_version', 'sort' => true),
!                     array('text' => $LANG32[18], 'field' => 'pi_gl_version', 'sort' => true),
!                     array('text' => $LANG_ADMIN['enabled'], 'field' => 'enabled', 'sort' => false)
      );
  
--- 397,407 ----
      require_once( $_CONF['path_system'] . 'lib-admin.php' );
  
+     $retval = '';
      $header_arr = array(      # display 'text' and use table field 'field'
!         array('text' => $LANG_ADMIN['edit'], 'field' => 'edit', 'sort' => false),
!         array('text' => $LANG32[16], 'field' => 'pi_name', 'sort' => true),
!         array('text' => $LANG32[17], 'field' => 'pi_version', 'sort' => true),
!         array('text' => $LANG32[18], 'field' => 'pi_gl_version', 'sort' => true),
!         array('text' => $LANG_ADMIN['enabled'], 'field' => 'enabled', 'sort' => false)
      );
  
***************
*** 410,414 ****
                      array('url' => $_CONF['site_admin_url'],
                            'text' => $LANG_ADMIN['admin_home']));
!     $menu = ADMIN_createMenu(
          $menu_arr,
          $LANG32[11],
--- 411,415 ----
                      array('url' => $_CONF['site_admin_url'],
                            'text' => $LANG_ADMIN['admin_home']));
!     $retval .= ADMIN_createMenu(
          $menu_arr,
          $LANG32[11],
***************
*** 416,438 ****
      );
  
!     $text_arr = array('has_menu' =>  true,
!                       'has_extras' => true,
!                       'title' => $LANG32[5],
!                       'instructions' => $LANG32[11],
!                       'icon' => $_CONF['layout_url'] . '/images/icons/plugins.'
!                                 . $_IMAGE_TYPE,
!                       'form_url' => $_CONF['site_admin_url'] . '/plugins.php');
  
!     $query_arr = array('table' => 'plugins',
!                        'sql' => "SELECT pi_name, pi_version, pi_gl_version, "
!                                ."pi_enabled, pi_homepage FROM {$_TABLES['plugins']} WHERE 1=1",
!                        'query_fields' => array('pi_name'),
!                        'default_filter' => '');
      // this is a dummy-variable so we know the form has been used if all plugins should be disabled
      // in order to disable the last one.
      $form_arr = array('bottom' => '<input type="hidden" name="pluginenabler" value="true">');
  
!     return ADMIN_list ('plugins', 'ADMIN_getListField_plugins', $header_arr,
                         $text_arr, $query_arr, $defsort_arr, $menu, '', '', '', $form_arr);
  
  }
--- 417,442 ----
      );
  
!     $text_arr = array(
!         'has_extras' => true,
!         'title' => $LANG32[5],
!         'instructions' => $LANG32[11],
!         'form_url' => $_CONF['site_admin_url'] . '/plugins.php'
!     );
  
!     $query_arr = array(
!         'table' => 'plugins',
!         'sql' => "SELECT pi_name, pi_version, pi_gl_version, "
!                 ."pi_enabled, pi_homepage FROM {$_TABLES['plugins']} WHERE 1=1",
!         'query_fields' => array('pi_name'),
!         'default_filter' => ''
!     );
      // this is a dummy-variable so we know the form has been used if all plugins should be disabled
      // in order to disable the last one.
      $form_arr = array('bottom' => '<input type="hidden" name="pluginenabler" value="true">');
  
!     $retval .= ADMIN_list ('plugins', 'ADMIN_getListField_plugins', $header_arr,
                         $text_arr, $query_arr, $defsort_arr, $menu, '', '', '', $form_arr);
+ 
+     return $retval;
  
  }

Index: group.php
===================================================================
RCS file: /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/public_html/admin/group.php,v
retrieving revision 1.94
retrieving revision 1.95
diff -C2 -d -r1.94 -r1.95
*** group.php	29 Aug 2007 06:55:04 -0000	1.94
--- group.php	29 Aug 2007 09:33:54 -0000	1.95
***************
*** 656,660 ****
                      array('url'  => $_CONF['site_admin_url'],
                            'text' => $LANG_ADMIN['admin_home']));
!     $menu = ADMIN_createMenu(
          $menu_arr,
          ' ',
--- 656,660 ----
                      array('url'  => $_CONF['site_admin_url'],
                            'text' => $LANG_ADMIN['admin_home']));
!     $retval .= ADMIN_createMenu(
          $menu_arr,
          ' ',
***************
*** 692,696 ****
  
      $retval .= ADMIN_list ( 'user', 'ADMIN_getListField_users',
!         $header_arr, $text_arr, $query_arr, $defsort_arr, $menu);
  
      return $retval;
--- 692,696 ----
  
      $retval .= ADMIN_list ( 'user', 'ADMIN_getListField_users',
!         $header_arr, $text_arr, $query_arr, $defsort_arr);
  
      return $retval;
***************
*** 706,714 ****
  
      $header_arr = array(      // display 'text' and use table field 'field'
!                     array('text' => $LANG_ADMIN['edit'], 'field' => 'edit', 'sort' => false),
!                     array('text' => $LANG_ACCESS['groupname'], 'field' => 'grp_name', 'sort' => true),
!                     array('text' => $LANG_ACCESS['description'], 'field' => 'grp_descr', 'sort' => true),
!                     array('text' => $LANG_ACCESS['coregroup'], 'field' => 'grp_gl_core', 'sort' => true),
!                     array('text' => $LANG_ACCESS['listusers'], 'field' => 'list', 'sort' => false)
      );
  
--- 706,714 ----
  
      $header_arr = array(      // display 'text' and use table field 'field'
!         array('text' => $LANG_ADMIN['edit'], 'field' => 'edit', 'sort' => false),
!         array('text' => $LANG_ACCESS['groupname'], 'field' => 'grp_name', 'sort' => true),
!         array('text' => $LANG_ACCESS['description'], 'field' => 'grp_descr', 'sort' => true),
!         array('text' => $LANG_ACCESS['coregroup'], 'field' => 'grp_gl_core', 'sort' => true),
!         array('text' => $LANG_ACCESS['listusers'], 'field' => 'list', 'sort' => false)
      );
  
***************
*** 726,730 ****
                'text' => $LANG_ADMIN['admin_home'])
      );
!     $menu = ADMIN_createMenu(
          $menu_arr,
          $LANG_ACCESS['newgroupmsg'],
--- 726,730 ----
                'text' => $LANG_ADMIN['admin_home'])
      );
!     $retval .= ADMIN_createMenu(
          $menu_arr,
          $LANG_ACCESS['newgroupmsg'],
***************
*** 760,778 ****
      if ($show_all_groups) {
          $filter .= '<label for="chk_showall"><input id="chk_showall" type="checkbox" name="chk_showall" value="1" checked="checked">';
!         $query_arr = array('table' => 'groups',
!                            'sql' => "SELECT * FROM {$_TABLES['groups']} WHERE 1=1",
!                            'query_fields' => array('grp_name', 'grp_descr'),
!                            'default_filter' => $grpFilter);
      } else {
          $filter .= '<label for="chk_showall"><input id="chk_showall" type="checkbox" name="chk_showall" value="1">';
!         $query_arr = array('table' => 'groups',
!                            'sql' => "SELECT * FROM {$_TABLES['groups']} WHERE (grp_gl_core = 0 OR grp_id in (2,13))",
!                            'query_fields' => array('grp_name', 'grp_descr'),
!                            'default_filter' => $grpFilter);
      }
      $filter .= $LANG28[48] . '</label></span>';
  
      $retval .= ADMIN_list ('groups', 'ADMIN_getListField_groups', $header_arr,
!                     $text_arr, $query_arr, $defsort_arr, $menu, $filter);
  
      return $retval;
--- 760,780 ----
      if ($show_all_groups) {
          $filter .= '<label for="chk_showall"><input id="chk_showall" type="checkbox" name="chk_showall" value="1" checked="checked">';
!         $query_arr = array(
!             'table' => 'groups',
!             'sql' => "SELECT * FROM {$_TABLES['groups']} WHERE 1=1",
!             'query_fields' => array('grp_name', 'grp_descr'),
!             'default_filter' => $grpFilter);
      } else {
          $filter .= '<label for="chk_showall"><input id="chk_showall" type="checkbox" name="chk_showall" value="1">';
!         $query_arr = array(
!             'table' => 'groups',
!             'sql' => "SELECT * FROM {$_TABLES['groups']} WHERE (grp_gl_core = 0 OR grp_id in (2,13))",
!             'query_fields' => array('grp_name', 'grp_descr'),
!             'default_filter' => $grpFilter);
      }
      $filter .= $LANG28[48] . '</label></span>';
  
      $retval .= ADMIN_list ('groups', 'ADMIN_getListField_groups', $header_arr,
!                     $text_arr, $query_arr, $defsort_arr, $filter);
  
      return $retval;

Index: trackback.php
===================================================================
RCS file: /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/public_html/admin/trackback.php,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** trackback.php	29 Aug 2007 06:55:04 -0000	1.46
--- trackback.php	29 Aug 2007 09:33:54 -0000	1.47
***************
*** 476,484 ****
  
      $header_arr = array(      # display 'text' and use table field 'field'
!                     array('text' => $LANG_ADMIN['edit'], 'field' => 'edit', 'sort' => false),
!                     array('text' => $LANG_TRB['service'], 'field' => 'name', 'sort' => true),
!                     array('text' => $LANG_TRB['ping_method'], 'field' => 'method', 'sort' => true),
!                     array('text' => $LANG_TRB['service_ping_url'], 'field' => 'ping_url', 'sort' => true),
!                     array('text' => $LANG_ADMIN['enabled'], 'field' => 'is_enabled', 'sort' => false));
  
      $defsort_arr = array('field' => 'name', 'direction' => 'asc');
--- 476,485 ----
  
      $header_arr = array(      # display 'text' and use table field 'field'
!         array('text' => $LANG_ADMIN['edit'], 'field' => 'edit', 'sort' => false),
!         array('text' => $LANG_TRB['service'], 'field' => 'name', 'sort' => true),
!         array('text' => $LANG_TRB['ping_method'], 'field' => 'method', 'sort' => true),
!         array('text' => $LANG_TRB['service_ping_url'], 'field' => 'ping_url', 'sort' => true),
!         array('text' => $LANG_ADMIN['enabled'], 'field' => 'is_enabled', 'sort' => false)
!     );
  
      $defsort_arr = array('field' => 'name', 'direction' => 'asc');
***************
*** 489,493 ****
          array('url' => $_CONF['site_admin_url'],
                'text' => $LANG_ADMIN['admin_home']));
!     $menu = ADMIN_createMenu(
          $menu_arr,
          $LANG_TRB['service_explain'],
--- 490,494 ----
          array('url' => $_CONF['site_admin_url'],
                'text' => $LANG_ADMIN['admin_home']));
!     $retval .= ADMIN_createMenu(
          $menu_arr,
          $LANG_TRB['service_explain'],
***************
*** 502,510 ****
      );
  
!     $query_arr = array('table' => 'pingservice',
!                        'sql' => "SELECT * FROM {$_TABLES['pingservice']} WHERE 1=1",
!                        'query_fields' => array('name', 'ping_url'),
!                        'default_filter' => "",
!                        'no_data' => $LANG_TRB['no_services']);
  
      // this is a dummy-variable so we know the form has been used if all services should be disabled
--- 503,513 ----
      );
  
!     $query_arr = array(
!         'table' => 'pingservice',
!         'sql' => "SELECT * FROM {$_TABLES['pingservice']} WHERE 1=1",
!         'query_fields' => array('name', 'ping_url'),
!         'default_filter' => "",
!         'no_data' => $LANG_TRB['no_services']
!     );
  
      // this is a dummy-variable so we know the form has been used if all services should be disabled




More information about the geeklog-cvs mailing list