aboutsummaryrefslogtreecommitdiffstats
path: root/lib/json.php
diff options
context:
space:
mode:
Diffstat (limited to 'lib/json.php')
-rw-r--r--lib/json.php13
1 files changed, 12 insertions, 1 deletions
diff --git a/lib/json.php b/lib/json.php
index 5ebd6c6b759..cedf79fd7c3 100644
--- a/lib/json.php
+++ b/lib/json.php
@@ -11,7 +11,7 @@ class OC_JSON{
/**
* set Content-Type header to jsonrequest
*/
- public static function setContentTypeHeader($type='application/jsonrequest'){
+ public static function setContentTypeHeader($type='application/json'){
if (!self::$send_content_type_header){
// We send json data
header( 'Content-Type: '.$type );
@@ -20,6 +20,17 @@ class OC_JSON{
}
/**
+ * Check if the app is enabled, send json error msg if not
+ */
+ public static function checkAppEnabled($app){
+ if( !OC_App::isEnabled($app)){
+ $l = new OC_L10N('core');
+ self::error(array( 'data' => array( 'message' => $l->t('Application is not enabled') )));
+ exit();
+ }
+ }
+
+ /**
* Check if the user is logged in, send json error msg if not
*/
public static function checkLoggedIn(){