[pLog-svn] r4244 - in plog/branches/lifetype-1.1.2: install locale
templates/admin
reto at devel.lifetype.net
reto at devel.lifetype.net
Sun Nov 5 19:59:25 GMT 2006
Author: reto
Date: 2006-11-05 19:59:24 +0000 (Sun, 05 Nov 2006)
New Revision: 4244
Modified:
plog/branches/lifetype-1.1.2/install/defaultconfig.properties.php
plog/branches/lifetype-1.1.2/locale/locale_en_UK.php
plog/branches/lifetype-1.1.2/templates/admin/globalsettings_security.template
Log:
removed the config options content_filter_enabled and ip_address_filter_enabled from the interface as well as the installation. I guess there is no easy way to remove these config options during an upgrade process...
if everybody agrees on this commit, i'll remove the locales for other languages, too.
Modified: plog/branches/lifetype-1.1.2/install/defaultconfig.properties.php
===================================================================
--- plog/branches/lifetype-1.1.2/install/defaultconfig.properties.php 2006-11-05 19:55:40 UTC (rev 4243)
+++ plog/branches/lifetype-1.1.2/install/defaultconfig.properties.php 2006-11-05 19:59:24 UTC (rev 4244)
@@ -63,8 +63,6 @@
$Inserts['bayesian_filter_max_length_token'] = "INSERT INTO {dbprefix}config (config_key, config_value, value_type) VALUES ('bayesian_filter_max_length_token', '100', 1);";
$Inserts['bayesian_filter_number_significant_tokens'] = "INSERT INTO {dbprefix}config (config_key, config_value, value_type) VALUES ('bayesian_filter_number_significant_tokens', 15, 1);";
$Inserts['bayesian_filter_spam_comments_action'] = "INSERT INTO {dbprefix}config (config_key, config_value, value_type) VALUES ('bayesian_filter_spam_comments_action', 0, 1 );";
-$Inserts['ip_address_filter_enabled'] = "INSERT INTO {dbprefix}config (config_key, config_value, value_type) VALUES ('ip_address_filter_enabled', 1, 1 );";
-$Inserts['content_filter_enabled'] = "INSERT INTO {dbprefix}config (config_key, config_value, value_type) VALUES ('content_filter_enabled', 1, 1 );";
$Inserts['thumbnail_format'] = "INSERT INTO {dbprefix}config (config_key, config_value, value_type) VALUES ('thumbnail_format','same',3);";
$Inserts['resources_folder'] = "INSERT INTO {dbprefix}config (config_key, config_value, value_type) VALUES ('resources_folder','./gallery/',3);";
$Inserts['beautify_comments_text'] = "INSERT INTO {dbprefix}config (config_key, config_value, value_type) VALUES ('beautify_comments_text', '1', 1);";
Modified: plog/branches/lifetype-1.1.2/locale/locale_en_UK.php
===================================================================
--- plog/branches/lifetype-1.1.2/locale/locale_en_UK.php 2006-11-05 19:55:40 UTC (rev 4243)
+++ plog/branches/lifetype-1.1.2/locale/locale_en_UK.php 2006-11-05 19:59:24 UTC (rev 4244)
@@ -771,8 +771,6 @@
$messages['help_default_rss_profile'] = 'Default version of RSS or Atom used to syndicate contents unless otherwise specified. [Default = RSS 1.0]';
// security
$messages['help_security_pipeline_enabled'] = 'Enable the security pipeline and all related filters. This also affects plugins that register new filters. [Default = Yes]';
-$messages['help_ip_address_filter_enabled'] = 'Enable the IP address filter. The security pipeline also needs to be enabled in order for this feature to work. [Default = Yes]';
-$messages['help_content_filter_enabled'] = 'Enable the regular expression-based content filter. The security pipeline also needs to be enabled in order for this feature to work. [Default = Yes]';
$messages['help_maximum_comment_size'] = 'Maximum size in bytes that a comment can have, set to 0 to disable this feature. [Default = 0]';
// bayesian filter
$messages['help_bayesian_filter_enabled'] = 'Enable the Bayesian filter for improved automatic spam filtering. [Default = Yes]';
@@ -1045,7 +1043,7 @@
$messages['first_day_of_week_label'] = 'First Day of Week';
$messages['first_day_of_week_help'] = 'First Day of Week in calendar.';
-$messages['help_subdomains_base_url'] = 'When subdomains are enabled, this base URL is used instead of base_url. Use {blogname} to get the blog name, {username} to get the name of the user owner of the blog and {blogdomain} to allow the user to specify any subdomain in order to generate a link to a blog. (e.g.. http://{blogname}.yourdomain.com)';
+$messages['help_subdomains_base_url'] = 'When subdomains are enabled, this base URL is used instead of base_url. Use {blogname} to get the blog name, {username} to get the name of the user owner of the blog and {blogdomain} to allow the user to specify any subdomain in order to generate a link to a blog. (e.g. http://{blogname}.yourdomain.com)';
$messages['registration_default_subject'] = 'LifeType registration confirmation';
Modified: plog/branches/lifetype-1.1.2/templates/admin/globalsettings_security.template
===================================================================
--- plog/branches/lifetype-1.1.2/templates/admin/globalsettings_security.template 2006-11-05 19:55:40 UTC (rev 4243)
+++ plog/branches/lifetype-1.1.2/templates/admin/globalsettings_security.template 2006-11-05 19:59:24 UTC (rev 4244)
@@ -6,20 +6,6 @@
<input class="radio" type="radio" id="config[security_pipeline_enabled]" name="config[security_pipeline_enabled]" value="1" {if $security_pipeline_enabled == 1 } checked="checked" {/if} />{$locale->tr("yes")}
<input class="radio" type="radio" id="config[security_pipeline_enabled]" name="config[security_pipeline_enabled]" value="0" {if $security_pipeline_enabled == 0 } checked="checked" {/if} />{$locale->tr("no")}
</div>
- <!-- ip_address_filter_enabled -->
- <div class="field">
- <label for="config[ip_address_filter_enabled]">ip_address_filter_enabled</label>
- <div class="formHelp">{$locale->tr("help_ip_address_filter_enabled")}</div>
- <input class="radio" type="radio" id="config[ip_address_filter_enabled]" name="config[ip_address_filter_enabled]" value="1" {if $ip_address_filter_enabled == 1 } checked="checked" {/if} />{$locale->tr("yes")}
- <input class="radio" type="radio" id="config[ip_address_filter_enabled]" name="config[ip_address_filter_enabled]" value="0" {if $ip_address_filter_enabled == 0 } checked="checked" {/if} />{$locale->tr("no")}
- </div>
- <!-- content_filter_enabled -->
- <div class="field">
- <label for="config[content_filter_enabled]">content_filter_enabled</label>
- <div class="formHelp">{$locale->tr("help_content_filter_enabled")}</div>
- <input class="radio" type="radio" id="config[content_filter_enabled]" name="config[content_filter_enabled]" value="1" {if $content_filter_enabled == 1 } checked="checked" {/if} />{$locale->tr("yes")}
- <input class="radio" type="radio" id="config[content_filter_enabled]" name="config[content_filter_enabled]" value="0" {if $content_filter_enabled == 0 } checked="checked" {/if} />{$locale->tr("no")}
- </div>
<!-- maximum size of a comment -->
<div class="field">
<label for="config[maximum_comment_size]">maximum_comment_size</label>
More information about the pLog-svn
mailing list