X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=application%2Fconfig%2FConfigJson.php;h=4509357ce887ea8a28334a68c50f999294780243;hb=f3d2f257946e2a3c8791c1ba99b379acbe934fec;hp=cbafbf6da07c3869c74151dbc7fbfc736560ff3d;hpb=b74b96bfbd0b778ac50fd17f5e107c51435b1678;p=github%2Fshaarli%2FShaarli.git diff --git a/application/config/ConfigJson.php b/application/config/ConfigJson.php index cbafbf6d..4509357c 100644 --- a/application/config/ConfigJson.php +++ b/application/config/ConfigJson.php @@ -1,4 +1,5 @@ ➜ ' . json_last_error_msg() .''; + if ($errorCode === JSON_ERROR_SYNTAX) { + $error .= '
'; + $error .= 'Please check your JSON syntax (without PHP comment tags) using a JSON lint tool such as '; + $error .= 'jsonlint.com.'; + } + throw new \Exception($error); } return $data; } @@ -42,16 +41,16 @@ class ConfigJson implements ConfigIO /** * @inheritdoc */ - function write($filepath, $conf) + public function write($filepath, $conf) { // JSON_PRETTY_PRINT is available from PHP 5.4. $print = defined('JSON_PRETTY_PRINT') ? JSON_PRETTY_PRINT : 0; - $data = self::$PHP_HEADER . json_encode($conf, $print); + $data = self::getPhpHeaders() . json_encode($conf, $print) . self::getPhpSuffix(); if (!file_put_contents($filepath, $data)) { - throw new IOException( + throw new \Shaarli\Exceptions\IOException( $filepath, - 'Shaarli could not create the config file. - Please make sure Shaarli has the right to write in the folder is it installed in.' + t('Shaarli could not create the config file. '. + 'Please make sure Shaarli has the right to write in the folder is it installed in.') ); } } @@ -59,8 +58,33 @@ class ConfigJson implements ConfigIO /** * @inheritdoc */ - function getExtension() + public function getExtension() { return '.json.php'; } + + /** + * The JSON data is wrapped in a PHP file for security purpose. + * This way, even if the file is accessible, credentials and configuration won't be exposed. + * + * Note: this isn't a static field because concatenation isn't supported in field declaration before PHP 5.6. + * + * @return string PHP start tag and comment tag. + */ + public static function getPhpHeaders() + { + return ''; + } }