X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=application%2Fconfig%2FConfigJson.php;h=23b22269540d46f3a03770ea50865738e31c1209;hb=48df9f45b8c4b2995c1e04146071628668531b37;hp=30007eb4cfd550fc106d7ace97fca00545519cff;hpb=7af9a41881ed0b9d44d18a0ce03a123a8441adf5;p=github%2Fshaarli%2FShaarli.git
diff --git a/application/config/ConfigJson.php b/application/config/ConfigJson.php
index 30007eb4..23b22269 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;
}
@@ -29,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::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.')
);
}
}
@@ -46,7 +58,7 @@ class ConfigJson implements ConfigIO
/**
* @inheritdoc
*/
- function getExtension()
+ public function getExtension()
{
return '.json.php';
}
@@ -61,7 +73,7 @@ class ConfigJson implements ConfigIO
*/
public static function getPhpHeaders()
{
- return '';
+ return '*/ ?>';
}
}