[geeklog-cvs] geeklog: Fixed the update (regarding comment additions)
geeklog-cvs at lists.geeklog.net
geeklog-cvs at lists.geeklog.net
Fri Apr 10 13:02:40 EDT 2009
details: http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/6cd8ac70b1ff
changeset: 6901:6cd8ac70b1ff
user: Dirk Haun <dirk at haun-online.de>
date: Fri Apr 10 17:34:06 2009 +0200
description:
Fixed the update (regarding comment additions)
diffstat:
3 files changed, 137 insertions(+), 24 deletions(-)
sql/mysql_tableanddata.php | 32 +++++++-------
sql/updates/mssql_1.5.2_to_1.6.0.php | 73 ++++++++++++++++++++++++++++++++++
sql/updates/mysql_1.5.2_to_1.6.0.php | 56 ++++++++++++++++++++++----
diffs (236 lines):
diff -r 16267635a8fc -r 6cd8ac70b1ff sql/mysql_tableanddata.php
--- a/sql/mysql_tableanddata.php Fri Apr 10 17:04:09 2009 +0200
+++ b/sql/mysql_tableanddata.php Fri Apr 10 17:34:06 2009 +0200
@@ -50,22 +50,6 @@
INDEX blocks_onleft(onleft),
PRIMARY KEY (bid)
) TYPE=MyISAM
-";
-
-$_SQL[] = "
-CREATE TABLE {$_TABLES['commentsubmissions']} (
- cid int(10) unsigned NOT NULL auto_increment,
- type varchar(30) NOT NULL default 'article',
- sid varchar(40) NOT NULL,
- date datetime default NULL,
- title varchar(128) default NULL,
- comment text,
- uid mediumint(8) NOT NULL default '1',
- name varchar(32) default NULL,
- pid int(10) NOT NULL default '0',
- ipaddress varchar(15) NOT NULL,
- PRIMARY KEY (cid)
-) ENGINE=MyISAM
";
$_SQL[] = "
@@ -127,6 +111,22 @@
INDEX comments_date(date),
PRIMARY KEY (cid)
) TYPE=MyISAM
+";
+
+$_SQL[] = "
+CREATE TABLE {$_TABLES['commentsubmissions']} (
+ cid int(10) unsigned NOT NULL auto_increment,
+ type varchar(30) NOT NULL default 'article',
+ sid varchar(40) NOT NULL,
+ date datetime default NULL,
+ title varchar(128) default NULL,
+ comment text,
+ uid mediumint(8) NOT NULL default '1',
+ name varchar(32) default NULL,
+ pid int(10) NOT NULL default '0',
+ ipaddress varchar(15) NOT NULL,
+ PRIMARY KEY (cid)
+) ENGINE=MyISAM
";
$_SQL[] = "
diff -r 16267635a8fc -r 6cd8ac70b1ff sql/updates/mssql_1.5.2_to_1.6.0.php
--- a/sql/updates/mssql_1.5.2_to_1.6.0.php Fri Apr 10 17:04:09 2009 +0200
+++ b/sql/updates/mssql_1.5.2_to_1.6.0.php Fri Apr 10 17:34:06 2009 +0200
@@ -7,7 +7,49 @@
$_SQL[] = "INSERT INTO {$_TABLES['features']} (ft_name, ft_descr, ft_gl_core) VALUES ('plugin.install','Can install/uninstall plugins',1)";
$_SQL[] = "INSERT INTO {$_TABLES['features']} (ft_name, ft_descr, ft_gl_core) VALUES ('plugin.upload','Can upload new plugins',1)";
$_SQL[] = "UPDATE {$_TABLES['features']} SET ft_descr = 'Can change plugin status' WHERE ft_name = 'plugin.edit'";
+
+// new group.assign permission
$_SQL[] = "INSERT INTO {$_TABLES['features']} (ft_name, ft_descr, ft_gl_core) VALUES ('group.assign','Ability to assign users to groups',1)";
+
+// new comment tables, groups, and permissions
+/* FIXME: MySQL syntax ...
+$_SQL[] = "
+CREATE TABLE {$_TABLES['commentedits']} (
+ cid int(10) NOT NULL,
+ uid mediumint(8) NOT NULL,
+ time datetime NOT NULL,
+ PRIMARY KEY (cid)
+) TYPE=MYISAM
+";
+$_SQL[] = "
+CREATE TABLE {$_TABLES['commentnotifications']} (
+ cid int(10) default NULL,
+ uid mediumint(8) NOT NULL,
+ deletehash varchar(32) NOT NULL,
+ mid int(10) default NULL,
+ PRIMARY KEY (deletehash)
+) ENGINE=MyISAM
+";
+$_SQL[] = "
+CREATE TABLE {$_TABLES['commentsubmissions']} (
+ cid int(10) unsigned NOT NULL auto_increment,
+ type varchar(30) NOT NULL default 'article',
+ sid varchar(40) NOT NULL,
+ date datetime default NULL,
+ title varchar(128) default NULL,
+ comment text,
+ uid mediumint(8) NOT NULL default '1',
+ name varchar(32) default NULL,
+ pid int(10) NOT NULL default '0',
+ ipaddress varchar(15) NOT NULL,
+ PRIMARY KEY (cid)
+) ENGINE=MyISAM
+";
+*/
+$_SQL[] = "INSERT INTO {$_TABLES['groups']} (grp_name, grp_descr, grp_gl_core) VALUES ('Comment Admin', 'Can moderate comments', 1)";
+$_SQL[] = "INSERT INTO {$_TABLES['groups']} (grp_name, grp_descr, grp_gl_core) VALUES ('Comment Submitters', 'Can submit comments', 0);";
+$_SQL[] = "INSERT INTO {$_TABLES['features']} (ft_name, ft_descr, ft_gl_core) VALUES ('comment.moderate', 'Ability to moderate comments', 1)";
+$_SQL[] = "INSERT INTO {$_TABLES['features']} (ft_name, ft_descr, ft_gl_core) VALUES ('comment.submit', 'Comments are automatically published', 1)";
/**
* Add new config options
@@ -54,6 +96,14 @@
// DOCTYPE declaration, for {doctype} in header.thtml
$c->add('doctype','html401strict','select',2,10,21,195,TRUE);
+ // new comment options
+ $c->add('comment_edit',0,'select',4,21,0,1680,TRUE);
+ $c->add('commentsubmission',0,'select',4,21,0, 1682, TRUE);
+ $c->add('comment_edittime',1800,'text',4,21,NULL,1684,TRUE);
+ $c->add('article_comment_close_days',30,'text',4,21,NULL,1686,TRUE);
+ $c->add('comment_close_rec_stories',0,'text',4,21,NULL,1688,TRUE);
+ $c->add('allow_reply_notifications',0,'select',4,21,0, 1689, TRUE);
+
return true;
}
@@ -85,6 +135,29 @@
if (($grp_id > 0) && ($assign_id > 0)) {
DB_query("INSERT INTO {$_TABLES['access']} (acc_ft_id, acc_grp_id) VALUES ($assign_id, $grp_id)");
}
+
+ // comment groups and permissions
+ $cmt_mod_id = DB_getItem($_TABLES['features'], 'ft_id',
+ "ft_name = 'comment.moderate'");
+ $cmt_sub_id = DB_getItem($_TABLES['features'], 'ft_id',
+ "ft_name = 'comment.submit'");
+ $cmt_admin = DB_getItem($_TABLES['groups'], 'grp_id',
+ "grp_name = 'Comment Admin'");
+ $cmt_submitter = DB_getItem($_TABLES['groups'], 'grp_id',
+ "grp_name = 'Comment Submitters'");
+
+ if (($cmt_mod_id > 0) && ($cmt_admin > 0)) {
+ DB_query("INSERT INTO {$_TABLES['access']} (acc_ft_id, acc_grp_id) VALUES ($cmt_mod_id, $cmt_admin)");
+ }
+ if (($cmt_sub_id > 0) && ($cmt_submitter > 0)) {
+ DB_query("INSERT INTO {$_TABLES['access']} (acc_ft_id, acc_grp_id) VALUES ($cmt_sub_id, $cmt_submitter)");
+ }
+ if ($cmt_admin > 0) {
+ DB_query("INSERT INTO {$_TABLES['group_assignments']} (ug_main_grp_id, ug_uid, ug_grp_id) VALUES ($cmt_admin,NULL,1)");
+ }
+ if ($cmt_submitter > 0) {
+ DB_query("INSERT INTO {$_TABLES['group_assignments']} (ug_main_grp_id, ug_uid, ug_grp_id) VALUES ($cmt_submitter,NULL,1)");
+ }
}
/**
diff -r 16267635a8fc -r 6cd8ac70b1ff sql/updates/mysql_1.5.2_to_1.6.0.php
--- a/sql/updates/mysql_1.5.2_to_1.6.0.php Fri Apr 10 17:04:09 2009 +0200
+++ b/sql/updates/mysql_1.5.2_to_1.6.0.php Fri Apr 10 17:34:06 2009 +0200
@@ -12,7 +12,39 @@
// new group.assign permission
$_SQL[] = "INSERT INTO {$_TABLES['features']} (ft_name, ft_descr, ft_gl_core) VALUES ('group.assign','Ability to assign users to groups',1)";
-// new comment groups and permissions
+// new comment tables, groups, and permissions
+$_SQL[] = "
+CREATE TABLE {$_TABLES['commentedits']} (
+ cid int(10) NOT NULL,
+ uid mediumint(8) NOT NULL,
+ time datetime NOT NULL,
+ PRIMARY KEY (cid)
+) TYPE=MYISAM
+";
+$_SQL[] = "
+CREATE TABLE {$_TABLES['commentnotifications']} (
+ cid int(10) default NULL,
+ uid mediumint(8) NOT NULL,
+ deletehash varchar(32) NOT NULL,
+ mid int(10) default NULL,
+ PRIMARY KEY (deletehash)
+) ENGINE=MyISAM
+";
+$_SQL[] = "
+CREATE TABLE {$_TABLES['commentsubmissions']} (
+ cid int(10) unsigned NOT NULL auto_increment,
+ type varchar(30) NOT NULL default 'article',
+ sid varchar(40) NOT NULL,
+ date datetime default NULL,
+ title varchar(128) default NULL,
+ comment text,
+ uid mediumint(8) NOT NULL default '1',
+ name varchar(32) default NULL,
+ pid int(10) NOT NULL default '0',
+ ipaddress varchar(15) NOT NULL,
+ PRIMARY KEY (cid)
+) ENGINE=MyISAM
+";
$_SQL[] = "INSERT INTO {$_TABLES['groups']} (grp_name, grp_descr, grp_gl_core) VALUES ('Comment Admin', 'Can moderate comments', 1)";
$_SQL[] = "INSERT INTO {$_TABLES['groups']} (grp_name, grp_descr, grp_gl_core) VALUES ('Comment Submitters', 'Can submit comments', 0);";
$_SQL[] = "INSERT INTO {$_TABLES['features']} (ft_name, ft_descr, ft_gl_core) VALUES ('comment.moderate', 'Ability to moderate comments', 1)";
@@ -63,6 +95,14 @@
// DOCTYPE declaration, for {doctype} in header.thtml
$c->add('doctype','html401strict','select',2,10,21,195,TRUE);
+ // new comment options
+ $c->add('comment_edit',0,'select',4,21,0,1680,TRUE);
+ $c->add('commentsubmission',0,'select',4,21,0, 1682, TRUE);
+ $c->add('comment_edittime',1800,'text',4,21,NULL,1684,TRUE);
+ $c->add('article_comment_close_days',30,'text',4,21,NULL,1686,TRUE);
+ $c->add('comment_close_rec_stories',0,'text',4,21,NULL,1688,TRUE);
+ $c->add('allow_reply_notifications',0,'select',4,21,0, 1689, TRUE);
+
return true;
}
@@ -100,22 +140,22 @@
"ft_name = 'comment.moderate'");
$cmt_sub_id = DB_getItem($_TABLES['features'], 'ft_id',
"ft_name = 'comment.submit'");
- $cmd_admin = DB_getItem($_TABLES['groups'], 'grp_id',
+ $cmt_admin = DB_getItem($_TABLES['groups'], 'grp_id',
"grp_name = 'Comment Admin'");
- $cmd_submitter = DB_getItem($_TABLES['groups'], 'grp_id',
- "grp_name = 'Comment Submitter'");
+ $cmt_submitter = DB_getItem($_TABLES['groups'], 'grp_id',
+ "grp_name = 'Comment Submitters'");
if (($cmt_mod_id > 0) && ($cmt_admin > 0)) {
DB_query("INSERT INTO {$_TABLES['access']} (acc_ft_id, acc_grp_id) VALUES ($cmt_mod_id, $cmt_admin)");
}
- if (($cmt_sub_id > 0) && ($cmd_submitter > 0)) {
- DB_query("INSERT INTO {$_TABLES['access']} (acc_ft_id, acc_grp_id) VALUES ($cmt_sub_id, $cmd_submitter)");
+ if (($cmt_sub_id > 0) && ($cmt_submitter > 0)) {
+ DB_query("INSERT INTO {$_TABLES['access']} (acc_ft_id, acc_grp_id) VALUES ($cmt_sub_id, $cmt_submitter)");
}
if ($cmt_admin > 0) {
DB_query("INSERT INTO {$_TABLES['group_assignments']} (ug_main_grp_id, ug_uid, ug_grp_id) VALUES ($cmt_admin,NULL,1)");
}
- if ($cmd_submitter > 0) {
- DB_query("INSERT INTO {$_TABLES['group_assignments']} (ug_main_grp_id, ug_uid, ug_grp_id) VALUES ($cmd_submitter,NULL,1)");
+ if ($cmt_submitter > 0) {
+ DB_query("INSERT INTO {$_TABLES['group_assignments']} (ug_main_grp_id, ug_uid, ug_grp_id) VALUES ($cmt_submitter,NULL,1)");
}
}
More information about the geeklog-cvs
mailing list