[geeklog-cvs] geeklog: Fixed bug that the Spam-x config option named "action" ...
geeklog-cvs at lists.geeklog.net
geeklog-cvs at lists.geeklog.net
Thu Mar 10 14:36:06 EST 2011
changeset 8149:70907d377b14
url: http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/70907d377b14
user: Tom <websitemaster at cogeco.net>
date: Thu Mar 10 14:35:27 2011 -0500
description:
Fixed bug that the Spam-x config option named "action" created in the new configuration ui (IE 8 and JavaScript problem). Config option is now named "spamx_action".
diffstat:
plugins/spamx/configuration_validation.php | 2 +-
plugins/spamx/functions.inc | 2 +-
plugins/spamx/install_defaults.php | 2 +-
plugins/spamx/language/english.php | 2 +-
plugins/spamx/sql/mssql_updates.php | 6 ++++--
plugins/spamx/sql/mysql_updates.php | 6 ++++--
plugins/spamx/sql/pgsql_updates.php | 6 ++++--
public_html/docs/english/spamx.html | 2 +-
8 files changed, 17 insertions(+), 11 deletions(-)
diffs (129 lines):
diff -r b4edcfea31f5 -r 70907d377b14 plugins/spamx/configuration_validation.php
--- a/plugins/spamx/configuration_validation.php Thu Mar 10 14:07:42 2011 -0500
+++ b/plugins/spamx/configuration_validation.php Thu Mar 10 14:35:27 2011 -0500
@@ -34,7 +34,7 @@
$_CONF_VALIDATE['spamx']['logging'] = array('rule' => 'boolean');
$_CONF_VALIDATE['spamx']['timeout'] = array('rule' => 'numeric');
$_CONF_VALIDATE['spamx']['notification_email'] = array('rule' => 'email');
-$_CONF_VALIDATE['spamx']['action'] = array('rule' => 'numeric');
+$_CONF_VALIDATE['spamx']['spamx_action'] = array('rule' => 'numeric');
?>
diff -r b4edcfea31f5 -r 70907d377b14 plugins/spamx/functions.inc
--- a/plugins/spamx/functions.inc Thu Mar 10 14:07:42 2011 -0500
+++ b/plugins/spamx/functions.inc Thu Mar 10 14:35:27 2011 -0500
@@ -346,7 +346,7 @@
$spamx_path = $_CONF['path'] . 'plugins/spamx/';
if (($action == -1) || ($action == '')) {
- $action = $_SPX_CONF['action'];
+ $action = $_SPX_CONF['spamx_action'];
}
// Set up Spamx_Action array
diff -r b4edcfea31f5 -r 70907d377b14 plugins/spamx/install_defaults.php
--- a/plugins/spamx/install_defaults.php Thu Mar 10 14:07:42 2011 -0500
+++ b/plugins/spamx/install_defaults.php Thu Mar 10 14:35:27 2011 -0500
@@ -105,7 +105,7 @@
0, 0, null, 30, true, 'spamx', 0);
$c->add('notification_email', $_SPX_DEFAULT['notification_email'],
'text', 0, 0, null, 40, $enable_email, 'spamx', 0);
- $c->add('action', $_SPX_DEFAULT['action'], 'text',
+ $c->add('spamx_action', $_SPX_DEFAULT['action'], 'text',
0, 0, null, 50, false, 'spamx', 0);
}
diff -r b4edcfea31f5 -r 70907d377b14 plugins/spamx/language/english.php
--- a/plugins/spamx/language/english.php Thu Mar 10 14:07:42 2011 -0500
+++ b/plugins/spamx/language/english.php Thu Mar 10 14:35:27 2011 -0500
@@ -144,7 +144,7 @@
);
$LANG_confignames['spamx'] = array(
- 'action' => 'Spam-X Actions',
+ 'spamx_action' => 'Spam-X Actions',
'notification_email' => 'Notification Email',
'logging' => 'Enable Logging',
'timeout' => 'Timeout'
diff -r b4edcfea31f5 -r 70907d377b14 plugins/spamx/sql/mssql_updates.php
--- a/plugins/spamx/sql/mssql_updates.php Thu Mar 10 14:07:42 2011 -0500
+++ b/plugins/spamx/sql/mssql_updates.php Thu Mar 10 14:35:27 2011 -0500
@@ -42,7 +42,9 @@
'1.2.1' => array(
// Set new Tab column to whatever fieldset is
"UPDATE {$_TABLES['conf_values']} SET tab = fieldset WHERE group_name = 'spamx'",
- "INSERT INTO {$_TABLES['features']} (ft_name, ft_descr, ft_gl_core) VALUES ('config.spamx.tab_main', 'Access to configure Spam-x main settings', 0)"
+ "INSERT INTO {$_TABLES['features']} (ft_name, ft_descr, ft_gl_core) VALUES ('config.spamx.tab_main', 'Access to configure Spam-x main settings', 0)",
+ // Rename the action config option since it is causes JavaScript issues in the config and IE 8
+ "UPDATE {$_TABLES['conf_values']} SET name = 'spamx_name' WHERE name = 'action'"
)
);
@@ -55,7 +57,7 @@
{
global $_TABLES;
- // Add in security rights for Calendar Admin
+ // Add in security rights for Spam-x Admin
$group_id = DB_getItem($_TABLES['groups'], 'grp_id',
"grp_name = 'Spamx Admin'");
diff -r b4edcfea31f5 -r 70907d377b14 plugins/spamx/sql/mysql_updates.php
--- a/plugins/spamx/sql/mysql_updates.php Thu Mar 10 14:07:42 2011 -0500
+++ b/plugins/spamx/sql/mysql_updates.php Thu Mar 10 14:35:27 2011 -0500
@@ -42,7 +42,9 @@
'1.2.1' => array(
// Set new Tab column to whatever fieldset is
"UPDATE {$_TABLES['conf_values']} SET tab = fieldset WHERE group_name = 'spamx'",
- "INSERT INTO {$_TABLES['features']} (ft_name, ft_descr, ft_gl_core) VALUES ('config.spamx.tab_main', 'Access to configure Spam-x main settings', 0)"
+ "INSERT INTO {$_TABLES['features']} (ft_name, ft_descr, ft_gl_core) VALUES ('config.spamx.tab_main', 'Access to configure Spam-x main settings', 0)",
+ // Rename the action config option since it is causes JavaScript issues in the config and IE 8
+ "UPDATE {$_TABLES['conf_values']} SET name = 'spamx_name' WHERE name = 'action'"
)
);
@@ -55,7 +57,7 @@
{
global $_TABLES;
- // Add in security rights for Calendar Admin
+ // Add in security rights for Spam-x Admin
$group_id = DB_getItem($_TABLES['groups'], 'grp_id',
"grp_name = 'Spamx Admin'");
diff -r b4edcfea31f5 -r 70907d377b14 plugins/spamx/sql/pgsql_updates.php
--- a/plugins/spamx/sql/pgsql_updates.php Thu Mar 10 14:07:42 2011 -0500
+++ b/plugins/spamx/sql/pgsql_updates.php Thu Mar 10 14:35:27 2011 -0500
@@ -37,7 +37,9 @@
'1.2.1' => array(
// Set new Tab column to whatever fieldset is
"UPDATE {$_TABLES['conf_values']} SET tab = fieldset WHERE group_name = 'spamx'",
- "INSERT INTO {$_TABLES['features']} (ft_name, ft_descr, ft_gl_core) VALUES ('config.spamx.tab_main', 'Access to configure Spam-x main settings', 0)"
+ "INSERT INTO {$_TABLES['features']} (ft_name, ft_descr, ft_gl_core) VALUES ('config.spamx.tab_main', 'Access to configure Spam-x main settings', 0)",
+ // Rename the action config option since it is causes JavaScript issues in the config and IE 8
+ "UPDATE {$_TABLES['conf_values']} SET name = 'spamx_name' WHERE name = 'action'"
)
);
@@ -50,7 +52,7 @@
{
global $_TABLES;
- // Add in security rights for Calendar Admin
+ // Add in security rights for Spam-x Admin
$group_id = DB_getItem($_TABLES['groups'], 'grp_id',
"grp_name = 'Spamx Admin'");
diff -r b4edcfea31f5 -r 70907d377b14 public_html/docs/english/spamx.html
--- a/public_html/docs/english/spamx.html Thu Mar 10 14:07:42 2011 -0500
+++ b/public_html/docs/english/spamx.html Thu Mar 10 14:35:27 2011 -0500
@@ -299,7 +299,7 @@
<a href="#action">action module</a> is enabled.</td>
</tr>
<tr class="r2">
- <td><a name="desc_action">action</a></td>
+ <td><a name="desc_spamx_action">spamx_action</a></td>
<td>128</td>
<td>This only exists as a fallback in case <a
href="config.html#desc_spamx">$_CONF['spamx']</a> in Geeklog's main
More information about the geeklog-cvs
mailing list