dbxe
/
fusionpbx
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

initial rewrite of time_conditions

This commit is contained in:
Matthew Vale 2015-11-03 14:23:52 +00:00
parent dd12f60d45
commit 81a5fc0db1
2 changed files with 86 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
app/time_conditions/app_defaults.php
View File

@ -3,46 +3,51 @@
if ($domains_processed == 1) { if ($domains_processed == 1) {
//define holiday presets //define holiday presets
$preset[] = json_encode(array("new_years_day" => array("mday" => "1", "mon" => "1"))); $preset['usa'][] = json_encode(array("new_years_day" => array("mday" => "1", "mon" => "1")));
$preset[] = json_encode(array("martin_luther_king_jr_day" => array("wday" => "2", "mon" => "1", "mweek" => "3"))); $preset['usa'][] = json_encode(array("martin_luther_king_jr_day" => array("wday" => "2", "mon" => "1", "mweek" => "3")));
$preset[] = json_encode(array("presidents_day" => array("wday" => "2", "mon" => "2", "mweek" => "3"))); $preset['usa'][] = json_encode(array("presidents_day" => array("wday" => "2", "mon" => "2", "mweek" => "3")));
$preset[] = json_encode(array("memorial_day" => array("mday" => "25-31", "wday" => "2", "mon" => "5"))); $preset['usa'][] = json_encode(array("memorial_day" => array("mday" => "25-31", "wday" => "2", "mon" => "5")));
$preset[] = json_encode(array("independence_day" => array("mday" => "4", "mon" => "7"))); $preset['usa'][] = json_encode(array("independence_day" => array("mday" => "4", "mon" => "7")));
$preset[] = json_encode(array("labor_day" => array("wday" => "2", "mon" => "9", "mweek" => "1"))); $preset['usa'][] = json_encode(array("labor_day" => array("wday" => "2", "mon" => "9", "mweek" => "1")));
$preset[] = json_encode(array("columbus_day" => array("wday" => "2", "mon" => "10", "mweek" => "2"))); $preset['usa'][] = json_encode(array("columbus_day" => array("wday" => "2", "mon" => "10", "mweek" => "2")));
$preset[] = json_encode(array("veterans_day" => array("mday" => "11", "mon" => "11"))); $preset['usa'][] = json_encode(array("veterans_day" => array("mday" => "11", "mon" => "11")));
$preset[] = json_encode(array("thanksgiving_day" => array("wday" => "5-6", "mon" => "11", "mweek" => "4"))); $preset['usa'][] = json_encode(array("thanksgiving_day" => array("wday" => "5-6", "mon" => "11", "mweek" => "4")));
$preset[] = json_encode(array("christmas_day" => array("mday" => "25", "mon" => "12"))); $preset['usa'][] = json_encode(array("christmas_day" => array("mday" => "25", "mon" => "12")));
//define array of settings //iterate and migrate old presets first
$x = 0; $sql = "update v_default_settings ";
foreach ($preset as $json) { $sql .= "set default_setting_subcategory = 'preset_usa' ";
$array[$x]['default_setting_category'] = 'time_conditions'; $sql .= ", default_setting_description = 'usa Holiday' ";
$array[$x]['default_setting_subcategory'] = 'preset';
$array[$x]['default_setting_name'] = 'array';
$array[$x]['default_setting_value'] = $json;
$array[$x]['default_setting_enabled'] = 'true';
$array[$x]['default_setting_description'] = 'Holiday';
$x++;
}
//get an array of the default settings
$sql = "select * from v_default_settings ";
$sql .= "where default_setting_category = 'time_conditions' "; $sql .= "where default_setting_category = 'time_conditions' ";
$sql .= "and default_setting_subcategory = 'preset' "; $sql .= "and default_setting_subcategory = 'preset' ";
$prep_statement = $db->prepare($sql);
if ($prep_statement) {
$prep_statement->execute();
unset ($prep_statement, $sql);
}
//iterate and add each, if necessary
$x = 0;
foreach ($preset as $region => $data) {
$sql = "select * from v_default_settings ";
$sql .= "where default_setting_category = 'time_conditions' ";
$sql .= "and default_setting_subcategory = 'preset_$region' ";
$sql .= "and default_setting_name = 'array' "; $sql .= "and default_setting_name = 'array' ";
$prep_statement = $db->prepare($sql); $prep_statement = $db->prepare($sql);
if ($prep_statement) {
$prep_statement->execute(); $prep_statement->execute();
$default_settings = $prep_statement->fetchAll(PDO::FETCH_NAMED); $default_settings = $prep_statement->fetchAll(PDO::FETCH_NAMED);
unset ($prep_statement, $sql); unset ($prep_statement, $sql);
foreach ($data as $json) {
//find the missing default settings
$x = 0;
foreach ($array as $setting) {
$found = false; $found = false;
$missing[$x] = $setting; $missing[$x]['default_setting_category'] = 'time_conditions';
$missing[$x]['default_setting_subcategory'] = "preset_$region";
$missing[$x]['default_setting_name'] = 'array';
$missing[$x]['default_setting_value'] = $json;
$missing[$x]['default_setting_enabled'] = 'true';
$missing[$x]['default_setting_description'] = "$region Holiday";
foreach ($default_settings as $row) { foreach ($default_settings as $row) {
if (trim($row['default_setting_value']) == trim($setting['default_setting_value'])) { if (trim($row['default_setting_value']) == trim($json)) {
$found = true; $found = true;
//remove items from the array that were found //remove items from the array that were found
unset($missing[$x]); unset($missing[$x]);
@ -50,6 +55,8 @@ if ($domains_processed == 1) {
} }
$x++; $x++;
} }
}
}
//add the missing default settings //add the missing default settings
foreach ($missing as $row) { foreach ($missing as $row) {
@ -63,6 +70,39 @@ if ($domains_processed == 1) {
} }
unset($missing); unset($missing);
$array[$x]['default_setting_category'] = 'time_conditions';
$array[$x]['default_setting_subcategory'] = 'region';
$array[$x]['default_setting_name'] = 'text';
$array[$x]['default_setting_value'] = 'usa';
$array[$x]['default_setting_enabled'] = 'true';
$array[$x]['default_setting_description'] = 'What region to use by default when choosing Time Conditions';
$x++;
//iterate and add each, if necessary
foreach ($array as $index => $default_settings) {
//add the default setting
$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']."' ";
$sql .= "and default_setting_name = '".$default_settings['default_setting_name']."' ";
$prep_statement = $db->prepare($sql);
if ($prep_statement) {
$prep_statement->execute();
$row = $prep_statement->fetch(PDO::FETCH_ASSOC);
unset($prep_statement);
if ($row['num_rows'] == 0) {
$orm = new orm;
$orm->name('default_settings');
$orm->save($array[$index]);
$message = $orm->message;
//print_r($message);
}
unset($row);
}
}
//unset the array variable //unset the array variable
unset($array); unset($array);
} }

4
app/time_conditions/time_condition_edit.php
View File

@ -44,9 +44,11 @@ require_once "resources/header.php";
$destination = new destinations; $destination = new destinations;
//load available presets //load available presets
foreach ($_SESSION['time_conditions']['preset'] as $json) { $preset_region = "preset_".$_SESSION['time_conditions']['region'];
foreach ($_SESSION['time_conditions'][$preset_region] as $json) {
$available_presets[] = json_decode($json, true); $available_presets[] = json_decode($json, true);
} }
unset($preset_region);
//set the action as an add or an update //set the action as an add or an update
if (isset($_REQUEST["id"])) { if (isset($_REQUEST["id"])) {