Commit info for scoop/struct:
Modified Files:
scoop.sql
Log Message:
Bug 38. Patch from janra.
--hulver
Index: scoop.sql
===================================================================
RCS file: /cvs/scoop/scoop/struct/scoop.sql,v
retrieving revision 1.183
retrieving revision 1.184
diff -r1.183 -r1.184
253,254c253,254
< INSERT INTO blocks VALUES ('new_user_html',' <TR>\r\n <TD COLSPAN=2 BGCOLOR=\"%%title_bgcolor%%\">%%title_font%%\r\n <B>Create New User Account</B>%%title_font_end%%<P>\r\n <FORM NAME=\"adduser\" METHOD=\"post\" ACTION=\"%%rootdir%%/\">\r\n <INPUT TYPE=\"hidden\" name=\"tool\" VALUE=\"writeuser\">\r\n <INPUT TYPE=\"hidden\" name=\"op\" VALUE=\"newuser\">\r\n <INPUT TYPE=\"hidden\" name=\"formkey\" VALUE=\"%%formkey%%\">\r\n </TD>\r\n </TR>\r\n <TR><TD COLSPAN=2><FONT COLOR=\"#FF0000\"><H3><CENTER>%%error%%</CENTER></H3></FONT></TD></TR>\r\n <TR><TD COLSPAN=2>%%norm_font%%\r\nIn order to create an account (which is free), fill out this form. You will receive an email containing your username and autogenerated password, at the address you provide here. Use this data to login. It\'s that easy.\r\n<P>\r\nWhy is the password autogenerated? First, random passwords are typically more secure than non-random ones. Second, by requiring you to log in using a passwor!
d we send you, we can make sure that the email address is valid. This makes it harder for malicious users to abuse the account creation system by creating an arbitrary number of accounts and spamming the site with stories or comments. If you do not like your autogenerated password, you can easily change it after logging in.\r\n<P>\r\nAgain, your password will be mailed to the email address you enter here, so it <B>must</B> work. Do NOT enter a spam-protected or fake email address. \r\n<P>\r\nIf you are concerned about privacy, this email does not have to be in any way traceable to you. We will never use the email you provide here for anything else, ever. All it needs to be is working, and accessible to you, at the time the account is created. \r\n <P>\r\n Now get started, and we hope you enjoy %%sitename%%!\r\n %%norm_font_end%%</TD></TR>\r\n <TR><TD COLSPAN=2> </TD></TR>\r\n <TR>\r\n <TD>\r\n %%norm_font%%\r\n Please enter your desired username:<BR>\r\n %!
%norm_font_end%%\r\n </TD>\r\n <TD>\r\n %%norm_font%%<IN!
PUT TYPE
=\"text\" NAME=\"nickname\" SIZE=30 VALUE=\"%%uname%%\">%%norm_font_end%%<BR>\r\n </TD>\r\n </TR>\r\n <TD COLSPAN=2>\r\n %%smallfont%%(Legal characters: a-z, A-Z, 0-9, space. Names may not start or end with a space, and may not contain more than one space in a row.)%%smallfont_end%%\r\n </TD>\r\n </TR>\r\n <TR>\r\n <TD>\r\n %%norm_font%%\r\n and a working email (this will never be made public!):<BR>\r\n <B><FONT COLOR=\"#FF0000\">Check this for typos!</FONT></B>\r\n %%norm_font_end%%\r\n </TD>\r\n <TD>\r\n %%norm_font%%<INPUT TYPE=\"text\" NAME=\"email\" VALUE=\"%%email%%\" SIZE=30>%%norm_font_end%%\r\n </TD>\r\n </TR>','1','The HTML form and explanation text used on the page a new user visits to create an account.','site_html','default','en');
< INSERT INTO blocks VALUES ('new_advertiser_html','<tr><td colspan=\"2\"><input type=\"hidden\" name=\"advertiser\" value=\"1\"> </td></tr>\r\n <TR>\r\n <TD colspan=\"2\">%%norm_font%%\r\nSince you have expressed an interest in advertising on this site, I\'ll be needing a bit more\r\ninformation about you, for billing purposes. \r\n%%norm_font_end%%</TD>\r\n </TR>\r\n <TR>\r\n <TD colspan=\"2\">%%norm_font%% %%advertising_account_disclaimer%% %%norm_font_end%% </TD>\r\n </TR>\r\n <TR>\r\n <TD align=\"right\">%%norm_font%% Your Name: %%norm_font_end%%</TD>\r\n <TD align=\"left\"> <input type=\"text\" name=\"realname\" value=\"%%yourname%%\" size=\"30\"></TD>\r\n </TR>\r\n <TR>\r\n <TD align=\"right\">%%norm_font%% Business name: %%norm_font_end%%</TD>\r\n <TD align=\"left\"><input type=\"text\" name=\"bizname\" value=\"%%bizname%%\" size=\"40\"> </TD>\r\n </TR>\r\n <TR>\r\n <TD align=\"right\">%%norm_font%% Contact phone number: %%norm_font_end%%</TD>\r\n <TD al!
ign=\"left\"><input type=\"text\" name=\"bizphone\" value=\"%%bizphone%%\" size=\"12\"> </TD>\r\n </TR>\r\n <TR>\r\n <TD align=\"right\">%%norm_font%% Mailing Address: %%norm_font_end%%</TD>\r\n <TD align=\"left\"><textarea cols=\"30\" rows=\"5\" name=\"snailmail\" value=\"%%snailmail%%\"></textarea></TD>\r\n </TR>\r\n','1','A form used for collecting contact information from new advertisers.','advertising','default','en');
---
> INSERT INTO blocks VALUES ('new_user_html','<table> <TR>\r\n <TD COLSPAN=2 BGCOLOR=\"%%title_bgcolor%%\">%%title_font%%\r\n <B>Create New User Account</B>%%title_font_end%%<P>\r\n <FORM NAME=\"adduser\" METHOD=\"post\" ACTION=\"%%rootdir%%/\">\r\n <INPUT TYPE=\"hidden\" name=\"tool\" VALUE=\"writeuser\">\r\n <INPUT TYPE=\"hidden\" name=\"op\" VALUE=\"newuser\">\r\n <INPUT TYPE=\"hidden\" name=\"formkey\" VALUE=\"%%formkey%%\">\r\n </TD>\r\n </TR>\r\n <TR><TD COLSPAN=2><FONT COLOR=\"#FF0000\"><H3><CENTER>%%error%%</CENTER></H3></FONT></TD></TR>\r\n <TR><TD COLSPAN=2>%%norm_font%%\r\nIn order to create an account (which is free), fill out this form. You will receive an email containing your username and autogenerated password, at the address you provide here. Use this data to login. It\'s that easy.\r\n<P>\r\nWhy is the password autogenerated? First, random passwords are typically more secure than non-random ones. Second, by requiring you to log in using a !
password we send you, we can make sure that the email address is valid. This makes it harder for malicious users to abuse the account creation system by creating an arbitrary number of accounts and spamming the site with stories or comments. If you do not like your autogenerated password, you can easily change it after logging in.\r\n<P>\r\nAgain, your password will be mailed to the email address you enter here, so it <B>must</B> work. Do NOT enter a spam-protected or fake email address. \r\n<P>\r\nIf you are concerned about privacy, this email does not have to be in any way traceable to you. We will never use the email you provide here for anything else, ever. All it needs to be is working, and accessible to you, at the time the account is created. \r\n <P>\r\n Now get started, and we hope you enjoy %%sitename%%!\r\n %%norm_font_end%%</TD></TR>\r\n <TR><TD COLSPAN=2> </TD></TR>\r\n <TR>\r\n <TD>\r\n %%norm_font%%\r\n Please enter your desired username:<BR>\!
r\n %%norm_font_end%%\r\n </TD>\r\n <TD>\r\n %%norm_fo!
nt%%<INP
UT TYPE=\"text\" NAME=\"nickname\" SIZE=30 VALUE=\"%%uname%%\">%%norm_font_end%%<BR>\r\n </TD>\r\n </TR>\r\n <TD COLSPAN=2>\r\n %%smallfont%%(Legal characters: a-z, A-Z, 0-9, space. Names may not start or end with a space, and may not contain more than one space in a row.)%%smallfont_end%%\r\n </TD>\r\n </TR>\r\n <TR>\r\n <TD>\r\n %%norm_font%%\r\n and a working email (this will never be made public!):<BR>\r\n <B><FONT COLOR=\"#FF0000\">Check this for typos!</FONT></B>\r\n %%norm_font_end%%\r\n </TD>\r\n <TD>\r\n %%norm_font%%<INPUT TYPE=\"text\" NAME=\"email\" VALUE=\"%%email%%\" SIZE=30>%%norm_font_end%%\r\n </TD>\r\n </TR><tr><td colspan=2 align=\"right\">%%norm_font%%<input type=\"submit\" value=\"Create Account!\" size=\"30\" /></form>%%norm_font_end%%</td></tr></table>','1','The HTML form and explanation text used on the page a new user visits to create an account.','site_html','default','en');
> INSERT INTO blocks VALUES ('new_advertiser_html','<table><tr><TD COLSPAN=2 BGCOLOR=\"%%title_bgcolor%%\">%%title_font%%<B>Upgrade to an Advertiser Account</B>%%title_font_end%%<P>\n<form name=\"adduser\" method=\"post\" action=\"%%rootdir%%/\">\n<input type=\"hidden\" name=\"tool\" value=\"writeuser\" />\n<input type=\"hidden\" name=\"op\" value=\"newuser\" />\n<input type=\"hidden\" name=\"formkey\" value=\"%%formkey%%\" /></td></tr>\n <TR><TD COLSPAN=2><FONT COLOR=\"#FF0000\"><H3><CENTER>%%error%%</CENTER></H3></FONT></TD></TR><tr><td colspan=\"2\"><input type=\"hidden\" name=\"advertiser\" value=\"1\"> </td></tr>\r\n <TR>\r\n <TD colspan=\"2\">%%norm_font%%\r\nSince you have expressed an interest in advertising on this site, I\'ll be needing a bit more\r\ninformation about you, for billing purposes. \r\n%%norm_font_end%%</TD>\r\n </TR>\r\n <TR>\r\n <TD colspan=\"2\">%%norm_font%% %%advertising_account_disclaimer%% %%norm_font_end%% </TD>\r\n </TR>\r\n <TR>\r\n <!
TD align=\"right\">%%norm_font%% Your Name: %%norm_font_end%%</TD>\r\n <TD align=\"left\"> <input type=\"text\" name=\"realname\" value=\"%%yourname%%\" size=\"30\"></TD>\r\n </TR>\r\n <TR>\r\n <TD align=\"right\">%%norm_font%% Business name: %%norm_font_end%%</TD>\r\n <TD align=\"left\"><input type=\"text\" name=\"bizname\" value=\"%%bizname%%\" size=\"40\"> </TD>\r\n </TR>\r\n <TR>\r\n <TD align=\"right\">%%norm_font%% Contact phone number: %%norm_font_end%%</TD>\r\n <TD align=\"left\"><input type=\"text\" name=\"bizphone\" value=\"%%bizphone%%\" size=\"12\"> </TD>\r\n </TR>\r\n <TR>\r\n <TD align=\"right\">%%norm_font%% Mailing Address: %%norm_font_end%%</TD>\r\n <TD align=\"left\"><textarea cols=\"30\" rows=\"5\" name=\"snailmail\" value=\"%%snailmail%%\"></textarea></TD>\r\n </TR>\r\n<tr><td colspan=2 align=\"right\">%%norm_font%%<input type=\"submit\" value=\"Create Account!\" size=\"30\" /></form>%%norm_font_end%%</td></tr></table>','1','A form used for collec!
ting contact information from new advertisers.','advertising',!
'default
','en');
348a349,351
> INSERT INTO blocks VALUES ('new_user_has_account','<P>Hey! You already have an account! I wouldn\'t worry about creating another. You must have arrived here in error. Please email %%local_email%% if you\'re having troubles with this site.</P>','1','<P>This block is displayed if a logged-in user visits the user creation page. It should be a self-contained bit of HTML letting the user know that they can\'t create an account while logged in. There are no special keys.</P>','Accounts','default','en');
> INSERT INTO blocks VALUES ('new_user_is_advertiser','<P>You already have an account that is enabled for advertising. You must have arrived here in error. Please email %%local_email%% if you\'re having troubles with this site.</P>','1','<P>This block is displayed if a logged-in advertiser visits the advertiser account creation page. It should be a self-contained bit of HTML letting the user know that they already have an advertiser account. This only applies if the site control <B>req_extra_advertiser_info</B> is set to 1. There are no special keys.</P>','Accounts','default','en');
> INSERT INTO blocks VALUES ('newuser_confirm_page','<h2>User Created!</h2>\n<p>You should soon receive an email at %%EMAIL%%. This email will contain your password and further instructions.</p>\n<p>Thanks for creating an account at %%SITENAME%%!</p>','1','<P>This page is displayed when the user has successfully created an account and the email containing their password has been sent. It should be a self-contained bit of HTML telling the user to look for the email, and may contain any welcome message you like. The special keys recognised are:</P>\n<DL>\n <DT>EMAIL</DT>\n <DD>The email address the confirmation email was sent to</DD>\n <DT>SITENAME</DT>\n <DD>The name of the site, as set in the site control <B>sitename</B></DD>\n</DL>','Accounts','default','en');
826a830
> INSERT INTO patches VALUES ('1_0-dev',27,'NewUserHtml','sql');
848c852
< 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');
---
> 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,make_new_accounts',0,'All permissions');
1477c1481
< 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,\nstory_displaystatus_select,\nstory_commentstatus_select','<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 ('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,\nstory_displaystatus_select,\nstory_commentstatus_select,\nmake_new_accounts','<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 th!
is 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');