[geeklog-cvs] Geeklog-1.x/public_html/admin/plugins/links index.php, 1.58, 1.59 category.php, 1.14, 1.15

[Dirk Haun]

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

Modified Files:
	index.php category.php 
Log Message:
Fixed "Validate Links" link


Index: category.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/admin/plugins/links/category.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** category.php	1 Jan 2008 12:25:22 -0000	1.14
--- category.php	17 May 2008 21:02:03 -0000	1.15
***************
*** 93,97 ****
          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',
--- 93,97 ----
          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?validate=enabled',
                'text' => $LANG_LINKS_ADMIN[26]),
          array('url' => $_CONF['site_admin_url'] . '/plugins/links/category.php',

Index: index.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/admin/plugins/links/index.php,v
retrieving revision 1.58
retrieving revision 1.59
diff -C2 -d -r1.58 -r1.59
*** index.php	17 May 2008 19:56:10 -0000	1.58
--- index.php	17 May 2008 21:02:03 -0000	1.59
***************
*** 372,387 ****
  
      $validate = '';
!     $token = SEC_createToken();
!     if (isset($_GET['validate']) && SEC_checkToken()) {
          $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'
!                           . '&'.CSRF_TOKEN.'='.$token;
          $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&'.CSRF_TOKEN.'='.$token;
!         } else if ($_GET['validate'] == 'validate'){
              $header_arr[] = array('text' => $LANG_LINKS_ADMIN[27], 'field' => 'dovalidate', 'sort' => false);
              $validate = '?validate=validate&'.CSRF_TOKEN.'='.$token;
--- 372,386 ----
  
      $validate = '';
!     if (isset($_GET['validate'])) {
!         $token = SEC_createToken();
          $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' . '&'.CSRF_TOKEN.'='.$token;
          $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&'.CSRF_TOKEN.'='.$token;
***************
*** 389,393 ****
          $validate_help = $LANG_LINKS_ADMIN[59];
      } else {
!         $menu_arr[] = array('url' => $_CONF['site_admin_url'] . '/plugins/links/index.php?validate=enabled&'.CSRF_TOKEN.'='.$token,
                'text' => $LANG_LINKS_ADMIN[26]);
          $form_arr = array();
--- 388,392 ----
          $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]);
          $form_arr = array();