diff options
| author | icewind1991 <robin@icewind.nl> | 2014-07-04 16:39:00 +0200 |
|---|---|---|
| committer | icewind1991 <robin@icewind.nl> | 2014-07-04 16:39:00 +0200 |
| commit | d3fab824f7052a8df400890833a0f6743769422c (patch) | |
| tree | eb04908d6deb044ab6fd2f73030efce561efeaf2 /lib | |
| parent | 5e89b53e78240cf3eee02db02ae5c409dc1bcc1f (diff) | |
| parent | 4fe1cdd2a7a1930d8ca0cb5bc23e5bfa22be6e55 (diff) | |
| download | nextcloud-server-d3fab824f7052a8df400890833a0f6743769422c.tar.gz nextcloud-server-d3fab824f7052a8df400890833a0f6743769422c.zip | |
Merge pull request #9445 from owncloud/filelist-auth-error
Reload the page when the files app encounters an authentication error
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/json.php | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/private/json.php b/lib/private/json.php index 4634d7adfea..da38654997f 100644 --- a/lib/private/json.php +++ b/lib/private/json.php @@ -26,7 +26,7 @@ class OC_JSON{ public static function checkAppEnabled($app) { if( !OC_App::isEnabled($app)) { $l = OC_L10N::get('lib'); - self::error(array( 'data' => array( 'message' => $l->t('Application is not enabled') ))); + self::error(array( 'data' => array( 'message' => $l->t('Application is not enabled'), 'error' => 'application_not_enabled' ))); exit(); } } @@ -37,7 +37,7 @@ class OC_JSON{ public static function checkLoggedIn() { if( !OC_User::isLoggedIn()) { $l = OC_L10N::get('lib'); - self::error(array( 'data' => array( 'message' => $l->t('Authentication error') ))); + self::error(array( 'data' => array( 'message' => $l->t('Authentication error'), 'error' => 'authentication_error' ))); exit(); } } @@ -48,7 +48,7 @@ class OC_JSON{ public static function callCheck() { if( !OC_Util::isCallRegistered()) { $l = OC_L10N::get('lib'); - self::error(array( 'data' => array( 'message' => $l->t('Token expired. Please reload page.') ))); + self::error(array( 'data' => array( 'message' => $l->t('Token expired. Please reload page.'), 'error' => 'token_expired' ))); exit(); } } @@ -59,7 +59,7 @@ class OC_JSON{ public static function checkAdminUser() { if( !OC_User::isAdminUser(OC_User::getUser())) { $l = OC_L10N::get('lib'); - self::error(array( 'data' => array( 'message' => $l->t('Authentication error') ))); + self::error(array( 'data' => array( 'message' => $l->t('Authentication error'), 'error' => 'authentication_error' ))); exit(); } } @@ -71,7 +71,7 @@ class OC_JSON{ public static function checkUserExists($user) { if (!OCP\User::userExists($user)) { $l = OC_L10N::get('lib'); - OCP\JSON::error(array('data' => array('message' => $l->t('Unknown user')))); + OCP\JSON::error(array('data' => array('message' => $l->t('Unknown user'), 'error' => 'unknown_user' ))); exit; } } @@ -84,7 +84,7 @@ class OC_JSON{ public static function checkSubAdminUser() { if(!OC_SubAdmin::isSubAdmin(OC_User::getUser())) { $l = OC_L10N::get('lib'); - self::error(array( 'data' => array( 'message' => $l->t('Authentication error') ))); + self::error(array( 'data' => array( 'message' => $l->t('Authentication error'), 'error' => 'authentication_error' ))); exit(); } } |