extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-24 06:48:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

use egw_json_response::call() instead of deprecated script()

Browse Source
This commit is contained in:
Ralf Becker 2014-02-11 12:16:16 +00:00
parent b18dea098d
commit 6d17e87b0a
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
phpgwapi/inc/class.egw_framework.inc.php
View File

@ -1883,14 +1883,10 @@ abstract class egw_framework
{ {
if (preg_match('/^[a-z0-9_]+$/i', $app)) if (preg_match('/^[a-z0-9_]+$/i', $app))
{ {
$response = egw_json_response::get();
$pref = json_encode($GLOBALS['egw_info']['user']['preferences'][$app] ?
$GLOBALS['egw_info']['user']['preferences'][$app] : array());
// send etag header, if we are directly called (not via jsonq!) // send etag header, if we are directly called (not via jsonq!)
if (strpos($_GET['menuaction'], __FUNCTION__) !== false) if (strpos($_GET['menuaction'], __FUNCTION__) !== false)
{ {
$etag = '"'.$app.'-'.md5($pref).'"'; $etag = '"'.$app.'-'.md5(json_encode($GLOBALS['egw_info']['user']['preferences'][$app])).'"';
if (isset($_SERVER['HTTP_IF_NONE_MATCH']) && $_SERVER['HTTP_IF_NONE_MATCH'] == $etag) if (isset($_SERVER['HTTP_IF_NONE_MATCH']) && $_SERVER['HTTP_IF_NONE_MATCH'] == $etag)
{ {
header("HTTP/1.1 304 Not Modified"); header("HTTP/1.1 304 Not Modified");
@ -1898,7 +1894,8 @@ abstract class egw_framework
} }
header('ETag: '.$etag); header('ETag: '.$etag);
} }
$response->script('window.egw.set_preferences('.$pref.', "'.$app.'");'); $response = egw_json_response::get();
$response->call('egw.set_preferences', (array)$GLOBALS['egw_info']['user']['preferences'][$app], $app);
} }
} }