Commit info for scoop/struct:
Modified Files:
scoop.sql
Log Message:
More bug fixes. The list is below. I also cleaned up some HTML in the code as I
went over it, but that was pretty minor. This is just copied out of the list I
was working off of, it might not make any sense.
code changes:
| if hide_rating_value is 0 or blank, min_rating - 1 is used. if min_rating
isn't 1, then there's no way to get hide_rating to be 0
| op=user;tool=prefs;uid=1 doesn't work anymore (editing user info)
| safe_mode should send back a 503 Service Unavailable
| requesting a non-existent user doesn't display an error message
| file uploads page shows subdirs as files. should not show them, or allow
using them
| autoformat won't linkify bars URLs anymore
| key impressions is requested by all ad emails but doesn't exist in db and
isn't used
| subscribe block isn't used anymore (hardcoded in Subscription.pm)
| subscribe_intro_text has a default code value, but it's duplicated in the
default database
| when creating a new ad template, properties get set but it can't be active
until an example ad is created, and it displays that error even if the admin
didn't try to mark it active
| in Ads::Submit, in structure on line 50: the value '5' isn't caught
| mail_ad_almost_done and mail_ad_done (and other blocks that use
escape_adjudge_mail) can only handle k5 style ads, even though the code can
handle other keys
| blocks admin tool needs /g on its description interpolate regexp
| digest_subjects is a block, but cron.pm looks in vars
| in the comment block, the special key "user_info" contains the value of the
special key "edit_user", even though "edit_user" is recognised as a separate
special key
| the mark_<group> blocks are only applied if subscriptions are on
| auto-post uses 4 queries to get votes instead of just one:
select count(vote) as score,vote,section_only from storymoderate where
sid='$sid' group by vote,section_only
| when calculating comment score, 1 is hard coded as the hidden comment
threshold instead of using the rating_min var
| upload_max_file_size in Utility.pm should be enforced (make sure $size isn't
greater, then only read in $size bytes)
| advertiser_group/req_extra_advertiser_info needs to work.
(/newuser/advertiser needs to be an op template to work)
| site controls links don't always work. model after blocks
(admin/tool/mode/item, not admin/tool/category)
| need instructions/link to blocks for creating a new ad template
| when editting a single block, links to other themes should take you to that
same block. if no block in that theme, blank form
| topics interface should use a checkbox to delete (like sections does)
database changes:
| user op EVAL needs a $p->{uid} = $uid; near the end
| user_box needs to test upload_user and upload_admin perms to add 'Your Files'
| story_info uses a special key (comment_controls) that isn't recognized. that
needs to be removed, as it's added elsewhere
| in poll_block, |hotlist| is used but it apparently isn't a valid key. |info|
isn't used either. remove these from the default
| block comment needs to have %%user_info%% changed to %%user_info%%
%%edit_user%%
| update admin/vars op template to be /tool/mode/item
| hook var needs update. user_new(username, is_advertiser) is the new one
| old box ops need to be converted to new format: buyimpressions_box,
fzdisplay,
renewad_box, submit_rdf. "This is a pretty easy change, just put that box
name
in the op definition, indicate that it's a box, and set the page template to
default_template or something similar. Then delete the four page template
blocks that were used before."
| subpay_paypal and ad_pay_paypal have paypal account name/email hard-coded in
boxes. should be a var
| submit_ad_pay_box should show whichever payment options have been turned on
by ads_use_cc and ads_use_paypal, instead of neither
| set newuser's template to /tool/
| poll_archive cron should run every 1M, not 1m
| pendingstory_bg isn't used in any code or box (remove it)
| missing blocks (in code only): donate_email_pledge, donate_email_success,
next_previous_links, rating_format
| in patches but missing from scoop.sql: author_edit_instructions
| comment_toggle(sid,cid,tool), file_upload(path), and user_confirm(nick)
missing from hook var
| block poll_box isn't used box poll_box's template (it uses plain). remove
poll_box block
| remove poll_guidelines, preview_text_ad_template, renew_confirm_message
| ads_use_cc and ads_use_payal (vars) don't exist. needed for payments
| remove column comment from storymoderate
Index: scoop.sql
===================================================================
RCS file: /cvs/scoop/scoop/struct/scoop.sql,v
retrieving revision 1.177
retrieving revision 1.178
diff -r1.177 -r1.178
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`
157d156
<
159c158
< -- Table structure for table 'advertisers'
---
> -- Table structure for table `advertisers`
172c171
< -- Dumping data for table 'advertisers'
---
> -- Dumping data for table `advertisers`
177c176
< -- Table structure for table 'blocks'
---
> -- Table structure for table `blocks`
192c191
< -- Dumping data for table 'blocks'
---
> -- Dumping data for table `blocks`
198,199c197,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');
210c209
< 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');
215d213
< INSERT INTO blocks VALUES ('poll_guidelines','These are poll guidelines','1','Not used','site_html','default','en');
218d215
< 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');
227d223
< 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');
243c239
< 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');
247d242
< 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');
254c249
< 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');
263c258,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');
272d267
< 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');
278d272
< 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');
282c276,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');
301d295
< 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');
357c351
< -- Table structure for table 'box'
---
> -- Table structure for table `box`
372c366
< -- Dumping data for table 'box'
---
> -- Dumping data for table `box`
376c370
< 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);
405c399
< 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);
415c409
< 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);
419c413
< -- Table structure for table 'cache_time'
---
> -- Table structure for table `cache_time`
429c423
< -- Dumping data for table 'cache_time'
---
> -- Dumping data for table `cache_time`
434c428
< -- Table structure for table 'commentcodes'
---
> -- Table structure for table `commentcodes`
444c438
< -- Dumping data for table 'commentcodes'
---
> -- Dumping data for table `commentcodes`
452c446
< -- Table structure for table 'commentratings'
---
> -- Table structure for table `commentratings`
466c460
< -- Dumping data for table 'commentratings'
---
> -- Dumping data for table `commentratings`
471c465
< -- Table structure for table 'comments'
---
> -- Table structure for table `comments`
496c490
< -- Dumping data for table 'comments'
---
> -- Dumping data for table `comments`
501c495
< -- Table structure for table 'cron'
---
> -- Table structure for table `cron`
515c509
< -- Dumping data for table 'cron'
---
> -- Dumping data for table `cron`
526c520
< 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);
531c525
< -- Table structure for table 'displaycodes'
---
> -- Table structure for table `displaycodes`
541c535
< -- Dumping data for table 'displaycodes'
---
> -- Dumping data for table `displaycodes`
551c545
< -- Table structure for table 'editcategorycodes'
---
> -- Table structure for table `editcategorycodes`
562c556
< -- Dumping data for table 'editcategorycodes'
---
> -- Dumping data for table `editcategorycodes`
569c563
< -- Table structure for table 'hooks'
---
> -- Table structure for table `hooks`
581c575
< -- Dumping data for table 'hooks'
---
> -- Dumping data for table `hooks`
590c584
< -- Table structure for table 'log_info'
---
> -- Table structure for table `log_info`
606c600
< -- Dumping data for table 'log_info'
---
> -- Dumping data for table `log_info`
611c605
< -- Table structure for table 'log_info_extended'
---
> -- Table structure for table `log_info_extended`
621c615,632
< -- Dumping data for table 'log_info_extended'
---
> -- Dumping data for table `log_info_extended`
> --
>
>
> --
> -- 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`
623a635
> 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');
626c638
< -- Table structure for table 'ops'
---
> -- Table structure for table `ops`
643c655
< -- Dumping data for table 'ops'
---
> -- Dumping data for table `ops`
651c663
< 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=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.');
---
> 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.');
656c668
< 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.');
661c673
< 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.');
666,667c678,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.');
673c685
< 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.');
675c687
< 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.');
681c693
< -- Table structure for table 'patches'
---
> -- Table structure for table `patches`
693c705
< -- Dumping data for table 'patches'
---
> -- Dumping data for table `patches`
803,804c815,819
< INSERT INTO patches VALUES ('1_0-dev',18,'Macros','sql');
< INSERT INTO patches VALUES ('1_0-dev',18,NULL,'post');
---
> 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');
807c822
< -- Table structure for table 'perm_groups'
---
> -- Table structure for table `perm_groups`
819c834
< -- Dumping data for table 'perm_groups'
---
> -- Dumping data for table `perm_groups`
830c845
< -- Table structure for table 'pollanswers'
---
> -- Table structure for table `pollanswers`
842c857
< -- Dumping data for table 'pollanswers'
---
> -- Dumping data for table `pollanswers`
855c870
< -- Table structure for table 'pollquestions'
---
> -- Table structure for table `pollquestions`
868c883
< -- Dumping data for table 'pollquestions'
---
> -- Dumping data for table `pollquestions`
875c890
< -- Table structure for table 'pollvoters'
---
> -- Table structure for table `pollvoters`
888c903
< -- Dumping data for table 'pollvoters'
---
> -- Dumping data for table `pollvoters`
894c909
< -- Table structure for table 'post_throttle'
---
> -- Table structure for table `post_throttle`
906c921
< -- Dumping data for table 'post_throttle'
---
> -- Dumping data for table `post_throttle`
911c926
< -- Table structure for table 'rdf_channels'
---
> -- Table structure for table `rdf_channels`
934c949
< -- Dumping data for table 'rdf_channels'
---
> -- Dumping data for table `rdf_channels`
942c957
< -- Table structure for table 'rdf_items'
---
> -- Table structure for table `rdf_items`
955c970
< -- Dumping data for table 'rdf_items'
---
> -- Dumping data for table `rdf_items`
960c975
< -- Table structure for table 'section_perms'
---
> -- Table structure for table `section_perms`
972c987
< -- Dumping data for table 'section_perms'
---
> -- Dumping data for table `section_perms`
989c1004
< -- Table structure for table 'sections'
---
> -- Table structure for table `sections`
1001c1016
< -- Dumping data for table 'sections'
---
> -- Dumping data for table `sections`
1008c1023
< -- Table structure for table 'sessions'
---
> -- Table structure for table `sessions`
1020c1035
< -- Dumping data for table 'sessions'
---
> -- Dumping data for table `sessions`
1025c1040
< -- Table structure for table 'special'
---
> -- Table structure for table `special`
1037c1052
< -- Dumping data for table 'special'
---
> -- Dumping data for table `special`
1053c1068
< -- Table structure for table 'statuscodes'
---
> -- Table structure for table `statuscodes`
1063c1078
< -- Dumping data for table 'statuscodes'
---
> -- Dumping data for table `statuscodes`
1071c1086
< -- Table structure for table 'stories'
---
> -- Table structure for table `stories`
1101c1116
< -- Dumping data for table 'stories'
---
> -- Dumping data for table `stories`
1107c1122
< -- Table structure for table 'storymoderate'
---
> -- Table structure for table `storymoderate`
1115d1129
< comment text,
1121c1135
< -- Dumping data for table 'storymoderate'
---
> -- Dumping data for table `storymoderate`
1126c1140
< -- Table structure for table 'subscription_info'
---
> -- Table structure for table `subscription_info`
1141c1155
< -- Dumping data for table 'subscription_info'
---
> -- Dumping data for table `subscription_info`
1146c1160
< -- Table structure for table 'subscription_payments'
---
> -- Table structure for table `subscription_payments`
1162c1176
< -- Dumping data for table 'subscription_payments'
---
> -- Dumping data for table `subscription_payments`
1167c1181
< -- Table structure for table 'subscription_types'
---
> -- Table structure for table `subscription_types`
1180c1194
< -- Dumping data for table 'subscription_types'
---
> -- Dumping data for table `subscription_types`
1185c1199
< -- Table structure for table 'subsections'
---
> -- Table structure for table `subsections`
1198c1212
< -- Dumping data for table 'subsections'
---
> -- Dumping data for table `subsections`
1203c1217
< -- Table structure for table 'topics'
---
> -- Table structure for table `topics`
1216c1230
< -- Dumping data for table 'topics'
---
> -- Dumping data for table `topics`
1224c1238
< -- Table structure for table 'userprefs'
---
> -- Table structure for table `userprefs`
1235c1249
< -- Dumping data for table 'userprefs'
---
> -- Dumping data for table `userprefs`
1240c1254
< -- Table structure for table 'users'
---
> -- Table structure for table `users`
1277c1291
< -- Dumping data for table 'users'
---
> -- Dumping data for table `users`
1283c1297
< -- Table structure for table 'vars'
---
> -- Table structure for table `vars`
1296c1310
< -- Dumping data for table 'vars'
---
> -- Dumping data for table `vars`
1453c1467
< 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 ('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');
1491,1492c1505,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');
1495c1511
< -- Table structure for table 'viewed_stories'
---
> -- Table structure for table `viewed_stories`
1509c1525
< -- Dumping data for table 'viewed_stories'
---
> -- Dumping data for table `viewed_stories`
1512,1522d1527
< --
< -- 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)
< );
1525c1530
< -- Dumping data for table 'macros'
---
> -- Table structure for table `whos_online`
1528,1529c1533,1538
<
< 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');
---
> CREATE TABLE whos_online (
> ip varchar(16) NOT NULL default '',
> uid int(11) NOT NULL default '0',
> last_visit timestamp(14) NOT NULL,
> PRIMARY KEY (ip)
> );
1532c1541
< -- Table structure for table 'whos_online'
---
> -- Dumping data for table `whos_online`
1535,1540d1543
< CREATE TABLE whos_online (
< 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)
< );