prehistoric-systems/mytinytodo
1
0
Fork 0
mirror of https://github.com/maxpozdeev/mytinytodo.git synced 2026-03-11 08:55:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

prevent possible errors if settings are saved as invalid JSON

Browse source
This commit is contained in:
Max Pozdeev 2022-04-15 20:13:29 +03:00
parent c45e6c6bef
commit 2dc8a2213f
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/includes/class.config.php
View file

@ -213,7 +213,11 @@ class Config
$db = DBConnection::instance();
$json = $db->sq("SELECT param_value FROM {$db->prefix}settings WHERE param_key = ?", array($key));
if (!$json) return array();
$j = json_decode($json, true);
$j = json_decode($json, true, 100, JSON_INVALID_UTF8_SUBSTITUTE);
if ($j === false) {
error_log("MTT Error: Failed to decode JSON object with settings. Code: ". (int)json_last_error());
return array();
}
return $j;
}
@ -238,7 +242,10 @@ class Config
*/
public static function saveDomain($key, $array)
{
$json = json_encode($array, JSON_PRETTY_PRINT);
$json = json_encode($array, JSON_PRETTY_PRINT /*| JSON_INVALID_UTF8_SUBSTITUTE*/);
if ($json === false) {
throw new Exception("Failed to create JSON object with settings. Code: ". (int)json_last_error());
}
$db = DBConnection::instance();
$keyExists = $db->sq("SELECT COUNT(param_key) FROM {$db->prefix}settings WHERE param_key = ?", array($key) );
if ($keyExists) {