diff options
Diffstat (limited to 'lib')
-rw-r--r-- | lib/private/AppFramework/Http/Request.php | 3 | ||||
-rw-r--r-- | lib/private/Log/File.php | 8 |
2 files changed, 6 insertions, 5 deletions
diff --git a/lib/private/AppFramework/Http/Request.php b/lib/private/AppFramework/Http/Request.php index 3f1e6fd951a..b39ae3e8c0c 100644 --- a/lib/private/AppFramework/Http/Request.php +++ b/lib/private/AppFramework/Http/Request.php @@ -578,7 +578,8 @@ class Request implements \ArrayAccess, \Countable, IRequest { } if(empty($this->requestId)) { - $this->requestId = $this->secureRandom->generate(20); + $validChars = ISecureRandom::CHAR_UPPER . ISecureRandom::CHAR_LOWER . ISecureRandom::CHAR_DIGITS; + $this->requestId = $this->secureRandom->generate(20, $validChars); } return $this->requestId; diff --git a/lib/private/Log/File.php b/lib/private/Log/File.php index 8011f63ab13..97ec5012b1f 100644 --- a/lib/private/Log/File.php +++ b/lib/private/Log/File.php @@ -106,14 +106,14 @@ class File { $version = $config->getValue('version', ''); $entry = compact( 'reqId', - 'remoteAddr', - 'app', - 'message', 'level', 'time', + 'remoteAddr', + 'user', + 'app', 'method', 'url', - 'user', + 'message', 'userAgent', 'version' ); |