nextcloud / server

lib/private/legacy/json.php

Spacing +16 added lines, -16 removed lines

@@ -36,16 +36,16 @@ 
  * Class OC_JSON
  * @deprecated Use a AppFramework JSONResponse instead
  */
-class OC_JSON{
+class OC_JSON {
 	static protected $send_content_type_header = false;
 	/**
 	 * set Content-Type header to jsonrequest
 	 * @deprecated Use a AppFramework JSONResponse instead
 	 */
-	public static function setContentTypeHeader($type='application/json') {
+	public static function setContentTypeHeader($type = 'application/json') {
 		if (!self::$send_content_type_header) {
 			// We send json data
-			header( 'Content-Type: '.$type . '; charset=utf-8');
+			header('Content-Type: '.$type.'; charset=utf-8');
 			self::$send_content_type_header = true;
 		}
 	}
@@ -57,9 +57,9 @@ 
 	 * @suppress PhanDeprecatedFunction
 	 */
 	public static function checkAppEnabled($app) {
-		if( !\OC::$server->getAppManager()->isEnabledForUser($app)) {
+		if (!\OC::$server->getAppManager()->isEnabledForUser($app)) {
 			$l = \OC::$server->getL10N('lib');
-			self::error(array( 'data' => array( 'message' => $l->t('Application is not enabled'), 'error' => 'application_not_enabled' )));
+			self::error(array('data' => array('message' => $l->t('Application is not enabled'), 'error' => 'application_not_enabled')));
 			exit();
 		}
 	}
@@ -71,11 +71,11 @@ 
 	 */
 	public static function checkLoggedIn() {
 		$twoFactorAuthManger = \OC::$server->getTwoFactorAuthManager();
-		if( !\OC::$server->getUserSession()->isLoggedIn()
+		if (!\OC::$server->getUserSession()->isLoggedIn()
 			|| $twoFactorAuthManger->needsSecondFactor(\OC::$server->getUserSession()->getUser())) {
 			$l = \OC::$server->getL10N('lib');
 			http_response_code(\OCP\AppFramework\Http::STATUS_UNAUTHORIZED);
-			self::error(array( 'data' => array( 'message' => $l->t('Authentication error'), 'error' => 'authentication_error' )));
+			self::error(array('data' => array('message' => $l->t('Authentication error'), 'error' => 'authentication_error')));
 			exit();
 		}
 	}
@@ -86,14 +86,14 @@ 
 	 * @suppress PhanDeprecatedFunction
 	 */
 	public static function callCheck() {
-		if(!\OC::$server->getRequest()->passesStrictCookieCheck()) {
+		if (!\OC::$server->getRequest()->passesStrictCookieCheck()) {
 			header('Location: '.\OC::$WEBROOT);
 			exit();
 		}
 
-		if( !\OC::$server->getRequest()->passesCSRFCheck()) {
+		if (!\OC::$server->getRequest()->passesCSRFCheck()) {
 			$l = \OC::$server->getL10N('lib');
-			self::error(array( 'data' => array( 'message' => $l->t('Token expired. Please reload page.'), 'error' => 'token_expired' )));
+			self::error(array('data' => array('message' => $l->t('Token expired. Please reload page.'), 'error' => 'token_expired')));
 			exit();
 		}
 	}
@@ -104,9 +104,9 @@ 
 	 * @suppress PhanDeprecatedFunction
 	 */
 	public static function checkAdminUser() {
-		if( !OC_User::isAdminUser(OC_User::getUser())) {
+		if (!OC_User::isAdminUser(OC_User::getUser())) {
 			$l = \OC::$server->getL10N('lib');
-			self::error(array( 'data' => array( 'message' => $l->t('Authentication error'), 'error' => 'authentication_error' )));
+			self::error(array('data' => array('message' => $l->t('Authentication error'), 'error' => 'authentication_error')));
 			exit();
 		}
 	}
@@ -119,13 +119,13 @@ 
 	public static function checkSubAdminUser() {
 		$userObject = \OC::$server->getUserSession()->getUser();
 		$isSubAdmin = false;
-		if($userObject !== null) {
+		if ($userObject !== null) {
 			$isSubAdmin = \OC::$server->getGroupManager()->getSubAdmin()->isSubAdmin($userObject);
 		}
 
-		if(!$isSubAdmin) {
+		if (!$isSubAdmin) {
 			$l = \OC::$server->getL10N('lib');
-			self::error(array( 'data' => array( 'message' => $l->t('Authentication error'), 'error' => 'authentication_error' )));
+			self::error(array('data' => array('message' => $l->t('Authentication error'), 'error' => 'authentication_error')));
 			exit();
 		}
 	}
@@ -155,7 +155,7 @@ 
 	 */
 	protected static function to_string(&$value) {
 		if ($value instanceof \OC\L10N\L10NString) {
-			$value = (string)$value;
+			$value = (string) $value;
 		}
 	}
 

Indentation +123 added lines, -123 removed lines

@@ -37,138 +37,138 @@
  * @deprecated Use a AppFramework JSONResponse instead
  */
 class OC_JSON{
-	static protected $send_content_type_header = false;
-	/**
-	 * set Content-Type header to jsonrequest
-	 * @deprecated Use a AppFramework JSONResponse instead
-	 */
-	public static function setContentTypeHeader($type='application/json') {
-		if (!self::$send_content_type_header) {
-			// We send json data
-			header( 'Content-Type: '.$type . '; charset=utf-8');
-			self::$send_content_type_header = true;
-		}
-	}
+    static protected $send_content_type_header = false;
+    /**
+     * set Content-Type header to jsonrequest
+     * @deprecated Use a AppFramework JSONResponse instead
+     */
+    public static function setContentTypeHeader($type='application/json') {
+        if (!self::$send_content_type_header) {
+            // We send json data
+            header( 'Content-Type: '.$type . '; charset=utf-8');
+            self::$send_content_type_header = true;
+        }
+    }
 
-	/**
-	 * Check if the app is enabled, send json error msg if not
-	 * @param string $app
-	 * @deprecated Use the AppFramework instead. It will automatically check if the app is enabled.
-	 * @suppress PhanDeprecatedFunction
-	 */
-	public static function checkAppEnabled($app) {
-		if( !\OC::$server->getAppManager()->isEnabledForUser($app)) {
-			$l = \OC::$server->getL10N('lib');
-			self::error(array( 'data' => array( 'message' => $l->t('Application is not enabled'), 'error' => 'application_not_enabled' )));
-			exit();
-		}
-	}
+    /**
+     * Check if the app is enabled, send json error msg if not
+     * @param string $app
+     * @deprecated Use the AppFramework instead. It will automatically check if the app is enabled.
+     * @suppress PhanDeprecatedFunction
+     */
+    public static function checkAppEnabled($app) {
+        if( !\OC::$server->getAppManager()->isEnabledForUser($app)) {
+            $l = \OC::$server->getL10N('lib');
+            self::error(array( 'data' => array( 'message' => $l->t('Application is not enabled'), 'error' => 'application_not_enabled' )));
+            exit();
+        }
+    }
 
-	/**
-	 * Check if the user is logged in, send json error msg if not
-	 * @deprecated Use annotation based ACLs from the AppFramework instead
-	 * @suppress PhanDeprecatedFunction
-	 */
-	public static function checkLoggedIn() {
-		$twoFactorAuthManger = \OC::$server->getTwoFactorAuthManager();
-		if( !\OC::$server->getUserSession()->isLoggedIn()
-			|| $twoFactorAuthManger->needsSecondFactor(\OC::$server->getUserSession()->getUser())) {
-			$l = \OC::$server->getL10N('lib');
-			http_response_code(\OCP\AppFramework\Http::STATUS_UNAUTHORIZED);
-			self::error(array( 'data' => array( 'message' => $l->t('Authentication error'), 'error' => 'authentication_error' )));
-			exit();
-		}
-	}
+    /**
+     * Check if the user is logged in, send json error msg if not
+     * @deprecated Use annotation based ACLs from the AppFramework instead
+     * @suppress PhanDeprecatedFunction
+     */
+    public static function checkLoggedIn() {
+        $twoFactorAuthManger = \OC::$server->getTwoFactorAuthManager();
+        if( !\OC::$server->getUserSession()->isLoggedIn()
+            || $twoFactorAuthManger->needsSecondFactor(\OC::$server->getUserSession()->getUser())) {
+            $l = \OC::$server->getL10N('lib');
+            http_response_code(\OCP\AppFramework\Http::STATUS_UNAUTHORIZED);
+            self::error(array( 'data' => array( 'message' => $l->t('Authentication error'), 'error' => 'authentication_error' )));
+            exit();
+        }
+    }
 
-	/**
-	 * Check an ajax get/post call if the request token is valid, send json error msg if not.
-	 * @deprecated Use annotation based CSRF checks from the AppFramework instead
-	 * @suppress PhanDeprecatedFunction
-	 */
-	public static function callCheck() {
-		if(!\OC::$server->getRequest()->passesStrictCookieCheck()) {
-			header('Location: '.\OC::$WEBROOT);
-			exit();
-		}
+    /**
+     * Check an ajax get/post call if the request token is valid, send json error msg if not.
+     * @deprecated Use annotation based CSRF checks from the AppFramework instead
+     * @suppress PhanDeprecatedFunction
+     */
+    public static function callCheck() {
+        if(!\OC::$server->getRequest()->passesStrictCookieCheck()) {
+            header('Location: '.\OC::$WEBROOT);
+            exit();
+        }
 
-		if( !\OC::$server->getRequest()->passesCSRFCheck()) {
-			$l = \OC::$server->getL10N('lib');
-			self::error(array( 'data' => array( 'message' => $l->t('Token expired. Please reload page.'), 'error' => 'token_expired' )));
-			exit();
-		}
-	}
+        if( !\OC::$server->getRequest()->passesCSRFCheck()) {
+            $l = \OC::$server->getL10N('lib');
+            self::error(array( 'data' => array( 'message' => $l->t('Token expired. Please reload page.'), 'error' => 'token_expired' )));
+            exit();
+        }
+    }
 
-	/**
-	 * Check if the user is a admin, send json error msg if not.
-	 * @deprecated Use annotation based ACLs from the AppFramework instead
-	 * @suppress PhanDeprecatedFunction
-	 */
-	public static function checkAdminUser() {
-		if( !OC_User::isAdminUser(OC_User::getUser())) {
-			$l = \OC::$server->getL10N('lib');
-			self::error(array( 'data' => array( 'message' => $l->t('Authentication error'), 'error' => 'authentication_error' )));
-			exit();
-		}
-	}
+    /**
+     * Check if the user is a admin, send json error msg if not.
+     * @deprecated Use annotation based ACLs from the AppFramework instead
+     * @suppress PhanDeprecatedFunction
+     */
+    public static function checkAdminUser() {
+        if( !OC_User::isAdminUser(OC_User::getUser())) {
+            $l = \OC::$server->getL10N('lib');
+            self::error(array( 'data' => array( 'message' => $l->t('Authentication error'), 'error' => 'authentication_error' )));
+            exit();
+        }
+    }
 
-	/**
-	 * Check if the user is a subadmin, send json error msg if not
-	 * @deprecated Use annotation based ACLs from the AppFramework instead
-	 * @suppress PhanDeprecatedFunction
-	 */
-	public static function checkSubAdminUser() {
-		$userObject = \OC::$server->getUserSession()->getUser();
-		$isSubAdmin = false;
-		if($userObject !== null) {
-			$isSubAdmin = \OC::$server->getGroupManager()->getSubAdmin()->isSubAdmin($userObject);
-		}
+    /**
+     * Check if the user is a subadmin, send json error msg if not
+     * @deprecated Use annotation based ACLs from the AppFramework instead
+     * @suppress PhanDeprecatedFunction
+     */
+    public static function checkSubAdminUser() {
+        $userObject = \OC::$server->getUserSession()->getUser();
+        $isSubAdmin = false;
+        if($userObject !== null) {
+            $isSubAdmin = \OC::$server->getGroupManager()->getSubAdmin()->isSubAdmin($userObject);
+        }
 
-		if(!$isSubAdmin) {
-			$l = \OC::$server->getL10N('lib');
-			self::error(array( 'data' => array( 'message' => $l->t('Authentication error'), 'error' => 'authentication_error' )));
-			exit();
-		}
-	}
+        if(!$isSubAdmin) {
+            $l = \OC::$server->getL10N('lib');
+            self::error(array( 'data' => array( 'message' => $l->t('Authentication error'), 'error' => 'authentication_error' )));
+            exit();
+        }
+    }
 
-	/**
-	 * Send json error msg
-	 * @deprecated Use a AppFramework JSONResponse instead
-	 * @suppress PhanDeprecatedFunction
-	 */
-	public static function error($data = array()) {
-		$data['status'] = 'error';
-		self::setContentTypeHeader();
-		echo self::encode($data);
-	}
+    /**
+     * Send json error msg
+     * @deprecated Use a AppFramework JSONResponse instead
+     * @suppress PhanDeprecatedFunction
+     */
+    public static function error($data = array()) {
+        $data['status'] = 'error';
+        self::setContentTypeHeader();
+        echo self::encode($data);
+    }
 
-	/**
-	 * Send json success msg
-	 * @deprecated Use a AppFramework JSONResponse instead
-	 * @suppress PhanDeprecatedFunction
-	 */
-	public static function success($data = array()) {
-		$data['status'] = 'success';
-		self::setContentTypeHeader();
-		echo self::encode($data);
-	}
+    /**
+     * Send json success msg
+     * @deprecated Use a AppFramework JSONResponse instead
+     * @suppress PhanDeprecatedFunction
+     */
+    public static function success($data = array()) {
+        $data['status'] = 'success';
+        self::setContentTypeHeader();
+        echo self::encode($data);
+    }
 
-	/**
-	 * Convert OC_L10N_String to string, for use in json encodings
-	 */
-	protected static function to_string(&$value) {
-		if ($value instanceof \OC\L10N\L10NString) {
-			$value = (string)$value;
-		}
-	}
+    /**
+     * Convert OC_L10N_String to string, for use in json encodings
+     */
+    protected static function to_string(&$value) {
+        if ($value instanceof \OC\L10N\L10NString) {
+            $value = (string)$value;
+        }
+    }
 
-	/**
-	 * Encode JSON
-	 * @deprecated Use a AppFramework JSONResponse instead
-	 */
-	public static function encode($data) {
-		if (is_array($data)) {
-			array_walk_recursive($data, array('OC_JSON', 'to_string'));
-		}
-		return json_encode($data, JSON_HEX_TAG);
-	}
+    /**
+     * Encode JSON
+     * @deprecated Use a AppFramework JSONResponse instead
+     */
+    public static function encode($data) {
+        if (is_array($data)) {
+            array_walk_recursive($data, array('OC_JSON', 'to_string'));
+        }
+        return json_encode($data, JSON_HEX_TAG);
+    }
 }

lib/public/JSON.php

Indentation +126 added lines, -126 removed lines

@@ -41,136 +41,136 @@
  * @deprecated 8.1.0 Use a AppFramework JSONResponse instead
  */
 class JSON {
-	/**
-	 * Check if the user is logged in, send json error msg if not.
-	 *
-	 * This method checks if a user is logged in. If not, a json error
-	 * response will be return and the method will exit from execution
-	 * of the script.
-	 * The returned json will be in the format:
-	 *
-	 *     {"status":"error","data":{"message":"Authentication error."}}
-	 *
-	 * Add this call to the start of all ajax method files that requires
-	 * an authenticated user.
-	 * @deprecated 8.1.0 Use annotation based ACLs from the AppFramework instead
-	 *
-	 * @suppress PhanDeprecatedFunction
-	 */
-	public static function checkLoggedIn() {
-		\OC_JSON::checkLoggedIn();
-	}
+    /**
+     * Check if the user is logged in, send json error msg if not.
+     *
+     * This method checks if a user is logged in. If not, a json error
+     * response will be return and the method will exit from execution
+     * of the script.
+     * The returned json will be in the format:
+     *
+     *     {"status":"error","data":{"message":"Authentication error."}}
+     *
+     * Add this call to the start of all ajax method files that requires
+     * an authenticated user.
+     * @deprecated 8.1.0 Use annotation based ACLs from the AppFramework instead
+     *
+     * @suppress PhanDeprecatedFunction
+     */
+    public static function checkLoggedIn() {
+        \OC_JSON::checkLoggedIn();
+    }
 
-	/**
-	 * Check an ajax get/post call if the request token is valid.
-	 *
-	 * This method checks for a valid variable 'requesttoken' in $_GET,
-	 * $_POST and $_SERVER. If a valid token is not found, a json error
-	 * response will be return and the method will exit from execution
-	 * of the script.
-	 * The returned json will be in the format:
-	 *
-	 *     {"status":"error","data":{"message":"Token expired. Please reload page."}}
-	 *
-	 * Add this call to the start of all ajax method files that creates,
-	 * updates or deletes anything.
-	 * In cases where you e.g. use an ajax call to load a dialog containing
-	 * a submittable form, you will need to add the requesttoken first as a
-	 * parameter to the ajax call, then assign it to the template and finally
-	 * add a hidden input field also named 'requesttoken' containing the value.
-	 * @deprecated 8.1.0 Use annotation based CSRF checks from the AppFramework instead
-	 *
-	 * @suppress PhanDeprecatedFunction
-	 */
-	public static function callCheck() {
-		\OC_JSON::callCheck();
-	}
+    /**
+     * Check an ajax get/post call if the request token is valid.
+     *
+     * This method checks for a valid variable 'requesttoken' in $_GET,
+     * $_POST and $_SERVER. If a valid token is not found, a json error
+     * response will be return and the method will exit from execution
+     * of the script.
+     * The returned json will be in the format:
+     *
+     *     {"status":"error","data":{"message":"Token expired. Please reload page."}}
+     *
+     * Add this call to the start of all ajax method files that creates,
+     * updates or deletes anything.
+     * In cases where you e.g. use an ajax call to load a dialog containing
+     * a submittable form, you will need to add the requesttoken first as a
+     * parameter to the ajax call, then assign it to the template and finally
+     * add a hidden input field also named 'requesttoken' containing the value.
+     * @deprecated 8.1.0 Use annotation based CSRF checks from the AppFramework instead
+     *
+     * @suppress PhanDeprecatedFunction
+     */
+    public static function callCheck() {
+        \OC_JSON::callCheck();
+    }
 
-	/**
-	 * Send json success msg
-	 *
-	 * Return a json success message with optional extra data.
-	 * @see \OCP\JSON::error()		for the format to use.
-	 *
-	 * @param array $data The data to use
-	 * @deprecated 8.1.0 Use a AppFramework JSONResponse instead
-	 * @suppress PhanDeprecatedFunction
-	 */
-	public static function success( $data = array() ) {
-		\OC_JSON::success($data);
-	}
+    /**
+     * Send json success msg
+     *
+     * Return a json success message with optional extra data.
+     * @see \OCP\JSON::error()		for the format to use.
+     *
+     * @param array $data The data to use
+     * @deprecated 8.1.0 Use a AppFramework JSONResponse instead
+     * @suppress PhanDeprecatedFunction
+     */
+    public static function success( $data = array() ) {
+        \OC_JSON::success($data);
+    }
 
-	/**
-	 * Send json error msg
-	 *
-	 * Return a json error message with optional extra data for
-	 * error message or app specific data.
-	 *
-	 * Example use:
-	 *
-	 *     $id = [some value]
-	 *     OCP\JSON::error(array('data':array('message':'An error happened', 'id': $id)));
-	 *
-	 * Will return the json formatted string:
-	 *
-	 *     {"status":"error","data":{"message":"An error happened", "id":[some value]}}
-	 *
-	 * @param array $data The data to use
-	 * @deprecated 8.1.0 Use a AppFramework JSONResponse instead
-	 * @suppress PhanDeprecatedFunction
-	 */
-	public static function error( $data = array() ) {
-		\OC_JSON::error($data);
-	}
+    /**
+     * Send json error msg
+     *
+     * Return a json error message with optional extra data for
+     * error message or app specific data.
+     *
+     * Example use:
+     *
+     *     $id = [some value]
+     *     OCP\JSON::error(array('data':array('message':'An error happened', 'id': $id)));
+     *
+     * Will return the json formatted string:
+     *
+     *     {"status":"error","data":{"message":"An error happened", "id":[some value]}}
+     *
+     * @param array $data The data to use
+     * @deprecated 8.1.0 Use a AppFramework JSONResponse instead
+     * @suppress PhanDeprecatedFunction
+     */
+    public static function error( $data = array() ) {
+        \OC_JSON::error($data);
+    }
 
-	/**
-	 * Set Content-Type header to jsonrequest
-	 * @param string $type The content type header
-	 * @deprecated 8.1.0 Use a AppFramework JSONResponse instead
-	 * @suppress PhanDeprecatedFunction
-	 */
-	public static function setContentTypeHeader( $type='application/json' ) {
-		\OC_JSON::setContentTypeHeader($type);
-	}
+    /**
+     * Set Content-Type header to jsonrequest
+     * @param string $type The content type header
+     * @deprecated 8.1.0 Use a AppFramework JSONResponse instead
+     * @suppress PhanDeprecatedFunction
+     */
+    public static function setContentTypeHeader( $type='application/json' ) {
+        \OC_JSON::setContentTypeHeader($type);
+    }
 
-	/**
-	 * Check if the App is enabled and send JSON error message instead
-	 *
-	 * This method checks if a specific app is enabled. If not, a json error
-	 * response will be return and the method will exit from execution
-	 * of the script.
-	 * The returned json will be in the format:
-	 *
-	 *     {"status":"error","data":{"message":"Application is not enabled."}}
-	 *
-	 * Add this call to the start of all ajax method files that requires
-	 * a specific app to be enabled.
-	 *
-	 * @param string $app The app to check
-	 * @deprecated 8.1.0 Use the AppFramework instead. It will automatically check if the app is enabled.
-	 * @suppress PhanDeprecatedFunction
-	 */
-	public static function checkAppEnabled( $app ) {
-		\OC_JSON::checkAppEnabled($app);
-	}
+    /**
+     * Check if the App is enabled and send JSON error message instead
+     *
+     * This method checks if a specific app is enabled. If not, a json error
+     * response will be return and the method will exit from execution
+     * of the script.
+     * The returned json will be in the format:
+     *
+     *     {"status":"error","data":{"message":"Application is not enabled."}}
+     *
+     * Add this call to the start of all ajax method files that requires
+     * a specific app to be enabled.
+     *
+     * @param string $app The app to check
+     * @deprecated 8.1.0 Use the AppFramework instead. It will automatically check if the app is enabled.
+     * @suppress PhanDeprecatedFunction
+     */
+    public static function checkAppEnabled( $app ) {
+        \OC_JSON::checkAppEnabled($app);
+    }
 
-	/**
-	 * Check if the user is a admin, send json error msg if not
-	 *
-	 * This method checks if the current user has admin rights. If not, a json error
-	 * response will be return and the method will exit from execution
-	 * of the script.
-	 * The returned json will be in the format:
-	 *
-	 *     {"status":"error","data":{"message":"Authentication error."}}
-	 *
-	 * Add this call to the start of all ajax method files that requires
-	 * administrative rights.
-	 *
-	 * @deprecated 8.1.0 Use annotation based ACLs from the AppFramework instead
-	 * @suppress PhanDeprecatedFunction
-	 */
-	public static function checkAdminUser() {
-		\OC_JSON::checkAdminUser();
-	}
+    /**
+     * Check if the user is a admin, send json error msg if not
+     *
+     * This method checks if the current user has admin rights. If not, a json error
+     * response will be return and the method will exit from execution
+     * of the script.
+     * The returned json will be in the format:
+     *
+     *     {"status":"error","data":{"message":"Authentication error."}}
+     *
+     * Add this call to the start of all ajax method files that requires
+     * administrative rights.
+     *
+     * @deprecated 8.1.0 Use annotation based ACLs from the AppFramework instead
+     * @suppress PhanDeprecatedFunction
+     */
+    public static function checkAdminUser() {
+        \OC_JSON::checkAdminUser();
+    }
 }

Spacing +4 added lines, -4 removed lines

@@ -96,7 +96,7 @@ 
 	 * @deprecated 8.1.0 Use a AppFramework JSONResponse instead
 	 * @suppress PhanDeprecatedFunction
 	 */
-	public static function success( $data = array() ) {
+	public static function success($data = array()) {
 		\OC_JSON::success($data);
 	}
 
@@ -119,7 +119,7 @@ 
 	 * @deprecated 8.1.0 Use a AppFramework JSONResponse instead
 	 * @suppress PhanDeprecatedFunction
 	 */
-	public static function error( $data = array() ) {
+	public static function error($data = array()) {
 		\OC_JSON::error($data);
 	}
 
@@ -129,7 +129,7 @@ 
 	 * @deprecated 8.1.0 Use a AppFramework JSONResponse instead
 	 * @suppress PhanDeprecatedFunction
 	 */
-	public static function setContentTypeHeader( $type='application/json' ) {
+	public static function setContentTypeHeader($type = 'application/json') {
 		\OC_JSON::setContentTypeHeader($type);
 	}
 
@@ -150,7 +150,7 @@ 
 	 * @deprecated 8.1.0 Use the AppFramework instead. It will automatically check if the app is enabled.
 	 * @suppress PhanDeprecatedFunction
 	 */
-	public static function checkAppEnabled( $app ) {
+	public static function checkAppEnabled($app) {
 		\OC_JSON::checkAppEnabled($app);
 	}
 

lib/private/legacy/eventsource.php

Indentation +89 added lines, -89 removed lines

@@ -33,99 +33,99 @@
  * use server side events with caution, to many open requests can hang the server
  */
 class OC_EventSource implements \OCP\IEventSource {
-	/**
-	 * @var bool
-	 */
-	private $fallback;
+    /**
+     * @var bool
+     */
+    private $fallback;
 
-	/**
-	 * @var int
-	 */
-	private $fallBackId = 0;
+    /**
+     * @var int
+     */
+    private $fallBackId = 0;
 
-	/**
-	 * @var bool
-	 */
-	private $started = false;
+    /**
+     * @var bool
+     */
+    private $started = false;
 
-	protected function init() {
-		if ($this->started) {
-			return;
-		}
-		$this->started = true;
+    protected function init() {
+        if ($this->started) {
+            return;
+        }
+        $this->started = true;
 
-		// prevent php output buffering, caching and nginx buffering
-		OC_Util::obEnd();
-		header('Cache-Control: no-cache');
-		header('X-Accel-Buffering: no');
-		$this->fallback = isset($_GET['fallback']) and $_GET['fallback'] == 'true';
-		if ($this->fallback) {
-			$this->fallBackId = (int)$_GET['fallback_id'];
-			/**
-			 * FIXME: The default content-security-policy of ownCloud forbids inline
-			 * JavaScript for security reasons. IE starting on Windows 10 will
-			 * however also obey the CSP which will break the event source fallback.
-			 *
-			 * As a workaround thus we set a custom policy which allows the execution
-			 * of inline JavaScript.
-			 *
-			 * @link https://github.com/owncloud/core/issues/14286
-			 */
-			header("Content-Security-Policy: default-src 'none'; script-src 'unsafe-inline'");
-			header("Content-Type: text/html");
-			echo str_repeat('<span></span>' . PHP_EOL, 10); //dummy data to keep IE happy
-		} else {
-			header("Content-Type: text/event-stream");
-		}
-		if(!\OC::$server->getRequest()->passesStrictCookieCheck()) {
-			header('Location: '.\OC::$WEBROOT);
-			exit();
-		}
-		if (!\OC::$server->getRequest()->passesCSRFCheck()) {
-			$this->send('error', 'Possible CSRF attack. Connection will be closed.');
-			$this->close();
-			exit();
-		}
-		flush();
-	}
+        // prevent php output buffering, caching and nginx buffering
+        OC_Util::obEnd();
+        header('Cache-Control: no-cache');
+        header('X-Accel-Buffering: no');
+        $this->fallback = isset($_GET['fallback']) and $_GET['fallback'] == 'true';
+        if ($this->fallback) {
+            $this->fallBackId = (int)$_GET['fallback_id'];
+            /**
+             * FIXME: The default content-security-policy of ownCloud forbids inline
+             * JavaScript for security reasons. IE starting on Windows 10 will
+             * however also obey the CSP which will break the event source fallback.
+             *
+             * As a workaround thus we set a custom policy which allows the execution
+             * of inline JavaScript.
+             *
+             * @link https://github.com/owncloud/core/issues/14286
+             */
+            header("Content-Security-Policy: default-src 'none'; script-src 'unsafe-inline'");
+            header("Content-Type: text/html");
+            echo str_repeat('<span></span>' . PHP_EOL, 10); //dummy data to keep IE happy
+        } else {
+            header("Content-Type: text/event-stream");
+        }
+        if(!\OC::$server->getRequest()->passesStrictCookieCheck()) {
+            header('Location: '.\OC::$WEBROOT);
+            exit();
+        }
+        if (!\OC::$server->getRequest()->passesCSRFCheck()) {
+            $this->send('error', 'Possible CSRF attack. Connection will be closed.');
+            $this->close();
+            exit();
+        }
+        flush();
+    }
 
-	/**
-	 * send a message to the client
-	 *
-	 * @param string $type
-	 * @param mixed $data
-	 *
-	 * @throws \BadMethodCallException
-	 * if only one parameter is given, a typeless message will be send with that parameter as data
-	 * @suppress PhanDeprecatedFunction
-	 */
-	public function send($type, $data = null) {
-		if ($data and !preg_match('/^[A-Za-z0-9_]+$/', $type)) {
-			throw new BadMethodCallException('Type needs to be alphanumeric ('. $type .')');
-		}
-		$this->init();
-		if (is_null($data)) {
-			$data = $type;
-			$type = null;
-		}
-		if ($this->fallback) {
-			$response = '<script type="text/javascript">window.parent.OC.EventSource.fallBackCallBack('
-				. $this->fallBackId . ',"' . $type . '",' . OC_JSON::encode($data) . ')</script>' . PHP_EOL;
-			echo $response;
-		} else {
-			if ($type) {
-				echo 'event: ' . $type . PHP_EOL;
-			}
-			echo 'data: ' . OC_JSON::encode($data) . PHP_EOL;
-		}
-		echo PHP_EOL;
-		flush();
-	}
+    /**
+     * send a message to the client
+     *
+     * @param string $type
+     * @param mixed $data
+     *
+     * @throws \BadMethodCallException
+     * if only one parameter is given, a typeless message will be send with that parameter as data
+     * @suppress PhanDeprecatedFunction
+     */
+    public function send($type, $data = null) {
+        if ($data and !preg_match('/^[A-Za-z0-9_]+$/', $type)) {
+            throw new BadMethodCallException('Type needs to be alphanumeric ('. $type .')');
+        }
+        $this->init();
+        if (is_null($data)) {
+            $data = $type;
+            $type = null;
+        }
+        if ($this->fallback) {
+            $response = '<script type="text/javascript">window.parent.OC.EventSource.fallBackCallBack('
+                . $this->fallBackId . ',"' . $type . '",' . OC_JSON::encode($data) . ')</script>' . PHP_EOL;
+            echo $response;
+        } else {
+            if ($type) {
+                echo 'event: ' . $type . PHP_EOL;
+            }
+            echo 'data: ' . OC_JSON::encode($data) . PHP_EOL;
+        }
+        echo PHP_EOL;
+        flush();
+    }
 
-	/**
-	 * close the connection of the event source
-	 */
-	public function close() {
-		$this->send('__internal__', 'close'); //server side closing can be an issue, let the client do it
-	}
+    /**
+     * close the connection of the event source
+     */
+    public function close() {
+        $this->send('__internal__', 'close'); //server side closing can be an issue, let the client do it
+    }
 }

Spacing +7 added lines, -7 removed lines

@@ -60,7 +60,7 @@ 
 		header('X-Accel-Buffering: no');
 		$this->fallback = isset($_GET['fallback']) and $_GET['fallback'] == 'true';
 		if ($this->fallback) {
-			$this->fallBackId = (int)$_GET['fallback_id'];
+			$this->fallBackId = (int) $_GET['fallback_id'];
 			/**
 			 * FIXME: The default content-security-policy of ownCloud forbids inline
 			 * JavaScript for security reasons. IE starting on Windows 10 will
@@ -73,11 +73,11 @@ 
 			 */
 			header("Content-Security-Policy: default-src 'none'; script-src 'unsafe-inline'");
 			header("Content-Type: text/html");
-			echo str_repeat('<span></span>' . PHP_EOL, 10); //dummy data to keep IE happy
+			echo str_repeat('<span></span>'.PHP_EOL, 10); //dummy data to keep IE happy
 		} else {
 			header("Content-Type: text/event-stream");
 		}
-		if(!\OC::$server->getRequest()->passesStrictCookieCheck()) {
+		if (!\OC::$server->getRequest()->passesStrictCookieCheck()) {
 			header('Location: '.\OC::$WEBROOT);
 			exit();
 		}
@@ -101,7 +101,7 @@ 
 	 */
 	public function send($type, $data = null) {
 		if ($data and !preg_match('/^[A-Za-z0-9_]+$/', $type)) {
-			throw new BadMethodCallException('Type needs to be alphanumeric ('. $type .')');
+			throw new BadMethodCallException('Type needs to be alphanumeric ('.$type.')');
 		}
 		$this->init();
 		if (is_null($data)) {
@@ -110,13 +110,13 @@ 
 		}
 		if ($this->fallback) {
 			$response = '<script type="text/javascript">window.parent.OC.EventSource.fallBackCallBack('
-				. $this->fallBackId . ',"' . $type . '",' . OC_JSON::encode($data) . ')</script>' . PHP_EOL;
+				. $this->fallBackId.',"'.$type.'",'.OC_JSON::encode($data).')</script>'.PHP_EOL;
 			echo $response;
 		} else {
 			if ($type) {
-				echo 'event: ' . $type . PHP_EOL;
+				echo 'event: '.$type.PHP_EOL;
 			}
-			echo 'data: ' . OC_JSON::encode($data) . PHP_EOL;
+			echo 'data: '.OC_JSON::encode($data).PHP_EOL;
 		}
 		echo PHP_EOL;
 		flush();