holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added "custom" (custom instance-specific translations) to apps which have to use home as app-name, also moved sanitrary checks before header-include

Browse Source
This commit is contained in:
Ralf Becker 2012-03-01 09:30:49 +00:00
parent 28f90f8554
commit 2175421d42
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
phpgwapi/lang.php
View File

@ -11,9 +11,13 @@
* @version $Id$
*/
// just to be sure, noone tries something nasty ...
if (!preg_match('/^[a-z0-9_]+$/i', $_GET['app'])) die('No valid application-name given!');
if (!preg_match('/^[a-z]{2}(-[a-z]{2})?$/i', $_GET['lang'])) die('No valid lang-name given!');
$GLOBALS['egw_info'] = array(
'flags' => array(
'currentapp' => in_array($_GET['app'],array('etemplate','common')) ? 'home' : $_GET['app'],
'currentapp' => in_array($_GET['app'],array('etemplate','common','custom')) ? 'home' : $_GET['app'],
'noheader' => true,
'load_translations' => false, // do not automatically load translations
'nocachecontrol' => true,
@ -22,10 +26,6 @@ $GLOBALS['egw_info'] = array(
include '../header.inc.php';
// just to be sure, noone tries something nasty ...
if (!preg_match('/^[a-z0-9_]+$/i', $_GET['app'])) die('No valid application-name given!');
if (!preg_match('/^[a-z]{2}(-[a-z]{2})?$/i', $_GET['lang'])) die('No valid lang-name given!');
// use an etag with app, lang and a hash over the creation-times of all lang-files
$etag = '"'.$_GET['app'].'-'.$_GET['lang'].'-'.md5(serialize($GLOBALS['egw_info']['server']['lang_ctimes'])).'"';