[geeklog-cvs] Geeklog-1.x/public_html/admin/plugins/links category.php, NONE, 1.1 index.php, 1.45, 1.46 install.php, 1.18, 1.19

Oliver ospiess at qs1489.pair.com
Tue Aug 28 03:34:14 EDT 2007


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

Modified Files:
	index.php install.php 
Added Files:
	category.php 
Log Message:
install new links plugin with cateogory tree

Index: install.php
===================================================================
RCS file: /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/public_html/admin/plugins/links/install.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** install.php	11 Feb 2007 01:13:21 -0000	1.18
--- install.php	28 Aug 2007 07:34:12 -0000	1.19
***************
*** 1,5 ****
  <?php
  
! // Reminder: always indent with 4 spaces (no tabs).
  // +---------------------------------------------------------------------------+
  // | Links plugin 1.0 for Geeklog                                              |
--- 1,5 ----
  <?php
  
! // Reminder: always indent with 4 spaces (no tabs). 
  // +---------------------------------------------------------------------------+
  // | Links plugin 1.0 for Geeklog                                              |
***************
*** 38,45 ****
  //
  
! /**
!  * This file installs and removes the data structures for the
!  * Links plugin for Geeklog.
!  *
   * @package Links
   * @subpackage admin
--- 38,45 ----
  //
  
! /** 
!  * This file installs and removes the data structures for the    
!  * Links plugin for Geeklog.  
!  * 
   * @package Links
   * @subpackage admin
***************
*** 48,52 ****
   * @since GL 1.4.0
   * @copyright Copyright © 2005-2006
!  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
   * @author Trinity Bays <trinity93 at steubentech.com>
   * @author Tony Bibbs <tony at tonybibbs.com>
--- 48,52 ----
   * @since GL 1.4.0
   * @copyright Copyright © 2005-2006
!  * @license http://opensource.org/licenses/gpl-license.php GNU Public License 
   * @author Trinity Bays <trinity93 at steubentech.com>
   * @author Tony Bibbs <tony at tonybibbs.com>
***************
*** 54,58 ****
   * @author Blaine Lang <langmail at sympatico.ca>
   * @author Dirk Haun <dirk at haun-online.de>
!  *
   */
  // $Id$
--- 54,58 ----
   * @author Blaine Lang <langmail at sympatico.ca>
   * @author Dirk Haun <dirk at haun-online.de>
!  * 
   */
  // $Id$
***************
*** 97,101 ****
   * the plugin's groups - assumes first group to be the Admin group
   * @global array $GROUPS
!  *
   */
  $GROUPS = array();
--- 97,101 ----
   * the plugin's groups - assumes first group to be the Admin group
   * @global array $GROUPS
!  * 
   */
  $GROUPS = array();
***************
*** 104,108 ****
  /**
  * @global array $FEATURES
! *
  */
  $FEATURES = array();
--- 104,108 ----
  /**
  * @global array $FEATURES
! * 
  */
  $FEATURES = array();
***************
*** 113,117 ****
  /**
   * @global array $MAPPINGS
!  *
   */
  $MAPPINGS = array();
--- 113,117 ----
  /**
   * @global array $MAPPINGS
!  * 
   */
  $MAPPINGS = array();
***************
*** 128,132 ****
   */
  $DEFVALUES = array();
! $DEFVALUES[] = "INSERT INTO {$_TABLES['links']} (lid, category, url, description, title, date, owner_id, group_id, perm_group) VALUES ('geeklog.net', 'Geeklog Sites', 'http://www.geeklog.net/', 'Visit the Geeklog homepage for support, FAQs, updates, add-ons, and a great community.', 'Geeklog Project Homepage', NOW(), 1, #group#, 3)";
  
  /**
--- 128,144 ----
   */
  $DEFVALUES = array();
! 
! $blockadmin_id = DB_GetItem ($_TABLES['groups'], 'grp_id', "grp_name='Block Admin'");
! 
! $DEFVALUES[] = "INSERT INTO {$_TABLES['linkcategories']} (cid, pid, category, description, tid, created, modified, group_id, owner_id, perm_owner, perm_group, perm_members, perm_anon) VALUES ('site', 'root', 'Root', 'Website root', '', NOW(), NOW(), 5, 2, 3, 3, 2, 2)";
! 
! $DEFVALUES[] = "INSERT INTO {$_TABLES['linkcategories']} (cid, pid, category, description, tid, created, modified, group_id, owner_id, perm_owner, perm_group, perm_members, perm_anon) VALUES ('20070122143647631', 'site', 'Geeklog sites', 'Sites using or related to the Geeklog CMS', '', NOW(), NOW(), 5, 2, 3, 3, 2, 2)";
! 
! $DEFVALUES[] = "INSERT INTO {$_TABLES['links']} (lid, cid, url, description, title, hits, date, owner_id, group_id, perm_owner, perm_group, perm_members, perm_anon) VALUES ('geeklog.net', '20070122143647631', 'http://www.geeklog.net/', 'Visit the homepage for support, FAQs, updates, add-ons, and a great community.', 'Geeklog Project Homepage', 43, NOW(), 1, 5, 3, 3, 2, 2)";
! 
! $DEFVALUES[] = "INSERT INTO gl_blocks (is_enabled, name, type, title, tid, blockorder, content, allow_autotags, rdfurl, rdfupdated, rdflimit, onleft, phpblockfn, help, owner_id, group_id, perm_owner, perm_group, perm_members, perm_anon) VALUES (1, 'links_topic_links', 'phpblock', 'Topic Links', 'all', 0, '', 0, '', '0000-00-00 00:00:00', 0, 0, 'phpblock_topic_links', '', 2, {$blockadmin_id}, 3, 3, 2, 2)";
! 
! $DEFVALUES[] = "INSERT INTO gl_blocks (is_enabled, name, type, title, tid, blockorder, content, allow_autotags, rdfurl, rdfupdated, rdflimit, onleft, phpblockfn, help, owner_id, group_id, perm_owner, perm_group, perm_members, perm_anon) VALUES (1, 'links_topic_categories', 'phpblock', 'Topic Categories', 'all', 0, '', 0, '', '0000-00-00 00:00:00', 0, 0, 'phpblock_topic_categories', '', 2, {$blockadmin_id}, 3, 3, 2, 2)";
! 
  
  /**
***************
*** 176,180 ****
      exit;
  }
! 
  
  /**
--- 188,192 ----
      exit;
  }
!  
  
  /**
***************
*** 203,206 ****
--- 215,220 ----
      COM_errorLog ("Attempting to install the $pi_display_name plugin", 1);
  
+     $uninstall_plugin = 'plugin_uninstall_' . $pi_name;
+ 
      // create the plugin's groups
      $admin_group_id = 0;
***************
*** 212,216 ****
          DB_query ("INSERT INTO {$_TABLES['groups']} (grp_name, grp_descr) VALUES ('$grp_name', '$grp_desc')", 1);
          if (DB_error ()) {
!             PLG_uninstall ($pi_name);
  
              return false;
--- 226,230 ----
          DB_query ("INSERT INTO {$_TABLES['groups']} (grp_name, grp_descr) VALUES ('$grp_name', '$grp_desc')", 1);
          if (DB_error ()) {
!             $uninstall_plugin ();
  
              return false;
***************
*** 247,251 ****
              if (DB_error ()) {
                  COM_errorLog ('Error creating table', 1);
!                 PLG_uninstall ($pi_name);
  
                  return false;
--- 261,265 ----
              if (DB_error ()) {
                  COM_errorLog ('Error creating table', 1);
!                 $uninstall_plugin ();
  
                  return false;
***************
*** 263,267 ****
                    . "VALUES ('$ft_name', '$ft_desc')", 1);
          if (DB_error ()) {
!             PLG_uninstall ($pi_name);
  
              return false;
--- 277,281 ----
                    . "VALUES ('$ft_name', '$ft_desc')", 1);
          if (DB_error ()) {
!             $uninstall_plugin ();
  
              return false;
***************
*** 275,279 ****
                  DB_query ("INSERT INTO {$_TABLES['access']} (acc_ft_id, acc_grp_id) VALUES ($feat_id, {$GROUPS[$group]})");
                  if (DB_error ()) {
!                     PLG_uninstall ($pi_name);
  
                      return false;
--- 289,293 ----
                  DB_query ("INSERT INTO {$_TABLES['access']} (acc_ft_id, acc_grp_id) VALUES ($feat_id, {$GROUPS[$group]})");
                  if (DB_error ()) {
!                     $uninstall_plugin ();
  
                      return false;
***************
*** 290,294 ****
                . "($admin_group_id, NULL, 1)");
      if (DB_error ()) {
!         PLG_uninstall ($pi_name);
  
          return false;
--- 304,308 ----
                . "($admin_group_id, NULL, 1)");
      if (DB_error ()) {
!         $uninstall_plugin ();
  
          return false;
***************
*** 301,305 ****
          DB_query ($sql, 1);
          if (DB_error ()) {
!             PLG_uninstall ($pi_name);
  
              return false;
--- 315,319 ----
          DB_query ($sql, 1);
          if (DB_error ()) {
!             $uninstall_plugin ();
  
              return false;
***************
*** 317,321 ****
  
      if (DB_error ()) {
!         PLG_uninstall ($pi_name);
  
          return false;
--- 331,335 ----
  
      if (DB_error ()) {
!         $uninstall_plugin ();
  
          return false;
***************
*** 325,329 ****
      if (function_exists ('plugin_postinstall')) {
          if (!plugin_postinstall ()) {
!             PLG_uninstall ($pi_name);
  
              return false;
--- 339,343 ----
      if (function_exists ('plugin_postinstall')) {
          if (!plugin_postinstall ()) {
!             $uninstall_plugin ();
  
              return false;

--- NEW FILE: category.php ---
<?php

/* Reminder: always indent with 4 spaces (no tabs). */
// +---------------------------------------------------------------------------+
// | Geeklog 1.3                                                               |
// +---------------------------------------------------------------------------+
// | category.php                                                              |
// |                                                                           |
// | Geeklog links category administration page.                               |
// +---------------------------------------------------------------------------+
// | Copyright (C) 2000-2004 by the following authors:                         |
// |                                                                           |
// | Authors: Tony Bibbs        - tony at tonybibbs.com                           |
// |          Mark Limburg      - mlimburg at users.sourceforge.net               |
// |          Jason Whittenburg - jwhitten at securitygeeks.com                   |
// |          Dirk Haun         - dirk at haun-online.de                          |
// |          Euan McKay        - info at heatherengineering.com                  |
// +---------------------------------------------------------------------------+
// |                                                                           |
// | This program is free software; you can redistribute it and/or             |
// | modify it under the terms of the GNU General Public License               |
// | as published by the Free Software Foundation; either version 2            |
// | of the License, or (at your option) any later version.                    |
// |                                                                           |
// | This program is distributed in the hope that it will be useful,           |
// | but WITHOUT ANY WARRANTY; without even the implied warranty of            |
// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the             |
// | GNU General Public License for more details.                              |
// |                                                                           |
// | You should have received a copy of the GNU General Public License         |
// | along with this program; if not, write to the Free Software Foundation,   |
// | Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           |
// |                                                                           |
// +---------------------------------------------------------------------------+
//
// $Id: 

require_once ('../../../lib-common.php');
require_once($_CONF['path'] . 'plugins/links/config.php');

// Uncomment the line below if you need to debug the HTTP variables being passed
// to the script.  This will sometimes cause errors but it will allow you to see
// the data being passed in a POST operation
// echo COM_debug($_POST);

$display = '';

if (!SEC_hasRights('links.edit')) {
    $display .= COM_siteHeader ('menu');
    $display .= COM_startBlock ($MESSAGE[30], '',
                                COM_getBlockTemplate ('_msg_block', 'header'));
    $display .= $MESSAGE[34];
    $display .= COM_endBlock (COM_getBlockTemplate ('_msg_block', 'footer'));
    $display .= COM_siteFooter ();
    COM_accessLog("User {$_USER['username']} tried to illegally access the link administration screen.");
    echo $display;
    exit;
}



// MAIN

$mode = '';
if (isset ($_REQUEST['mode'])) {
    $mode = $_REQUEST['mode'];
}

$root = 'site';

// delete category
if ((($mode == $LANG_ADMIN['delete']) && !empty ($LANG_ADMIN['delete'])) || ($mode=="delete")) {
    $cid = COM_applyFilter ($_REQUEST['cid']);
    if (!isset ($cid) || empty ($cid)) {  // || ($cid == 0)
        COM_errorLog ('Attempted to delete category cid=' . $cid );
        $display .= COM_refresh ($_CONF['site_admin_url'] . '/plugins/links/category.php');
    } else {
        $display .= COM_siteHeader ('menu', $LANG_LINKS_ADMIN[11]);
        $result  = links_delete_category ($cid);

        $display .= COM_startBlock ($LANG_LINKS[41], '', COM_getBlockTemplate ('_msg_block', 'header'));
        $display .= $result;
        $display .= COM_endBlock(COM_getBlockTemplate ('_msg_block', 'footer'));
        $display .= links_list_categories($root);
        $display .= COM_siteFooter();

    }

// save category
} else if (($mode == $LANG_ADMIN['save']) && !empty ($LANG_ADMIN['save'])) {
    $display .= COM_siteHeader ('menu', $LANG_LINKS_ADMIN[11]);
    $result = links_save_category (COM_applyFilter ($_POST['cid']), 
            COM_applyFilter ($_POST['old_cid']), 
            COM_applyFilter ($_POST['pid']), $_POST['category'], $_POST['description'],
            COM_applyFilter ($_POST['tid']),
            COM_applyFilter ($_POST['owner_id'], true),
            COM_applyFilter ($_POST['group_id'], true),
            $_POST['perm_owner'], $_POST['perm_group'],
            $_POST['perm_members'], $_POST['perm_anon']);
    $display .= COM_startBlock ($LANG_LINKS[41], '', COM_getBlockTemplate ('_msg_block', 'header'));
    if ($result==1) {
        $display .= $LANG_LINKS_ADMIN[39];
    } else {
        $display .= $result;
    }
    $display .= COM_endBlock(COM_getBlockTemplate ('_msg_block', 'footer'));

    $display .= links_list_categories($root);
    $display .= COM_siteFooter();

// edit category
} else if ($mode == "edit") {
    $display .= COM_siteHeader ('menu', $LANG_LINKS_ADMIN[11]);
    $pid   = COM_applyFilter ($_GET['pid']);
    $cid   = COM_applyFilter ($_GET['cid']);
    $display .= links_edit_category ($cid,$pid);
    $display .= COM_siteFooter();

// nothing, so list categories
} else {
    $display .= COM_siteHeader ('menu', $LANG_LINKS_ADMIN[11]);
    if (isset ($_REQUEST['msg'])) {
        $msg = COM_applyFilter ($_REQUEST['msg'], true);
        if ($msg > 0) {
            $display .= COM_showMessage ($msg, 'links');
        }
    }
    $display .= links_list_categories($root);
    $display .= COM_siteFooter();
}

echo $display;

?>

Index: index.php
===================================================================
RCS file: /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/public_html/admin/plugins/links/index.php,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** index.php	9 Aug 2007 06:56:57 -0000	1.45
--- index.php	28 Aug 2007 07:34:12 -0000	1.46
***************
*** 103,115 ****
      $link_templates->set_var('site_admin_url', $_CONF['site_admin_url']);
      $link_templates->set_var('layout_url',$_CONF['layout_url']);
      if ($mode <> 'editsubmission' AND !empty($lid)) {
          $result = DB_query("SELECT * FROM {$_TABLES['links']} WHERE lid ='$lid'");
-         if (DB_numRows($result) !== 1) {
-             $msg = COM_startBlock ($LANG_LINKS_ADMIN[24], '',
-                 COM_getBlockTemplate ('_msg_block', 'header'));
-             $msg .= $LANG_LINKS_ADMIN[25];
-             $msg .= COM_endBlock (COM_getBlockTemplate ('_msg_block', 'footer'));
-             return $msg;
-         }
          $A = DB_fetchArray($result);
          $access = SEC_hasAccess($A['owner_id'],$A['group_id'],$A['perm_owner'],$A['perm_group'],$A['perm_members'],$A['perm_anon']);
--- 103,117 ----
      $link_templates->set_var('site_admin_url', $_CONF['site_admin_url']);
      $link_templates->set_var('layout_url',$_CONF['layout_url']);
+ 
+     $link_templates->set_var('lang_pagetitle', $LANG_LINKS_ADMIN[28]);
+     $link_templates->set_var('lang_link_list', $LANG_LINKS_ADMIN[27]);
+     $link_templates->set_var('lang_new_link', $LANG_LINKS_ADMIN[25]);
+     $link_templates->set_var('lang_list_categories', $LANG_LINKS_ADMIN[24]);
+     $link_templates->set_var('lang_new_category', $LANG_LINKS_ADMIN[26]);
+     $link_templates->set_var('lang_admin_home', $LANG_ADMIN['admin_home']);
+     $link_templates->set_var('instructions', $LANG_LINKS_ADMIN[29]);
+ 
      if ($mode <> 'editsubmission' AND !empty($lid)) {
          $result = DB_query("SELECT * FROM {$_TABLES['links']} WHERE lid ='$lid'");
          $A = DB_fetchArray($result);
          $access = SEC_hasAccess($A['owner_id'],$A['group_id'],$A['perm_owner'],$A['perm_group'],$A['perm_members'],$A['perm_anon']);
***************
*** 128,138 ****
          } else {
              $A['lid'] = COM_makesid();
!             $A['category'] = '';
              $A['url'] = '';
              $A['description'] = '';
              $A['title']= '';
-             $A['owner_id'] = $_USER['uid'];
          }
          $A['hits'] = 0;
          if (isset ($_GROUPS['Links Admin'])) {
              $A['group_id'] = $_GROUPS['Links Admin'];
--- 130,140 ----
          } else {
              $A['lid'] = COM_makesid();
!             $A['cid'] = '';
              $A['url'] = '';
              $A['description'] = '';
              $A['title']= '';
          }
          $A['hits'] = 0;
+         $A['owner_id'] = $_USER['uid'];
          if (isset ($_GROUPS['Links Admin'])) {
              $A['group_id'] = $_GROUPS['Links Admin'];
***************
*** 165,171 ****
      $link_templates->set_var('lang_includehttp', $LANG_LINKS_ADMIN[6]);
      $link_templates->set_var('lang_category', $LANG_LINKS_ADMIN[5]);
!     $othercategory = $A['category'];
!     $link_templates->set_var('category_options',
!                              links_getCategoryList ($othercategory));
      $link_templates->set_var('lang_ifotherspecify', $LANG_LINKS_ADMIN[20]);
      $link_templates->set_var('category', $othercategory);
--- 167,172 ----
      $link_templates->set_var('lang_includehttp', $LANG_LINKS_ADMIN[6]);
      $link_templates->set_var('lang_category', $LANG_LINKS_ADMIN[5]);
!     $othercategory = links_select_box (3,$A['cid']);
!     $link_templates->set_var('category_options', $othercategory);
      $link_templates->set_var('lang_ifotherspecify', $LANG_LINKS_ADMIN[20]);
      $link_templates->set_var('category', $othercategory);
***************
*** 206,210 ****
  * @param    string  $lid            ID for link
  * @param    string  $old_lid        old ID for link
! * @param    string  $category       Category link belongs to
  * @param    string  $categorydd     Category links belong to
  * @param    string  $url            URL of link to save
--- 207,211 ----
  * @param    string  $lid            ID for link
  * @param    string  $old_lid        old ID for link
! * @param    string  $cid            cid of category link belongs to
  * @param    string  $categorydd     Category links belong to
  * @param    string  $url            URL of link to save
***************
*** 227,233 ****
  *
  */
! function savelink ($lid, $old_lid, $category, $categorydd, $url, $description, $title, $hits, $owner_id, $group_id, $perm_owner, $perm_group, $perm_members, $perm_anon)
  {
!     global $_CONF, $_GROUPS, $_TABLES, $_USER, $MESSAGE, $LANG_LINKS_ADMIN, $_LI_CONF;
  
      $retval = '';
--- 228,234 ----
  *
  */
! function savelink ($lid, $old_lid, $cid, $categorydd, $url, $description, $title, $hits, $owner_id, $group_id, $perm_owner, $perm_group, $perm_members, $perm_anon)
  {
!     global $_CONF, $_GROUPS, $_TABLES, $_USER, $MESSAGE, $LANG_LINKS_ADMIN;
  
      $retval = '';
***************
*** 241,245 ****
      $description = addslashes (COM_checkHTML (COM_checkWords ($description)));
      $title = addslashes (COM_checkHTML (COM_checkWords ($title)));
!     $category = addslashes ($category);
  
      if (empty ($owner_id)) {
--- 242,246 ----
      $description = addslashes (COM_checkHTML (COM_checkWords ($description)));
      $title = addslashes (COM_checkHTML (COM_checkWords ($title)));
!     $cid = addslashes ($cid);
  
      if (empty ($owner_id)) {
***************
*** 291,295 ****
  
          if ($categorydd != $LANG_LINKS_ADMIN[7] && !empty($categorydd)) {
!             $category = addslashes ($categorydd);
          } else if ($categorydd != $LANG_LINKS_ADMIN[7]) {
              echo COM_refresh($_CONF['site_admin_url'] . '/plugins/links/index.php');
--- 292,296 ----
  
          if ($categorydd != $LANG_LINKS_ADMIN[7] && !empty($categorydd)) {
!             $cid = addslashes ($categorydd);
          } else if ($categorydd != $LANG_LINKS_ADMIN[7]) {
              echo COM_refresh($_CONF['site_admin_url'] . '/plugins/links/index.php');
***************
*** 299,312 ****
          DB_delete ($_TABLES['links'], 'lid', $old_lid);
  
!         DB_save ($_TABLES['links'], 'lid,category,url,description,title,date,hits,owner_id,group_id,perm_owner,perm_group,perm_members,perm_anon', "'$lid','$category','$url','$description','$title',NOW(),'$hits',$owner_id,$group_id,$perm_owner,$perm_group,$perm_members,$perm_anon");
          COM_rdfUpToDateCheck ('links', $category, $lid);
  
!         return PLG_afterSaveSwitch (
!             $_LI_CONF['aftersave'],
!             COM_buildURL ("{$_CONF['site_url']}/links/portal.php?what=link&item=$lid"),
!             'links',
!             2
!         );
! 
      } else { // missing fields
          $retval .= COM_siteHeader('menu', $LANG_LINKS_ADMIN[1]);
--- 300,309 ----
          DB_delete ($_TABLES['links'], 'lid', $old_lid);
  
!         DB_save ($_TABLES['links'], 'lid,cid,url,description,title,date,hits,owner_id,group_id,perm_owner,perm_group,perm_members,perm_anon', "'$lid','$cid','$url','$description','$title',NOW(),'$hits',$owner_id,$group_id,$perm_owner,$perm_group,$perm_members,$perm_anon");
!         // Get category for rdf check
!         $category = DB_getItem ($_TABLES['linkcategories'],"category","cid='{$cid}'");
          COM_rdfUpToDateCheck ('links', $category, $lid);
  
!         return COM_refresh ($_CONF['site_admin_url'] . '/plugins/links/index.php?msg=2');
      } else { // missing fields
          $retval .= COM_siteHeader('menu', $LANG_LINKS_ADMIN[1]);
***************
*** 354,360 ****
  
      $menu_arr = array (
                      array('url' => $_CONF['site_admin_url'] . '/plugins/links/index.php?mode=edit',
!                           'text' => $LANG_ADMIN['create_new']),
                      array('url' => $_CONF['site_admin_url'] . '/plugins/links/index.php?checkhtml=true',
                            'text' => $LANG_LINKS_ADMIN[26]),
                      array('url' => $_CONF['site_admin_url'],
--- 351,363 ----
  
      $menu_arr = array (
+     //                array('url' => $_CONF['site_admin_url'] . '/plugins/links/index.php',
+     //                      'text' => $LANG_LINKS_ADMIN[27]),
                      array('url' => $_CONF['site_admin_url'] . '/plugins/links/index.php?mode=edit',
!                           'text' => $LANG_LINKS_ADMIN[25]),
                      array('url' => $_CONF['site_admin_url'] . '/plugins/links/index.php?checkhtml=true',
+                           'text' => $LANG_LINKS_ADMIN[49]),
+                     array('url' => $_CONF['site_admin_url'] . '/plugins/links/category.php',
+                           'text' => $LANG_LINKS_ADMIN[24]),
+                     array('url' => $_CONF['site_admin_url'] . '/plugins/links/category.php?mode=edit',
                            'text' => $LANG_LINKS_ADMIN[26]),
                      array('url' => $_CONF['site_admin_url'],
***************
*** 364,374 ****
                        'has_extras'   => true,
                        'title' => $LANG_LINKS_ADMIN[11], 'instructions' => $LANG_LINKS_ADMIN[12],
!                       'icon' => plugin_geticon_links(),
                        'form_url' => $_CONF['site_admin_url'] . "/plugins/links/index.php$validate");
  
      $query_arr = array('table' => 'links',
!                        'sql' => "SELECT * FROM {$_TABLES['links']} WHERE 1=1",
                         'query_fields' => array('title', 'category', 'url', 'description'),
!                        'default_filter' => COM_getPermSql ('AND'));
  
      $retval .= ADMIN_list ("links", "plugin_getListField_links", $header_arr, $text_arr,
--- 367,377 ----
                        'has_extras'   => true,
                        'title' => $LANG_LINKS_ADMIN[11], 'instructions' => $LANG_LINKS_ADMIN[12],
!                       'icon' => $_CONF['site_url'] . '/links/images/links.png',
                        'form_url' => $_CONF['site_admin_url'] . "/plugins/links/index.php$validate");
  
      $query_arr = array('table' => 'links',
!                        'sql' => "SELECT l.lid AS lid, l.title AS title, c.category AS category, l.url AS url, l.description AS description, l.owner_id, l.group_id, l.perm_owner, l.perm_group, l.perm_members, l.perm_anon FROM {$_TABLES['links']} AS l LEFT JOIN {$_TABLES['linkcategories']} AS c ON l.cid=c.cid WHERE 1=1",
                         'query_fields' => array('title', 'category', 'url', 'description'),
!                        'default_filter' => COM_getPermSql ('AND', 0, 3, 'l'));
  
      $retval .= ADMIN_list ("links", "plugin_getListField_links", $header_arr, $text_arr,
***************
*** 421,425 ****
      $display .= savelink (COM_applyFilter ($_POST['lid']),
              COM_applyFilter ($_POST['old_lid']),
!             $_POST['category'], $_POST['categorydd'],
              $_POST['url'], $_POST['description'], $_POST['title'],
              COM_applyFilter ($_POST['hits'], true),
--- 424,428 ----
      $display .= savelink (COM_applyFilter ($_POST['lid']),
              COM_applyFilter ($_POST['old_lid']),
!             $_POST['cid'], $_POST['categorydd'],
              $_POST['url'], $_POST['description'], $_POST['title'],
              COM_applyFilter ($_POST['hits'], true),




More information about the geeklog-cvs mailing list