[geeklog-cvs] Geeklog-1.x/sql mysql_tableanddata.php,1.184,1.185

Oliver ospiess at qs1489.pair.com
Wed Aug 29 00:28:10 EDT 2007 

Update of /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/sql
In directory qs1489.pair.com:/tmp/cvs-serv5214

Modified Files:
	mysql_tableanddata.php 
Log Message:
new version from Euan (2nd try)

Index: mysql_tableanddata.php
===================================================================
RCS file: /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/sql/mysql_tableanddata.php,v
retrieving revision 1.184
retrieving revision 1.185
diff -C2 -d -r1.184 -r1.185
*** mysql_tableanddata.php	29 Aug 2007 02:11:35 -0000	1.184
--- mysql_tableanddata.php	29 Aug 2007 04:28:08 -0000	1.185
***************
*** 224,229 ****
  $_SQL[16] = "
  CREATE TABLE {$_TABLES['links']} (
!   lid varchar(40) NOT NULL default '',
!   category varchar(32) default NULL,
    url varchar(255) default NULL,
    description text,
--- 224,229 ----
  $_SQL[16] = "
  CREATE TABLE {$_TABLES['links']} (
!   lid varchar(20) NOT NULL default '',
!   cid varchar(32) default NULL,
    url varchar(255) default NULL,
    description text,
***************
*** 237,244 ****
    perm_members tinyint(1) unsigned NOT NULL default '2',
    perm_anon tinyint(1) unsigned NOT NULL default '2',
!   INDEX links_lid(lid),
!   INDEX links_category(category),
    INDEX links_date(date),
!   PRIMARY KEY  (lid)
  ) TYPE=MyISAM
  ";
--- 237,243 ----
    perm_members tinyint(1) unsigned NOT NULL default '2',
    perm_anon tinyint(1) unsigned NOT NULL default '2',
!   INDEX links_category(cid),
    INDEX links_date(date),
!   PRIMARY KEY (lid)
  ) TYPE=MyISAM
  ";
***************
*** 246,251 ****
  $_SQL[17] = "
  CREATE TABLE {$_TABLES['linksubmission']} (
!   lid varchar(40) NOT NULL default '',
!   category varchar(32) default NULL,
    url varchar(255) default NULL,
    description text,
--- 245,250 ----
  $_SQL[17] = "
  CREATE TABLE {$_TABLES['linksubmission']} (
!   lid varchar(20) NOT NULL default '',
!   cid varchar(32) default NULL,
    url varchar(255) default NULL,
    description text,
***************
*** 254,258 ****
    date datetime default NULL,
    owner_id mediumint(8) unsigned NOT NULL default '1',
!   PRIMARY KEY  (lid)
  ) TYPE=MyISAM
  ";
--- 253,257 ----
    date datetime default NULL,
    owner_id mediumint(8) unsigned NOT NULL default '1',
!   PRIMARY KEY (lid)
  ) TYPE=MyISAM
  ";
***************
*** 705,708 ****
--- 704,727 ----
  ";
  
+ $_SQL[46] = "
+ CREATE TABLE {$_TABLES['linkcategories']} (
+   cid varchar(20) NOT NULL,
+   pid varchar(20) NOT NULL,
+   category varchar(32) NOT NULL,
+   description text DEFAULT NULL,
+   tid varchar(20) DEFAULT NULL,
+   created datetime DEFAULT NULL,
+   modified datetime DEFAULT NULL,
+   owner_id mediumint(8) unsigned NOT NULL default '1',
+   group_id mediumint(8) unsigned NOT NULL default '1',
+   perm_owner tinyint(1) unsigned NOT NULL default '3',
+   perm_group tinyint(1) unsigned NOT NULL default '2',
+   perm_members tinyint(1) unsigned NOT NULL default '2',
+   perm_anon tinyint(1) unsigned NOT NULL default '2',
+   PRIMARY KEY (cid),
+   KEY links_pid (pid)
+ ) TYPE=MyISAM
+ ";
+ 
  $_DATA[] = "INSERT INTO {$_TABLES['access']} (acc_ft_id, acc_grp_id) VALUES (1,3) ";
  $_DATA[] = "INSERT INTO {$_TABLES['access']} (acc_ft_id, acc_grp_id) VALUES (2,3) ";
***************
*** 1052,1056 ****
  $_DATA[] = "INSERT INTO {$_TABLES['groups']} (grp_id, grp_name, grp_descr, grp_gl_core) VALUES (17,'Syndication Admin', 'Can create and modify web feeds for the site',1) ";
  
! $_DATA[] = "INSERT INTO {$_TABLES['links']} (lid, category, url, description, title, date, owner_id, group_id) 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,5)";
  
  $_DATA[] = "INSERT INTO {$_TABLES['maillist']} (code, name) VALUES (0,'Don\'t Email') ";
--- 1071,1077 ----
  $_DATA[] = "INSERT INTO {$_TABLES['groups']} (grp_id, grp_name, grp_descr, grp_gl_core) VALUES (17,'Syndication Admin', 'Can create and modify web feeds for the site',1) ";
  
! $_DATA[] = "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', '20070828065220743', 'http://www.geeklog.net/', 'Visit the Geeklog homepage for support, FAQs, updates, add-ons, and a great community.', 'Geeklog Project Homepage', 0, '2007-08-28 14:52:13', 1, 5, 3, 2, 2, 2);";
! $_DATA[] = "INSERT INTO {$_TABLES['linkcategories']} (cid, pid, category, description, tid, created, modified, owner_id, group_id, perm_owner, perm_group, perm_members, perm_anon) VALUES ('20070828065220743', 'site', 'Geeklog Sites', NULL, NULL, '2007-08-28 14:52:20', '2007-08-28 14:52:20', 2, 5, 3, 2, 2, 2);";
! $_DATA[] = "INSERT INTO {$_TABLES['linkcategories']} (cid, pid, category, description, tid, created, modified, owner_id, group_id, perm_owner, perm_group, perm_members, perm_anon) VALUES ('site', 'root', 'Root', 'Website root', '', '2007-08-28 14:52:21', '2007-08-28 14:52:21', 2, 5, 3, 3, 2, 2);";
  
  $_DATA[] = "INSERT INTO {$_TABLES['maillist']} (code, name) VALUES (0,'Don\'t Email') ";
***************
*** 1061,1065 ****
  $_DATA[] = "INSERT INTO {$_TABLES['plugins']} (pi_name, pi_version, pi_gl_version, pi_enabled, pi_homepage) VALUES ('staticpages', '1.4.4','1.4.1',1,'http://www.geeklog.net/') ";
  $_DATA[] = "INSERT INTO {$_TABLES['plugins']} (pi_name, pi_version, pi_gl_version, pi_enabled, pi_homepage) VALUES ('spamx', '1.1.1','1.4.1',1,'http://www.pigstye.net/gplugs/staticpages/index.php/spamx') ";
! $_DATA[] = "INSERT INTO {$_TABLES['plugins']} (pi_name, pi_version, pi_gl_version, pi_enabled, pi_homepage) VALUES ('links', '1.1.1', '1.4.1', 1, 'http://www.geeklog.net/')";
  $_DATA[] = "INSERT INTO {$_TABLES['plugins']} (pi_name, pi_version, pi_gl_version, pi_enabled, pi_homepage) VALUES ('polls', '2.0.1', '1.4.1', '1', 'http://www.geeklog.net/')";
  $_DATA[] = "INSERT INTO {$_TABLES['plugins']} (pi_name, pi_version, pi_gl_version, pi_enabled, pi_homepage) VALUES ('calendar', '1.0.2', '1.4.1', '1', 'http://www.geeklog.net/')";
--- 1082,1086 ----
  $_DATA[] = "INSERT INTO {$_TABLES['plugins']} (pi_name, pi_version, pi_gl_version, pi_enabled, pi_homepage) VALUES ('staticpages', '1.4.4','1.4.1',1,'http://www.geeklog.net/') ";
  $_DATA[] = "INSERT INTO {$_TABLES['plugins']} (pi_name, pi_version, pi_gl_version, pi_enabled, pi_homepage) VALUES ('spamx', '1.1.1','1.4.1',1,'http://www.pigstye.net/gplugs/staticpages/index.php/spamx') ";
! $_DATA[] = "INSERT INTO {$_TABLES['plugins']} (pi_name, pi_version, pi_gl_version, pi_enabled, pi_homepage) VALUES ('links', '2.0', '1.4.1', 1, 'http://www.geeklog.net/')";
  $_DATA[] = "INSERT INTO {$_TABLES['plugins']} (pi_name, pi_version, pi_gl_version, pi_enabled, pi_homepage) VALUES ('polls', '2.0.1', '1.4.1', '1', 'http://www.geeklog.net/')";
  $_DATA[] = "INSERT INTO {$_TABLES['plugins']} (pi_name, pi_version, pi_gl_version, pi_enabled, pi_homepage) VALUES ('calendar', '1.0.2', '1.4.1', '1', 'http://www.geeklog.net/')";

More information about the geeklog-cvs mailing list