nextcloud / server

lib/public/Template.php

Doc Comments +1 added lines, -1 removed lines

@@ -106,7 +106,7 @@
 /**
  * Return the relative date in relation to today. Returns something like "last hour" or "two month ago"
  * @param int $timestamp unix timestamp
- * @param boolean $dateOnly
+ * @param integer $dateOnly
  * @return string human readable interpretation of the timestamp
  *
  * @deprecated 8.0.0 Use \OCP\Template::relative_modified_date() instead

lib/private/L10N/L10NString.php

Indentation +46 added lines, -46 removed lines

@@ -29,59 +29,59 @@
 namespace OC\L10N;
 
 class L10NString implements \JsonSerializable {
-	/** @var \OC\L10N\L10N */
-	protected $l10n;
+    /** @var \OC\L10N\L10N */
+    protected $l10n;
 
-	/** @var string */
-	protected $text;
+    /** @var string */
+    protected $text;
 
-	/** @var array */
-	protected $parameters;
+    /** @var array */
+    protected $parameters;
 
-	/** @var integer */
-	protected $count;
+    /** @var integer */
+    protected $count;
 
-	/**
-	 * @param \OC\L10N\L10N $l10n
-	 * @param string|string[] $text
-	 * @param array $parameters
-	 * @param int $count
-	 */
-	public function __construct(\OC\L10N\L10N $l10n, $text, $parameters, $count = 1) {
-		$this->l10n = $l10n;
-		$this->text = $text;
-		$this->parameters = $parameters;
-		$this->count = $count;
-	}
+    /**
+     * @param \OC\L10N\L10N $l10n
+     * @param string|string[] $text
+     * @param array $parameters
+     * @param int $count
+     */
+    public function __construct(\OC\L10N\L10N $l10n, $text, $parameters, $count = 1) {
+        $this->l10n = $l10n;
+        $this->text = $text;
+        $this->parameters = $parameters;
+        $this->count = $count;
+    }
 
-	/**
-	 * @return string
-	 */
-	public function __toString() {
-		$translations = $this->l10n->getTranslations();
+    /**
+     * @return string
+     */
+    public function __toString() {
+        $translations = $this->l10n->getTranslations();
 
-		$text = $this->text;
-		if(array_key_exists($this->text, $translations)) {
-			if(is_array($translations[$this->text])) {
-				$fn = $this->l10n->getPluralFormFunction();
-				$id = $fn($this->count);
-				$text = $translations[$this->text][$id];
-			}
-			else{
-				$text = $translations[$this->text];
-			}
-		}
+        $text = $this->text;
+        if(array_key_exists($this->text, $translations)) {
+            if(is_array($translations[$this->text])) {
+                $fn = $this->l10n->getPluralFormFunction();
+                $id = $fn($this->count);
+                $text = $translations[$this->text][$id];
+            }
+            else{
+                $text = $translations[$this->text];
+            }
+        }
 
-		// Replace %n first (won't interfere with vsprintf)
-		$text = str_replace('%n', $this->count, $text);
-		return vsprintf($text, $this->parameters);
-	}
+        // Replace %n first (won't interfere with vsprintf)
+        $text = str_replace('%n', $this->count, $text);
+        return vsprintf($text, $this->parameters);
+    }
 
 
-	/**
-	 * @return string
-	 */
-	public function jsonSerialize() {
-		return $this->__toString();
-	}
+    /**
+     * @return string
+     */
+    public function jsonSerialize() {
+        return $this->__toString();
+    }
 }

lib/private/L10N/L10N.php

Indentation +186 added lines, -186 removed lines

@@ -28,190 +28,190 @@
 
 class L10N implements IL10N {
 
-	/** @var IFactory */
-	protected $factory;
-
-	/** @var string App of this object */
-	protected $app;
-
-	/** @var string Language of this object */
-	protected $lang;
-
-	/** @var string Plural forms (string) */
-	private $pluralFormString = 'nplurals=2; plural=(n != 1);';
-
-	/** @var string Plural forms (function) */
-	private $pluralFormFunction = null;
-
-	/** @var string[] */
-	private $translations = [];
-
-	/**
-	 * @param IFactory $factory
-	 * @param string $app
-	 * @param string $lang
-	 * @param array $files
-	 */
-	public function __construct(IFactory $factory, $app, $lang, array $files) {
-		$this->factory = $factory;
-		$this->app = $app;
-		$this->lang = $lang;
-
-		$this->translations = [];
-		foreach ($files as $languageFile) {
-			$this->load($languageFile);
-		}
-	}
-
-	/**
-	 * The code (en, de, ...) of the language that is used for this instance
-	 *
-	 * @return string language
-	 */
-	public function getLanguageCode() {
-		return $this->lang;
-	}
-
-	/**
-	 * Translating
-	 * @param string $text The text we need a translation for
-	 * @param array $parameters default:array() Parameters for sprintf
-	 * @return string Translation or the same text
-	 *
-	 * Returns the translation. If no translation is found, $text will be
-	 * returned.
-	 */
-	public function t($text, $parameters = array()) {
-		return (string) new L10NString($this, $text, $parameters);
-	}
-
-	/**
-	 * Translating
-	 * @param string $text_singular the string to translate for exactly one object
-	 * @param string $text_plural the string to translate for n objects
-	 * @param integer $count Number of objects
-	 * @param array $parameters default:array() Parameters for sprintf
-	 * @return string Translation or the same text
-	 *
-	 * Returns the translation. If no translation is found, $text will be
-	 * returned. %n will be replaced with the number of objects.
-	 *
-	 * The correct plural is determined by the plural_forms-function
-	 * provided by the po file.
-	 *
-	 */
-	public function n($text_singular, $text_plural, $count, $parameters = array()) {
-		$identifier = "_${text_singular}_::_${text_plural}_";
-		if (isset($this->translations[$identifier])) {
-			return (string) new L10NString($this, $identifier, $parameters, $count);
-		} else {
-			if ($count === 1) {
-				return (string) new L10NString($this, $text_singular, $parameters, $count);
-			} else {
-				return (string) new L10NString($this, $text_plural, $parameters, $count);
-			}
-		}
-	}
-
-	/**
-	 * Localization
-	 * @param string $type Type of localization
-	 * @param \DateTime|int|string $data parameters for this localization
-	 * @param array $options
-	 * @return string|int|false
-	 *
-	 * Returns the localized data.
-	 *
-	 * Implemented types:
-	 *  - date
-	 *    - Creates a date
-	 *    - params: timestamp (int/string)
-	 *  - datetime
-	 *    - Creates date and time
-	 *    - params: timestamp (int/string)
-	 *  - time
-	 *    - Creates a time
-	 *    - params: timestamp (int/string)
-	 *  - firstday: Returns the first day of the week (0 sunday - 6 saturday)
-	 *  - jsdate: Returns the short JS date format
-	 */
-	public function l($type, $data = null, $options = array()) {
-		// Use the language of the instance
-		$locale = $this->getLanguageCode();
-		if ($locale === 'sr@latin') {
-			$locale = 'sr_latn';
-		}
-
-		if ($type === 'firstday') {
-			return (int) Calendar::getFirstWeekday($locale);
-		}
-		if ($type === 'jsdate') {
-			return (string) Calendar::getDateFormat('short', $locale);
-		}
-
-		$value = new \DateTime();
-		if ($data instanceof \DateTime) {
-			$value = $data;
-		} else if (is_string($data) && !is_numeric($data)) {
-			$data = strtotime($data);
-			$value->setTimestamp($data);
-		} else if ($data !== null) {
-			$value->setTimestamp($data);
-		}
-
-		$options = array_merge(array('width' => 'long'), $options);
-		$width = $options['width'];
-		switch ($type) {
-			case 'date':
-				return (string) Calendar::formatDate($value, $width, $locale);
-			case 'datetime':
-				return (string) Calendar::formatDatetime($value, $width, $locale);
-			case 'time':
-				return (string) Calendar::formatTime($value, $width, $locale);
-			default:
-				return false;
-		}
-	}
-
-	/**
-	 * Returns an associative array with all translations
-	 *
-	 * Called by \OC_L10N_String
-	 * @return array
-	 */
-	public function getTranslations() {
-		return $this->translations;
-	}
-
-	/**
-	 * Returnsed function accepts the argument $n
-	 *
-	 * Called by \OC_L10N_String
-	 * @return string the plural form function
-	 */
-	public function getPluralFormFunction() {
-		if (is_null($this->pluralFormFunction)) {
-			$this->pluralFormFunction = $this->factory->createPluralFunction($this->pluralFormString);
-		}
-		return $this->pluralFormFunction;
-	}
-
-	/**
-	 * @param $translationFile
-	 * @return bool
-	 */
-	protected function load($translationFile) {
-		$json = json_decode(file_get_contents($translationFile), true);
-		if (!is_array($json)) {
-			$jsonError = json_last_error();
-			\OC::$server->getLogger()->warning("Failed to load $translationFile - json error code: $jsonError", ['app' => 'l10n']);
-			return false;
-		}
-
-		if (!empty($json['pluralForm'])) {
-			$this->pluralFormString = $json['pluralForm'];
-		}
-		$this->translations = array_merge($this->translations, $json['translations']);
-		return true;
-	}
+    /** @var IFactory */
+    protected $factory;
+
+    /** @var string App of this object */
+    protected $app;
+
+    /** @var string Language of this object */
+    protected $lang;
+
+    /** @var string Plural forms (string) */
+    private $pluralFormString = 'nplurals=2; plural=(n != 1);';
+
+    /** @var string Plural forms (function) */
+    private $pluralFormFunction = null;
+
+    /** @var string[] */
+    private $translations = [];
+
+    /**
+     * @param IFactory $factory
+     * @param string $app
+     * @param string $lang
+     * @param array $files
+     */
+    public function __construct(IFactory $factory, $app, $lang, array $files) {
+        $this->factory = $factory;
+        $this->app = $app;
+        $this->lang = $lang;
+
+        $this->translations = [];
+        foreach ($files as $languageFile) {
+            $this->load($languageFile);
+        }
+    }
+
+    /**
+     * The code (en, de, ...) of the language that is used for this instance
+     *
+     * @return string language
+     */
+    public function getLanguageCode() {
+        return $this->lang;
+    }
+
+    /**
+     * Translating
+     * @param string $text The text we need a translation for
+     * @param array $parameters default:array() Parameters for sprintf
+     * @return string Translation or the same text
+     *
+     * Returns the translation. If no translation is found, $text will be
+     * returned.
+     */
+    public function t($text, $parameters = array()) {
+        return (string) new L10NString($this, $text, $parameters);
+    }
+
+    /**
+     * Translating
+     * @param string $text_singular the string to translate for exactly one object
+     * @param string $text_plural the string to translate for n objects
+     * @param integer $count Number of objects
+     * @param array $parameters default:array() Parameters for sprintf
+     * @return string Translation or the same text
+     *
+     * Returns the translation. If no translation is found, $text will be
+     * returned. %n will be replaced with the number of objects.
+     *
+     * The correct plural is determined by the plural_forms-function
+     * provided by the po file.
+     *
+     */
+    public function n($text_singular, $text_plural, $count, $parameters = array()) {
+        $identifier = "_${text_singular}_::_${text_plural}_";
+        if (isset($this->translations[$identifier])) {
+            return (string) new L10NString($this, $identifier, $parameters, $count);
+        } else {
+            if ($count === 1) {
+                return (string) new L10NString($this, $text_singular, $parameters, $count);
+            } else {
+                return (string) new L10NString($this, $text_plural, $parameters, $count);
+            }
+        }
+    }
+
+    /**
+     * Localization
+     * @param string $type Type of localization
+     * @param \DateTime|int|string $data parameters for this localization
+     * @param array $options
+     * @return string|int|false
+     *
+     * Returns the localized data.
+     *
+     * Implemented types:
+     *  - date
+     *    - Creates a date
+     *    - params: timestamp (int/string)
+     *  - datetime
+     *    - Creates date and time
+     *    - params: timestamp (int/string)
+     *  - time
+     *    - Creates a time
+     *    - params: timestamp (int/string)
+     *  - firstday: Returns the first day of the week (0 sunday - 6 saturday)
+     *  - jsdate: Returns the short JS date format
+     */
+    public function l($type, $data = null, $options = array()) {
+        // Use the language of the instance
+        $locale = $this->getLanguageCode();
+        if ($locale === 'sr@latin') {
+            $locale = 'sr_latn';
+        }
+
+        if ($type === 'firstday') {
+            return (int) Calendar::getFirstWeekday($locale);
+        }
+        if ($type === 'jsdate') {
+            return (string) Calendar::getDateFormat('short', $locale);
+        }
+
+        $value = new \DateTime();
+        if ($data instanceof \DateTime) {
+            $value = $data;
+        } else if (is_string($data) && !is_numeric($data)) {
+            $data = strtotime($data);
+            $value->setTimestamp($data);
+        } else if ($data !== null) {
+            $value->setTimestamp($data);
+        }
+
+        $options = array_merge(array('width' => 'long'), $options);
+        $width = $options['width'];
+        switch ($type) {
+            case 'date':
+                return (string) Calendar::formatDate($value, $width, $locale);
+            case 'datetime':
+                return (string) Calendar::formatDatetime($value, $width, $locale);
+            case 'time':
+                return (string) Calendar::formatTime($value, $width, $locale);
+            default:
+                return false;
+        }
+    }
+
+    /**
+     * Returns an associative array with all translations
+     *
+     * Called by \OC_L10N_String
+     * @return array
+     */
+    public function getTranslations() {
+        return $this->translations;
+    }
+
+    /**
+     * Returnsed function accepts the argument $n
+     *
+     * Called by \OC_L10N_String
+     * @return string the plural form function
+     */
+    public function getPluralFormFunction() {
+        if (is_null($this->pluralFormFunction)) {
+            $this->pluralFormFunction = $this->factory->createPluralFunction($this->pluralFormString);
+        }
+        return $this->pluralFormFunction;
+    }
+
+    /**
+     * @param $translationFile
+     * @return bool
+     */
+    protected function load($translationFile) {
+        $json = json_decode(file_get_contents($translationFile), true);
+        if (!is_array($json)) {
+            $jsonError = json_last_error();
+            \OC::$server->getLogger()->warning("Failed to load $translationFile - json error code: $jsonError", ['app' => 'l10n']);
+            return false;
+        }
+
+        if (!empty($json['pluralForm'])) {
+            $this->pluralFormString = $json['pluralForm'];
+        }
+        $this->translations = array_merge($this->translations, $json['translations']);
+        return true;
+    }
 }

lib/private/legacy/json.php

Indentation +136 added lines, -136 removed lines

@@ -35,154 +35,154 @@
  * @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.
-	 */
-	public static function checkAppEnabled($app) {
-		if( !OC_App::isEnabled($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.
+     */
+    public static function checkAppEnabled($app) {
+        if( !OC_App::isEnabled($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
-	 */
-	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
+     */
+    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
-	 */
-	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
+     */
+    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
-	 */
-	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
+     */
+    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 is a given user exists - send json error msg if not
-	 * @param string $user
-	 * @deprecated Use a AppFramework JSONResponse instead
-	 */
-	public static function checkUserExists($user) {
-		if (!OCP\User::userExists($user)) {
-			$l = \OC::$server->getL10N('lib');
-			OCP\JSON::error(array('data' => array('message' => $l->t('Unknown user'), 'error' => 'unknown_user' )));
-			exit;
-		}
-	}
+    /**
+     * Check is a given user exists - send json error msg if not
+     * @param string $user
+     * @deprecated Use a AppFramework JSONResponse instead
+     */
+    public static function checkUserExists($user) {
+        if (!OCP\User::userExists($user)) {
+            $l = \OC::$server->getL10N('lib');
+            OCP\JSON::error(array('data' => array('message' => $l->t('Unknown user'), 'error' => 'unknown_user' )));
+            exit;
+        }
+    }
 
 
-	/**
-	 * Check if the user is a subadmin, send json error msg if not
-	 * @deprecated Use annotation based ACLs from the AppFramework instead
-	 */
-	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
+     */
+    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
-	 */
-	public static function error($data = array()) {
-		$data['status'] = 'error';
-		self::encodedPrint($data);
-	}
+    /**
+     * Send json error msg
+     * @deprecated Use a AppFramework JSONResponse instead
+     */
+    public static function error($data = array()) {
+        $data['status'] = 'error';
+        self::encodedPrint($data);
+    }
 
-	/**
-	 * Send json success msg
-	 * @deprecated Use a AppFramework JSONResponse instead
-	 */
-	public static function success($data = array()) {
-		$data['status'] = 'success';
-		self::encodedPrint($data);
-	}
+    /**
+     * Send json success msg
+     * @deprecated Use a AppFramework JSONResponse instead
+     */
+    public static function success($data = array()) {
+        $data['status'] = 'success';
+        self::encodedPrint($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 and print $data in json format
-	 * @deprecated Use a AppFramework JSONResponse instead
-	 */
-	public static function encodedPrint($data, $setContentType=true) {
-		if($setContentType) {
-			self::setContentTypeHeader();
-		}
-		echo self::encode($data);
-	}
+    /**
+     * Encode and print $data in json format
+     * @deprecated Use a AppFramework JSONResponse instead
+     */
+    public static function encodedPrint($data, $setContentType=true) {
+        if($setContentType) {
+            self::setContentTypeHeader();
+        }
+        echo self::encode($data);
+    }
 
-	/**
-	 * 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);
+    }
 }

Spacing +19 added lines, -19 removed lines

@@ -34,16 +34,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;
 		}
 	}
@@ -54,9 +54,9 @@ 
 	 * @deprecated Use the AppFramework instead. It will automatically check if the app is enabled.
 	 */
 	public static function checkAppEnabled($app) {
-		if( !OC_App::isEnabled($app)) {
+		if (!OC_App::isEnabled($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();
 		}
 	}
@@ -67,11 +67,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();
 		}
 	}
@@ -81,14 +81,14 @@ 
 	 * @deprecated Use annotation based CSRF checks from the AppFramework instead
 	 */
 	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();
 		}
 	}
@@ -98,9 +98,9 @@ 
 	 * @deprecated Use annotation based ACLs from the AppFramework instead
 	 */
 	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();
 		}
 	}
@@ -113,7 +113,7 @@ 
 	public static function checkUserExists($user) {
 		if (!OCP\User::userExists($user)) {
 			$l = \OC::$server->getL10N('lib');
-			OCP\JSON::error(array('data' => array('message' => $l->t('Unknown user'), 'error' => 'unknown_user' )));
+			OCP\JSON::error(array('data' => array('message' => $l->t('Unknown user'), 'error' => 'unknown_user')));
 			exit;
 		}
 	}
@@ -126,13 +126,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();
 		}
 	}
@@ -160,7 +160,7 @@ 
 	 */
 	protected static function to_string(&$value) {
 		if ($value instanceof \OC\L10N\L10NString) {
-			$value = (string)$value;
+			$value = (string) $value;
 		}
 	}
 
@@ -168,8 +168,8 @@ 
 	 * Encode and print $data in json format
 	 * @deprecated Use a AppFramework JSONResponse instead
 	 */
-	public static function encodedPrint($data, $setContentType=true) {
-		if($setContentType) {
+	public static function encodedPrint($data, $setContentType = true) {
+		if ($setContentType) {
 			self::setContentTypeHeader();
 		}
 		echo self::encode($data);

lib/public/IL10N.php

Indentation +61 added lines, -61 removed lines

@@ -43,69 +43,69 @@
  * @since 6.0.0
  */
 interface IL10N {
-	/**
-	 * Translating
-	 * @param string $text The text we need a translation for
-	 * @param array $parameters default:array() Parameters for sprintf
-	 * @return string Translation or the same text
-	 *
-	 * Returns the translation. If no translation is found, $text will be
-	 * returned.
-	 * @since 6.0.0
-	 */
-	public function t($text, $parameters = array());
+    /**
+     * Translating
+     * @param string $text The text we need a translation for
+     * @param array $parameters default:array() Parameters for sprintf
+     * @return string Translation or the same text
+     *
+     * Returns the translation. If no translation is found, $text will be
+     * returned.
+     * @since 6.0.0
+     */
+    public function t($text, $parameters = array());
 
-	/**
-	 * Translating
-	 * @param string $text_singular the string to translate for exactly one object
-	 * @param string $text_plural the string to translate for n objects
-	 * @param integer $count Number of objects
-	 * @param array $parameters default:array() Parameters for sprintf
-	 * @return string Translation or the same text
-	 *
-	 * Returns the translation. If no translation is found, $text will be
-	 * returned. %n will be replaced with the number of objects.
-	 *
-	 * The correct plural is determined by the plural_forms-function
-	 * provided by the po file.
-	 * @since 6.0.0
-	 *
-	 */
-	public function n($text_singular, $text_plural, $count, $parameters = array());
+    /**
+     * Translating
+     * @param string $text_singular the string to translate for exactly one object
+     * @param string $text_plural the string to translate for n objects
+     * @param integer $count Number of objects
+     * @param array $parameters default:array() Parameters for sprintf
+     * @return string Translation or the same text
+     *
+     * Returns the translation. If no translation is found, $text will be
+     * returned. %n will be replaced with the number of objects.
+     *
+     * The correct plural is determined by the plural_forms-function
+     * provided by the po file.
+     * @since 6.0.0
+     *
+     */
+    public function n($text_singular, $text_plural, $count, $parameters = array());
 
-	/**
-	 * Localization
-	 * @param string $type Type of localization
-	 * @param \DateTime|int|string $data parameters for this localization
-	 * @param array $options currently supports following options:
-	 * 			- 'width': handed into \Punic\Calendar::formatDate as second parameter
-	 * @return string|int|false
-	 *
-	 * Returns the localized data.
-	 *
-	 * Implemented types:
-	 *  - date
-	 *    - Creates a date
-	 *    - l10n-field: date
-	 *    - params: timestamp (int/string)
-	 *  - datetime
-	 *    - Creates date and time
-	 *    - l10n-field: datetime
-	 *    - params: timestamp (int/string)
-	 *  - time
-	 *    - Creates a time
-	 *    - l10n-field: time
-	 *    - params: timestamp (int/string)
-	 * @since 6.0.0 - parameter $options was added in 8.0.0
-	 */
-	public function l($type, $data, $options = array());
+    /**
+     * Localization
+     * @param string $type Type of localization
+     * @param \DateTime|int|string $data parameters for this localization
+     * @param array $options currently supports following options:
+     * 			- 'width': handed into \Punic\Calendar::formatDate as second parameter
+     * @return string|int|false
+     *
+     * Returns the localized data.
+     *
+     * Implemented types:
+     *  - date
+     *    - Creates a date
+     *    - l10n-field: date
+     *    - params: timestamp (int/string)
+     *  - datetime
+     *    - Creates date and time
+     *    - l10n-field: datetime
+     *    - params: timestamp (int/string)
+     *  - time
+     *    - Creates a time
+     *    - l10n-field: time
+     *    - params: timestamp (int/string)
+     * @since 6.0.0 - parameter $options was added in 8.0.0
+     */
+    public function l($type, $data, $options = array());
 
 
-	/**
-	 * The code (en, de, ...) of the language that is used for this IL10N object
-	 *
-	 * @return string language
-	 * @since 7.0.0
-	 */
-	public function getLanguageCode();
+    /**
+     * The code (en, de, ...) of the language that is used for this IL10N object
+     *
+     * @return string language
+     * @since 7.0.0
+     */
+    public function getLanguageCode();
 }