mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Move calls to \OCP\JSON to private \OC_JSON 

They should be properly fixed at some point.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
This commit is contained in:
Roeland Jago Douma 2018-03-22 13:19:29 +01:00
parent f843b7edfe
commit 3dac15a891
No known key found for this signature in database
GPG Key ID: F941078878347C0C
25 changed files with 96 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
apps/files/ajax/list.php
View File

@ -27,7 +27,7 @@
use OCP\Files\StorageNotAvailableException;
use OCP\Files\StorageInvalidException;
OCP\JSON::checkLoggedIn();
\OC_JSON::checkLoggedIn();
\OC::$server->getSession()->close();
$l = \OC::$server->getL10N('files');
@ -79,10 +79,10 @@ try {
$data['files'] = \OCA\Files\Helper::formatFileInfos($files);
$data['permissions'] = $permissions;
OCP\JSON::success(array('data' => $data));
\OC_JSON::success(array('data' => $data));
} catch (\OCP\Files\StorageNotAvailableException $e) {
\OC::$server->getLogger()->logException($e, ['app' => 'files']);
OCP\JSON::error([
\OC_JSON::error([
'data' => [
'exception' => StorageNotAvailableException::class,
'message' => $l->t('Storage is temporarily not available')
@ -90,7 +90,7 @@ try {
]);
} catch (\OCP\Files\StorageInvalidException $e) {
\OC::$server->getLogger()->logException($e, ['app' => 'files']);
OCP\JSON::error(array(
\OC_JSON::error(array(
'data' => array(
'exception' => StorageInvalidException::class,
'message' => $l->t('Storage invalid')
@ -98,7 +98,7 @@ try {
));
} catch (\Exception $e) {
\OC::$server->getLogger()->logException($e, ['app' => 'files']);
OCP\JSON::error(array(
\OC_JSON::error(array(
'data' => array(
'exception' => \Exception::class,
'message' => $l->t('Unknown error')

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

@ -21,10 +21,10 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
*/
OCP\JSON::checkAppEnabled('files_external');
OCP\JSON::callCheck();
\OC_JSON::checkAppEnabled('files_external');
\OC_JSON::callCheck();
OCP\JSON::checkAdminUser();
\OC_JSON::checkAdminUser();
$pattern = '';
$limit = null;
@ -51,4 +51,4 @@ foreach (\OC::$server->getUserManager()->searchDisplayName($pattern, $limit, $of
$results = array('groups' => $groups, 'users' => $users);
\OCP\JSON::success($results);
\\OC_JSON::success($results);

6
apps/files_external/ajax/oauth2.php
View File

@ -22,9 +22,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
*/
OCP\JSON::checkAppEnabled('files_external');
OCP\JSON::checkLoggedIn();
OCP\JSON::callCheck();
\OC_JSON::checkAppEnabled('files_external');
\OC_JSON::checkLoggedIn();
\OC_JSON::callCheck();
$l = \OC::$server->getL10N('files_external');
// TODO: implement redirect to which storage backend requested this

8
apps/files_trashbin/ajax/delete.php
View File

@ -24,8 +24,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
*/
OCP\JSON::checkLoggedIn();
OCP\JSON::callCheck();
\OC_JSON::checkLoggedIn();
\OC_JSON::callCheck();
\OC::$server->getSession()->close();
$folder = isset($_POST['dir']) ? $_POST['dir'] : '/';
@ -83,8 +83,8 @@ if ( $error ) {
}
$l = \OC::$server->getL10N('files_trashbin');
$message = $l->t("Couldn't delete %s permanently", array(rtrim($filelist, ', ')));
OCP\JSON::error(array("data" => array("message" => $message,
\OC_JSON::error(array("data" => array("message" => $message,
"success" => $success, "error" => $error)));
} else {
OCP\JSON::success(array("data" => array("success" => $success)));
\OC_JSON::success(array("data" => array("success" => $success)));
}

6
apps/files_trashbin/ajax/isEmpty.php
View File

@ -22,12 +22,12 @@
*
*/
OCP\JSON::checkLoggedIn();
OCP\JSON::callCheck();
\OC_JSON::checkLoggedIn();
\OC_JSON::callCheck();
\OC::$server->getSession()->close();
$trashStatus = OCA\Files_Trashbin\Trashbin::isEmpty(OCP\User::getUser());
OCP\JSON::success(array("data" => array("isEmpty" => $trashStatus)));
\OC_JSON::success(array("data" => array("isEmpty" => $trashStatus)));

4
apps/files_trashbin/ajax/list.php
View File

@ -21,7 +21,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
*/
OCP\JSON::checkLoggedIn();
\OC_JSON::checkLoggedIn();
\OC::$server->getSession()->close();
// Load the files
@ -44,5 +44,5 @@ $data['permissions'] = 0;
$data['directory'] = $dir;
$data['files'] = \OCA\Files_Trashbin\Helper::formatFileInfos($files);
OCP\JSON::success(array('data' => $data));
\OC_JSON::success(array('data' => $data));

8
apps/files_trashbin/ajax/undelete.php
View File

@ -26,8 +26,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
*/
OCP\JSON::checkLoggedIn();
OCP\JSON::callCheck();
\OC_JSON::checkLoggedIn();
\OC_JSON::callCheck();
\OC::$server->getSession()->close();
$dir = '/';
@ -88,8 +88,8 @@ if ( $error ) {
}
$l = OC::$server->getL10N('files_trashbin');
$message = $l->t("Couldn't restore %s", array(rtrim($filelist, ', ')));
OCP\JSON::error(array("data" => array("message" => $message,
\OC_JSON::error(array("data" => array("message" => $message,
"success" => $success, "error" => $error)));
} else {
OCP\JSON::success(array("data" => array("success" => $success)));
\OC_JSON::success(array("data" => array("success" => $success)));
}

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

@ -24,9 +24,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
*/
OCP\JSON::checkLoggedIn();
OCP\JSON::callCheck();
OCP\JSON::checkAppEnabled('files_versions');
\OC_JSON::checkLoggedIn();
\OC_JSON::callCheck();
\OC_JSON::checkAppEnabled('files_versions');
$source = (string)$_GET['source'];
$start = (int)$_GET['start'];
@ -47,10 +47,10 @@ if( $versions ) {
unset($version['path']);
}
\OCP\JSON::success(array('data' => array('versions' => $versions, 'endReached' => $endReached)));
\\OC_JSON::success(array('data' => array('versions' => $versions, 'endReached' => $endReached)));
} else {
\OCP\JSON::success(array('data' => array('versions' => [], 'endReached' => true)));
\\OC_JSON::success(array('data' => array('versions' => [], 'endReached' => true)));
}

10
apps/files_versions/ajax/rollbackVersion.php
View File

@ -26,16 +26,16 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
*/
OCP\JSON::checkLoggedIn();
OCP\JSON::checkAppEnabled('files_versions');
OCP\JSON::callCheck();
\OC_JSON::checkLoggedIn();
\OC_JSON::checkAppEnabled('files_versions');
\OC_JSON::callCheck();
$file = (string)$_GET['file'];
$revision=(int)$_GET['revision'];
if(OCA\Files_Versions\Storage::rollback( $file, $revision )) {
OCP\JSON::success(array("data" => array( "revision" => $revision, "file" => $file )));
\OC_JSON::success(array("data" => array( "revision" => $revision, "file" => $file )));
}else{
$l = \OC::$server->getL10N('files_versions');
OCP\JSON::error(array("data" => array( "message" => $l->t("Could not revert: %s", array($file) ))));
\OC_JSON::error(array("data" => array( "message" => $l->t("Could not revert: %s", array($file) ))));
}

4
apps/files_versions/download.php
View File

@ -25,8 +25,8 @@
*
*/
OCP\JSON::checkAppEnabled('files_versions');
OCP\JSON::checkLoggedIn();
\OC_JSON::checkAppEnabled('files_versions');
\OC_JSON::checkLoggedIn();
$file = $_GET['file'];
$revision=(int)$_GET['revision'];

10
apps/user_ldap/ajax/clearMappings.php
View File

@ -27,9 +27,9 @@ use OCA\User_LDAP\Mapping\UserMapping;
use OCA\User_LDAP\Mapping\GroupMapping;
// Check user and app status
OCP\JSON::checkAdminUser();
OCP\JSON::checkAppEnabled('user_ldap');
OCP\JSON::callCheck();
\OC_JSON::checkAdminUser();
\OC_JSON::checkAppEnabled('user_ldap');
\OC_JSON::callCheck();
$subject = (string)$_POST['ldap_clear_mapping'];
$mapping = null;
@ -43,7 +43,7 @@ try {
$l = \OC::$server->getL10N('user_ldap');
throw new \Exception($l->t('Failed to clear the mappings.'));
}
OCP\JSON::success();
\OC_JSON::success();
} catch (\Exception $e) {
OCP\JSON::error(array('message' => $e->getMessage()));
\OC_JSON::error(array('message' => $e->getMessage()));
}

10
apps/user_ldap/ajax/deleteConfiguration.php
View File

@ -27,15 +27,15 @@
*/
// Check user and app status
OCP\JSON::checkAdminUser();
OCP\JSON::checkAppEnabled('user_ldap');
OCP\JSON::callCheck();
\OC_JSON::checkAdminUser();
\OC_JSON::checkAppEnabled('user_ldap');
\OC_JSON::callCheck();
$prefix = (string)$_POST['ldap_serverconfig_chooser'];
$helper = new \OCA\User_LDAP\Helper(\OC::$server->getConfig());
if($helper->deleteServerConfiguration($prefix)) {
OCP\JSON::success();
\OC_JSON::success();
} else {
$l = \OC::$server->getL10N('user_ldap');
OCP\JSON::error(array('message' => $l->t('Failed to delete the server configuration')));
\OC_JSON::error(array('message' => $l->t('Failed to delete the server configuration')));
}

8
apps/user_ldap/ajax/getConfiguration.php
View File

@ -25,9 +25,9 @@
*/
// Check user and app status
OCP\JSON::checkAdminUser();
OCP\JSON::checkAppEnabled('user_ldap');
OCP\JSON::callCheck();
\OC_JSON::checkAdminUser();
\OC_JSON::checkAppEnabled('user_ldap');
\OC_JSON::callCheck();
$prefix = (string)$_POST['ldap_serverconfig_chooser'];
$ldapWrapper = new OCA\User_LDAP\LDAP();
@ -37,4 +37,4 @@ if (isset($configuration['ldap_agent_password']) && $configuration['ldap_agent_p
// hide password
$configuration['ldap_agent_password'] = '**PASSWORD SET**';
}
OCP\JSON::success(array('configuration' => $configuration));
\OC_JSON::success(array('configuration' => $configuration));

8
apps/user_ldap/ajax/getNewServerConfigPrefix.php
View File

@ -24,9 +24,9 @@
*/
// Check user and app status
OCP\JSON::checkAdminUser();
OCP\JSON::checkAppEnabled('user_ldap');
OCP\JSON::callCheck();
\OC_JSON::checkAdminUser();
\OC_JSON::checkAppEnabled('user_ldap');
\OC_JSON::callCheck();
$helper = new \OCA\User_LDAP\Helper(\OC::$server->getConfig());
$serverConnections = $helper->getServerConfigurationPrefixes();
@ -48,4 +48,4 @@ if(isset($_POST['copyConfig'])) {
}
$newConfig->saveConfiguration();
OCP\JSON::success($resultData);
\OC_JSON::success($resultData);

8
apps/user_ldap/ajax/setConfiguration.php
View File

@ -26,9 +26,9 @@
*/
// Check user and app status
OCP\JSON::checkAdminUser();
OCP\JSON::checkAppEnabled('user_ldap');
OCP\JSON::callCheck();
\OC_JSON::checkAdminUser();
\OC_JSON::checkAppEnabled('user_ldap');
\OC_JSON::callCheck();
$prefix = (string)$_POST['ldap_serverconfig_chooser'];
@ -47,4 +47,4 @@ $ldapWrapper = new OCA\User_LDAP\LDAP();
$connection = new \OCA\User_LDAP\Connection($ldapWrapper, $prefix);
$connection->setConfiguration($_POST);
$connection->saveConfiguration();
OCP\JSON::success();
\OC_JSON::success();

16
apps/user_ldap/ajax/testConfiguration.php
View File

@ -28,9 +28,9 @@
*/
// Check user and app status
OCP\JSON::checkAdminUser();
OCP\JSON::checkAppEnabled('user_ldap');
OCP\JSON::callCheck();
\OC_JSON::checkAdminUser();
\OC_JSON::checkAppEnabled('user_ldap');
\OC_JSON::callCheck();
$l = \OC::$server->getL10N('user_ldap');
@ -69,20 +69,20 @@ try {
$ldapWrapper->read($connection->getConnectionResource(), '', 'objectClass=*', array('dn'));
} catch (\Exception $e) {
if($e->getCode() === 1) {
OCP\JSON::error(array('message' => $l->t('Invalid configuration: Anonymous binding is not allowed.')));
\OC_JSON::error(array('message' => $l->t('Invalid configuration: Anonymous binding is not allowed.')));
exit;
}
}
OCP\JSON::success(array('message'
\OC_JSON::success(array('message'
=> $l->t('Valid configuration, connection established!')));
} else {
OCP\JSON::error(array('message'
\OC_JSON::error(array('message'
=> $l->t('Valid configuration, but binding failed. Please check the server settings and credentials.')));
}
} else {
OCP\JSON::error(array('message'
\OC_JSON::error(array('message'
=> $l->t('Invalid configuration. Please have a look at the logs for further details.')));
}
} catch (\Exception $e) {
OCP\JSON::error(array('message' => $e->getMessage()));
\OC_JSON::error(array('message' => $e->getMessage()));
}

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

@ -29,20 +29,20 @@
*/
// Check user and app status
OCP\JSON::checkAdminUser();
OCP\JSON::checkAppEnabled('user_ldap');
OCP\JSON::callCheck();
\OC_JSON::checkAdminUser();
\OC_JSON::checkAppEnabled('user_ldap');
\OC_JSON::callCheck();
$l = \OC::$server->getL10N('user_ldap');
if(!isset($_POST['action'])) {
\OCP\JSON::error(array('message' => $l->t('No action specified')));
\\OC_JSON::error(array('message' => $l->t('No action specified')));
}
$action = (string)$_POST['action'];
if(!isset($_POST['ldap_serverconfig_chooser'])) {
\OCP\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'];
@ -94,14 +94,14 @@ switch($action) {
try {
$result = $wizard->$action();
if($result !== false) {
OCP\JSON::success($result->getResultArray());
\OC_JSON::success($result->getResultArray());
exit;
}
} catch (\Exception $e) {
\OCP\JSON::error(array('message' => $e->getMessage(), 'code' => $e->getCode()));
\\OC_JSON::error(array('message' => $e->getMessage(), 'code' => $e->getCode()));
exit;
}
\OCP\JSON::error();
\\OC_JSON::error();
exit;
break;
@ -110,14 +110,14 @@ switch($action) {
$loginName = $_POST['ldap_test_loginname'];
$result = $wizard->$action($loginName);
if($result !== false) {
OCP\JSON::success($result->getResultArray());
\OC_JSON::success($result->getResultArray());
exit;
}
} catch (\Exception $e) {
\OCP\JSON::error(array('message' => $e->getMessage()));
\\OC_JSON::error(array('message' => $e->getMessage()));
exit;
}
\OCP\JSON::error();
\\OC_JSON::error();
exit;
break;
}
@ -126,14 +126,14 @@ switch($action) {
$key = isset($_POST['cfgkey']) ? $_POST['cfgkey'] : false;
$val = isset($_POST['cfgval']) ? $_POST['cfgval'] : null;
if($key === false || is_null($val)) {
\OCP\JSON::error(array('message' => $l->t('No data specified')));
\\OC_JSON::error(array('message' => $l->t('No data specified')));
exit;
}
$cfg = array($key => $val);
$setParameters = array();
$configuration->setConfiguration($cfg, $setParameters);
if(!in_array($key, $setParameters)) {
\OCP\JSON::error(array('message' => $l->t($key.
\\OC_JSON::error(array('message' => $l->t($key.
' Could not set configuration %s', $setParameters[0])));
exit;
}
@ -141,9 +141,9 @@ switch($action) {
//clear the cache on save
$connection = new \OCA\User_LDAP\Connection($ldapWrapper, $prefix);
$connection->clearCache();
OCP\JSON::success();
\OC_JSON::success();
break;
default:
\OCP\JSON::error(array('message' => $l->t('Action does not exist')));
\\OC_JSON::error(array('message' => $l->t('Action does not exist')));
break;
}

4
lib/base.php
View File

@ -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);

4
settings/ajax/disableapp.php
View File

@ -21,8 +21,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
*/
OCP\JSON::checkAdminUser();
OCP\JSON::callCheck();
\OC_JSON::checkAdminUser();
\OC_JSON::callCheck();
$lastConfirm = (int) \OC::$server->getSession()->get('last-password-confirm');
if ($lastConfirm < (time() - 30 * 60 + 15)) { // allow 15 seconds delay

2
settings/ajax/enableapp.php
View File

@ -25,7 +25,7 @@
*
*/
OC_JSON::checkAdminUser();
OCP\JSON::callCheck();
\OC_JSON::callCheck();
$lastConfirm = (int) \OC::$server->getSession()->get('last-password-confirm');
if ($lastConfirm < (time() - 30 * 60 + 15)) { // allow 15 seconds delay

4
settings/ajax/navigationdetect.php
View File

@ -21,8 +21,8 @@
*
*/
OC_Util::checkAdminUser();
OCP\JSON::callCheck();
\OC_JSON::callCheck();
$navigation = \OC::$server->getNavigationManager()->getAll();
OCP\JSON::success(['nav_entries' => $navigation]);
\OC_JSON::success(['nav_entries' => $navigation]);

2
settings/ajax/setquota.php
View File

@ -31,7 +31,7 @@
*/
OC_JSON::checkSubAdminUser();
OCP\JSON::callCheck();
\OC_JSON::callCheck();
$lastConfirm = (int) \OC::$server->getSession()->get('last-password-confirm');
if ($lastConfirm < (time() - 30 * 60 + 15)) { // allow 15 seconds delay

2
settings/ajax/togglesubadmins.php
View File

@ -24,7 +24,7 @@
*
*/
OC_JSON::checkAdminUser();
OCP\JSON::callCheck();
\OC_JSON::callCheck();
$lastConfirm = (int) \OC::$server->getSession()->get('last-password-confirm');
if ($lastConfirm < (time() - 30 * 60 + 15)) { // allow 15 seconds delay

4
settings/ajax/uninstallapp.php
View File

@ -22,8 +22,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
*/
OCP\JSON::checkAdminUser();
OCP\JSON::callCheck();
\OC_JSON::checkAdminUser();
\OC_JSON::callCheck();
$lastConfirm = (int) \OC::$server->getSession()->get('last-password-confirm');
if ($lastConfirm < (time() - 30 * 60 + 15)) { // allow 15 seconds delay

6
settings/ajax/updateapp.php
View File

@ -25,11 +25,11 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
*/
OCP\JSON::checkAdminUser();
OCP\JSON::callCheck();
\OC_JSON::checkAdminUser();
\OC_JSON::callCheck();
if (!array_key_exists('appid', $_POST)) {
OCP\JSON::error(array(
\OC_JSON::error(array(
'message' => 'No AppId given!'
));
return;