[geeklog-cvs] Geeklog-1.x/public_html/links index.php, 1.25, 1.26 portal.php, 1.4, 1.5

[Dirk Haun]

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

Modified Files:
	index.php portal.php 
Log Message:
Fixed Links plugin update and handling of categories (for backward compatibility)


Index: portal.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/links/portal.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** portal.php	29 Aug 2007 04:27:34 -0000	1.4
--- portal.php	31 Dec 2007 10:41:47 -0000	1.5
***************
*** 3,7 ****
  /* Reminder: always indent with 4 spaces (no tabs). */
  // +---------------------------------------------------------------------------+
! // | Geeklog 1.3                                                               |
  // +---------------------------------------------------------------------------+
  // | portal.php                                                                |
--- 3,7 ----
  /* Reminder: always indent with 4 spaces (no tabs). */
  // +---------------------------------------------------------------------------+
! // | Geeklog 1.5                                                               |
  // +---------------------------------------------------------------------------+
  // | portal.php                                                                |
***************
*** 9,13 ****
  // | Geeklog portal page that tracks link click throughs.                      |
  // +---------------------------------------------------------------------------+
! // | Copyright (C) 2000-2004 by the following authors:                         |
  // |                                                                           |
  // | Authors: Tony Bibbs        - tony at tonybibbs.com                           |
--- 9,13 ----
  // | Geeklog portal page that tracks link click throughs.                      |
  // +---------------------------------------------------------------------------+
! // | Copyright (C) 2000-2007 by the following authors:                         |
  // |                                                                           |
  // | Authors: Tony Bibbs        - tony at tonybibbs.com                           |
***************
*** 78,82 ****
  
      if (!empty ($item)) {
!         $url = COM_buildURL("{$_CONF['site_url']}/links/index.php?cid={$item}");
      }
  }
--- 78,82 ----
  
      if (!empty ($item)) {
!         $url = COM_buildURL("{$_CONF['site_url']}/links/index.php?category=" . urlencode($item));
      }
  }

Index: index.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/links/index.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** index.php	29 Dec 2007 16:14:03 -0000	1.25
--- index.php	31 Dec 2007 10:41:47 -0000	1.26
***************
*** 3,7 ****
  /* Reminder: always indent with 4 spaces (no tabs). */
  // +---------------------------------------------------------------------------+
! // | Links Plugin 1.0                                                          |
  // +---------------------------------------------------------------------------+
  // | index.php                                                                 |
--- 3,7 ----
  /* Reminder: always indent with 4 spaces (no tabs). */
  // +---------------------------------------------------------------------------+
! // | Links Plugin 2.0                                                          |
  // +---------------------------------------------------------------------------+
  // | index.php                                                                 |
***************
*** 41,45 ****
   * @subpackage public_html
   * @filesource
!  * @version 1.0
   * @since GL 1.4.0
   * @copyright Copyright © 2005-2007
--- 41,45 ----
   * @subpackage public_html
   * @filesource
!  * @version 2.0
   * @since GL 1.4.0
   * @copyright Copyright © 2005-2007
***************
*** 69,76 ****
      $cid = $_LI_CONF['root'];
      $display = '';
!     if (isset ($_GET['cid'])) {
!         $cid = strip_tags (COM_stripslashes ($_GET['cid']));
!     } elseif (isset ($_POST['cid'])) {
!         $cid = strip_tags (COM_stripslashes ($_POST['cid']));
      }
      $page = 0;
--- 69,76 ----
      $cid = $_LI_CONF['root'];
      $display = '';
!     if (isset($_GET['category'])) {
!         $cid = strip_tags (COM_stripslashes ($_GET['category']));
!     } elseif (isset($_POST['category'])) {
!         $cid = strip_tags (COM_stripslashes ($_POST['category']));
      }
      $page = 0;
***************
*** 130,145 ****
                                  'actcol'   => 'categoryactivecol.thtml',
                                  'pagenav'  => 'pagenavigation.thtml'));
!     $linklist->set_var ( 'xhtml', XHTML );
!     $linklist->set_var ('blockheader',COM_startBlock($LANG_LINKS[114]));
!     $linklist->set_var ('layout_url',$_CONF['layout_url']);
!     
      // Create breadcrumb trail
      $linklist->set_var('breadcrumbs', links_breadcrumbs ($_LI_CONF['root'], $cid));
  
      // Set dropdown for category jump
!     $linklist->set_var ('lang_go', $LANG_LINKS[124]);
      $linklist->set_var('link_dropdown', links_select_box(2, $cid));
  
- 
      if ($_LI_CONF['linkcols'] > 0) {
          // Show categories
--- 130,144 ----
                                  'actcol'   => 'categoryactivecol.thtml',
                                  'pagenav'  => 'pagenavigation.thtml'));
!     $linklist->set_var('xhtml', XHTML);
!     $linklist->set_var('blockheader', COM_startBlock($LANG_LINKS[114]));
!     $linklist->set_var('layout_url', $_CONF['layout_url']);
! 
      // Create breadcrumb trail
      $linklist->set_var('breadcrumbs', links_breadcrumbs ($_LI_CONF['root'], $cid));
  
      // Set dropdown for category jump
!     $linklist->set_var('lang_go', $LANG_LINKS[124]);
      $linklist->set_var('link_dropdown', links_select_box(2, $cid));
  
      if ($_LI_CONF['linkcols'] > 0) {
          // Show categories
***************
*** 188,192 ****
                  }
                  $linklist->set_var ('category_link', $_CONF['site_url'] .
!                     '/links/index.php?cid=' . urlencode ($C['cid']));
                  $linklist->set_var ('category_count', $display_count);
                  $linklist->set_var ('width', floor (100 / $_LI_CONF['linkcols']));
--- 187,191 ----
                  }
                  $linklist->set_var ('category_link', $_CONF['site_url'] .
!                     '/links/index.php?category=' . urlencode ($C['cid']));
                  $linklist->set_var ('category_count', $display_count);
                  $linklist->set_var ('width', floor (100 / $_LI_CONF['linkcols']));
***************
*** 212,218 ****
      }
  
!     $linklist->set_var ('site_url', $_CONF['site_url']);
!     $linklist->set_var ('cid', $cid);
!     $linklist->set_var ('lang_addalink', $LANG_LINKS[116]);
  
      // Build SQL for links
--- 211,219 ----
      }
  
!     $linklist->set_var('site_url', $_CONF['site_url']);
!     $linklist->set_var('cid', $cid);
!     $linklist->set_var('cid_plain', $cid);
!     $linklist->set_var('cid_encoded', urlencode($cid));
!     $linklist->set_var('lang_addalink', $LANG_LINKS[116]);
  
      // Build SQL for links
***************
*** 260,264 ****
      } else {
          // Get current category name
!         $currentcategory=DB_GetItem($_TABLES['linkcategories'], "category","cid='{$cid}'");
          $linklist->set_var ('link_category', $currentcategory);
          $linklist->set_var ('link_details', '');
--- 261,266 ----
      } else {
          // Get current category name
!         $currentcategory = DB_getItem($_TABLES['linkcategories'], 'category',
!                                       "cid='{$cid}'");
          $linklist->set_var ('link_category', $currentcategory);
          $linklist->set_var ('link_details', '');
***************
*** 400,404 ****
  } else {
      $display .= links_list($message);
- 
  }
  
--- 402,405 ----