X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=application%2Fconfig%2FConfigJson.php;h=c0c0dab9ab9df4ce10f0a8217ae28a88dc011483;hb=8fabcd0224b1122a48b495326854bb3562cd2e9d;hp=30908d90db436574f9585d20d6b437f29d56e363;hpb=3c66e56435359dc678048193e8ee239d06f79b64;p=github%2Fshaarli%2FShaarli.git
diff --git a/application/config/ConfigJson.php b/application/config/ConfigJson.php
index 30908d90..c0c0dab9 100644
--- a/application/config/ConfigJson.php
+++ b/application/config/ConfigJson.php
@@ -21,8 +21,19 @@ class ConfigJson implements ConfigIO
$data = str_replace(self::getPhpSuffix(), '', $data);
$data = json_decode($data, true);
if ($data === null) {
- $error = json_last_error();
- throw new \Exception('An error occurred while parsing JSON file: error code #'. $error);
+ $errorCode = json_last_error();
+ $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 .= '
';
+ $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;
}
@@ -35,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.')
);
}
}