diff options
| author | Thomas Mueller <thomas.mueller@tmit.eu> | 2013-02-12 00:42:27 +0400 |
|---|---|---|
| committer | Thomas Mueller <thomas.mueller@tmit.eu> | 2013-02-12 00:42:27 +0400 |
| commit | 037fcde1334d7b4d2bdeaaad0a71adc692b27ff8 (patch) | |
| tree | 6f10b1a8d54cfea8cc3adf343de0bbf0f115f3d2 /settings/ajax | |
| parent | f58ed7a509da54fcd29e21dc6fc75528822157a4 (diff) | |
| parent | 58e57151e51a02788377f761b183c15cd03b0ef0 (diff) | |
Merge branch 'master' into fixing-1424-master
Diffstat (limited to 'settings/ajax')
| -rw-r--r-- | settings/ajax/apps/ocs.php | 8 | ||||
| -rw-r--r-- | settings/ajax/changedisplayname.php | 4 | ||||
| -rw-r--r-- | settings/ajax/updateapp.php | 5 |
3 files changed, 9 insertions, 8 deletions
diff --git a/settings/ajax/apps/ocs.php b/settings/ajax/apps/ocs.php index d0205a1ba34..9c5adfcfef9 100644 --- a/settings/ajax/apps/ocs.php +++ b/settings/ajax/apps/ocs.php @@ -23,9 +23,9 @@ if(is_null($enabledApps)) { $apps=array(); // apps from external repo via OCS -$catagoryNames=OC_OCSClient::getCategories(); -if(is_array($catagoryNames)) { - $categories=array_keys($catagoryNames); +$categoryNames=OC_OCSClient::getCategories(); +if(is_array($categoryNames)) { + $categories=array_keys($categoryNames); $page=0; $filter='approved'; $externalApps=OC_OCSClient::getApplications($categories, $page, $filter); @@ -45,7 +45,7 @@ if(is_array($catagoryNames)) { $pre=$app['preview']; } if($app['label']=='recommended') { - $label='3rd Party App'; + $label='3rd Party'; } else { $label='Recommended'; } diff --git a/settings/ajax/changedisplayname.php b/settings/ajax/changedisplayname.php index 8f2ff865bd5..69462330765 100644 --- a/settings/ajax/changedisplayname.php +++ b/settings/ajax/changedisplayname.php @@ -15,6 +15,10 @@ if(OC_SubAdmin::isUserAccessible(OC_User::getUser(), $username)) { $userstatus = 'subadmin';
}
+if ($username == OC_User::getUser() && OC_User::canUserChangeDisplayName($username)) {
+ $userstatus = 'changeOwnDisplayName';
+}
+
if(is_null($userstatus)) {
OC_JSON::error( array( "data" => array( "message" => $l->t("Authentication error") )));
exit();
diff --git a/settings/ajax/updateapp.php b/settings/ajax/updateapp.php index 9367a3b5a3b..300e8642515 100644 --- a/settings/ajax/updateapp.php +++ b/settings/ajax/updateapp.php @@ -12,7 +12,4 @@ if($result !== false) { } else { $l = OC_L10N::get('settings'); OC_JSON::error(array("data" => array( "message" => $l->t("Couldn't update app.") ))); -} - - - +}
\ No newline at end of file |