diff options
author | Thomas Tanghus <thomas@tanghus.net> | 2012-11-05 12:06:59 +0100 |
---|---|---|
committer | Thomas Tanghus <thomas@tanghus.net> | 2012-11-05 12:06:59 +0100 |
commit | 1147dc977422e827a201fa081abd07721231d072 (patch) | |
tree | 203d47297c49545a67bbdd98cbe137b255a5d6d8 /core/ajax | |
parent | 88b91a7304f2de998f71a674f4f62e85f5b83e54 (diff) | |
parent | 135680e50bf760d55a1bcaaaa02f959bde396c52 (diff) | |
download | nextcloud-server-1147dc977422e827a201fa081abd07721231d072.tar.gz nextcloud-server-1147dc977422e827a201fa081abd07721231d072.zip |
Merge branch 'master' of github.com:owncloud/core into vcategories_db
Conflicts:
lib/vcategories.php
Diffstat (limited to 'core/ajax')
-rw-r--r-- | core/ajax/requesttoken.php | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/core/ajax/requesttoken.php b/core/ajax/requesttoken.php deleted file mode 100644 index 9d43a722852..00000000000 --- a/core/ajax/requesttoken.php +++ /dev/null @@ -1,40 +0,0 @@ -<?php -/** -* ownCloud -* @author Christian Reiner -* @copyright 2011-2012 Christian Reiner <foss@christian-reiner.info> -* -* This library is free software; you can redistribute it and/or -* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE -* License as published by the Free Software Foundation; either -* version 3 of the license, or any later version. -* -* This library is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU AFFERO GENERAL PUBLIC LICENSE for more details. -* -* You should have received a copy of the GNU Affero General Public -* License along with this library. -* If not, see <http://www.gnu.org/licenses/>. -* -*/ - -/** - * @file core/ajax/requesttoken.php - * @brief Ajax method to retrieve a fresh request protection token for ajax calls - * @return json: success/error state indicator including a fresh request token - * @author Christian Reiner - */ - -// don't load apps or filesystem for this task -$RUNTIME_NOAPPS = true; -$RUNTIME_NOSETUPFS = true; - -// Sanity checks -// using OCP\JSON::callCheck() below protects the token refreshing itself. -//OCP\JSON::callCheck ( ); -OCP\JSON::checkLoggedIn ( ); -// hand out a fresh token -OCP\JSON::success ( array ( 'token' => OCP\Util::callRegister() ) ); -?> |