X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=application%2Fconfig%2FConfigJson.php;h=23b22269540d46f3a03770ea50865738e31c1209;hb=ce901a58289c72bf7f4dc3515a2be70562cd618b;hp=9ef2ef562634bb346cf398b290093cbd02e66926;hpb=c4c655d9bfe68a914898d76bb9c479eea1b04f72;p=github%2Fshaarli%2FShaarli.git
diff --git a/application/config/ConfigJson.php b/application/config/ConfigJson.php
index 9ef2ef56..23b22269 100644
--- a/application/config/ConfigJson.php
+++ b/application/config/ConfigJson.php
@@ -19,13 +19,18 @@ class ConfigJson implements ConfigIO
$data = file_get_contents($filepath);
$data = str_replace(self::getPhpHeaders(), '', $data);
$data = str_replace(self::getPhpSuffix(), '', $data);
- $data = json_decode($data, true);
+ $data = json_decode(trim($data), true);
if ($data === null) {
$errorCode = json_last_error();
- $error = 'An error occurred while parsing JSON configuration file ('. $filepath .'): error code #';
- $error .= $errorCode. '
â ' . json_last_error_msg() .'
';
+ $error = sprintf(
+ 'An error occurred while parsing JSON configuration file (%s): error code #%d',
+ $filepath,
+ $errorCode
+ );
+ $error .= '
â ' . json_last_error_msg() .'
';
if ($errorCode === JSON_ERROR_SYNTAX) {
- $error .= '
Please check your JSON syntax (without PHP comment tags) using a JSON lint tool such as ';
+ $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);
@@ -41,11 +46,11 @@ class ConfigJson implements ConfigIO
// JSON_PRETTY_PRINT is available from PHP 5.4.
$print = defined('JSON_PRETTY_PRINT') ? JSON_PRETTY_PRINT : 0;
$data = self::getPhpHeaders() . json_encode($conf, $print) . self::getPhpSuffix();
- if (!file_put_contents($filepath, $data)) {
- throw new \IOException(
+ if (empty($filepath) || !file_put_contents($filepath, $data)) {
+ 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.')
);
}
}
@@ -68,7 +73,7 @@ class ConfigJson implements ConfigIO
*/
public static function getPhpHeaders()
{
- return '';
+ return '*/ ?>';
}
}