summaryrefslogtreecommitdiffstats
path: root/lib/private
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2015-02-16 15:04:20 +0100
committerThomas Müller <thomas.mueller@tmit.eu>2015-02-16 15:04:20 +0100
commit9c47ab91f2c27ced6b80ce44003809358da76ee2 (patch)
tree3538375d470757fda67a8660011380c878677433 /lib/private
parentc6705ab574bf443fd867fb3c643e886fc91da885 (diff)
parent025110821f41ba55ec9deb2479ff7eb6b3e8b5c1 (diff)
downloadnextcloud-server-9c47ab91f2c27ced6b80ce44003809358da76ee2.tar.gz
nextcloud-server-9c47ab91f2c27ced6b80ce44003809358da76ee2.zip
Merge pull request #14194 from owncloud/url-encode-logout-attribute
URLEncode logout attribute
Diffstat (limited to 'lib/private')
-rw-r--r--lib/private/security/securerandom.php3
-rw-r--r--lib/private/user.php2
2 files changed, 2 insertions, 3 deletions
diff --git a/lib/private/security/securerandom.php b/lib/private/security/securerandom.php
index 2402e863fb0..b1169bff289 100644
--- a/lib/private/security/securerandom.php
+++ b/lib/private/security/securerandom.php
@@ -64,8 +64,7 @@ class SecureRandom implements ISecureRandom {
* Generate a random string of specified length.
* @param string $length The length of the generated string
* @param string $characters An optional list of characters to use if no characterlist is
- * specified 0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ./
- * is used.
+ * specified all valid base64 characters are used.
* @return string
* @throws \Exception If the generator is not initialized.
*/
diff --git a/lib/private/user.php b/lib/private/user.php
index d1fedffcaaf..10457c224f2 100644
--- a/lib/private/user.php
+++ b/lib/private/user.php
@@ -366,7 +366,7 @@ class OC_User {
return $backend->getLogoutAttribute();
}
- return 'href="' . link_to('', 'index.php') . '?logout=true&requesttoken=' . OC_Util::callRegister() . '"';
+ return 'href="' . link_to('', 'index.php') . '?logout=true&requesttoken=' . urlencode(OC_Util::callRegister()) . '"';
}
/**