diff options
| author | Robin Appelman <icewind@owncloud.com> | 2012-10-30 22:59:55 +0100 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2012-10-30 22:59:55 +0100 |
| commit | 6e9e2634978f08494a13bb3c5185032fc0ed7792 (patch) | |
| tree | 8f0cf5eef65c29715c84b2c253834a2fa047bbd7 /apps/files/ajax | |
| parent | 890fbb82993db294489fb6ecf14d91d7652763d1 (diff) | |
| parent | 6738275b01abf514d32171da604da8d63a2808e0 (diff) | |
| download | nextcloud-server-6e9e2634978f08494a13bb3c5185032fc0ed7792.tar.gz nextcloud-server-6e9e2634978f08494a13bb3c5185032fc0ed7792.zip | |
merge master into filesystem
Diffstat (limited to 'apps/files/ajax')
| -rw-r--r-- | apps/files/ajax/move.php | 4 | ||||
| -rw-r--r-- | apps/files/ajax/timezone.php | 5 |
2 files changed, 3 insertions, 6 deletions
diff --git a/apps/files/ajax/move.php b/apps/files/ajax/move.php index e8b0aea063f..d4eacd962a0 100644 --- a/apps/files/ajax/move.php +++ b/apps/files/ajax/move.php @@ -9,9 +9,9 @@ OCP\JSON::callCheck(); // Get data $dir = stripslashes($_GET["dir"]); $file = stripslashes($_GET["file"]); -$target = stripslashes(urldecode($_GET["target"])); +$target = stripslashes(rawurldecode($_GET["target"])); -if (OC_User::isLoggedIn() && ($dir != '' || $file != 'Shared')) { +if ($dir != '' || $file != 'Shared') { $targetFile = \OC\Files\Filesystem::normalizePath($dir . '/' . $file); $sourceFile = \OC\Files\Filesystem::normalizePath($target . '/' . $file); if(\OC\Files\Filesystem::rename($sourceFile, $targetFile)) { diff --git a/apps/files/ajax/timezone.php b/apps/files/ajax/timezone.php index b71fa3940cb..b547d162b3e 100644 --- a/apps/files/ajax/timezone.php +++ b/apps/files/ajax/timezone.php @@ -1,5 +1,2 @@ <?php - // FIXME: this should start a secure session if forcessl is enabled - // see lib/base.php for an example - //session_start(); - $_SESSION['timezone'] = $_GET['time']; +$_SESSION['timezone'] = $_GET['time']; |