[geeklog-cvs] Geeklog-1.x/public_html/admin/plugins/links index.php, 1.51, 1.52

[Oliver]

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

Modified Files:
	index.php 
Log Message:
make the validation of links a second step in the process

Index: index.php
===================================================================
RCS file: /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/public_html/admin/plugins/links/index.php,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -d -r1.51 -r1.52
*** index.php	29 Aug 2007 09:33:54 -0000	1.51
--- index.php	9 Oct 2007 05:39:49 -0000	1.52
***************
*** 355,381 ****
          array('text' => $LANG_ACCESS['access'], 'field' => 'access', 'sort' => false),
          array('text' => $LANG_LINKS_ADMIN[14], 'field' => 'category', 'sort' => true)
!         );
  
      $validate = '';
!     if (isset($_GET['checkhtml'])) {
!         $header_arr[] = array('text' => $LANG_LINKS_ADMIN[27], 'field' => 'htmlcode', 'sort' => false);
!         $validate = '?checkhtml=true';
      }
  
      $defsort_arr = array('field' => 'title', 'direction' => 'asc');
  
!     $menu_arr = array (
!         array('url' => $_CONF['site_admin_url'] . '/plugins/links/index.php?mode=edit',
!               'text' => $LANG_LINKS_ADMIN[51]),
!         array('url' => $_CONF['site_admin_url'] . '/plugins/links/index.php?checkhtml=true',
!               'text' => $LANG_LINKS_ADMIN[26]),
!         array('url' => $_CONF['site_admin_url'] . '/plugins/links/category.php',
!               'text' => $LANG_LINKS_ADMIN[50]),
!         array('url' => $_CONF['site_admin_url'] . '/plugins/links/category.php?mode=edit',
!               'text' => $LANG_LINKS_ADMIN[52]),
!         array('url' => $_CONF['site_admin_url'],
!               'text' => $LANG_ADMIN['admin_home'])
!     );
!     $retval .= ADMIN_createMenu($menu_arr, $LANG_LINKS_ADMIN[12], plugin_geticon_links());
  
      $text_arr = array(
--- 355,396 ----
          array('text' => $LANG_ACCESS['access'], 'field' => 'access', 'sort' => false),
          array('text' => $LANG_LINKS_ADMIN[14], 'field' => 'category', 'sort' => true)
!     );
! 
!     $menu_arr = array (
!         array('url' => $_CONF['site_admin_url'] . '/plugins/links/index.php?mode=edit',
!               'text' => $LANG_LINKS_ADMIN[51])
!     );
  
      $validate = '';
!     if (isset($_GET['validate'])) {
!         $menu_arr[] = array('url' => $_CONF['site_admin_url'] . '/plugins/links/index.php',
!             'text' => $LANG_LINKS_ADMIN[53]);
!         $dovalidate_url = $_CONF['site_admin_url'] . '/plugins/links/index.php?validate=validate';
!         $dovalidate_text = $LANG_LINKS_ADMIN[58];
!         $form_arr['top'] = COM_createLink($dovalidate_text, $dovalidate_url);
!         if ($_GET['validate'] == 'enabled') {
!             $header_arr[] = array('text' => $LANG_LINKS_ADMIN[27], 'field' => 'beforevalidate', 'sort' => false);
!             $validate = '?validate=enabled';
!         } else if ($_GET['validate'] == 'validate'){
!             $header_arr[] = array('text' => $LANG_LINKS_ADMIN[27], 'field' => 'dovalidate', 'sort' => false);
!             $validate = '?validate=validate';
!         }
!         $validate_help = $LANG_LINKS_ADMIN[59];
!     } else {
!         $menu_arr[] = array('url' => $_CONF['site_admin_url'] . '/plugins/links/index.php?validate=enabled',
!               'text' => $LANG_LINKS_ADMIN[26]);
!         $validate_help = '';
      }
  
      $defsort_arr = array('field' => 'title', 'direction' => 'asc');
  
!     $menu_arr[] = array('url' => $_CONF['site_admin_url'] . '/plugins/links/category.php',
!               'text' => $LANG_LINKS_ADMIN[50]);
!     $menu_arr[] = array('url' => $_CONF['site_admin_url'] . '/plugins/links/category.php?mode=edit',
!               'text' => $LANG_LINKS_ADMIN[52]);
!     $menu_arr[] = array('url' => $_CONF['site_admin_url'],
!               'text' => $LANG_ADMIN['admin_home']);
! 
!     $retval .= ADMIN_createMenu($menu_arr, $LANG_LINKS_ADMIN[12] . $validate_help, plugin_geticon_links());
  
      $text_arr = array(
***************
*** 397,401 ****
  
      $retval .= ADMIN_list ("links", "plugin_getListField_links", $header_arr, $text_arr,
!                             $query_arr, $defsort_arr);
  
      return $retval;
--- 412,416 ----
  
      $retval .= ADMIN_list ("links", "plugin_getListField_links", $header_arr, $text_arr,
!                             $query_arr, $defsort_arr, '', '', '', $form_arr);
  
      return $retval;