From cd80258a0c15b260bed63ab78c045fd0bc8bee63 Mon Sep 17 00:00:00 2001 From: Nate Jones Date: Sat, 24 Jan 2015 04:39:17 +0000 Subject: [PATCH] Default Settings Edit: JSON value detection. Functions: is_json function added. --- .../default_settings/default_setting_edit.php | 30 +++++++++++++------ resources/functions.php | 8 +++++ 2 files changed, 29 insertions(+), 9 deletions(-) diff --git a/core/default_settings/default_setting_edit.php b/core/default_settings/default_setting_edit.php index 0ba7e816f2..d2458f784b 100644 --- a/core/default_settings/default_setting_edit.php +++ b/core/default_settings/default_setting_edit.php @@ -261,7 +261,8 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { echo " \n"; } echo " \n"; - } elseif ($category == "cdr" && $subcategory == "storage" && $name == "text" ) { + } + elseif ($category == "cdr" && $subcategory == "storage" && $name == "text" ) { echo " \n"; - } elseif ($category == "domain" && $subcategory == "menu" && $name == "uuid" ) { + } + elseif ($category == "domain" && $subcategory == "menu" && $name == "uuid" ) { echo " \n"; - } elseif ($category == "domain" && $subcategory == "template" && $name == "name" ) { + } + elseif ($category == "domain" && $subcategory == "template" && $name == "name" ) { echo " \n"; - } elseif ($category == "domain" && $subcategory == "language" && $name == "code" ) { + } + elseif ($category == "domain" && $subcategory == "language" && $name == "code" ) { echo " \n"; - } elseif ($category == "email" && $subcategory == "smtp_auth" && $name == "var" ) { + } + elseif ($category == "email" && $subcategory == "smtp_auth" && $name == "var" ) { echo " \n"; - } elseif ($category == "email" && $subcategory == "smtp_secure" && $name == "var" ) { + } + elseif ($category == "email" && $subcategory == "smtp_secure" && $name == "var" ) { echo " \n"; - } elseif ($category == "domain" && $subcategory == "time_zone" && $name == "name" ) { + } + elseif ($category == "domain" && $subcategory == "time_zone" && $name == "name" ) { echo " "; - } elseif ($category == "theme" && $subcategory == "domain_visible" && $name == "text" ) { + } + elseif ($category == "theme" && $subcategory == "domain_visible" && $name == "text" ) { echo " \n"; - } elseif ($category == "theme" && $subcategory == "cache" && $name == "boolean" ) { + } + elseif ($category == "theme" && $subcategory == "cache" && $name == "boolean" ) { echo " \n"; } + elseif (is_json($default_setting_value)) { + echo " \n"; + } else { echo " \n"; } diff --git a/resources/functions.php b/resources/functions.php index be4ddc726b..61eb9db077 100644 --- a/resources/functions.php +++ b/resources/functions.php @@ -1241,4 +1241,12 @@ function number_pad($number,$n) { return rtrim(mcrypt_decrypt(MCRYPT_RIJNDAEL_256, md5($key), base64_decode($str_to_dec), MCRYPT_MODE_CBC, md5(md5($key))), "\0"); } } + +//json detection + if (!function_exists('is_json')) { + function is_json($str) { + return (is_string($str) && is_object(json_decode($str))) ? true : false; + } + } + ?>