extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-27 09:09:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

* All apps: fix random failure in drag-n-drop or pasting images into CKEditor eg. mail compose

Browse Source
This commit is contained in:
Ralf Becker 2017-01-27 17:37:04 +01:00
parent a1687cad68
commit 388bffc48b
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
api/src/Etemplate/Request.php
View File

@ -357,12 +357,13 @@ class Request
*/ */
static function request_id() static function request_id()
{ {
// As we replace spaces with + for those account ids which contain spaces, therefore we need to do the same for getting request id too. // replace url-unsafe chars with _ to not run into url-encoding issues when used in a url
$userID = str_replace(' ', '+', rawurldecode($GLOBALS['egw_info']['user']['account_lid'])); $userID = preg_replace('/[^a-z0-9_\\.@-]/i', '_', $GLOBALS['egw_info']['user']['account_lid']);
// generate random token (using oppenssl if available otherwise mt_rand based Auth::randomstring) // generate random token (using oppenssl if available otherwise mt_rand based Auth::randomstring)
$token = function_exists('openssl_random_pseudo_bytes') ? $token = function_exists('openssl_random_pseudo_bytes') ?
base64_encode(openssl_random_pseudo_bytes(32)) : // replace + with _ to not run into url-encoding issues when used in a url
str_replace('+', '_', base64_encode(openssl_random_pseudo_bytes(32))) :
\EGroupware\Api\Auth::randomstring(44); \EGroupware\Api\Auth::randomstring(44);
return $GLOBALS['egw_info']['flags']['currentapp'].'_'.$userID.'_'.$token; return $GLOBALS['egw_info']['flags']['currentapp'].'_'.$userID.'_'.$token;