diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2018-03-23 15:20:38 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-23 15:20:38 +0100 |
| commit | e2866091bc60d10560d16b2ed8044055e7753de8 (patch) | |
| tree | 744a5e31a2ba607f79f351741aade1f2049b6a17 /settings | |
| parent | 3d8fcad88b610a41c4939663ab3b4256a149ab1f (diff) | |
| parent | 2c9fd794b82a9aa2c762526973a9afb66cc46eda (diff) | |
| download | nextcloud-server-e2866091bc60d10560d16b2ed8044055e7753de8.tar.gz nextcloud-server-e2866091bc60d10560d16b2ed8044055e7753de8.zip | |
Merge pull request #8943 from nextcloud/dep_oc_json
Remove \OCP\JSON
Diffstat (limited to 'settings')
| -rw-r--r-- | settings/ajax/disableapp.php | 4 | ||||
| -rw-r--r-- | settings/ajax/enableapp.php | 2 | ||||
| -rw-r--r-- | settings/ajax/navigationdetect.php | 4 | ||||
| -rw-r--r-- | settings/ajax/setquota.php | 2 | ||||
| -rw-r--r-- | settings/ajax/togglesubadmins.php | 2 | ||||
| -rw-r--r-- | settings/ajax/uninstallapp.php | 4 | ||||
| -rw-r--r-- | settings/ajax/updateapp.php | 6 |
7 files changed, 12 insertions, 12 deletions
diff --git a/settings/ajax/disableapp.php b/settings/ajax/disableapp.php index 1d9cb984e2a..d719c3e9f23 100644 --- a/settings/ajax/disableapp.php +++ b/settings/ajax/disableapp.php @@ -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 diff --git a/settings/ajax/enableapp.php b/settings/ajax/enableapp.php index edcccf9b0b9..efe5ee3374f 100644 --- a/settings/ajax/enableapp.php +++ b/settings/ajax/enableapp.php @@ -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 diff --git a/settings/ajax/navigationdetect.php b/settings/ajax/navigationdetect.php index 043e10da559..35cc25f19ff 100644 --- a/settings/ajax/navigationdetect.php +++ b/settings/ajax/navigationdetect.php @@ -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]); diff --git a/settings/ajax/setquota.php b/settings/ajax/setquota.php index c3fde409c00..b1155ee0f97 100644 --- a/settings/ajax/setquota.php +++ b/settings/ajax/setquota.php @@ -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 diff --git a/settings/ajax/togglesubadmins.php b/settings/ajax/togglesubadmins.php index 4fee0530dd1..c115568bca7 100644 --- a/settings/ajax/togglesubadmins.php +++ b/settings/ajax/togglesubadmins.php @@ -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 diff --git a/settings/ajax/uninstallapp.php b/settings/ajax/uninstallapp.php index 63107905b02..26100d3b066 100644 --- a/settings/ajax/uninstallapp.php +++ b/settings/ajax/uninstallapp.php @@ -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 diff --git a/settings/ajax/updateapp.php b/settings/ajax/updateapp.php index 3431c68dbd7..d37e1cfcaed 100644 --- a/settings/ajax/updateapp.php +++ b/settings/ajax/updateapp.php @@ -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; |