Skip to content

Commit 26073ea

Browse files
committed
Finally remove \OCP\JSON
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
1 parent 3dac15a commit 26073ea

4 files changed

Lines changed: 12 additions & 178 deletions

File tree

apps/files_external/ajax/applicable.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,4 +51,4 @@
5151

5252
$results = array('groups' => $groups, 'users' => $users);
5353

54-
\\OC_JSON::success($results);
54+
\OC_JSON::success($results);

apps/files_versions/ajax/getVersions.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,10 @@
4747
unset($version['path']);
4848
}
4949

50-
\\OC_JSON::success(array('data' => array('versions' => $versions, 'endReached' => $endReached)));
50+
\OC_JSON::success(array('data' => array('versions' => $versions, 'endReached' => $endReached)));
5151

5252
} else {
5353

54-
\\OC_JSON::success(array('data' => array('versions' => [], 'endReached' => true)));
54+
\OC_JSON::success(array('data' => array('versions' => [], 'endReached' => true)));
5555

5656
}

apps/user_ldap/ajax/wizard.php

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,13 @@
3636
$l = \OC::$server->getL10N('user_ldap');
3737

3838
if(!isset($_POST['action'])) {
39-
\\OC_JSON::error(array('message' => $l->t('No action specified')));
39+
\OC_JSON::error(array('message' => $l->t('No action specified')));
4040
}
4141
$action = (string)$_POST['action'];
4242

4343

4444
if(!isset($_POST['ldap_serverconfig_chooser'])) {
45-
\\OC_JSON::error(array('message' => $l->t('No configuration specified')));
45+
\OC_JSON::error(array('message' => $l->t('No configuration specified')));
4646
}
4747
$prefix = (string)$_POST['ldap_serverconfig_chooser'];
4848

@@ -98,10 +98,10 @@
9898
exit;
9999
}
100100
} catch (\Exception $e) {
101-
\\OC_JSON::error(array('message' => $e->getMessage(), 'code' => $e->getCode()));
101+
\OC_JSON::error(array('message' => $e->getMessage(), 'code' => $e->getCode()));
102102
exit;
103103
}
104-
\\OC_JSON::error();
104+
\OC_JSON::error();
105105
exit;
106106
break;
107107

@@ -114,10 +114,10 @@
114114
exit;
115115
}
116116
} catch (\Exception $e) {
117-
\\OC_JSON::error(array('message' => $e->getMessage()));
117+
\OC_JSON::error(array('message' => $e->getMessage()));
118118
exit;
119119
}
120-
\\OC_JSON::error();
120+
\OC_JSON::error();
121121
exit;
122122
break;
123123
}
@@ -126,14 +126,14 @@
126126
$key = isset($_POST['cfgkey']) ? $_POST['cfgkey'] : false;
127127
$val = isset($_POST['cfgval']) ? $_POST['cfgval'] : null;
128128
if($key === false || is_null($val)) {
129-
\\OC_JSON::error(array('message' => $l->t('No data specified')));
129+
\OC_JSON::error(array('message' => $l->t('No data specified')));
130130
exit;
131131
}
132132
$cfg = array($key => $val);
133133
$setParameters = array();
134134
$configuration->setConfiguration($cfg, $setParameters);
135135
if(!in_array($key, $setParameters)) {
136-
\\OC_JSON::error(array('message' => $l->t($key.
136+
\OC_JSON::error(array('message' => $l->t($key.
137137
' Could not set configuration %s', $setParameters[0])));
138138
exit;
139139
}
@@ -144,6 +144,6 @@
144144
\OC_JSON::success();
145145
break;
146146
default:
147-
\\OC_JSON::error(array('message' => $l->t('Action does not exist')));
147+
\OC_JSON::error(array('message' => $l->t('Action does not exist')));
148148
break;
149149
}

lib/public/JSON.php

Lines changed: 0 additions & 166 deletions
This file was deleted.

0 commit comments

Comments
 (0)