diff --git a/settings/ajax/setquota.php b/settings/ajax/setquota.php index 356466c0c0..cd8dc0e279 100644 --- a/settings/ajax/setquota.php +++ b/settings/ajax/setquota.php @@ -10,7 +10,9 @@ OCP\JSON::callCheck(); $username = isset($_POST["username"])?$_POST["username"]:''; -if(($username == '' && !OC_User::isAdminUser(OC_User::getUser()))|| (!OC_User::isAdminUser(OC_User::getUser()) && !OC_SubAdmin::isUserAccessible(OC_User::getUser(), $username))) { +if(($username == '' && !OC_User::isAdminUser(OC_User::getUser())) + || (!OC_User::isAdminUser(OC_User::getUser()) + && !OC_SubAdmin::isUserAccessible(OC_User::getUser(), $username))) { $l = OC_L10N::get('core'); OC_JSON::error(array( 'data' => array( 'message' => $l->t('Authentication error') ))); exit(); diff --git a/settings/ajax/togglegroups.php b/settings/ajax/togglegroups.php index 9bba9c5269..f6fd9aba6d 100644 --- a/settings/ajax/togglegroups.php +++ b/settings/ajax/togglegroups.php @@ -13,7 +13,9 @@ if($username == OC_User::getUser() && $group == "admin" && OC_User::isAdminUser exit(); } -if(!OC_User::isAdminUser(OC_User::getUser()) && (!OC_SubAdmin::isUserAccessible(OC_User::getUser(), $username) || !OC_SubAdmin::isGroupAccessible(OC_User::getUser(), $group))) { +if(!OC_User::isAdminUser(OC_User::getUser()) + && (!OC_SubAdmin::isUserAccessible(OC_User::getUser(), $username) + || !OC_SubAdmin::isGroupAccessible(OC_User::getUser(), $group))) { $l = OC_L10N::get('core'); OC_JSON::error(array( 'data' => array( 'message' => $l->t('Authentication error') ))); exit(); diff --git a/settings/oauth.php b/settings/oauth.php index 07b7ae5c31..8b4759f999 100644 --- a/settings/oauth.php +++ b/settings/oauth.php @@ -5,7 +5,7 @@ * See the COPYING-README file. */ -require_once('../lib/base.php'); +require_once '../lib/base.php'; // Logic $operation = isset($_GET['operation']) ? $_GET['operation'] : ''; $server = OC_OAuth_server::init(); @@ -23,9 +23,10 @@ switch($operation){ $callbackfail = empty($_GET['callback_fail']) ? null : $_GET['callback_fail']; $consumer = OC_OAuth_Server::register_consumer($_GET['name'], $_GET['url'], $callbacksuccess, $callbackfail); - echo 'Registered consumer successfully! Key: ' . $consumer->key . 'Secret: ' . $consumer->secret; + echo 'Registered consumer successfully! Key: ' . $consumer->key + . 'Secret: ' . $consumer->secret; } - break; + break; case 'request_token': @@ -38,7 +39,7 @@ switch($operation){ echo $exception->getMessage(); } - break; + break; case 'authorise'; OC_API::checkLoggedIn(); @@ -61,9 +62,11 @@ switch($operation){ if(!empty($notfound)) { // We need more apps :( Show error if(count($notfound)==1) { - $message = 'requires that you have an extra app installed on your ownCloud. Please contact your ownCloud administrator and ask them to install the app below.'; + $message = 'requires that you have an extra app installed on your ownCloud.' + .' Please contact your ownCloud administrator and ask them to install the app below.'; } else { - $message = 'requires that you have some extra apps installed on your ownCloud. Please contract your ownCloud administrator and ask them to install the apps below.'; + $message = 'requires that you have some extra apps installed on your ownCloud.' + .' Please contract your ownCloud administrator and ask them to install the apps below.'; } $t = new OC_Template('settings', 'oauth-required-apps', 'guest'); OC_Util::addStyle('settings', 'oauth'); @@ -77,7 +80,7 @@ switch($operation){ $t->assign('consumer', $consumer); $t->printPage(); } - break; + break; case 'access_token'; try { @@ -89,10 +92,10 @@ switch($operation){ echo $exception->getMessage(); } - break; + break; default: // Something went wrong, we need an operation! OC_Response::setStatus(400); - break; + break; } diff --git a/settings/routes.php b/settings/routes.php index 0a8af0dde2..26d933dba4 100644 --- a/settings/routes.php +++ b/settings/routes.php @@ -40,7 +40,7 @@ $this->create('settings_ajax_removegroup', '/settings/ajax/removegroup.php') $this->create('settings_ajax_changepassword', '/settings/ajax/changepassword.php') ->actionInclude('settings/ajax/changepassword.php'); $this->create('settings_ajax_changedisplayname', '/settings/ajax/changedisplayname.php') -->actionInclude('settings/ajax/changedisplayname.php'); + ->actionInclude('settings/ajax/changedisplayname.php'); // personel $this->create('settings_ajax_lostpassword', '/settings/ajax/lostpassword.php') ->actionInclude('settings/ajax/lostpassword.php'); diff --git a/settings/templates/apps.php b/settings/templates/apps.php index ed1232ac32..b6e98c41bd 100644 --- a/settings/templates/apps.php +++ b/settings/templates/apps.php @@ -3,7 +3,8 @@ * This file is licensed under the Affero General Public License version 3 or later. * See the COPYING-README file. */?> - +
t('You have used %s of the available %s', array($_['usage'], $_['total_space']));?>
+t('You have used %s of the available %s', + array($_['usage'], $_['total_space']));?>