summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/base.php4
-rw-r--r--lib/composer/composer/autoload_classmap.php1
-rw-r--r--lib/composer/composer/autoload_static.php1
-rw-r--r--lib/public/JSON.php166
4 files changed, 2 insertions, 170 deletions
diff --git a/lib/base.php b/lib/base.php
index 0c78d235c59..8af674e7ee8 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -944,8 +944,8 @@ class OC {
&& $request->getMethod() === 'POST'
&& ((array)$request->getParam('appid')) !== ''
) {
- \OCP\JSON::callCheck();
- \OCP\JSON::checkAdminUser();
+ \OC_JSON::callCheck();
+ \OC_JSON::checkAdminUser();
$appIds = (array)$request->getParam('appid');
foreach($appIds as $appId) {
$appId = \OC_App::cleanAppId($appId);
diff --git a/lib/composer/composer/autoload_classmap.php b/lib/composer/composer/autoload_classmap.php
index 032b7f5ea17..32534c2a9e9 100644
--- a/lib/composer/composer/autoload_classmap.php
+++ b/lib/composer/composer/autoload_classmap.php
@@ -222,7 +222,6 @@ return array(
'OCP\\IUserManager' => $baseDir . '/lib/public/IUserManager.php',
'OCP\\IUserSession' => $baseDir . '/lib/public/IUserSession.php',
'OCP\\Image' => $baseDir . '/lib/public/Image.php',
- 'OCP\\JSON' => $baseDir . '/lib/public/JSON.php',
'OCP\\L10N\\IFactory' => $baseDir . '/lib/public/L10N/IFactory.php',
'OCP\\LDAP\\IDeletionFlagSupport' => $baseDir . '/lib/public/LDAP/IDeletionFlagSupport.php',
'OCP\\LDAP\\ILDAPProvider' => $baseDir . '/lib/public/LDAP/ILDAPProvider.php',
diff --git a/lib/composer/composer/autoload_static.php b/lib/composer/composer/autoload_static.php
index 8159a65f3ce..d37777001b6 100644
--- a/lib/composer/composer/autoload_static.php
+++ b/lib/composer/composer/autoload_static.php
@@ -252,7 +252,6 @@ class ComposerStaticInit53792487c5a8370acc0b06b1a864ff4c
'OCP\\IUserManager' => __DIR__ . '/../../..' . '/lib/public/IUserManager.php',
'OCP\\IUserSession' => __DIR__ . '/../../..' . '/lib/public/IUserSession.php',
'OCP\\Image' => __DIR__ . '/../../..' . '/lib/public/Image.php',
- 'OCP\\JSON' => __DIR__ . '/../../..' . '/lib/public/JSON.php',
'OCP\\L10N\\IFactory' => __DIR__ . '/../../..' . '/lib/public/L10N/IFactory.php',
'OCP\\LDAP\\IDeletionFlagSupport' => __DIR__ . '/../../..' . '/lib/public/LDAP/IDeletionFlagSupport.php',
'OCP\\LDAP\\ILDAPProvider' => __DIR__ . '/../../..' . '/lib/public/LDAP/ILDAPProvider.php',
diff --git a/lib/public/JSON.php b/lib/public/JSON.php
deleted file mode 100644
index 6138aec1f49..00000000000
--- a/lib/public/JSON.php
+++ /dev/null
@@ -1,166 +0,0 @@
-<?php
-/**
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- *
- * @author Bart Visscher <bartv@thisnet.nl>
- * @author Frank Karlitschek <frank@karlitschek.de>
- * @author Lukas Reschke <lukas@statuscode.ch>
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author Roeland Jago Douma <roeland@famdouma.nl>
- * @author Thomas Müller <thomas.mueller@tmit.eu>
- * @author Thomas Tanghus <thomas@tanghus.net>
- * @author Vincent Petry <pvince81@owncloud.com>
- *
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program 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, version 3,
- * along with this program. If not, see <http://www.gnu.org/licenses/>
- *
- */
-
-/**
- * Public interface of ownCloud for apps to use.
- * JSON Class
- */
-
-// use OCP namespace for all classes that are considered public.
-// This means that they should be used by apps instead of the internal ownCloud classes
-namespace OCP;
-
-/**
- * This class provides convenient functions to generate and send JSON data. Useful for Ajax calls
- * @deprecated 8.1.0 Use a AppFramework JSONResponse instead
- */
-class JSON {
- /**
- * Check if the user is logged in, send json error msg if not.
- *
- * This method checks if a user is logged in. If not, a json error
- * response will be return and the method will exit from execution
- * of the script.
- * The returned json will be in the format:
- *
- * {"status":"error","data":{"message":"Authentication error."}}
- *
- * Add this call to the start of all ajax method files that requires
- * an authenticated user.
- * @deprecated 8.1.0 Use annotation based ACLs from the AppFramework instead
- *
- * @suppress PhanDeprecatedFunction
- */
- public static function checkLoggedIn() {
- \OC_JSON::checkLoggedIn();
- }
-
- /**
- * Check an ajax get/post call if the request token is valid.
- *
- * This method checks for a valid variable 'requesttoken' in $_GET,
- * $_POST and $_SERVER. If a valid token is not found, a json error
- * response will be return and the method will exit from execution
- * of the script.
- * The returned json will be in the format:
- *
- * {"status":"error","data":{"message":"Token expired. Please reload page."}}
- *
- * Add this call to the start of all ajax method files that creates,
- * updates or deletes anything.
- * In cases where you e.g. use an ajax call to load a dialog containing
- * a submittable form, you will need to add the requesttoken first as a
- * parameter to the ajax call, then assign it to the template and finally
- * add a hidden input field also named 'requesttoken' containing the value.
- * @deprecated 8.1.0 Use annotation based CSRF checks from the AppFramework instead
- *
- * @suppress PhanDeprecatedFunction
- */
- public static function callCheck() {
- \OC_JSON::callCheck();
- }
-
- /**
- * Send json success msg
- *
- * Return a json success message with optional extra data.
- * @see \OCP\JSON::error() for the format to use.
- *
- * @param array $data The data to use
- * @deprecated 8.1.0 Use a AppFramework JSONResponse instead
- * @suppress PhanDeprecatedFunction
- */
- public static function success( $data = array() ) {
- \OC_JSON::success($data);
- }
-
- /**
- * Send json error msg
- *
- * Return a json error message with optional extra data for
- * error message or app specific data.
- *
- * Example use:
- *
- * $id = [some value]
- * OCP\JSON::error(array('data':array('message':'An error happened', 'id': $id)));
- *
- * Will return the json formatted string:
- *
- * {"status":"error","data":{"message":"An error happened", "id":[some value]}}
- *
- * @param array $data The data to use
- * @deprecated 8.1.0 Use a AppFramework JSONResponse instead
- * @suppress PhanDeprecatedFunction
- */
- public static function error( $data = array() ) {
- \OC_JSON::error($data);
- }
-
- /**
- * Check if the App is enabled and send JSON error message instead
- *
- * This method checks if a specific app is enabled. If not, a json error
- * response will be return and the method will exit from execution
- * of the script.
- * The returned json will be in the format:
- *
- * {"status":"error","data":{"message":"Application is not enabled."}}
- *
- * Add this call to the start of all ajax method files that requires
- * a specific app to be enabled.
- *
- * @param string $app The app to check
- * @deprecated 8.1.0 Use the AppFramework instead. It will automatically check if the app is enabled.
- * @suppress PhanDeprecatedFunction
- */
- public static function checkAppEnabled( $app ) {
- \OC_JSON::checkAppEnabled($app);
- }
-
- /**
- * Check if the user is a admin, send json error msg if not
- *
- * This method checks if the current user has admin rights. If not, a json error
- * response will be return and the method will exit from execution
- * of the script.
- * The returned json will be in the format:
- *
- * {"status":"error","data":{"message":"Authentication error."}}
- *
- * Add this call to the start of all ajax method files that requires
- * administrative rights.
- *
- * @deprecated 8.1.0 Use annotation based ACLs from the AppFramework instead
- * @suppress PhanDeprecatedFunction
- */
- public static function checkAdminUser() {
- \OC_JSON::checkAdminUser();
- }
-}
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-20 01:17:03 +0000