[geeklog-cvs] Geeklog-1.x/plugins/links/sql mysql_install.php, 1.6, 1.7 upgrade_1.0.1_2.mysql.php, 1.2, 1.3

[Dirk Haun]

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

Modified Files:
	mysql_install.php upgrade_1.0.1_2.mysql.php 
Log Message:
'cid' and 'pid' need to be 32 characters (for backward compatibility)


Index: upgrade_1.0.1_2.mysql.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/links/sql/upgrade_1.0.1_2.mysql.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** upgrade_1.0.1_2.mysql.php	28 Aug 2007 07:52:26 -0000	1.2
--- upgrade_1.0.1_2.mysql.php	1 Jan 2008 17:51:54 -0000	1.3
***************
*** 6,11 ****
  $LINKS_SQL['linkcategories'] = "
  CREATE TABLE {$_TABLES['linkcategories']} (
!   cid varchar(20) NOT NULL,
!   pid varchar(20) NOT NULL,
    category varchar(32) NOT NULL,
    description text DEFAULT NULL,
--- 6,11 ----
  $LINKS_SQL['linkcategories'] = "
  CREATE TABLE {$_TABLES['linkcategories']} (
!   cid varchar(32) NOT NULL,
!   pid varchar(32) NOT NULL,
    category varchar(32) NOT NULL,
    description text DEFAULT NULL,
***************
*** 30,34 ****
  $LINKS_SQL['linksubmission2'] = "ALTER TABLE {$_TABLES['linksubmission']} CHANGE category cid varchar(20) NOT NULL";
  
! $LINKS_SQL['links'] = "ALTER TABLE {$_TABLES['links']} CHANGE category cid varchar(20) NOT NULL";
  
  $LINKS_SQL['root'] = "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)";
--- 30,34 ----
  $LINKS_SQL['linksubmission2'] = "ALTER TABLE {$_TABLES['linksubmission']} CHANGE category cid varchar(20) NOT NULL";
  
! $LINKS_SQL['links'] = "ALTER TABLE {$_TABLES['links']} CHANGE category cid varchar(32) NOT NULL";
  
  $LINKS_SQL['root'] = "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)";

Index: mysql_install.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/links/sql/mysql_install.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** mysql_install.php	2 Sep 2007 02:44:55 -0000	1.6
--- mysql_install.php	1 Jan 2008 17:51:54 -0000	1.7
***************
*** 3,11 ****
  /* Reminder: always indent with 4 spaces (no tabs). */
  // +---------------------------------------------------------------------------+
! // | Links Plugin 1.0                                                          |
  // +---------------------------------------------------------------------------+
  // | Installation SQL                                                          |
  // +---------------------------------------------------------------------------+
! // | Copyright (C) 2000-2006 by the following authors:                         |
  // |                                                                           |
  // | Authors: Tony Bibbs        - tony AT tonybibbs DOT com                    |
--- 3,11 ----
  /* Reminder: always indent with 4 spaces (no tabs). */
  // +---------------------------------------------------------------------------+
! // | Links Plugin 2.0                                                          |
  // +---------------------------------------------------------------------------+
  // | Installation SQL                                                          |
  // +---------------------------------------------------------------------------+
! // | Copyright (C) 2000-2008 by the following authors:                         |
  // |                                                                           |
  // | Authors: Tony Bibbs        - tony AT tonybibbs DOT com                    |
***************
*** 31,34 ****
--- 31,35 ----
  // +---------------------------------------------------------------------------+
  //
+ // $Id$
  
  /**
***************
*** 37,43 ****
   * @package Links
   * @filesource
!  * @version 1.0
   * @since GL 1.4.0
!  * @copyright Copyright © 2005
   * @license http://opensource.org/licenses/gpl-license.php GNU Public License
   * @author Trinity Bays <trinity93 at steubentech.com>
--- 38,44 ----
   * @package Links
   * @filesource
!  * @version 2.0
   * @since GL 1.4.0
!  * @copyright Copyright © 2005-2008
   * @license http://opensource.org/licenses/gpl-license.php GNU Public License
   * @author Trinity Bays <trinity93 at steubentech.com>
***************
*** 50,60 ****
  
  
- 
- // $Id$
- 
  $_SQL[] = "
  CREATE TABLE {$_TABLES['linkcategories']} (
!   cid varchar(20) NOT NULL,
!   pid varchar(20) NOT NULL,
    category varchar(32) NOT NULL,
    description text DEFAULT NULL,
--- 51,58 ----
  
  
  $_SQL[] = "
  CREATE TABLE {$_TABLES['linkcategories']} (
!   cid varchar(32) NOT NULL,
!   pid varchar(32) NOT NULL,
    category varchar(32) NOT NULL,
    description text DEFAULT NULL,