Simplify step inclusion in controller (index.php)

git-svn-id: https://svn.roundcube.net/trunk@1560 208e9e7b-5314-0410-a742-e7e81cd9613c

2 files changed, 2 insertions, 2 deletions

diff --git a/roundcubemail/program/include/main.inc b/roundcubemail/program/include/main.inc
index 2740ee35d..a29978a5e 100644
--- a/roundcubemail/program/include/main.inc
+++ b/roundcubemail/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/roundcubemail/program/include/rcmail.php b/roundcubemail/program/include/rcmail.php
index 0b5bcdb95..009ad0448 100644
--- a/roundcubemail/program/include/rcmail.php
+++ b/roundcubemail/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();