Mirrors
/
nextcloud-server
mirror of https://github.com/nextcloud/server
3
0
Fork 0
Code Releases Activity
Browse Source

Finally remove \OCP\JSON 

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
pull/8943/head
Roeland Jago Douma 8 years ago
parent
3dac15a891
commit
26073eac0c
No known key found for this signature in database GPG Key ID: F941078878347C0C
4 changed files with 12 additions and 178 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      apps/files_external/ajax/applicable.php
  2. 4
      apps/files_versions/ajax/getVersions.php
  3. 18
      apps/user_ldap/ajax/wizard.php
  4. 166
      lib/public/JSON.php

2
apps/files_external/ajax/applicable.php
View File

@ -51,4 +51,4 @@ foreach (\OC::$server->getUserManager()->searchDisplayName($pattern, $limit, $of
$results = array('groups' => $groups, 'users' => $users); $results = array('groups' => $groups, 'users' => $users);
\\OC_JSON::success($results);
\OC_JSON::success($results);

4
apps/files_versions/ajax/getVersions.php
View File

@ -47,10 +47,10 @@ if( $versions ) {
unset($version['path']); unset($version['path']);
} }
\\OC_JSON::success(array('data' => array('versions' => $versions, 'endReached' => $endReached)));
\OC_JSON::success(array('data' => array('versions' => $versions, 'endReached' => $endReached)));
} else { } else {
\\OC_JSON::success(array('data' => array('versions' => [], 'endReached' => true)));
\OC_JSON::success(array('data' => array('versions' => [], 'endReached' => true)));
} }

18
apps/user_ldap/ajax/wizard.php
View File

@ -36,13 +36,13 @@
$l = \OC::$server->getL10N('user_ldap'); $l = \OC::$server->getL10N('user_ldap');
if(!isset($_POST['action'])) { if(!isset($_POST['action'])) {
\\OC_JSON::error(array('message' => $l->t('No action specified')));
\OC_JSON::error(array('message' => $l->t('No action specified')));
} }
$action = (string)$_POST['action']; $action = (string)$_POST['action'];
if(!isset($_POST['ldap_serverconfig_chooser'])) { if(!isset($_POST['ldap_serverconfig_chooser'])) {
\\OC_JSON::error(array('message' => $l->t('No configuration specified')));
\OC_JSON::error(array('message' => $l->t('No configuration specified')));
} }
$prefix = (string)$_POST['ldap_serverconfig_chooser']; $prefix = (string)$_POST['ldap_serverconfig_chooser'];
@ -98,10 +98,10 @@ switch($action) {
exit; exit;
} }
} catch (\Exception $e) { } catch (\Exception $e) {
\\OC_JSON::error(array('message' => $e->getMessage(), 'code' => $e->getCode()));
\OC_JSON::error(array('message' => $e->getMessage(), 'code' => $e->getCode()));
exit; exit;
} }
\\OC_JSON::error();
\OC_JSON::error();
exit; exit;
break; break;
@ -114,10 +114,10 @@ switch($action) {
exit; exit;
} }
} catch (\Exception $e) { } catch (\Exception $e) {
\\OC_JSON::error(array('message' => $e->getMessage()));
\OC_JSON::error(array('message' => $e->getMessage()));
exit; exit;
} }
\\OC_JSON::error();
\OC_JSON::error();
exit; exit;
break; break;
} }
@ -126,14 +126,14 @@ switch($action) {
$key = isset($_POST['cfgkey']) ? $_POST['cfgkey'] : false; $key = isset($_POST['cfgkey']) ? $_POST['cfgkey'] : false;
$val = isset($_POST['cfgval']) ? $_POST['cfgval'] : null; $val = isset($_POST['cfgval']) ? $_POST['cfgval'] : null;
if($key === false || is_null($val)) { if($key === false || is_null($val)) {
\\OC_JSON::error(array('message' => $l->t('No data specified')));
\OC_JSON::error(array('message' => $l->t('No data specified')));
exit; exit;
} }
$cfg = array($key => $val); $cfg = array($key => $val);
$setParameters = array(); $setParameters = array();
$configuration->setConfiguration($cfg, $setParameters); $configuration->setConfiguration($cfg, $setParameters);
if(!in_array($key, $setParameters)) { if(!in_array($key, $setParameters)) {
\\OC_JSON::error(array('message' => $l->t($key.
\OC_JSON::error(array('message' => $l->t($key.
' Could not set configuration %s', $setParameters[0]))); ' Could not set configuration %s', $setParameters[0])));
exit; exit;
} }
@ -144,6 +144,6 @@ switch($action) {
\OC_JSON::success(); \OC_JSON::success();
break; break;
default: default:
\\OC_JSON::error(array('message' => $l->t('Action does not exist')));
\OC_JSON::error(array('message' => $l->t('Action does not exist')));
break; break;
} }

166
lib/public/JSON.php
View File

@ -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();
}
}
Write Preview
Loading…
Cancel
Save