From 32cc36d269b665bd6e77b666446a8839be6c3f81 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Mon, 26 Mar 2012 08:06:17 +0000 Subject: [PATCH] allow dash in app-name like in "sitemgr-site" --- phpgwapi/inc/common_functions.inc.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/phpgwapi/inc/common_functions.inc.php b/phpgwapi/inc/common_functions.inc.php index 1d0c01e0e8..315e06a0b2 100755 --- a/phpgwapi/inc/common_functions.inc.php +++ b/phpgwapi/inc/common_functions.inc.php @@ -1306,13 +1306,13 @@ foreach(array('_GET','_POST','_REQUEST','HTTP_GET_VARS','HTTP_POST_VARS') as $n //if (is_array($GLOBALS['egw_unset_vars'])) { echo "egw_unset_vars=
".htmlspecialchars(print_r($GLOBALS['egw_unset_vars'],true))."
"; exit; } // check menuaction and die if it contains something nasty or unexpected -if (isset($_GET['menuaction']) && !preg_match('/^[A-Za-z0-9_]+\.[A-Za-z0-9_]+\.[A-Za-z0-9_]+$/',$_GET['menuaction'])) +if (isset($_GET['menuaction']) && !preg_match('/^[A-Za-z0-9_-]+\.[A-Za-z0-9_]+\.[A-Za-z0-9_]+$/',$_GET['menuaction'])) { die('Invalid menuaction!'); } // $GLOBALS[egw_info][flags][currentapp] and die if it contains something nasty or unexpected if (isset($GLOBALS['egw_info']) && isset($GLOBALS['egw_info']['flags']) && - isset($GLOBALS['egw_info']['flags']['currentapp']) && !preg_match('/^[A-Za-z0-9_]+$/',$GLOBALS['egw_info']['flags']['currentapp'])) + isset($GLOBALS['egw_info']['flags']['currentapp']) && !preg_match('/^[A-Za-z0-9_-]+$/',$GLOBALS['egw_info']['flags']['currentapp'])) { die('Invalid $GLOBALS[egw_info][flags][currentapp]!'); }