From 3abaff004c7f966070007b4e8d6ccc2cddd53046 Mon Sep 17 00:00:00 2001 From: markjcrane Date: Wed, 4 May 2016 00:22:35 -0600 Subject: [PATCH] Check the missing array has content before processing it. --- app/edit/app_defaults.php | 2 +- app/fax/app_defaults.php | 3 +- app/phrases/app_defaults.php | 2 +- app/provision/app_defaults.php | 2 +- app/time_conditions/app_defaults.php | 2 +- app/vars/app_defaults.php | 2 +- app/xml_cdr/app_defaults.php | 2 +- core/default_settings/app_defaults.php | 52 +++++++++++++------------- resources/classes/switch_settings.php | 2 +- themes/default/app_defaults.php | 52 +++++++++++++------------- 10 files changed, 63 insertions(+), 58 deletions(-) diff --git a/app/edit/app_defaults.php b/app/edit/app_defaults.php index 0387dde90f..30230dcaa6 100644 --- a/app/edit/app_defaults.php +++ b/app/edit/app_defaults.php @@ -70,7 +70,7 @@ if ($domains_processed == 1) { } //add the missing default settings - foreach ($missing as $row) { + if (count($missing) > 0) foreach ($missing as $row) { //add the default settings $orm = new orm; $orm->name('default_settings'); diff --git a/app/fax/app_defaults.php b/app/fax/app_defaults.php index 6ddd130f6f..25d42f7672 100644 --- a/app/fax/app_defaults.php +++ b/app/fax/app_defaults.php @@ -137,6 +137,7 @@ if ($domains_processed == 1) { $array[$x]['default_setting_enabled'] = 'true'; $array[$x]['default_setting_description'] = 'Delay before next call sequence'; $x++; + //get an array of the default settings $sql = "select * from v_default_settings "; $prep_statement = $db->prepare($sql); @@ -160,7 +161,7 @@ if ($domains_processed == 1) { } //add the missing default settings - foreach ($missing as $row) { + if (count($missing) > 0) foreach ($missing as $row) { //add the default settings $orm = new orm; $orm->name('default_settings'); diff --git a/app/phrases/app_defaults.php b/app/phrases/app_defaults.php index 1d707c96b6..0dd4b67582 100644 --- a/app/phrases/app_defaults.php +++ b/app/phrases/app_defaults.php @@ -39,7 +39,7 @@ if ($domains_processed == 1) { //iterate and add each, if necessary foreach ($array as $index => $default_settings) { - //add default settings + //add default settings $sql = "select count(*) as num_rows from v_default_settings "; $sql .= "where default_setting_category = '".$default_settings['default_setting_category']."' "; $sql .= "and default_setting_subcategory = '".$default_settings['default_setting_subcategory']."' "; diff --git a/app/provision/app_defaults.php b/app/provision/app_defaults.php index 959d6e4cb3..6e8c3a196b 100644 --- a/app/provision/app_defaults.php +++ b/app/provision/app_defaults.php @@ -287,7 +287,7 @@ } //add the missing default settings - foreach ($missing as $row) { + if (count($missing) > 0) foreach ($missing as $row) { //add the default settings $orm = new orm; $orm->name('default_settings'); diff --git a/app/time_conditions/app_defaults.php b/app/time_conditions/app_defaults.php index 564346674b..ec25269bfd 100644 --- a/app/time_conditions/app_defaults.php +++ b/app/time_conditions/app_defaults.php @@ -66,7 +66,7 @@ if ($domains_processed == 1) { } //add the missing default settings - foreach ($missing as $row) { + if (count($missing) > 0) foreach ($missing as $row) { //add the default settings $orm = new orm; $orm->name('default_settings'); diff --git a/app/vars/app_defaults.php b/app/vars/app_defaults.php index 6f5a12dd23..ad24b8d958 100644 --- a/app/vars/app_defaults.php +++ b/app/vars/app_defaults.php @@ -101,7 +101,7 @@ EOD; function set_country_vars($db, $x) { require "resources/countries.php"; - // $country_iso=$_SESSION['domain']['country']['iso_code']; + //$country_iso=$_SESSION['domain']['country']['iso_code']; $sql = "select default_setting_value as value from v_default_settings "; $sql .= "where default_setting_name = 'iso_code' "; diff --git a/app/xml_cdr/app_defaults.php b/app/xml_cdr/app_defaults.php index dced897ded..2c138d59b7 100644 --- a/app/xml_cdr/app_defaults.php +++ b/app/xml_cdr/app_defaults.php @@ -77,7 +77,7 @@ $default_settings = $prep_statement->fetchAll(PDO::FETCH_NAMED); $x = 0; - foreach ($array as $row) { + if (isset($array)) foreach ($array as $row) { $found = false; foreach ($default_settings as $field) { if ($row['default_setting_subcategory'] == $field['default_setting_subcategory']) { diff --git a/core/default_settings/app_defaults.php b/core/default_settings/app_defaults.php index b4add8453a..192ec5f4bf 100644 --- a/core/default_settings/app_defaults.php +++ b/core/default_settings/app_defaults.php @@ -330,33 +330,35 @@ if ($domains_processed == 1) { $missing_count = $i; //add the missing default settings - $sql = "insert into v_default_settings ("; - $sql .= "default_setting_uuid, "; - $sql .= "default_setting_category, "; - $sql .= "default_setting_subcategory, "; - $sql .= "default_setting_name, "; - $sql .= "default_setting_value, "; - $sql .= "default_setting_enabled, "; - $sql .= "default_setting_description "; - $sql .= ") values \n"; - $i = 1; - foreach ($missing as $row) { - $sql .= "("; - $sql .= "'".uuid()."', "; - $sql .= "'".check_str($row['default_setting_category'])."', "; - $sql .= "'".check_str($row['default_setting_subcategory'])."', "; - $sql .= "'".check_str($row['default_setting_name'])."', "; - $sql .= "'".check_str($row['default_setting_value'])."', "; - $sql .= "'".check_str($row['default_setting_enabled'])."', "; - $sql .= "'".check_str($row['default_setting_description'])."' "; - $sql .= ")"; - if ($missing_count != $i) { - $sql .= ",\n"; + if (count($missing) > 0) { + $sql = "insert into v_default_settings ("; + $sql .= "default_setting_uuid, "; + $sql .= "default_setting_category, "; + $sql .= "default_setting_subcategory, "; + $sql .= "default_setting_name, "; + $sql .= "default_setting_value, "; + $sql .= "default_setting_enabled, "; + $sql .= "default_setting_description "; + $sql .= ") values \n"; + $i = 1; + foreach ($missing as $row) { + $sql .= "("; + $sql .= "'".uuid()."', "; + $sql .= "'".check_str($row['default_setting_category'])."', "; + $sql .= "'".check_str($row['default_setting_subcategory'])."', "; + $sql .= "'".check_str($row['default_setting_name'])."', "; + $sql .= "'".check_str($row['default_setting_value'])."', "; + $sql .= "'".check_str($row['default_setting_enabled'])."', "; + $sql .= "'".check_str($row['default_setting_description'])."' "; + $sql .= ")"; + if ($missing_count != $i) { + $sql .= ",\n"; + } + $i++; } - $i++; + $db->exec(check_sql($sql)); + unset($missing); } - $db->exec(check_sql($sql)); - unset($missing); //move the dynamic provision variables that from v_vars table to v_default_settings if (count($_SESSION['provision']) == 0) { diff --git a/resources/classes/switch_settings.php b/resources/classes/switch_settings.php index a01afad1b2..4d99ee71ff 100644 --- a/resources/classes/switch_settings.php +++ b/resources/classes/switch_settings.php @@ -239,7 +239,7 @@ if (!class_exists('switch_settings')) { } //add the missing default settings - if (is_array($missing)) { + if (count($missing) > 0) { $sql = "insert into v_default_settings ("; $sql .= "default_setting_uuid, "; $sql .= "default_setting_category, "; diff --git a/themes/default/app_defaults.php b/themes/default/app_defaults.php index c1d5128f41..5a2efb30d3 100644 --- a/themes/default/app_defaults.php +++ b/themes/default/app_defaults.php @@ -1346,33 +1346,35 @@ if ($domains_processed == 1) { $missing_count = $i; //add the missing default settings - $sql = "insert into v_default_settings ("; - $sql .= "default_setting_uuid, "; - $sql .= "default_setting_category, "; - $sql .= "default_setting_subcategory, "; - $sql .= "default_setting_name, "; - $sql .= "default_setting_value, "; - $sql .= "default_setting_enabled, "; - $sql .= "default_setting_description "; - $sql .= ") values \n"; - $i = 1; - foreach ($missing as $row) { - $sql .= "("; - $sql .= "'".uuid()."', "; - $sql .= "'".check_str($row['default_setting_category'])."', "; - $sql .= "'".check_str($row['default_setting_subcategory'])."', "; - $sql .= "'".check_str($row['default_setting_name'])."', "; - $sql .= "'".check_str($row['default_setting_value'])."', "; - $sql .= "'".check_str($row['default_setting_enabled'])."', "; - $sql .= "'".check_str($row['default_setting_description'])."' "; - $sql .= ")"; - if ($missing_count != $i) { - $sql .= ",\n"; + if (count($missing) > 0) { + $sql = "insert into v_default_settings ("; + $sql .= "default_setting_uuid, "; + $sql .= "default_setting_category, "; + $sql .= "default_setting_subcategory, "; + $sql .= "default_setting_name, "; + $sql .= "default_setting_value, "; + $sql .= "default_setting_enabled, "; + $sql .= "default_setting_description "; + $sql .= ") values \n"; + $i = 1; + foreach ($missing as $row) { + $sql .= "("; + $sql .= "'".uuid()."', "; + $sql .= "'".check_str($row['default_setting_category'])."', "; + $sql .= "'".check_str($row['default_setting_subcategory'])."', "; + $sql .= "'".check_str($row['default_setting_name'])."', "; + $sql .= "'".check_str($row['default_setting_value'])."', "; + $sql .= "'".check_str($row['default_setting_enabled'])."', "; + $sql .= "'".check_str($row['default_setting_description'])."' "; + $sql .= ")"; + if ($missing_count != $i) { + $sql .= ",\n"; + } + $i++; } - $i++; + $db->exec(check_sql($sql)); + unset($missing); } - $db->exec(check_sql($sql)); - unset($missing); //unset the array variable unset($array);