Commit info for scoop/struct:
Modified Files:
Tag: CURRENT
scoop.sql
Log Message:
Resyncing CURRENT with all of panner's bugfixes. I swear, independent
development will be happening soon with this. I think I have an excuse.
--j
Index: scoop.sql
===================================================================
RCS file: /cvs/scoop/scoop/struct/scoop.sql,v
retrieving revision 1.173.2.2
retrieving revision 1.173.2.3
diff -r1.173.2.2 -r1.173.2.3
1c1
< -- MySQL dump 9.08
---
> -- MySQL dump 9.09
4,5c4,5
< -- -------------------------------------------------------
< -- Server version 4.0.13-log
---
> -- ------------------------------------------------------
> -- Server version 4.0.16
8c8
< -- Table structure for table 'ad_info'
---
> -- Table structure for table `ad_info`
45c45
< -- Dumping data for table 'ad_info'
---
> -- Dumping data for table `ad_info`
51c51
< -- Table structure for table 'ad_log'
---
> -- Table structure for table `ad_log`
65c65
< -- Dumping data for table 'ad_log'
---
> -- Dumping data for table `ad_log`
70c70
< -- Table structure for table 'ad_payments'
---
> -- Table structure for table `ad_payments`
85c85
< -- Dumping data for table 'ad_payments'
---
> -- Dumping data for table `ad_payments`
90c90
< -- Table structure for table 'ad_types'
---
> -- Table structure for table `ad_types`
112c112
< -- Dumping data for table 'ad_types'
---
> -- Dumping data for table `ad_types`
118c118
< -- Table structure for table 'admin_tools'
---
> -- Table structure for table `admin_tools`
133c133
< -- Dumping data for table 'admin_tools'
---
> -- Dumping data for table `admin_tools`
154a155
> INSERT INTO admin_tools VALUES ('macros',20,'Macros','Macros','edit_macros','edit_macros',0);
157c158
< -- Table structure for table 'advertisers'
---
> -- Table structure for table `advertisers`
170c171
< -- Dumping data for table 'advertisers'
---
> -- Dumping data for table `advertisers`
175c176
< -- Table structure for table 'blocks'
---
> -- Table structure for table `blocks`
190c191
< -- Dumping data for table 'blocks'
---
> -- Dumping data for table `blocks`
196,197c197,198
< INSERT INTO blocks VALUES ('comment','<!-- start comment -->\r\n<TABLE CELLPADDING=1 CELLSPACING=0 BORDER=0 BGCOLOR=\"#006699\">\r\n <TR>\r\n <TD width=\"100%\">\r\n <TABLE CELLPADDING=2 CELLSPACING=0 BORDER=0 BGCOLOR=\"%%comment_head_bg%%\" width=\"100%\">\r\n <TR>\r\n <TD WIDTH=\"100%\"><A NAME=\"%%cid%%\"></A>\r\n %%norm_font%% %%new%% <B>%%subject%%</B>\r\n(<A HREF=\"%%rootdir%%/comments/%%sid%%/%%cid%%?mode=alone;showrate=1#%%cid%%\">%%score%% / %%num_ratings%%</A>)\r\n(<A CLASS=\"light\" HREF=\"%%rootdir%%/comments/%%sid%%/%%cid%%#%%cid%%\">#%%cid%%</A>)%%norm_font_end%% <BR>\r\n %%norm_font%%by %%name%% %%email%% on %%date%%<BR>%%user_info%% %%url%%%%norm_font_end%%\r\n </TD>\r\n </TR>\r\n </TABLE>\r\n </TD>\r\n </TR>\r\n</TABLE>\r\n<BR>\r\n<TABLE BORDER=0 CELLPADDING=0 CELLSPACING=0>\r\n <TR>\r\n <TD>\r\n %%norm_font%%%%comment%%<BR>%%sig%%<BR>%%actions%%%%norm_font_end%%\r\n </TD>\r\n <!
/TR>\r\n</TABLE>\r\n<BR><BR>\r\n%%norm_font%%%%replies%%%%norm_font_end%%\r\n\r\n<!-- end comment -->\r\n\r\n','1','The structure of comments attached to a story. This should be mostly self-contained and have the replies at the end. See http://guide.kuro5hin.org for details on the special vars.','content','default','en');
< INSERT INTO blocks VALUES ('story_info','<!-- Story info -->\r\n<TABLE BORDER=0 CELLPADDING=1 CELLSPACING=0 ALIGN=\"center\" WIDTH=\"100%\">\r\n <TR BGCOLOR=\"%%story_mod_bg%%\">\r\n <TD align=\"center\">\r\n %%smallfont%%%%story_info%%%%smallfont_end%%\r\n </TD>\r\n </TR>\r\n <TR>\r\n <TD ALIGN=\"center\" BGCOLOR=\"%%story_mod_bg%%\">\r\n %%smallfont%%%%comment_controls%%%%smallfont_end%%\r\n </TD>\r\n </TR>\r\n</TABLE>\r\n<!-- X Story info -->\r\n\r\n','1','The bar placed at the top and bottom of the comments. It contains the story name, number and type of comments, and the \'post a comment\' link.','content','default','en');
---
> INSERT INTO blocks VALUES ('comment','<!-- start comment -->\r\n<TABLE CELLPADDING=1 CELLSPACING=0 BORDER=0 BGCOLOR=\"#006699\">\r\n <TR>\r\n <TD width=\"100%\">\r\n <TABLE CELLPADDING=2 CELLSPACING=0 BORDER=0 BGCOLOR=\"%%comment_head_bg%%\" width=\"100%\">\r\n <TR>\r\n <TD WIDTH=\"100%\"><A NAME=\"%%cid%%\"></A>\r\n %%norm_font%% %%new%% <B>%%subject%%</B>\r\n(<A HREF=\"%%rootdir%%/comments/%%sid%%/%%cid%%?mode=alone;showrate=1#%%cid%%\">%%score%% / %%num_ratings%%</A>)\r\n(<A CLASS=\"light\" HREF=\"%%rootdir%%/comments/%%sid%%/%%cid%%#%%cid%%\">#%%cid%%</A>)%%norm_font_end%% <BR>\r\n %%norm_font%%by %%name%% %%email%% on %%date%%<BR>%%user_info%%%%edit_user%% %%url%%%%norm_font_end%%\r\n </TD>\r\n </TR>\r\n </TABLE>\r\n </TD>\r\n </TR>\r\n</TABLE>\r\n<BR>\r\n<TABLE BORDER=0 CELLPADDING=0 CELLSPACING=0>\r\n <TR>\r\n <TD>\r\n %%norm_font%%%%comment%%<BR>%%sig%%<BR>%%actions%%%%norm_font_end%%\r\n !
</TD>\r\n </TR>\r\n</TABLE>\r\n<BR><BR>\r\n%%norm_font%%%%replies%%%%norm_font_end%%\r\n\r\n<!-- end comment -->\r\n\r\n','1','The structure of comments attached to a story. This should be mostly self-contained and have the replies at the end. See http://guide.kuro5hin.org for details on the special vars.','content','default','en');
> INSERT INTO blocks VALUES ('story_info','<!-- Story info -->\r\n<TABLE BORDER=0 CELLPADDING=1 CELLSPACING=0 ALIGN=\"center\" WIDTH=\"100%\">\r\n <TR BGCOLOR=\"%%story_mod_bg%%\">\r\n <TD align=\"center\">\r\n %%smallfont%%%%story_info%%%%smallfont_end%%\r\n </TD>\r\n </TR></TABLE>\r\n<!-- X Story info -->\r\n\r\n','1','The bar placed at the top and bottom of the comments. It contains the story name, number and type of comments, and the \'post a comment\' link.','content','default','en');
208c209
< INSERT INTO blocks VALUES ('poll_block','<!-- Poll Block -->\r\n<TABLE WIDTH=100% BORDER=0 CELLPADDING=1 CELLSPACING=0>\r\n <TR>\r\n <TD BGCOLOR=\"%%title_bgcolor%%\" colspan=2>\r\n %%title_font%%<B>%%title%%</B></FONT>\r\n </TD>\r\n </TR>\r\n <TR>\r\n <TD BGCOLOR=\"%%topic_bg%%\">\r\n %%norm_font%%%%info%%%%norm_font_end%%\r\n </TD>\r\n <TD BGCOLOR=\"%%topic_bg%%\" align=\"right\">\r\n %%norm_font%%%%hotlist%%%%norm_font_end%%\r\n </TD>\r\n </TR>\r\n <tr><td><br></td></tr>\r\n %%poll_image%%\r\n</TABLE>\r\n<!-- X Poll Block -->','1','Used by Scoop to format and display a poll.','content','default','en');
---
> INSERT INTO blocks VALUES ('poll_block','<!-- Poll Block -->\r\n<TABLE WIDTH=100% BORDER=0 CELLPADDING=1 CELLSPACING=0>\r\n <TR>\r\n <TD BGCOLOR=\"%%title_bgcolor%%\" colspan=2>\r\n %%title_font%%<B>%%title%%</B></FONT>\r\n </TD>\r\n </TR><tr><td><br></td></tr>\r\n %%poll_image%%\r\n</TABLE>\r\n<!-- X Poll Block -->','1','Used by Scoop to format and display a poll.','content','default','en');
213d213
< INSERT INTO blocks VALUES ('poll_guidelines','These are poll guidelines','1','Not used','site_html','default','en');
216d215
< INSERT INTO blocks VALUES ('poll_box','<TABLE BGCOLOR=\"#000000\" WIDTH=\"100%\" BORDER=0 CELLPADDING=2 CELLSPACING=0>\r\n <TR>\r\n <TD><TABLE WIDTH=\"100%\" BORDER=0 CELLPADDING=2 CELLSPACING=0 BGCOLOR=\"#FFFFFF\">\r\n <TR>\r\n <TD>\r\n %%box_title_font%%%%title%%%%box_title_font_end%%\r\n </TD>\r\n </TR>\r\n <TR>\r\n <TD>\r\n %%smallfont%%\r\n %%content%%\r\n %%smallfont_end%%\r\n </TD>\r\n </TR>\r\n <TR>\r\n <TD><IMG SRC=\"%%imagedir%%/spacer.gif\" HEIGHT=5></TD>\r\n </TR>\r\n </TABLE></TD>\r\n </TR>\r\n</TABLE>\r\n','1','A box template. This one is used for the poll.','boxes','default','en');
225d223
< INSERT INTO blocks VALUES ('pendingstory_bg','#c0c0c0','1','The background colour of a story that is still in moderation. Used only in the story list. A hexadecimal colour value: #rrggbb (r = red, g = green, b = blue)','display','default','en');
241c239
< 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%%BOX,fzdisplay%%</center>\r\n</td></tr>\r\n</table>\r\n</td></tr>\r\n</table>\r\n</body>\r\n</html>','1','Forumzilla stuff.','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 stuff.','templates','default','en');
245d242
< INSERT INTO blocks VALUES ('submitrdf_template','<HTML>\r\n<HEAD>\r\n<TITLE>%%sitename%% || %%subtitle%%</title>\r\n</head>\r\n<BODY bgcolor=\"#FFFFFF\" text=\"#000000\" link=\"#006699\" vlink=\"#003366\">\r\n\r\n%%header%%\r\n\r\n<!-- Main layout table -->\r\n<TABLE BORDER=0 WIDTH=\"99%\" ALIGN=\"center\" CELLPADDING=0 CELLSPACING=10>\r\n <!-- Main page block -->\r\n <TR>\r\n \r\n <!-- Center content section -->\r\n <TD VALIGN=\"top\" width=\"75%\">\r\n %%BOX,submit_rdf%%\r\n </td>\r\n <!-- X center content section -->\r\n \r\n <!-- Right boxes column -->\r\n <TD VALIGN=\"top\" WIDTH=\"25%\">\r\n\r\n %%BOX,main_menu%%\r\n %%BOX,hotlist_box%%\r\n %%BOX,user_box%%\r\n %%BOX,admin_tools%%\r\n \r\n </td>\r\n <!-- X Right boxes column -->\r\n </tr>\r\n <!-- X main page block -->\r\n</table>\r\n<!-- X Main layout table -->\r\n<P>\r\n%%footer%%\r\n<P>\r\n<CENTER>%%BOX,menu_footer%%</center>\r\n</body>\r\n</html>\r\n','1','A page template. This one is used wh!
en users submit RDF feeds. No special vars, just the submit_rdf box.','templates','default','en');
252c249
< INSERT INTO blocks VALUES ('subscribe','You are not currently a subscriber. Why not become one?','1','Text of a \"please subscribe\" message.','site_html','default','en');
---
> INSERT INTO blocks VALUES ('subscribe','<p>You are not currently a paid member. Why not <a href=\"%%rootdir%%/subscribe\">become one</a>?</p>','1','Text of a \"please subscribe\" message.','site_html','default','en');
261c258,259
< INSERT INTO blocks VALUES ('preview_text_ad_template','<TABLE bgcolor=\"FFFFFF\" fgcolor=\"000000\" border=\"0\" cellpadding=\"2\" cellspacing=\"1\" width=\"200\">\r\n<TR><TD><a href=\"%%LINK_URL%%\" title=\"%%LINK_URL%%\">%%norm_font%% %%TITLE%%%%norm_font_end%% </a></TD></TR>\r\n<TR><TD>%%norm_font%%%%TEXT1%%%%norm_font_end%%</TD></TR>\r\n</TABLE>','1','The text ad template used when previewing a new ad.','templates','default','en');
---
> INSERT INTO blocks VALUES ('donate_email_success','Thank you for your donation of $%%AMOUNT%%.',NULL,'Email sent to confirm that a donation was recieved.','email','default','en');
> INSERT INTO blocks VALUES ('next_previous_links','',NULL,'If filled in, can be used to replace the Next and Previous links on the front and section pages. The special keys PREVIOUS_LINK and NEXT_LINK will be filled with the appropriate relative URLs. If this block is left empty, then the default code will be used instead.','site_html','default','en');
270d267
< INSERT INTO blocks VALUES ('buyimpressions_template','<HTML>\r\n<HEAD>\r\n<TITLE>%%sitename%% || %%subtitle%%</TITLE>\r\n</HEAD>\r\n<BODY bgcolor=\"#FFFFFF\" text=\"#000000\" link=\"#006699\" vlink=\"#003366\">\r\n\r\n%%header%%\r\n\r\n<!-- Main layout table -->\r\n<TABLE BORDER=0 WIDTH=\"99%\" ALIGN=\"center\" CELLPADDING=0 CELLSPACING=10>\r\n <!-- Main page block -->\r\n <TR>\r\n \r\n <!-- Center content section -->\r\n <TD VALIGN=\"top\" width=\"73%\">\r\n %%BOX,buyimpressions_box%%\r\n </TD>\r\n <!-- X center content section -->\r\n \r\n <!-- Right boxes column -->\r\n <TD VALIGN=\"top\" WIDTH=\"27%\">\r\n\r\n %%BOX,main_menu%%\r\n %%BOX,hotlist_box%%\r\n %%BOX,user_box%%\r\n %%BOX,admin_tools%%\r\n \r\n </TD>\r\n <!-- X Right boxes column -->\r\n </TR>\r\n <!-- X main page block -->\r\n</TABLE>\r\n<!-- X Main layout table -->\r\n<P>\r\n%%footer%%\r\n<P>\r\n<CENTER>%%BOX,menu_footer%%</CENTER>\r\n</BODY>\r\n</HTML>\r\n','1','A page template to hold!
the box buyimpressions_box.','templates','default','en');
276d272
< INSERT INTO blocks VALUES ('renewad_template','<HTML>\r\n<HEAD>\r\n<TITLE>%%sitename%% || %%subtitle%%</TITLE>\r\n</HEAD>\r\n<BODY bgcolor=\"#FFFFFF\" text=\"#000000\" link=\"#006699\" vlink=\"#003366\">\r\n\r\n%%header%%\r\n\r\n<!-- Main layout table -->\r\n<TABLE BORDER=0 WIDTH=\"99%\" ALIGN=\"center\" CELLPADDING=0 CELLSPACING=10>\r\n <!-- Main page block -->\r\n <TR>\r\n \r\n <!-- Center content section -->\r\n <TD VALIGN=\"top\" width=\"73%\">\r\n %%BOX,renewad_box%%\r\n </TD>\r\n <!-- X center content section -->\r\n \r\n <!-- Right boxes column -->\r\n <TD VALIGN=\"top\" WIDTH=\"27%\">\r\n\r\n %%BOX,main_menu%%\r\n %%BOX,hotlist_box%%\r\n %%BOX,user_box%%\r\n %%BOX,admin_tools%%\r\n \r\n </TD>\r\n <!-- X Right boxes column -->\r\n </TR>\r\n <!-- X main page block -->\r\n</TABLE>\r\n<!-- X Main layout table -->\r\n<P>\r\n%%footer%%\r\n<P>\r\n<CENTER>%%BOX,menu_footer%%</CENTER>\r\n</BODY>\r\n</HTML>\r\n','1','Page template to hold the renewad box!
','templates','default','en');
280c276,277
< INSERT INTO blocks VALUES ('renew_confirm_message','%%norm_font%% Be sure that you entered the correct amount of impressions to buy, and click confirm below when you are satisfied and ready to purchase. %%norm_font_end%%','1','Message displayed just before ad renewal purchase, getting the user to double-check that everything is correct','advertising','default','en');
---
> INSERT INTO blocks VALUES ('rating_format','(<A HREF=\"%%rootdir%%/comments/%%sid%%/%%cid%%?mode=alone;showrate=1#%%cid%%\">%%score%% / %%num_ratings%%</A>)',NULL,'The rating part of a comment for inclusion into the comment block.','site_html','default','en');
> INSERT INTO blocks VALUES ('donate_email_pledge','Thank you for your donation. Please remember to send $%%AMOUNT%% to our mailing address.',NULL,'Email sent to confirm a pledge to donate. Should probably remind the person to actually send their money.','email','default','en');
296c293,296
< INSERT INTO blocks VALUES ('var_category_list','<tr>\r\n <td>%%norm_font%%<a href=\"%%rootdir%%/admin/vars/%%item_url%%\">%%item%%</a>%%norm_font_end%%</td>\r\n <td>%%norm_font%%<a href=\"%%rootdir%%/admin/vars/%%item_url%%\">%%item%%</a>%%norm_font_end%%</td>\r\n <td>%%norm_font%%<a href=\"%%rootdir%%/admin/vars/%%item_url%%\">%%item%%</a>%%norm_font_end%%</td>\r\n</tr>\r\n',NULL,'One line of the var category list. Usually one table row.','admin_pages','default','en');
---
> INSERT INTO blocks VALUES ('var_category_list','<tr>\r\n <td>%%norm_font%%<a href=\"%%rootdir%%/admin/vars/%%item_url%%\">%%item%%</a>%%norm_font_end%%</td>\r\n <td>%%norm_font%%<a href=\"%%rootdir%%/admin/vars/%%item_url%%\">%%item%%</a>%%norm_font_end%%</td>\r\n <td>%%norm_font%%<a href=\"%%rootdir%%/admin/vars/%%item_url%%\">%%item%%</a>%%norm_font_end%%</td>\r\n</tr>\r\n',NULL,'One line of the var category list. Usually one table row.','admin_pages','default','en');
> INSERT INTO blocks VALUES ('edit_macro','<form name=\"editmacros\" action=\"%%rootdir%%/admin/macros/\" method=\"post\">\r\n<input type=\"hidden\" name=\"cat\" value=\"%%category%%\" />\r\n\r\n<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"100%\">\r\n<tr><td bgcolor=\"%%title_bgcolor%%\">%%title_font%%Macros: %%category%%%%title_font_end%%</td></tr>\r\n<tr><td>%%norm_font%%%%update_msg%%%%norm_font_end%%</td></tr>\r\n<tr><td> </td></tr>\r\n<tr><td>%%norm_font%%Choose a category to edit:%%norm_font_end%%</td></tr>\r\n<tr><td>\r\n <table border=\"0\" cellpadding=\"0\" cellspacing=\"2\" width=\"100%\">%%catlist%%</table>\r\n</td></tr>\r\n<tr><td>%%norm_font%%<input type=\"submit\" name=\"save\" value=\"Save\" /> <input type=\"submit\" name=\"edit\" value=\"Get\" />%%norm_font_end%%</td></tr>\r\n<tr><td><table border=\"0\" cellpadding=\"2\" cellspacing=\"0\" width=\"100%\">%%form_body%%</table></td></tr>\r\n<tr><td>%%norm_font%%<input type=\"submit\" name=\"sa!
ve\" value=\"Save\" /> <input type=\"submit\" name=\"edit\" value=\"Get\" />%%norm_font_end%%</td></tr>\r\n</table>\r\n</form>\r\n',NULL,'The main edit macro page. The special var \"form_body\" is either the single-var edit form, or the category table, depending on which view you\'re using.','admin_pages','default','en');
> INSERT INTO blocks VALUES ('edit_one_macro','<tr><td>%%norm_font%%Or edit a macro directly:%%norm_font_end%%</td></tr>\r\n<tr><td><table cellspacing=\"2\" cellpadding=\"0\" width=\"100%\">\r\n <tr>\r\n <td colspan=\"2\">%%norm_font%%<b>Delete:</b><input type=\"checkbox\" name=\"delete\" value=\"1\" />%%norm_font_end%%</td>\r\n </tr>\r\n <tr>\r\n <td>%%norm_font%%<b>Select Macro:</b>%%norm_font_end%%</td>\r\n <td>%%macroselect%%</td>\r\n <tr>\r\n <td>%%norm_font%%<b>Select Categories:</b>%%norm_font_end%%</td>\r\n <td>%%catselect%%</td>\r\n </tr>\r\n <tr>\r\n <td>%%norm_font%%<b>Name:</b>%%norm_font_end%%</td>\r\n <td><input type=\"text\" size=\"60\" name=\"name\" value=\"%%name%%\" /></td>\r\n </tr>\r\n <tr>\r\n <td>%%norm_font%%<b>New Category:</b>%%norm_font_end%%</td>\r\n <td><input type=\"text\" size=\"60\" name=\"category\" value=\"\"><br />\r\n %%norm_font%%<i>(seperate multiple categories with commas)</i>%%norm_font_end%%\r\n </td>\r\n </tr>\r\n <tr>\r\n!
<td colspan=\"2\">\r\n %%norm_font%%<b>Value:</b>%%norm_font_end%%<br />\r\n <textarea cols=\"60\" rows=\"6\" name=\"value\" wrap=\"soft\">%%value%%</textarea>\r\n </td>\r\n </tr>\r\n <tr>\r\n <td colspan=\"2\">\r\n %%norm_font%%<b>Description:</b>%%norm_font_end%%<br />\r\n <textarea cols=\"60\" rows=\"3\" name=\"description\" wrap=\"soft\">%%description%%</textarea>\r\n </td>\r\n </tr>\r\n</table></td></tr>\r\n',NULL,'','admin_pages','default','en');
> INSERT INTO blocks VALUES ('macro_category_list','<tr>\r\n <td>%%norm_font%%<a href=\"%%rootdir%%/admin/macros/%%item_url%%\">%%item%%</a>%%norm_font_end%%</td>\r\n <td>%%norm_font%%<a href=\"%%rootdir%%/admin/macros/%%item_url%%\">%%item%%</a>%%norm_font_end%%</td>\r\n <td>%%norm_font%%<a href=\"%%rootdir%%/admin/macros/%%item_url%%\">%%item%%</a>%%norm_font_end%%</td>\r\n</tr>\r\n',NULL,'One line of the macro category list. Usually one table row.','admin_pages','default','en');
351c351
< -- Table structure for table 'box'
---
> -- Table structure for table `box`
366c366
< -- Dumping data for table 'box'
---
> -- Dumping data for table `box`
370c370
< INSERT INTO box VALUES ('user_box','Login','my $content;\r\nif ($S->{UID} > 0) {\r\n if ($S->have_perm(\'moderate\')) {\r\n my ($nstories, $tstories) = $S->_count_new_sub();\r\n my $color = \'\';\r\n my $c_end = \'\';\r\n if ($nstories) {\r\n $color = \'<font color=\"#FF0000\"><b>\';\r\n $c_end = \'</b></font>\';\r\n }\r\n $content = qq|\r\n %%dot%% <a class=\"light\" href=\"%%rootdir%%/modsub\">Moderate Submissions</a> ($tstories/$color$nstories$c_end new)<BR>|;\r\n }\r\n\r\n if ($S->{TRUSTLEV} == 2 || $S->have_perm(\'super_mojo\')) {\r\n $content .= qq{%%dot%% <a class=\"light\" href=\"%%rootdir%%/search?type=comment;hidden_comments=show\">Review Hidden Comments</a><br />};\r\n }\r\n \r\n my $urlnick = $S->urlify($S->{NICK});\r\n my $diary_link = $S->{UI}->{VARS}->{use_diaries} ? \r\n qq{\r\n %%dot%% <a class=\"light\" href=\"%%rootdir%%/user/$urlnick/diary\">Your Diary</a><br />\r\n %%dot%% <a class=\"light\" href=\"!
%%rootdir%%/submitstory/Diary\">New Diary Entry</a><br /> \r\n } : \'\';\r\n\r\n my $ad_link = $S->{UI}->{VARS}->{use_ads} ?\r\n qq{\r\n %%dot%% <a class=\"light\" href=\"%%rootdir%%/user/$urlnick/ads\">Your Advertisements</a><br />\r\n %%dot%% <a class=\"light\" href=\"%%rootdir%%/submitad\">Submit Ad</a><br />\r\n } : \'\';\r\n\r\n $content .= qq|\r\n %%dot%% <a class=\"light\" href=\"%%rootdir%%/user/$urlnick\">User Info</a><br />\r\n %%dot%% <a class=\"light\" href=\"%%rootdir%%/user/$urlnick/comments\">Your Comments</a><br />\r\n %%dot%% <a class=\"light\" href=\"%%rootdir%%/user/$urlnick/stories\">Your Stories</a><br?>\r\n $diary_link\r\n $ad_link\r\n %%dot%% <a class=\"light\" href=\"%%rootdir%%/user/$urlnick/prefs\">User Preferences</a><br />\r\n %%dot%% <a class=\"light\" href=\"%%rootdir%%/interface/prefs\">Display Preferences</a><br />\r\n %%dot%% <a class=\"light\" href=\"%%rootdir%%/interface/comments\">Comment Pr!
eferences</a><br />\r\n %%dot%% <a class=\"light\" href=\!
"%%rootd
ir%%/logout\">Logout $S->{NICK}</a><BR>|;\r\n\r\n $title = $S->{NICK};\r\n} else {\r\n $content = $S->{UI}->{BLOCKS}->{login_box};\r\n $content =~ s/%%LOGIN_ERROR%%/$S->{LOGIN_ERROR}/;\r\n}\r\nreturn {content => $content, title => $title };\r\n','the login box','box',0);
---
> INSERT INTO box VALUES ('user_box','Login','my $content;\r\nif ($S->{UID} > 0) {\r\n if ($S->have_perm(\'moderate\')) {\r\n my ($nstories, $tstories) = $S->_count_new_sub();\r\n my $color = \'\';\r\n my $c_end = \'\';\r\n if ($nstories) {\r\n $color = \'<font color=\"#FF0000\"><b>\';\r\n $c_end = \'</b></font>\';\r\n }\r\n $content = qq|\r\n %%dot%% <a class=\"light\" href=\"%%rootdir%%/modsub\">Moderate Submissions</a> ($tstories/$color$nstories$c_end new)<BR>|;\r\n }\r\n\r\n if ($S->{TRUSTLEV} == 2 || $S->have_perm(\'super_mojo\')) {\r\n $content .= qq{%%dot%% <a class=\"light\" href=\"%%rootdir%%/search?type=comment;hidden_comments=show\">Review Hidden Comments</a><br />};\r\n }\r\n \r\n my $urlnick = $S->urlify($S->{NICK});\r\n my $diary_link = $S->{UI}->{VARS}->{use_diaries} ? \r\n qq{\r\n %%dot%% <a class=\"light\" href=\"%%rootdir%%/user/$urlnick/diary\">Your Diary</a><br />\r\n %%dot%% <a class=\"light\" href=\"!
%%rootdir%%/submitstory/Diary\">New Diary Entry</a><br /> \r\n } : \'\';\r\n my $upload_link = ($S->have_perm(\'upload_user\') || $S->have_perm(\'upload_admin\')) ?\n qq{%%dot%% <a class=\"light\" href=\"%%rootdir%%/user/$urlnick/files\">Your Files</a><br />} : \'\';\n\r\n my $ad_link = $S->{UI}->{VARS}->{use_ads} ?\r\n qq{\r\n %%dot%% <a class=\"light\" href=\"%%rootdir%%/user/$urlnick/ads\">Your Advertisements</a><br />\r\n %%dot%% <a class=\"light\" href=\"%%rootdir%%/submitad\">Submit Ad</a><br />\r\n } : \'\';\r\n\r\n $content .= qq|\r\n %%dot%% <a class=\"light\" href=\"%%rootdir%%/user/$urlnick\">User Info</a><br />\r\n %%dot%% <a class=\"light\" href=\"%%rootdir%%/user/$urlnick/comments\">Your Comments</a><br />\r\n %%dot%% <a class=\"light\" href=\"%%rootdir%%/user/$urlnick/stories\">Your Stories</a><br?>\r\n $diary_link\r\n $ad_link\r\n $upload_link\n %%dot%% <a class=\"light\" href=\"%%rootdir%%/user/$urlnick/prefs\">Us!
er Preferences</a><br />\r\n %%dot%% <a class=\"light\" h!
ref=\"%%
rootdir%%/interface/prefs\">Display Preferences</a><br />\r\n %%dot%% <a class=\"light\" href=\"%%rootdir%%/interface/comments\">Comment Preferences</a><br />\r\n %%dot%% <a class=\"light\" href=\"%%rootdir%%/logout\">Logout $S->{NICK}</a><BR>|;\r\n\r\n $title = $S->{NICK};\r\n} else {\r\n $content = $S->{UI}->{BLOCKS}->{login_box};\r\n $content =~ s/%%LOGIN_ERROR%%/$S->{LOGIN_ERROR}/;\r\n}\r\nreturn {content => $content, title => $title };\r\n','the login box','box',0);
387c387
< INSERT INTO box VALUES ('whos_online','','## begin whos_online\nreturn if $S->{UID} == -1;\nif (($S->cache->{CACHE}->{WHOBOX}->{TIME}) &&\n ($S->cache->{CACHE}->{WHOBOX}->{TIME} < (time + 120))) {\n return {\n content => $S->cache->{CACHE}->{WHOBOX}->{CONTENT},\n title => $S->cache->{CACHE}->{WHOBOX}->{TITLE}\n };\n}\n\nrequire Storable;\n\nmy $interval = 5;\nmy ($rv,$sth) = $S->db_select({\n FROM => \'sessions\',\n WHAT => \'a_session\',\n WHERE => \"last_accessed > DATE_SUB(NOW(), INTERVAL $interval MINUTE)\",\n ORDER_BY => \'last_accessed DESC\',\n DEBUG => 0\n});\n\n\nmy %uids;\nmy $total;\nwhile (my ($s) = $sth->fetchrow_array) {\n my $d = Storable::thaw($s);\n\n next if $d->{UID} eq \'\';\n $uids{ $d->{UID} } = 0 unless $uids{ $d->{UID} };\n $total++;\n $uids{ $d->{UID} }++;\n}\n\n$sth->finish;\nmy @sorted = sort {\n return 1 if $a == -1; return -1 if $b == -1; return 0;\n} keys %uids;\nreturn unless @sorted;\n\n$S->user_data(\\@sorted); # pre-cache user data\n\!
nmy $out;\nmy $hidden;\nmy $list;\nmy $max_show = 75;\nforeach (@sorted) {\n $_ = -1 if $_ eq \'anon\';\n if ($S->user_data($_)->{prefs}->{online_cloak}) {\n $hidden++;\n next;\n }\n next unless (($list < $max_show) || $_ == -1);\n $list++ unless $_ == -1;\n my $nick = $S->user_data($_)->{nickname};\n my $linknick = $S->urlify($nick);\n $out .= qq~%%dot%%~;\n $out .= qq~ <A HREF=\"%%rootdir%%/user/$linknick\">~ unless $_ == -1;\n $out .= \' \' if $_ == -1;\n $out .= $nick;\n $out .= \"</A>\" unless $_ == -1;\n $out .= \" ($uids{$_})\" if $uids{$_} > 1;\n $out .= \"<BR>\\n\";\n}\n\nif ($total > ($list + $hidden + $uids{-1})) {\n my $more = ($total - $list - $hidden - $uids{-1});\n $out .= qq~%%dot%% ...and $more more. :-)<br>~;\n}\n\nif ($hidden) {\n $out .= qq~%%dot%% Cloaked Users ($hidden)<p>~;\n} else {\n $out .= \'<p>\';\n}\n\n$out .= qq~<small>\n$interval minute interval.<br>You may cloak yourself from appearing here in your <A HREF=\"%%rootdir%%/interface/prefs\">Di!
splay Preferences</A></small>.~;\n\nmy $title = \"Who\'s Onlin!
e? ($tot
al)\";\n\n$S->cache->{CACHE}->{WHOBOX}->{CONTENT} = $out;\n$S->cache->{CACHE}->{WHOBOX}->{TITLE} = $title;\n$S->cache->{CACHE}->{WHOBOX}->{TIME} = time;\n\nreturn {content => $out, title => $title};\n',NULL,'',1);
---
> INSERT INTO box VALUES ('whos_online','Who\'s online','## New Who\'s Online Box\r\n## Quite a bit of stuff borrowed from the old one.\r\n\r\n# return if anonymous for now\r\n#return if $S->{UID} == -1;\r\n\r\n# The time stuff can be changed to taste\r\n\r\n# The query\r\n\r\nmy ($rv,$sth) = $S->db_select({\r\n FROM => \'whos_online\',\r\n WHAT => \'ip, uid\',\r\n WHERE => \'last_visit > DATE_SUB(NOW(), INTERVAL 30 MINUTE)\',\r\n ORDER_BY => \'uid\'\r\n});\r\n\r\nmy %uids;\r\nmy $total;\r\nmy $anontotal;\r\n\r\nwhile (my $s = $sth->fetchrow_hashref()) {\r\n if ($s->{\'uid\'} == -1) {\r\n $anontotal++;\r\n next;\r\n }\r\n $total++;\r\n $uids{ $s->{\'uid\'} }++;\r\n}\r\n\r\n$sth->finish;\r\n\r\nmy @sorted = sort { return 1 if $a == -1; return -1 if $b == -1;\r\nreturn 0; } keys %uids;\r\n\r\nmy $noneonline = \"No one currently online (except you just now, of course).<BR>\";\r\nreturn {content => $noneonline, title => \"Who\'s Online?\"} u!
nless @sorted;\r\n\r\nmy $out;\r\nmy $hidden;\r\nforeach (@sorted) {\r\n #$_ = -1 if $_ eq \'anon\';\r\n if ($S->user_data($_)->{prefs}->{online_cloak}) {\r\n $hidden++;\r\n next;\r\n }\r\n my $nick = $S->user_data($_)->{nickname};\r\n $out .= qq~%%dot%%~;\r\n $out .= qq~ <A HREF=\"%%rootdir%%/user/uid:$_\">~ unless $_ == -1;\r\n $out .= \' \' if $_ == -1;\r\n $out .= $nick;\r\n $out .= \"</A>\" unless $_ == -1;\r\n $out .= \" ($uids{$_})\" if $uids{$_} > 1;\r\n $out .= \"<BR>\\n\";\r\n}\r\nif($anontotal){\r\n my $anon_user_nick = $S->{UI}->{VARS}->{anon_user_nick};\r\n $out .= \"%%dot%% $anon_user_nick: $anontotal <BR>\";\r\n }\r\nif ($hidden) {\r\n $out .= qq~%%dot%% Cloaked Users ($hidden)<p>~;\r\n} else {\r\n $out .= \'<p>\';\r\n}\r\n$total = $total + $anontotal;\r\n$out .= qq~<small>Note: You may cloak yourself from appearing here in your <A HREF=\"%%rootdir%%/interface/prefs\">Display Preferences</A></small>.~;\r\nreturn {cont!
ent => $out, title => \"Who\'s Online? ($total)\"};\r\n','','b!
ox',1);
399c399
< INSERT INTO box VALUES ('ad_pay_paypal','Pay using paypal','my $ad_id = $ARGS[0];\r\nmy $count = $ARGS[1];\r\nmy $content;\r\nmy $site = $S->{UI}->{VARS}->{site_url}.$S->{UI}->{VARS}->{rootdir};\r\nmy $secure_site = $S->{UI}->{VARS}->{secure_site_url}.$S->{UI}->{VARS}->{rootdir};\r\nmy $business_id = \'paypal at mysite.org\';\r\n\r\nunless ($ad_id) {\r\n return \"No ad id passed.\";\r\n}\r\n\r\nmy ($num, $price, $item);\r\nif ($count) {\r\n # Get total price\r\n my ($rv, $sth) = $S->db_select({\r\n WHAT => \'ad_types.cpm\',\r\n FROM => \'ad_info, ad_types\',\r\n WHERE => \"ad_info.ad_id = $ad_id AND ad_info.ad_tmpl = ad_types.type_template\"\r\n });\r\n my ($cpm) = $sth->fetchrow();\r\n $price = ($count/1000) * $cpm;\r\n $price = sprintf(\"%1.2f\", $price);\r\n $num = $count;\r\n $item = \"Ad Renewal\";\r\n} else {\r\n my ($rv, $sth) = $S->db_select({\r\n WHAT => \'purchase_size,purchase_price\',\r\n FROM => \'ad_info\',\r\n WHERE => \"ad_id=$ad_id\"});\r\n ($num, !
$price) = $sth->fetchrow();\r\n $sth->finish();\r\n $item = \"Advertisement\";\r\n}\r\n\r\nmy $finished = $S->cgi->param(\'finished\');\r\nmy $canceled = $S->cgi->param(\'canceled\');\r\n\r\nif ($finished) {\r\n my $content = $S->{UI}->{BLOCKS}->{paypal_finished}; \r\n return $content;\r\n} elsif ($canceled) {\r\n my $content = $S->{UI}->{BLOCKS}->{paypal_canceled};\r\n return $content;\r\n}\r\n\r\nmy $paypal_form = qq{\r\n<form action=\"https://www.paypal.com/cgi-bin/webscr\" method=\"post\">\r\n<input type=\"hidden\" name=\"cmd\" value=\"_xclick\">\r\n<input type=\"hidden\" name=\"business\" value=\"$business_id\">\r\n<input type=\"hidden\" name=\"notify_url\" value=\"$site/special/paypal_confirm\">\r\n<input type=\"hidden\" name=\"item_name\" value=\"$item\">\r\n<input type=\"hidden\" name=\"item_number\" value=\"$ad_id\">\r\n<input type=\"hidden\" name=\"no_shipping\" value=\"1\">\r\n<input type=\"hidden\" name=\"return\" value=\"$secure_site/special/adpay?type=paypal;a!
d_id=$ad_id;finished=1\">\r\n<input type=\"hidden\" name=\"can!
cel_retu
rn\" value=\"$secure_site/special/adpay?type=paypal;ad_id=$ad_id;canceled=1\">\r\n<input type=\"hidden\" name=\"amount\" value=\"$price\">\r\n<input type=\"hidden\" name=\"custom\" value=\"$num\">\r\n<input type=\"image\" src=\"%%imagedir%%/paypal.gif\" border=\"0\" name=\"submit\" alt=\"Make payments with PayPal - it\'s fast, free and secure!\">\r\n</form>};\r\n\r\n$content = qq{\r\n<b>Your ad:</b><br>\r\n<center></center>\r\n<p>\r\nYour purchase details are below. Click the Paypal button, and you will go to a page on Paypal where you will finish the payment process.\r\n<table border=0 cellpadding=1 cellspacing=0 bgcolor=\"#000000\" align=\"center\">\r\n <tr>\r\n <td>\r\n <table width=\"100%\" cellpadding=5 cellspacing=0 border=0 bgcolor=\"#eeeeee\">\r\n <tr>\r\n <td>\r\n <FONT FACE=\"verdana, arial, helvetica, sans-serif\" SIZE=\"2\"><b>Impressions:</b></font>\r\n </td>\r\n <td>\r\n <FONT FACE=\"verdana, arial, helvetica, sans-serif\" SIZE=\"2\">$!
num</font>\r\n </td>\r\n </tr>\r\n <tr>\r\n <td>\r\n <FONT FACE=\"verdana, arial, helvetica, sans-serif\" SIZE=\"2\"><b>Total Price:</b></font>\r\n </td>\r\n <td>\r\n <FONT FACE=\"verdana, arial, helvetica, sans-serif\" SIZE=\"2\">\\$$price</font>\r\n </td>\r\n </tr>\r\n <tr>\r\n <td colspan=2 align=\"center\">\r\n <FONT FACE=\"verdana, arial, helvetica, sans-serif\" SIZE=\"2\">\r\n Click below to purchase.<br>\r\n $paypal_form\r\n </font>\r\n </td>\r\n </tr>\r\n </table>\r\n </td>\r\n </tr>\r\n</table>};\r\n\r\nreturn $content;','','blank_box',0);
---
> INSERT INTO box VALUES ('ad_pay_paypal','Pay using paypal','my $ad_id = $ARGS[0];\r\nmy $count = $ARGS[1];\r\nmy $content;\r\nmy $site = $S->{UI}->{VARS}->{site_url}.$S->{UI}->{VARS}->{rootdir};\r\nmy $secure_site = $S->{UI}->{VARS}->{secure_site_url}.$S->{UI}->{VARS}->{rootdir};\r\nmy $business_id = $S->{UI}->{VARS}->{paypal_business_id};\r\n\r\nunless ($ad_id) {\r\n return \"No ad id passed.\";\r\n}\r\n\r\nmy ($num, $price, $item);\r\nif ($count) {\r\n # Get total price\r\n my ($rv, $sth) = $S->db_select({\r\n WHAT => \'ad_types.cpm\',\r\n FROM => \'ad_info, ad_types\',\r\n WHERE => \"ad_info.ad_id = $ad_id AND ad_info.ad_tmpl = ad_types.type_template\"\r\n });\r\n my ($cpm) = $sth->fetchrow();\r\n $price = ($count/1000) * $cpm;\r\n $price = sprintf(\"%1.2f\", $price);\r\n $num = $count;\r\n $item = \"Ad Renewal\";\r\n} else {\r\n my ($rv, $sth) = $S->db_select({\r\n WHAT => \'purchase_size,purchase_price\',\r\n FROM => \'ad_info\',\r\n WHERE => \"ad_id=$ad_id!
\"});\r\n ($num, $price) = $sth->fetchrow();\r\n $sth->finish();\r\n $item = \"Advertisement\";\r\n}\r\n\r\nmy $finished = $S->cgi->param(\'finished\');\r\nmy $canceled = $S->cgi->param(\'canceled\');\r\n\r\nif ($finished) {\r\n my $content = $S->{UI}->{BLOCKS}->{paypal_finished}; \r\n return $content;\r\n} elsif ($canceled) {\r\n my $content = $S->{UI}->{BLOCKS}->{paypal_canceled};\r\n return $content;\r\n}\r\n\r\nmy $paypal_form = qq{\r\n<form action=\"https://www.paypal.com/cgi-bin/webscr\" method=\"post\">\r\n<input type=\"hidden\" name=\"cmd\" value=\"_xclick\">\r\n<input type=\"hidden\" name=\"business\" value=\"$business_id\">\r\n<input type=\"hidden\" name=\"notify_url\" value=\"$site/special/paypal_confirm\">\r\n<input type=\"hidden\" name=\"item_name\" value=\"$item\">\r\n<input type=\"hidden\" name=\"item_number\" value=\"$ad_id\">\r\n<input type=\"hidden\" name=\"no_shipping\" value=\"1\">\r\n<input type=\"hidden\" name=\"return\" value=\"$secure_site/special/ad!
pay?type=paypal;ad_id=$ad_id;finished=1\">\r\n<input type=\"hi!
dden\" n
ame=\"cancel_return\" value=\"$secure_site/special/adpay?type=paypal;ad_id=$ad_id;canceled=1\">\r\n<input type=\"hidden\" name=\"amount\" value=\"$price\">\r\n<input type=\"hidden\" name=\"custom\" value=\"$num\">\r\n<input type=\"image\" src=\"%%imagedir%%/paypal.gif\" border=\"0\" name=\"submit\" alt=\"Make payments with PayPal - it\'s fast, free and secure!\">\r\n</form>};\r\n\r\n$content = qq{\r\n<b>Your ad:</b><br>\r\n<center></center>\r\n<p>\r\nYour purchase details are below. Click the Paypal button, and you will go to a page on Paypal where you will finish the payment process.\r\n<table border=0 cellpadding=1 cellspacing=0 bgcolor=\"#000000\" align=\"center\">\r\n <tr>\r\n <td>\r\n <table width=\"100%\" cellpadding=5 cellspacing=0 border=0 bgcolor=\"#eeeeee\">\r\n <tr>\r\n <td>\r\n <FONT FACE=\"verdana, arial, helvetica, sans-serif\" SIZE=\"2\"><b>Impressions:</b></font>\r\n </td>\r\n <td>\r\n <FONT FACE=\"verdana, arial, helvetica, sans-ser!
if\" SIZE=\"2\">$num</font>\r\n </td>\r\n </tr>\r\n <tr>\r\n <td>\r\n <FONT FACE=\"verdana, arial, helvetica, sans-serif\" SIZE=\"2\"><b>Total Price:</b></font>\r\n </td>\r\n <td>\r\n <FONT FACE=\"verdana, arial, helvetica, sans-serif\" SIZE=\"2\">\\$$price</font>\r\n </td>\r\n </tr>\r\n <tr>\r\n <td colspan=2 align=\"center\">\r\n <FONT FACE=\"verdana, arial, helvetica, sans-serif\" SIZE=\"2\">\r\n Click below to purchase.<br>\r\n $paypal_form\r\n </font>\r\n </td>\r\n </tr>\r\n </table>\r\n </td>\r\n </tr>\r\n</table>};\r\n\r\nreturn $content;','','blank_box',0);
409c409
< INSERT INTO box VALUES ('subpay_paypal','','my $content;\r\nmy $type = $ARGS[0];\r\nmy $months = $ARGS[1];\r\nmy $site = $S->{UI}->{VARS}->{site_url}.$S->{UI}->{VARS}->{rootdir};\r\nmy $secure_site = $S->{UI}->{VARS}->{secure_site_url}.$S->{UI}->{VARS}->{rootdir};\r\nmy $business_id = \'paypal at kuro5hin.org\';\r\nmy $item = \'Subscription\';\r\n\r\nmy $type_data = $S->sub_get_type($type);\r\n\r\n# Bounds check the period\r\n$months = $type_data->{max_time} \r\n if (($type_data->{max_time}) && $months > $type_data->{max_time});\r\n\r\nmy ($price, $remaining) = $S->sub_calculate_purchase_cost($type, $months);\r\n\r\nmy $finished = $S->cgi->param(\'finished\');\r\nmy $canceled = $S->cgi->param(\'canceled\');\r\n\r\nif ($finished) {\r\n $content = $S->{UI}->{BLOCKS}->{sub_paypal_finished}; \r\n return $content;\r\n} elsif ($canceled) {\r\n $content = $S->{UI}->{BLOCKS}->{sub_paypal_canceled};\r\n return $content;\r\n}\r\n\r\nmy $paypal_form = qq{\r\n<form action=\"https://!
www.paypal.com/cgi-bin/webscr\" method=\"post\">\r\n<input type=\"hidden\" name=\"cmd\" value=\"_xclick\">\r\n<input type=\"hidden\" name=\"business\" value=\"$business_id\">\r\n<input type=\"hidden\" name=\"notify_url\" value=\"$site/special/paypal_confirm\">\r\n<input type=\"hidden\" name=\"item_name\" value=\"Subscription\">\r\n<input type=\"hidden\" name=\"item_number\" value=\"$type\">\r\n<input type=\"hidden\" name=\"no_shipping\" value=\"1\">\r\n<input type=\"hidden\" name=\"return\" value=\"$secure_site/subpay?pay_type=paypal;type=$type;months=$months;finished=1\">\r\n<input type=\"hidden\" name=\"cancel_return\" value=\"$secure_site/subpay?pay_type=paypal;type=$type;months=$months;canceled=1\">\r\n<input type=\"hidden\" name=\"amount\" value=\"$price\">\r\n<input type=\"hidden\" name=\"custom\" value=\"$months\">\r\n<input type=\"image\" src=\"%%imagedir%%/paypal.gif\" border=\"0\" name=\"submit\" alt=\"Make payments with PayPal - it\'s fast, free and secure!\">\r\!
n</form>};\r\n\r\n$content = qq{\r\n%%norm_font%%\r\n$remainin!
g\r\n<p>
\r\nClick the Paypal button, and you will go to a page on Paypal where you will finish the payment process.\r\n%%norm_font_end%%\r\n<p>\r\n<table border=0 cellpadding=1 cellspacing=0 bgcolor=\"#000000\" align=\"center\">\r\n <tr>\r\n <td>\r\n <table width=\"100%\" cellpadding=5 cellspacing=0 border=0 bgcolor=\"#eeeeee\">\r\n <tr>\r\n <td colspan=2 align=\"center\">\r\n <FONT FACE=\"verdana, arial, helvetica, sans-serif\" SIZE=\"2\">\r\n Click below to purchase.<br>\r\n $paypal_form\r\n </font>\r\n </td>\r\n </tr>\r\n </table>\r\n </td>\r\n </tr>\r\n</table>};\r\n\r\nreturn $content;','','blank_box',0);
---
> INSERT INTO box VALUES ('subpay_paypal','','my $content;\r\nmy $type = $ARGS[0];\r\nmy $months = $ARGS[1];\r\nmy $site = $S->{UI}->{VARS}->{site_url}.$S->{UI}->{VARS}->{rootdir};\r\nmy $secure_site = $S->{UI}->{VARS}->{secure_site_url}.$S->{UI}->{VARS}->{rootdir};\r\nmy $business_id = $S->{UI}->{VARS}->{paypal_business_id};\r\nmy $item = \'Subscription\';\r\n\r\nmy $type_data = $S->sub_get_type($type);\r\n\r\n# Bounds check the period\r\n$months = $type_data->{max_time} \r\n if (($type_data->{max_time}) && $months > $type_data->{max_time});\r\n\r\nmy ($price, $remaining) = $S->sub_calculate_purchase_cost($type, $months);\r\n\r\nmy $finished = $S->cgi->param(\'finished\');\r\nmy $canceled = $S->cgi->param(\'canceled\');\r\n\r\nif ($finished) {\r\n $content = $S->{UI}->{BLOCKS}->{sub_paypal_finished}; \r\n return $content;\r\n} elsif ($canceled) {\r\n $content = $S->{UI}->{BLOCKS}->{sub_paypal_canceled};\r\n return $content;\r\n}\r\n\r\nmy $paypal_form = qq{\r\n<form ac!
tion=\"https://www.paypal.com/cgi-bin/webscr\" method=\"post\">\r\n<input type=\"hidden\" name=\"cmd\" value=\"_xclick\">\r\n<input type=\"hidden\" name=\"business\" value=\"$business_id\">\r\n<input type=\"hidden\" name=\"notify_url\" value=\"$site/special/paypal_confirm\">\r\n<input type=\"hidden\" name=\"item_name\" value=\"Subscription\">\r\n<input type=\"hidden\" name=\"item_number\" value=\"$type\">\r\n<input type=\"hidden\" name=\"no_shipping\" value=\"1\">\r\n<input type=\"hidden\" name=\"return\" value=\"$secure_site/subpay?pay_type=paypal;type=$type;months=$months;finished=1\">\r\n<input type=\"hidden\" name=\"cancel_return\" value=\"$secure_site/subpay?pay_type=paypal;type=$type;months=$months;canceled=1\">\r\n<input type=\"hidden\" name=\"amount\" value=\"$price\">\r\n<input type=\"hidden\" name=\"custom\" value=\"$months\">\r\n<input type=\"image\" src=\"%%imagedir%%/paypal.gif\" border=\"0\" name=\"submit\" alt=\"Make payments with PayPal - it\'s fast, free an!
d secure!\">\r\n</form>};\r\n\r\n$content = qq{\r\n%%norm_font!
%%\r\n$r
emaining\r\n<p>\r\nClick the Paypal button, and you will go to a page on Paypal where you will finish the payment process.\r\n%%norm_font_end%%\r\n<p>\r\n<table border=0 cellpadding=1 cellspacing=0 bgcolor=\"#000000\" align=\"center\">\r\n <tr>\r\n <td>\r\n <table width=\"100%\" cellpadding=5 cellspacing=0 border=0 bgcolor=\"#eeeeee\">\r\n <tr>\r\n <td colspan=2 align=\"center\">\r\n <FONT FACE=\"verdana, arial, helvetica, sans-serif\" SIZE=\"2\">\r\n Click below to purchase.<br>\r\n $paypal_form\r\n </font>\r\n </td>\r\n </tr>\r\n </table>\r\n </td>\r\n </tr>\r\n</table>};\r\n\r\nreturn $content;','','blank_box',0);
413c413
< -- Table structure for table 'cache_time'
---
> -- Table structure for table `cache_time`
423c423
< -- Dumping data for table 'cache_time'
---
> -- Dumping data for table `cache_time`
428c428
< -- Table structure for table 'commentcodes'
---
> -- Table structure for table `commentcodes`
438c438
< -- Dumping data for table 'commentcodes'
---
> -- Dumping data for table `commentcodes`
446c446
< -- Table structure for table 'commentratings'
---
> -- Table structure for table `commentratings`
460c460
< -- Dumping data for table 'commentratings'
---
> -- Dumping data for table `commentratings`
465c465
< -- Table structure for table 'comments'
---
> -- Table structure for table `comments`
490c490
< -- Dumping data for table 'comments'
---
> -- Dumping data for table `comments`
495c495
< -- Table structure for table 'cron'
---
> -- Table structure for table `cron`
509c509
< -- Dumping data for table 'cron'
---
> -- Dumping data for table `cron`
520c520
< INSERT INTO cron VALUES ('poll_archive','poll_archive',60,'2002-09-27 13:20:59',0,0);
---
> INSERT INTO cron VALUES ('poll_archive','poll_archive',2592000,'2002-09-27 13:20:59',0,0);
525c525
< -- Table structure for table 'displaycodes'
---
> -- Table structure for table `displaycodes`
535c535
< -- Dumping data for table 'displaycodes'
---
> -- Dumping data for table `displaycodes`
545c545
< -- Table structure for table 'editcategorycodes'
---
> -- Table structure for table `editcategorycodes`
556c556
< -- Dumping data for table 'editcategorycodes'
---
> -- Dumping data for table `editcategorycodes`
563c563
< -- Table structure for table 'hooks'
---
> -- Table structure for table `hooks`
575c575
< -- Dumping data for table 'hooks'
---
> -- Dumping data for table `hooks`
584c584
< -- Table structure for table 'log_info'
---
> -- Table structure for table `log_info`
600c600
< -- Dumping data for table 'log_info'
---
> -- Dumping data for table `log_info`
605c605
< -- Table structure for table 'log_info_extended'
---
> -- Table structure for table `log_info_extended`
615c615
< -- Dumping data for table 'log_info_extended'
---
> -- Dumping data for table `log_info_extended`
620c620,638
< -- Table structure for table 'ops'
---
> -- Table structure for table `macros`
> --
>
> CREATE TABLE macros (
> name varchar(32) NOT NULL default '',
> value text,
> description text,
> category varchar(128) NOT NULL default '',
> PRIMARY KEY (name)
> );
>
> --
> -- Dumping data for table `macros`
> --
>
> INSERT INTO macros VALUES ('macro_test','<span style=\"color: red\">The macro engine is active!</span>','A test macro - if you can see it, it\'s working.','General');
>
> --
> -- Table structure for table `ops`
637c655
< -- Dumping data for table 'ops'
---
> -- Dumping data for table `ops`
645c663
< INSERT INTO ops VALUES ('admin','default_template','admin_main',0,1,'','','element.1=blocks:/tool/mode/theme/item/,\nelement.1=story:/tool/sid{5}/,\nelement.1=editpoll:/tool/editqid/option/,\nelement.1=vars:/tool/cat/,\nelement.1=topics:/tool/tid/,\nelement.1=sections:/tool/section/,\nelement.1=special:/tool/id/,\nelement.1=boxes:/tool/id,\nelement.1=optemplates:/tool/opcode,\nelement.1=groups:/tool/perm_group_id/,\nelement.1=rdf:/tool/action/,\nelement.1=cron:/tool/action/which/,\nelement.1=ads:/tool/type/which,\nelement.1=ops:/tool/opcode/,\nelement.1=log:/tool/log_type/page/log_id/,\n/tool/','Entry point to the various admin tools.');
---
> INSERT INTO ops VALUES ('admin','default_template','admin_main',0,1,'','','element.1=blocks:/tool/mode/theme/item/,\nelement.1=story:/tool/sid{5}/,\nelement.1=editpoll:/tool/editqid/option/,\nelement.1=vars:/tool/mode/item/,\nelement.1=topics:/tool/tid/,\nelement.1=sections:/tool/section/,\nelement.1=special:/tool/id/,\nelement.1=boxes:/tool/id,\nelement.1=optemplates:/tool/opcode,\nelement.1=groups:/tool/perm_group_id/,\nelement.1=rdf:/tool/action/,\nelement.1=cron:/tool/action/which/,\nelement.1=ads:/tool/type/which,\nelement.1=ops:/tool/opcode/,\nelement.1=macros:/tool/,\nelement.1=storylist:/tool/,\nelement.1=archivelist:/tool/,\nelement.1=hooks:/tool/,\nelement.1=listpolls:/tool/,\nelement.1=log:/tool/log_type/page/log_id/,\n/tool/','Entry point to the various admin tools.');
650c668
< INSERT INTO ops VALUES ('newuser','default_template','new_user',0,1,'','','','Starts the process of creating a new user.');
---
> INSERT INTO ops VALUES ('newuser','default_template','new_user',0,1,'','','/tool/','Starts the process of creating a new user.');
655c673
< INSERT INTO ops VALUES ('user','default_template','edit_user',0,1,'','whois my ~.+','EVAL{\r\n my $p = {};\r\n if ($S->cgi->param(\'caller_op\') eq \'my\') {\r\n unshift @path__COMMA__ $S->{NICK};\r\n } elsif ($S->cgi->param(\'caller_op\') =~ m/^~(.+)$/) {\r\n unshift @path__COMMA__ $1;\r\n }\r\n my $uid;\r\n if ($path[0] =~ /uid:/) {\r\n $path[0] =~ s/^uid://;\r\n $uid = $path[0];\r\n $path[0] = $S->get_nick_from_uid($uid);\r\n } else {\r\n $uid=$S->get_uid_from_nick($path[0]); \r\n }\r\n if ($path[1] eq \'edit\') { $path[1] = \'prefs\' }\r\n if ($path[1] eq \'diary\') {\r\n $p = {\r\n op => \'section\'__COMMA__\r\n user => \"diary_$uid\"__COMMA__\r\n section => \'Diary\'__COMMA__\r\n page => $path[2]\r\n };\r\n } elsif ($path[1] =~ /comment/) {\r\n $p->{op} = \'search\';\r\n $p->{type} = \'comment_by\';\r\n $p->{string} = $path[0];\r\n } elsif ($path[1] eq \'ads\') {\r\n $p->{op} !
= \'adinfo\';\r\n $p->{ad_id} = \"uid:$uid\";\r\n } elsif ($path[1] eq \'stories\' || $path[1] eq \'story\') {\r\n $p->{op} = \'search\';\r\n $p->{type} = \'author\';\r\n $p->{string} = $path[0];\r\n } else {\r\n $p->{op} = \'user\';\r\n $p->{tool} = $path[1];\r\n $p->{nick} = $path[0];\r\n }\r\n return $p;\r\n}','Display and edit registered users.');
---
> INSERT INTO ops VALUES ('user','default_template','edit_user',0,1,'','whois my ~.+','EVAL{\r\n my $p = {};\r\n if ($S->cgi->param(\'caller_op\') eq \'my\') {\r\n unshift @path__COMMA__ $S->{NICK};\r\n } elsif ($S->cgi->param(\'caller_op\') =~ m/^~(.+)$/) {\r\n unshift @path__COMMA__ $1;\r\n }\r\n my $uid;\r\n if ($path[0] =~ /uid:/) {\r\n $path[0] =~ s/^uid://;\r\n $uid = $path[0];\r\n $path[0] = $S->get_nick_from_uid($uid);\r\n } else {\r\n $uid=$S->get_uid_from_nick($path[0]); \r\n }\r\n if ($path[1] eq \'edit\') { $path[1] = \'prefs\' }\r\n if ($path[1] eq \'diary\') {\r\n $p = {\r\n op => \'section\'__COMMA__\r\n user => \"diary_$uid\"__COMMA__\r\n section => \'Diary\'__COMMA__\r\n page => $path[2]\r\n };\r\n } elsif ($path[1] =~ /comment/) {\r\n $p->{op} = \'search\';\r\n $p->{type} = \'comment_by\';\r\n $p->{string} = $path[0];\r\n } elsif ($path[1] eq \'ads\') {\r\n $p->{op} !
= \'adinfo\';\r\n $p->{ad_id} = \"uid:$uid\";\r\n } elsif ($path[1] eq \'stories\' || $path[1] eq \'story\') {\r\n $p->{op} = \'search\';\r\n $p->{type} = \'author\';\r\n $p->{string} = $path[0];\r\n } else {\r\n $p->{op} = \'user\';\r\n $p->{tool} = $path[1];\r\n $p->{nick} = $path[0];\r\n $p->{uid} = $uid;\n }\r\n return $p;\r\n}','Display and edit registered users.');
660,661c678,679
< INSERT INTO ops VALUES ('fzdisplay','fzdisplay_template',NULL,0,1,'','','/action/sid{5}/cid/','Displays stories and comments for ForumZilla.');
< INSERT INTO ops VALUES ('submitrdf','submitrdf_template',NULL,0,1,'','','','Walks the user through submitting an RDF feed.');
---
> 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.');
667c685
< INSERT INTO ops VALUES ('ads','buyimpressions_template',NULL,0,1,'','','/distribute','Used for purchasing ad impressions.');
---
> INSERT INTO ops VALUES ('ads','default_template','buyimpressions_box',1,1,'','','/distribute','Used for purchasing ad impressions.');
669c687
< INSERT INTO ops VALUES ('renew','renewad_template',NULL,0,1,'','','','Used to renew ads that are already running.');
---
> INSERT INTO ops VALUES ('renew','default_template','renewad_box',1,1,'','','','Used to renew ads that are already running.');
675c693
< -- Table structure for table 'patches'
---
> -- Table structure for table `patches`
687c705
< -- Dumping data for table 'patches'
---
> -- Dumping data for table `patches`
788a807,819
> INSERT INTO patches VALUES ('1_0-dev',11,'ExcludeSection','sql');
> INSERT INTO patches VALUES ('1_0-dev',12,'TopicImagesDefault','sql');
> INSERT INTO patches VALUES ('1_0-dev',13,'FastArchive','sql');
> INSERT INTO patches VALUES ('1_0-dev',14,'ManyChanges','sql');
> INSERT INTO patches VALUES ('1_0-dev',14,NULL,'post');
> INSERT INTO patches VALUES ('1_0-dev',15,'RatingIP','sql');
> INSERT INTO patches VALUES ('1_0-dev',16,'SafeMode','sql');
> INSERT INTO patches VALUES ('1_0-dev',17,'OpTemplates','sql');
> INSERT INTO patches VALUES ('1_0-dev',18,'AdPayOptions','sql');
> INSERT INTO patches VALUES ('1_0-dev',19,'WhosOnline','sql');
> INSERT INTO patches VALUES ('1_0-dev',20,'OpToBlock','sql');
> INSERT INTO patches VALUES ('1_0-dev',21,'MoreChanges','sql');
> INSERT INTO patches VALUES ('1_0-dev',21,NULL,'post');
791c822
< -- Table structure for table 'perm_groups'
---
> -- Table structure for table `perm_groups`
803c834
< -- Dumping data for table 'perm_groups'
---
> -- Dumping data for table `perm_groups`
809,810c840,841
< INSERT INTO perm_groups VALUES ('Admins','ad_admin,attach_poll,comment_delete,comment_post,comment_rate,edit_blocks,edit_polls,edit_sections,edit_special,edit_user,edit_vars,list_polls,moderate,poll_post_comments,poll_read_comments,poll_vote,rdf_admin,show_perms,story_admin,story_list,story_post,submit_ad,view_polls,use_spellcheck,view_comment_ip,editorial_comments,view_log',0,'Site administrators and junk');
< INSERT INTO perm_groups VALUES ('Superuser','ad_admin,attach_poll,comment_delete,comment_post,comment_rate,cron_admin,edit_blocks,edit_boxes,edit_groups,edit_perms,edit_polls,edit_sections,edit_special,edit_topics,edit_user,edit_vars,list_polls,moderate,poll_post_comments,poll_read_comments,poll_vote,rdf_admin,show_perms,story_admin,story_list,story_post,submit_ad,submit_rdf,super_mojo,view_polls,use_spellcheck,view_comment_ip,edit_ops,edit_hooks,editorial_comments,view_log,subscription_admin',0,'All permissions');
---
> INSERT INTO perm_groups VALUES ('Admins','ad_admin,attach_poll,comment_delete,comment_post,comment_rate,edit_blocks,edit_polls,edit_sections,edit_special,edit_user,edit_vars,list_polls,moderate,poll_post_comments,poll_read_comments,poll_vote,rdf_admin,show_perms,story_admin,story_list,story_post,submit_ad,view_polls,use_spellcheck,view_comment_ip,editorial_comments,view_log,edit_macros',0,'Site administrators and junk');
> INSERT INTO perm_groups VALUES ('Superuser','ad_admin,attach_poll,comment_delete,comment_post,comment_rate,cron_admin,edit_blocks,edit_boxes,edit_groups,edit_perms,edit_polls,edit_sections,edit_special,edit_topics,edit_user,edit_vars,list_polls,moderate,poll_post_comments,poll_read_comments,poll_vote,rdf_admin,show_perms,story_admin,story_list,story_post,submit_ad,submit_rdf,super_mojo,view_polls,use_spellcheck,view_comment_ip,edit_ops,edit_hooks,editorial_comments,view_log,subscription_admin,edit_macros',0,'All permissions');
814c845
< -- Table structure for table 'pollanswers'
---
> -- Table structure for table `pollanswers`
826c857
< -- Dumping data for table 'pollanswers'
---
> -- Dumping data for table `pollanswers`
839c870
< -- Table structure for table 'pollquestions'
---
> -- Table structure for table `pollquestions`
852c883
< -- Dumping data for table 'pollquestions'
---
> -- Dumping data for table `pollquestions`
859c890
< -- Table structure for table 'pollvoters'
---
> -- Table structure for table `pollvoters`
872c903
< -- Dumping data for table 'pollvoters'
---
> -- Dumping data for table `pollvoters`
878c909
< -- Table structure for table 'post_throttle'
---
> -- Table structure for table `post_throttle`
890c921
< -- Dumping data for table 'post_throttle'
---
> -- Dumping data for table `post_throttle`
895c926
< -- Table structure for table 'rdf_channels'
---
> -- Table structure for table `rdf_channels`
918c949
< -- Dumping data for table 'rdf_channels'
---
> -- Dumping data for table `rdf_channels`
926c957
< -- Table structure for table 'rdf_items'
---
> -- Table structure for table `rdf_items`
939c970
< -- Dumping data for table 'rdf_items'
---
> -- Dumping data for table `rdf_items`
944c975
< -- Table structure for table 'section_perms'
---
> -- Table structure for table `section_perms`
956c987
< -- Dumping data for table 'section_perms'
---
> -- Dumping data for table `section_perms`
973c1004
< -- Table structure for table 'sections'
---
> -- Table structure for table `sections`
985c1016
< -- Dumping data for table 'sections'
---
> -- Dumping data for table `sections`
992c1023
< -- Table structure for table 'sessions'
---
> -- Table structure for table `sessions`
1004c1035
< -- Dumping data for table 'sessions'
---
> -- Dumping data for table `sessions`
1009c1040
< -- Table structure for table 'special'
---
> -- Table structure for table `special`
1021c1052
< -- Dumping data for table 'special'
---
> -- Dumping data for table `special`
1037c1068
< -- Table structure for table 'statuscodes'
---
> -- Table structure for table `statuscodes`
1047c1078
< -- Dumping data for table 'statuscodes'
---
> -- Dumping data for table `statuscodes`
1055c1086
< -- Table structure for table 'stories'
---
> -- Table structure for table `stories`
1085c1116
< -- Dumping data for table 'stories'
---
> -- Dumping data for table `stories`
1091c1122
< -- Table structure for table 'storymoderate'
---
> -- Table structure for table `storymoderate`
1099d1129
< comment text,
1105c1135
< -- Dumping data for table 'storymoderate'
---
> -- Dumping data for table `storymoderate`
1110c1140
< -- Table structure for table 'subscription_info'
---
> -- Table structure for table `subscription_info`
1125c1155
< -- Dumping data for table 'subscription_info'
---
> -- Dumping data for table `subscription_info`
1130c1160
< -- Table structure for table 'subscription_payments'
---
> -- Table structure for table `subscription_payments`
1146c1176
< -- Dumping data for table 'subscription_payments'
---
> -- Dumping data for table `subscription_payments`
1151c1181
< -- Table structure for table 'subscription_types'
---
> -- Table structure for table `subscription_types`
1164c1194
< -- Dumping data for table 'subscription_types'
---
> -- Dumping data for table `subscription_types`
1169c1199
< -- Table structure for table 'subsections'
---
> -- Table structure for table `subsections`
1182c1212
< -- Dumping data for table 'subsections'
---
> -- Dumping data for table `subsections`
1187c1217
< -- Table structure for table 'topics'
---
> -- Table structure for table `topics`
1200c1230
< -- Dumping data for table 'topics'
---
> -- Dumping data for table `topics`
1208c1238
< -- Table structure for table 'userprefs'
---
> -- Table structure for table `userprefs`
1219c1249
< -- Dumping data for table 'userprefs'
---
> -- Dumping data for table `userprefs`
1224c1254
< -- Table structure for table 'users'
---
> -- Table structure for table `users`
1261c1291
< -- Dumping data for table 'users'
---
> -- Dumping data for table `users`
1267c1297
< -- Table structure for table 'vars'
---
> -- Table structure for table `vars`
1280c1310
< -- Dumping data for table 'vars'
---
> -- Dumping data for table `vars`
1316a1347,1349
> INSERT INTO vars VALUES ('use_macros','0','Set to 1 to enable the use of macros in stories and comments.','bool','Macros');
> INSERT INTO vars VALUES ('macro_render_on_save','0','Set to 1 to cause macros to render when saved; if 0, macros remain as raw macro text in stories and comments until archived','bool','Macros');
> INSERT INTO vars VALUES ('macro_render_verbose','0','Set to 1 to render macros verbosely, with HTML comments as delimiters and original macro text preserved in comment (for post-processing)','bool','Macros');
1433,1434c1466,1467
< INSERT INTO vars VALUES ('perms','edit_user,\r\nedit_special,\r\nedit_boxes,\r\nedit_vars,\r\nlist_polls,\r\nedit_topics,\r\nedit_polls,\r\nedit_sections,\r\nstory_admin,\r\nstory_post,\r\nstory_list,\r\ncomment_post,\r\ncomment_delete,\r\ncomment_rate,\r\nmoderate,\r\nattach_poll,\r\npoll_vote,\r\npoll_post_comments,\r\npoll_read_comments,\r\nview_polls,\r\nedit_groups,\r\nsuper_mojo,\r\nrdf_admin,\r\nsubmit_rdf,\r\ncron_admin,\r\nad_admin,\r\nedit_blocks,\r\nsubmit_ad,\r\nhotlist,\nuse_spellcheck,\nview_comment_ip,\nshow_hidden_sections,\nedit_own_story,\nedit_ops,\nedit_hooks,\neditorial_comments,\nupload_content,\nupload_admin,\nupload_user,\nview_log,\nsubscription_admin,\nallow_subscription,\nsuballow_group_change','<P>This variable contains a list of all permissions used by Scoop, in a comma-separated list, one permission per line.<BR>\nIf any perm is added or removed from this list, the change will be reflected in the list of perms in the Groups Admin Tool. Added !
perms default to off for all groups. Removed perms are only removed from the admin tool; any removed perms that had been granted to groups before removal are still granted to those groups afterward.</P>','tarea','Security');
< INSERT INTO vars VALUES ('hooks','comment_new(sid, cid)\ncomment_rate(sid, cid, uid, rating)\nstory_hide(sid)\nstory_leave_editing(sid)\nstory_new(sid)\nstory_post(sid, where)\nstory_update(sid)\nstory_vote(sid, uid, vote, section_only)\nuser_new(nick)\ncomment_delete(sid, cid)\nstory_delete(sid)','<P>This variable contains a list of hooks recognised by Scoop for use in the Hooks Admin Tool. The format of this variable is: one hook definition per line; each definition consists of the hook name and a comma-separated list of arguments it accepts in parentheses.<BR>\nEach hook is named based on an activity that can be taken on a Scoop site. In the Hooks Admin Tool, each of these hooks can have code attached which will run when those activities are performed. See the Scoop Admin Guide for more details.</P>','tarea','General');
---
> INSERT INTO vars VALUES ('perms','edit_user,\r\nedit_special,\r\nedit_boxes,\r\nedit_vars,\r\nlist_polls,\r\nedit_topics,\r\nedit_polls,\r\nedit_sections,\r\nstory_admin,\r\nstory_post,\r\nstory_list,\r\ncomment_post,\r\ncomment_delete,\r\ncomment_rate,\r\nmoderate,\r\nattach_poll,\r\npoll_vote,\r\npoll_post_comments,\r\npoll_read_comments,\r\nview_polls,\r\nedit_groups,\r\nsuper_mojo,\r\nrdf_admin,\r\nsubmit_rdf,\r\ncron_admin,\r\nad_admin,\r\nedit_blocks,\r\nsubmit_ad,\r\nhotlist,\nuse_spellcheck,\nview_comment_ip,\nshow_hidden_sections,\nedit_own_story,\nedit_ops,\nedit_hooks,\neditorial_comments,\nupload_content,\nupload_admin,\nupload_user,\nview_log,\nsubscription_admin,\nallow_subscription,\nsuballow_group_change,\nedit_macros','<P>This variable contains a list of all permissions used by Scoop, in a comma-separated list, one permission per line.<BR>\nIf any perm is added or removed from this list, the change will be reflected in the list of perms in the Groups Admin!
Tool. Added perms default to off for all groups. Removed perms are only removed from the admin tool; any removed perms that had been granted to groups before removal are still granted to those groups afterward.</P>','tarea','Security');
> INSERT INTO vars VALUES ('hooks','comment_new(sid, cid)\ncomment_rate(sid, cid, uid, rating)\nstory_hide(sid)\nstory_leave_editing(sid)\nstory_new(sid)\nstory_post(sid, where)\nstory_update(sid)\nstory_vote(sid, uid, vote, section_only)\nuser_new(nick, is_advertiser)\ncomment_delete(sid, cid)\nstory_delete(sid)\ncomment_toggle(sid,cid,tool)\nfile_upload(path)\nuser_confirm(nick)','<P>This variable contains a list of hooks recognised by Scoop for use in the Hooks Admin Tool. The format of this variable is: one hook definition per line; each definition consists of the hook name and a comma-separated list of arguments it accepts in parentheses.<BR>\nEach hook is named based on an activity that can be taken on a Scoop site. In the Hooks Admin Tool, each of these hooks can have code attached which will run when those activities are performed. See the Scoop Admin Guide for more details.</P>','tarea','General');
1472,1473c1505,1508
< INSERT INTO vars VALUES ('use_whosonline','0','Enable using a database table to
< keep track of who\'s online and the number of visitors?','bool','General');
---
> INSERT INTO vars VALUES ('use_whosonline','0','Enable using a database table to\nkeep track of who\'s online and the number of visitors?','bool','General');
> INSERT INTO vars VALUES ('ads_use_cc','0','Set true to enable credit card payment options in the ad system.','bool','Advertising');
> INSERT INTO vars VALUES ('ads_use_paypal','0','Set true to enable paypal payment options in the ad system.','bool','Advertising');
> INSERT INTO vars VALUES ('paypal_business_id','paypal at mysite.org','The business/paypal id that\'s used for recieving paypal payments, such as through ad_pay_paypal or subpay_paypal.','text','Advertising,General');
1476c1511
< -- Table structure for table 'viewed_stories'
---
> -- Table structure for table `viewed_stories`
1490c1525
< -- Dumping data for table 'viewed_stories'
---
> -- Dumping data for table `viewed_stories`
1492a1528
>
1494c1530
< -- Table structure for table 'whos_online'
---
> -- Table structure for table `whos_online`
1498,1501c1534,1537
< ip varchar(16) NOT NULL default '',
< uid int(11) NOT NULL default '0',
< last_visit timestamp NOT NULL default '0000-00-00 00:00:00',
< PRIMARY KEY (ip)
---
> ip varchar(16) NOT NULL default '',
> uid int(11) NOT NULL default '0',
> last_visit timestamp(14) NOT NULL,
> PRIMARY KEY (ip)
1502a1539,1543
>
> --
> -- Dumping data for table `whos_online`
> --
>