summaryrefslogtreecommitdiff
path: root/program
diff options
context:
space:
mode:
authorthomascube <thomas@roundcube.net>2008-06-20 08:46:16 +0000
committerthomascube <thomas@roundcube.net>2008-06-20 08:46:16 +0000
commit6ea6c9b96e33f0c6616ff270cc5b81efe216a209 (patch)
tree4a377687aa807a699db1791f42b4e8c5d8a1d7c6 /program
parent9f6adf92647e729ad1dd796447f9d4cf9859fe7a (diff)
Simplify step inclusion in controller (index.php)
Diffstat (limited to 'program')
-rw-r--r--program/include/main.inc2
-rw-r--r--program/include/rcmail.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/program/include/main.inc b/program/include/main.inc
index 2740ee35d..a29978a5e 100644
--- a/program/include/main.inc
+++ b/program/include/main.inc
@@ -475,7 +475,7 @@ function get_input_value($fname, $source, $allow_html=FALSE, $charset=NULL)
*/
function asciiwords($str)
{
- return preg_replace('/[^a-z0-9.-_]/i', '', $str);
+ return preg_replace('/[^a-z0-9._-]/i', '', $str);
}
/**
diff --git a/program/include/rcmail.php b/program/include/rcmail.php
index 0b5bcdb95..009ad0448 100644
--- a/program/include/rcmail.php
+++ b/program/include/rcmail.php
@@ -84,7 +84,7 @@ class rcmail
// set task and action properties
$this->set_task(strip_quotes(get_input_value('_task', RCUBE_INPUT_GPC)));
- $this->action = strip_quotes(get_input_value('_action', RCUBE_INPUT_GPC));
+ $this->action = asciiwords(get_input_value('_action', RCUBE_INPUT_GPC));
// connect to database
$GLOBALS['DB'] = $this->get_dbh();