Update of /cvs/scoop/scoop/struct
In directory lithium.sabren.com:/tmp/cvs-serv4402/struct
Modified Files:
scoop.sql
Log Message:
Dropping ForumZilla support, since no one uses it and no one has ever used it
as far as anyone can tell. -j
Index: scoop.sql
===================================================================
RCS file: /cvs/scoop/scoop/struct/scoop.sql,v
retrieving revision 1.207
retrieving revision 1.208
diff -C2 -d -r1.207 -r1.208
*** scoop.sql 27 Jan 2005 19:37:16 -0000 1.207
--- scoop.sql 27 Jan 2005 22:40:03 -0000 1.208
***************
*** 238,248 ****
INSERT INTO blocks VALUES ('undisplayedstory_bg','#c0c0c0','1','<P>This block is used as the background colour for a line in the Story List Admin Tool for stories that have been voted down in the queue or hidden by an admin. It should be a hex colour value, including the #.','Colours','default','en');
INSERT INTO blocks VALUES ('scoop_intro','<DIV class=\"box\">\r\n%%box_title_font%%Welcome to Scoop%%box_title_font_end%%\r\n\r\n<P>%%norm_font%%Holy Crap! You have your own <A HREF=\"http://scoop.kuro5hin.org\">Scoop</A> site now. Well, there\'s too many features for me to explain right here, but I can give you some places to look for help and whatnot.%%norm_font_end%%</P>\r\n\r\n<P>%%norm_font%%The main development site is at <A HREF=\"http://scoop.kuro5hin.org\">scoop.kuro5hin.org</A>. This contains links to all the other stuff, so poke around a little.%%norm_font_end%%</P>\r\n\r\n<P>%%norm_font%%For immediate help and assistance from the Scoop code monkeys, join the <A HREF=\"http://sourceforge.net/mail/?group_id=4901\">scoop-help mailing list</A>. This is practically a requirement for a pleasant Scoop administrative experience, as Scoop is rather complicated and it isn\'t always obvious where to find things.%%norm_font_end%%</P>\r\n\r\n<P>%%norm_font%%To help figure t!
hings out, there is a <A\r\nHREF=\"http://scoop.kuro5hin.org/guide/\">Scoop Admin Guide</A> which can\r\nhopefully answer most of your questions. Look in the doc/ directory of your\r\nScoop install for another copy of the admin guide.%%norm_font_end%%</P>\r\n\r\n<P>%%norm_font%%Other things of note:%%norm_font_end%%</P>\r\n\r\n<UL>\r\n<LI>%%norm_font%%Many Scoop developers can often be found on IRC, channel #scoop at irc.slashnet.org.%%norm_font_end%%</LI>\r\n<LI>%%norm_font%%The <A HREF=\"http://sourceforge.net/project/?group_id=4901\">main Sourceforge page</A> has some information on the project%%norm_font_end%%</LI>\r\n<LI>%%norm_font%%The latest code is always <A HREF=\"http://scoop.versionhost.com/viewcvs.cgi/\">in CVS</A> (username and password are both \"anonymous\")%%norm_font_end%%</LI>\r\n<LI>%%norm_font%%You can look at a convenient <A HREF=\"http://scoop.kuro5hin.org/special/sites\">list of other Scoop sites</A> to see what folks are doing with it%%norm_font_end!
%%</LI>\r\n</UL>\r\n</DIV>\r\n','1','<P>This block contains introducto
ry information and is displayed in the left column of the front page when you first install Scoop. There is useful information on where to get help in this block, so make a note of it before deleting. This block should not be displayed on a live site, because its content is of no interest except to the administrator.</P>','General','default','en');
- INSERT INTO blocks VALUES ('rss_template','<?xml version=\"1.0\" encoding=\"UTF-8\"?>\r\n\r\n<rdf:RDF\r\nxmlns:rdf=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\"\r\nxmlns:fz=\"http://www.zapogee.com/rdf/forumzilla/\"\r\n>\r\n\r\n%%BOX,fzdescribe%%\r\n\r\n</rdf:RDF>','1','forumzilla support is going to be removed in the near fiture. Ignore this block.','FZ','default','en');
- INSERT INTO blocks VALUES ('fz_navigation_url','%%site_url%%%%rootdir%%/blank','1','forumzilla support is going to be removed in the near future. Ignore this block.','FZ','default','en');
- INSERT INTO blocks VALUES ('fz_ad_url','%%site_url%%%%rootdir%%/blank','1','forumzilla support is going to be removed in the near future. Ignore this block.','FZ','default','en');
INSERT INTO blocks VALUES ('blank_template','<HTML>\r\n<HEAD>\r\n<TITLE></TITLE>\r\n</HEAD>\r\n<BODY>\r\n</BODY>\r\n</HTML>','1','<P>This block is a complete, blank HTML page. No header, footer, or CONTENT. It must be a complete HTML page. This template is used for commands which do not display pages, such as the logout or redirect ops.</P>','Page Templates','default','en');
INSERT INTO blocks VALUES ('empty_box','%%content%%','1','<P>This block is a box template that should have absolutely nothing but the content special key in it, so that the box output has no frame and will not mess up the formatting of whatever part of the page it\'s placed on. The special key content is replaced with the output of whichever box uses it as a wrapper.</P>','Box Templates','default','en');
- INSERT INTO blocks VALUES ('fzdisplay_template','<html>\r\n<head><title>%%slogan%%</title></head>\r\n<body bgcolor=\"#EEEEEE\">\r\n<table width=\"80%\" align=\"center\" cellpadding=0 cellspacing=0 bgcolor=\"#000000\" border=0>\r\n<tr><td>\r\n<table width=\"100%\" align=\"center\" cellpadding=10 cellspacing=0 bgcolor=\"#ffffff\" border=0>\r\n<tr><td>\r\n%%CONTENT%%</center>\r\n</td></tr>\r\n</table>\r\n</td></tr>\r\n</table>\r\n</body>\r\n</html>','1','forumzilla support is going to be removed in the near future. Ignore this block.','FZ','default','en');
- INSERT INTO blocks VALUES ('rss_box','<?xml version=\"1.0\" encoding=\"UTF-8\"?>\r\n\r\n<rdf:RDF\r\nxmlns:rdf=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\"\r\nxmlns:fz=\"http://www.zapogee.com/rdf/forumzilla/\"\r\n>\r\n\r\n%%BOX,fzdescribe%%\r\n\r\n</rdf:RDF>','1','forumzilla support is going to be removed in the near future. Ignore this block.','FZ','default','en');
INSERT INTO blocks VALUES ('new_comment_marker','<FONT COLOR=\"#FF0000\"><B>[new]</B></FONT>','1','<P>This block is inserted in the comment if the user has not yet read this comment, according to Scoop\'s read-tracking system. It replaces the special key <TT>|new|</TT> in the blocks <B>comment</B> and <B>moderation_comment</B>.</P>','Comments','default','en');
INSERT INTO blocks VALUES ('submit_rdf_message','<P>Know of any good sites that syndicate their headlines, but aren\'t carried by this site yet? Well, most likely this is because the admins don\'t know about the site yet, or that they syndicate headlines with RDF. All it takes is for you to find a URL for the site where their RDF file is, and copy it to the form below. Once submitted, and admin will review it, and will either approve it or delete it.</P>','1','<P>This block is displayed just above the form used to submit an RDF file explaining what the form is for.</P>','RDF','default','en');
--- 238,243 ----
***************
*** 503,508 ****
INSERT INTO box VALUES ('section_title','null','my $content = \'Latest News\';\r\n\r\nmy $op = $S->{CGI}->param(\'op\');\r\nmy $page_num = $S->cgi->param(\'page\');\r\nmy $page = \'\';\r\nif ($page_num && $page_num != 1) {\r\n $page = \"(page $page_num)\";\r\n}\r\n\r\nif ($op eq \'section\') {\r\n my $section = $S->{CGI}->param(\'section\');\r\n unless($S->have_section_perm(\'hide_read_stories\',$section)) {\r\n $content = $S->{SECTION_DATA}->{$section}->{title} || \'All Stories\';\r\n } else {\r\n $content = \'\';\r\n }\r\n}\r\n\r\nreturn {\'content\' => \"%%title_font%%$content $page%%title_font_end%%\" };','Display title of current section','blank_box',0);
INSERT INTO box VALUES ('show_comment_raters','Others have rated this comment as follows:','my $content = qq{\r\n <table width=\"100%\" border=0 cellpadding=2 cellspacing=0>};\r\n\r\nmy $cid = $S->{CGI}->param(\'cid\');\r\nmy $sid = $S->{CGI}->param(\'sid\');\nmy $archive = $S->_check_archivestatus($sid);\r\n\r\nmy $f_cid = $S->{DBH}->quote($cid);\r\nmy $f_sid = $S->{DBH}->quote($sid);\r\n\r\n#Check for hidden\r\nmy ($rv, $sth) = $S->db_select({\n ARCHIVE => $archive,\r\n WHAT => \'points\',\r\n FROM => \'comments\',\r\n WHERE => qq{sid = $f_sid AND cid = $f_cid}});\r\n\r\nmy $points = $sth->fetchrow();\r\n$sth->finish();\r\n\r\nif (($points < $S->{UI}->{VARS}->{rating_min}) && ($S->{TRUSTLEV} != 2)) {\r\n return \'\';\r\n}\r\n\r\nmy ($rv, $sth) = $S->db_select({\n ARCHIVE => $archive,\r\n WHAT => \'uid, rating\',\r\n FROM => \'commentratings\',\r\n WHERE => qq{sid = $f_sid AND cid = $f_cid}});\r\n\r\nmy $zeros = 0;\r\n\r\nwhile (my $rating = $sth->fetchrow_hashref()) {\r\!
n my $user = $S->user_data($rating->{uid});\r\n \r\n if (($rating->{\'rating\'} < $S->{UI}->{VARS}->{rating_min}) && ($S->{TRUSTLEV} != 2)) {\r\n $zeros++;\r\n } else {\r\n $content .= qq{\r\n <tr>\r\n <td>%%norm_font%%<A HREF=\"%%rootdir%%/user/uid:$rating->{uid}\">$user->{nickname}</A>%%norm_font_end%%</td>\r\n <td>%%norm_font%%$rating->{rating}%%norm_font_end%%</td>\r\n </tr>};\r\n }\r\n}\r\n\r\n$sth->finish();\r\n\r\nif ($zeros) {\r\n my $word = ($zeros == 1) ? \"Rating\" : \"Ratings\";\r\n \r\n $content .= qq{\r\n <tr>\r\n <td colspan=2>%%norm_font%%Zero $word: $zeros%%norm_font_end%%</td>\r\n </tr>};\r\n}\r\n\r\n$content .= qq{\r\n </table>};\r\n\r\nreturn {\'content\' => $content};','Display who rated a comment what','',0);
- INSERT INTO box VALUES ('fzdescribe','ForumZilla Support code','my $action = $S->{CGI}->param(\'action\'); \r\nmy $page; \r\n\r\nif ($action eq \'describestory\') { \r\n $page = $S->fzDescribeStory(); \r\n} else { \r\n $page = $S->fzDescribeForum(); \r\n} \r\n\r\nreturn {\'content\'=>$page};','This is the interface to the FormZilla lib, to support ForumZilla. See http://www.zapogee.com/forumzilla/docs/server-howto.html for more','empty_box',0);
- INSERT INTO box VALUES ('fzdisplay','ForumZilla Support code','my $action = $S->{CGI}->param(\'action\'); \r\nmy $sid = $S->{CGI}->param(\'sid\');\r\nmy $cid = $S->{CGI}->param(\'cid\');\r\nmy $pid = $S->{CGI}->param(\'pid\');\r\n\r\nmy $page; \r\n\r\nif ($action eq \'story\') {\r\n $page = $S->displaystory($sid)\r\n} elsif ($action eq \'comment\') { \r\n $page = $S->display_comments($sid, $pid, \'alone\', $cid);\r\n} \r\n\r\nreturn {\'content\'=>$page};','This is the interface to display stories and comments in FormZilla. See http://www.zapogee.com/forumzilla/docs/server-howto.html for more','empty_box',0);
INSERT INTO box VALUES ('rdf_feeds','External Feeds','return unless $S->{UI}->{VARS}->{use_rdf_feeds} || $S->have_perm(\'rdf_admin\');\r\n\r\nmy $to_display = {};\r\nif (@ARGS || $S->{CGI}->param(\'rdf\')) {\r\n my $rdf_arg = $S->{CGI}->param(\'rdf\');\r\n if ($rdf_arg eq \'all\') {\r\n $to_display->{\'all\'} = 1;\r\n } else {\r\n @ARGS = split(/,/, $rdf_arg) if $rdf_arg;\r\n foreach (@ARGS) {\r\n $to_display->{$_} = 1;\r\n }\r\n }\r\n}\r\n\r\nmy $content;\r\nmy $channels = $S->rdf_channels();\r\nmy $user_feeds = $S->rdf_get_prefs() unless @ARGS;\r\nmy $item_limit = defined($S->{prefs}->{rdf_max_headlines}) ?\r\n $S->{prefs}->{rdf_max_headlines} :\r\n defined($S->{UI}->{VARS}->{rdf_max_headlines}) ?\r\n $S->{UI}->{VARS}->{rdf_max_headlines} : 15;\r\n\r\nforeach my $c (@{$channels}) {\r\n unless ($to_display->{all} == 1) {\r\n if (@ARGS) {\r\n next unless $to_display->{ $c->{rid} };\r\n } else {\r\n next unless $user_feeds->{ $c->{rid} };\r\n }\r\n }\r\n next u!
nless $c->{title};\r\n unless ($S->have_perm(\'rdf_admin\')) {\r\n next if $c->{submitted} || !$c->{enabled};\r\n }\r\n\r\n if ($S->{UI}->{VARS}->{rdf_use_images} && $c->{image_url}) {\r\n $content .= qq|<a href=\"$c->{image_link}\"><img src=\"$c->{image_url}\" alt=\"$c->{image_title}\" border=\"1\"></a><br>\\n|;\r\n } else {\r\n $content .= qq|<b><a class=\"light\" href=\"$c->{link}\">$c->{title}</a></b><br />\\n|;\r\n }\r\n\r\n my $items = $S->rdf_items($c->{rid}, $item_limit);\r\n foreach my $i (@{$items}) {\r\n $content .= qq|%%dot%% <a class=\"light\" href=\"$i->{link}\">$i->{title}</a><br />\\n|;\r\n }\r\n\r\n if ($S->{UI}->{VARS}->{rdf_use_forms} && $c->{form_link}) {\r\n $content .= qq|<form action=\"$c->{form_link}\" method=\"GET\">$c->{form_title}: <input type=\"text\" name=\"$c->{form_name}\"></form><br />\\n|;\r\n }\r\n\r\n $content .= \"<br />\\n\";\r\n}\r\n\r\nif ($content && $S->have_perm(\'submit_rdf\')) {\r\n $content = qq|<a class=\"light\" href=\"%%r!
ootdir%%/submitrdf\">Submit Feed</a><br /><br />\\n| . $content;\r\n}\
r\n\r\nreturn $content;\r\n','contains RDF feeds from other sites','box',1);
INSERT INTO box VALUES ('submit_rdf','Submit Feed','return \"Sorry, you don\'t have permission to submit a feed.\"\r\n\r\nunless $S->have_perm(\'submit_rdf\');\r\n\r\nmy $action = $S->{CGI}->param(\'action\') || \'showform\';\r\n\r\nif ($action eq \'showform\') {\r\n\r\nreturn &disp_form();\r\n\r\n} elsif ($action eq \'save\') {\r\n\r\nmy $url = $S->{CGI}->param(\'url\');\r\n\r\nreturn (\'Please fill in the URL field\') unless $url;\r\n\r\n# check to see if this RDF already exists\r\n\r\nmy $is_dup = 0;\r\n\r\nmy $channels = $S->rdf_channels;\r\n\r\nforeach my $c (@{$channels}) {\r\n\r\n$is_dup = 1 if $c->{rdf_link} eq $url;\r\n\r\n}\r\n\r\nreturn &disp_form(\'That RDF already exists, or has been submitted already.\') if $is_dup;\r\n\r\n\r\n\r\nmy $do_fetch = $S->{UI}->{VARS}->{allow_rdf_fetch} ? 1 : 0;\r\n\r\nmy ($id, $res) = $S->rdf_add_channel($url, $do_fetch, $S->{NICK});\r\n\r\nunless ($res) {\r\n\r\n$S->rdf_remove_channel($id);\r\n\r\nreturn &disp_form(\'Error adding!
RDF file: $res\');\r\n\r\n}\r\n\r\nmy $fetched_msg = qq|\r\n\r\n%%norm_font%%Your RDF has been fetched. An admin will check it out as soon as possible%%norm_font_end%%|;\r\n\r\nreturn $fetched_msg;\r\n\r\n}\r\n\r\n\r\n\r\nsub disp_form {\r\n\r\nmy $form = qq|\r\n\r\n%%norm_font%% %%submit_rdf_message%% %%norm_font_end%%\r\n\r\n<p>\r\n\r\n<form action=\"%%rootdir%%/?\" method=\"GET\">\r\n\r\n<input type=\"hidden\" name=\"op\" value=\"submitrdf\">\r\n\r\n<input type=\"hidden\" name=\"action\" value=\"save\">\r\n\r\n<table border=0 cellspacing=0 cellpadding=0>|;\r\n\r\n$form .= qq|\r\n\r\n<tr>\r\n\r\n<td><FONT color=\"#FF0000\">%%norm_font%%$_[0]%%norm_font_end%%</font></td>\r\n\r\n</tr>| if $_[0];\r\n\r\n$form .= qq|\r\n\r\n<tr>\r\n\r\n<td>%%norm_font%%URL of RDF file:%%norm_font_end%% <input type=\"text\" name=\"url\" size=\"50\"></td>\r\n\r\n</tr>\r\n\r\n<tr>\r\n\r\n<td><input type=\"submit\" value=\"Submit\"></td>\r\n\r\n</tr>\r\n\r\n</table>\r\n\r\n</form>\r\n\r\n|;\r\n\!
r\nreturn $form;\r\n\r\n}\r\n\r\n','Box to do submitrdf op and such.',
'titled_box',0);
--- 498,501 ----
***************
*** 1024,1029 ****
INSERT INTO ops VALUES ('logout','blank_template','logout_box',1,1,'','','','Logs the user out and removes their session.');
INSERT INTO ops VALUES ('default','index_template',NULL,0,1,'','','','The template used when no other is known. \'main\' is actually the default op');
- INSERT INTO ops VALUES ('fz','rss_template',NULL,0,1,'','forumzilla','','Interacts with ForumZilla to provide support for it.');
- INSERT INTO ops VALUES ('fzdisplay','fzdisplay_template','fzdisplay',1,1,'','','/action/sid{5}/cid/','Displays stories and comments for ForumZilla.');
INSERT INTO ops VALUES ('submitrdf','default_template','submit_rdf',1,1,'','','','Walks the user through submitting an RDF feed.');
INSERT INTO ops VALUES ('cron','cron_template','cron',0,1,'','','','Run waiting cron jobs.');
--- 1017,1020 ----
***************
*** 1213,1216 ****
--- 1204,1208 ----
INSERT INTO patches VALUES ('1_1-dev',11,'SignupWithPass','sql');
INSERT INTO patches VALUES ('1_1-dev',12,'RemoveComments','sql');
+ INSERT INTO patches VALUES ('1_1-dev',13,'RemoveForumZilla','sql');
#