From 0dd92eb4e7e57dcafe92deff26974a929a8d3829 Mon Sep 17 00:00:00 2001 From: Mark Crane Date: Sat, 20 Sep 2014 03:32:55 +0000 Subject: [PATCH] Add default settings --- app/settings/app_defaults.php | 125 +++++++++++++++++++++++----------- resources/install.php | 4 +- 2 files changed, 88 insertions(+), 41 deletions(-) diff --git a/app/settings/app_defaults.php b/app/settings/app_defaults.php index 112f45e699..8258eaf7d8 100644 --- a/app/settings/app_defaults.php +++ b/app/settings/app_defaults.php @@ -17,7 +17,7 @@ The Initial Developer of the Original Code is Mark J Crane - Portions created by the Initial Developer are Copyright (C) 2008-2012 + Portions created by the Initial Developer are Copyright (C) 2008-2014 the Initial Developer. All Rights Reserved. Contributor(s): @@ -30,45 +30,92 @@ if (count($_SESSION['email']) == 0 && $domains_processed == 1) { $sql = "select * from v_settings "; $prep_statement = $db->prepare(check_sql($sql)); $prep_statement->execute(); - $row = $prep_statement->fetch(PDO::FETCH_NAMED); - unset($prep_statement); - //set the variable - $smtp[]['smtp_host'] = check_str($row['smtp_host']); - $smtp[]['smtp_secure'] = check_str($row['smtp_secure']); - $smtp[]['smtp_auth'] = check_str($row['smtp_auth']); - $smtp[]['smtp_username'] = check_str($row['smtp_username']); - $smtp[]['smtp_password'] = check_str($row['smtp_password']); - $smtp[]['smtp_from'] = check_str($row['smtp_from']); - $smtp[]['smtp_from_name'] = check_str($row['smtp_from_name']); - //build the sql inserts - foreach ($smtp as $row) { - foreach ($row as $key => $value) { - //add the provision variable to the default settings table - $sql = "insert into v_default_settings "; - $sql .= "("; - $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 .= ") "; - $sql .= "values "; - $sql .= "("; - $sql .= "'".uuid()."', "; - $sql .= "'email', "; - $sql .= "'".$key."', "; - $sql .= "'var', "; - $sql .= "'".check_str($value)."', "; - $sql .= "'true', "; - $sql .= "'' "; - $sql .= ")"; - //echo $sql."\n"; - $db->exec(check_sql($sql)); - unset($sql); - } + if ($prep_statement) { + $row = $prep_statement->fetch(PDO::FETCH_NAMED); + unset($prep_statement); } + + //check the row count + if (count($row) == 0) { + //add default settings + $event_socket_ip_address = "127.0.0.1"; + $event_socket_port = "8021"; + $event_socket_password = "ClueCon"; + $xml_rpc_http_port = "8787"; + $xml_rpc_auth_realm = "freeswitch"; + $xml_rpc_auth_user = "freeswitch"; + $xml_rpc_auth_pass = "works"; + $mod_shout_decoder = ""; + $mod_shout_volume = "0.3"; + + $sql = "insert into v_settings "; + $sql .= "("; + $sql .= "setting_uuid, "; + $sql .= "event_socket_ip_address, "; + $sql .= "event_socket_port, "; + $sql .= "event_socket_password, "; + $sql .= "xml_rpc_http_port, "; + $sql .= "xml_rpc_auth_realm, "; + $sql .= "xml_rpc_auth_user, "; + $sql .= "xml_rpc_auth_pass, "; + $sql .= "mod_shout_decoder, "; + $sql .= "mod_shout_volume "; + $sql .= ")"; + $sql .= "values "; + $sql .= "("; + $sql .= "'".uuid()."', "; + $sql .= "'$event_socket_ip_address', "; + $sql .= "'$event_socket_port', "; + $sql .= "'$event_socket_password', "; + $sql .= "'$xml_rpc_http_port', "; + $sql .= "'$xml_rpc_auth_realm', "; + $sql .= "'$xml_rpc_auth_user', "; + $sql .= "'$xml_rpc_auth_pass', "; + $sql .= "'$mod_shout_decoder', "; + $sql .= "'$mod_shout_volume' "; + $sql .= ")"; + $db->exec(check_sql($sql)); + unset($sql); + } + else { + //set the variable + $smtp[]['smtp_host'] = check_str($row['smtp_host']); + $smtp[]['smtp_secure'] = check_str($row['smtp_secure']); + $smtp[]['smtp_auth'] = check_str($row['smtp_auth']); + $smtp[]['smtp_username'] = check_str($row['smtp_username']); + $smtp[]['smtp_password'] = check_str($row['smtp_password']); + $smtp[]['smtp_from'] = check_str($row['smtp_from']); + $smtp[]['smtp_from_name'] = check_str($row['smtp_from_name']); + //build the sql inserts + foreach ($smtp as $row) { + foreach ($row as $key => $value) { + //add the provision variable to the default settings table + $sql = "insert into v_default_settings "; + $sql .= "("; + $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 .= ") "; + $sql .= "values "; + $sql .= "("; + $sql .= "'".uuid()."', "; + $sql .= "'email', "; + $sql .= "'".$key."', "; + $sql .= "'var', "; + $sql .= "'".check_str($value)."', "; + $sql .= "'true', "; + $sql .= "'' "; + $sql .= ")"; + //echo $sql."\n"; + $db->exec(check_sql($sql)); + unset($sql); + } + } + } } ?> \ No newline at end of file diff --git a/resources/install.php b/resources/install.php index 90ab8e41b6..e44bde5998 100644 --- a/resources/install.php +++ b/resources/install.php @@ -206,7 +206,7 @@ require_once "resources/functions.php"; if (file_exists('/var/lib/fusionpbx/storage')) { $switch_storage_dir = '/var/lib/fusionpbx/storage'; $switch_voicemail_dir = $switch_storage_dir.'/voicemail'; - } + } //old elseif (file_exists('/var/lib/freeswitch/storage')) { $switch_storage_dir = '/var/lib/freeswitch/storage'; @@ -216,7 +216,7 @@ require_once "resources/functions.php"; if (file_exists('/var/lib/fusionpbx/recordings')) { $switch_recordings_dir = '/var/lib/fusionpbx/recordings'; } - //old + //old elseif (file_exists('/var/lib/freeswitch/recordings')) { $switch_recordings_dir = '/var/lib/freeswitch/recordings'; }