nsinnovations/fusionpbx
2
0
Fork 0
mirror of https://github.com/fusionpbx/fusionpbx.git synced 2026-01-07 12:13:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve code to update the scripts directory.

Browse Source
This commit is contained in:
markjcrane
2015-07-20 15:32:52 -06:00
parent c0d694a62b
commit 5dfbc2e183
3 changed files with 147 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

225
core/upgrade/app_defaults.php
View File

@@ -17,138 +17,133 @@
The Initial Developer of the Original Code is
Mark J Crane <markjcrane@fusionpbx.com>
Portions created by the Initial Developer are Copyright (C) 2008-2012
Portions created by the Initial Developer are Copyright (C) 2008-2015
the Initial Developer. All Rights Reserved.
Contributor(s):
Mark J Crane <markjcrane@fusionpbx.com>
*/
if (strlen($_SESSION['switch']['scripts']['dir']) > 0) {
if ($domains_processed == 1) {
//if the resource scripts resource directory does not exist then create it
if (!is_dir($_SESSION['switch']['scripts']['dir']."/resources")) {
if ($domains_processed == 1) {
//process if the scripts directory exists
if (strlen($_SESSION['switch']['scripts']['dir']) > 0) {
//if the resource scripts resource directory does not exist then create it
if (!is_dir($_SESSION['switch']['scripts']['dir']."/resources")) {
mkdir($_SESSION['switch']['scripts']['dir']."/resources",0755,true);
}
//copy the files and directories from resources/install
$install = new install;
$install->domain_uuid = $domain_uuid;
$install->switch_scripts_dir = $_SESSION['switch']['scripts']['dir'];
$install->copy_scripts();
}
//update the software table
$sql = "select count(*) as num_rows from v_software ";
$prep_statement = $db->prepare($sql);
if ($prep_statement) {
$prep_statement->execute();
$row = $prep_statement->fetch(PDO::FETCH_ASSOC);
if ($row['num_rows'] == 0) {
$sql = "insert into v_software ";
$sql .= "(";
$sql .= "software_uuid, ";
$sql .= "software_name, ";
$sql .= "software_url, ";
$sql .= "software_version ";
$sql .= ")";
$sql .= "values ";
$sql .= "(";
$sql .= "'".uuid()."', ";
$sql .= "'FusionPBX', ";
$sql .= "'www.fusionpbx.com', ";
$sql .= "'".software_version()."' ";
$sql .= ")";
$db->exec(check_sql($sql));
unset($sql);
}
//copy the files and directories from resources/install
//require_once "resources/classes/install.php";
$install = new install;
$install->domain_uuid = $domain_uuid;
$install->domain_name = $domain;
//$install->switch_conf_dir = $_SESSION['switch']['conf']['dir'];
$install->switch_scripts_dir = $_SESSION['switch']['scripts']['dir'];
//$install->switch_sounds_dir = $_SESSION['switch']['sounds']['dir'];
$install->copy_scripts();
//$install->copy_sounds();
//print_r($install->result);
//update the software table
$sql = "select count(*) as num_rows from v_software ";
$prep_statement = $db->prepare($sql);
if ($prep_statement) {
$prep_statement->execute();
$row = $prep_statement->fetch(PDO::FETCH_ASSOC);
if ($row['num_rows'] == 0) {
$sql = "insert into v_software ";
$sql .= "(";
$sql .= "software_uuid, ";
$sql .= "software_name, ";
$sql .= "software_url, ";
$sql .= "software_version ";
$sql .= ")";
$sql .= "values ";
$sql .= "(";
$sql .= "'".uuid()."', ";
$sql .= "'FusionPBX', ";
$sql .= "'www.fusionpbx.com', ";
$sql .= "'".software_version()."' ";
$sql .= ")";
$db->exec(check_sql($sql));
unset($sql);
}
else {
$sql = "update v_software ";
$sql .= "set software_version = '".software_version()."' ";
$db->exec(check_sql($sql));
unset($sql);
}
unset($prep_statement, $row);
else {
$sql = "update v_software ";
$sql .= "set software_version = '".software_version()."' ";
$db->exec(check_sql($sql));
unset($sql);
}
unset($prep_statement, $row);
}
//ensure the login message is set, if new message exists
$sql = "select count(*) as num_rows from v_default_settings ";
$sql .= "where default_setting_category = 'login' ";
$sql .= "and default_setting_subcategory = 'message' ";
$sql .= "and default_setting_name = 'text' ";
$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) {
//ensure the login message is set, if new message exists
$sql = "select count(*) as num_rows from v_default_settings ";
$sql .= "where default_setting_category = 'login' ";
$sql .= "and default_setting_subcategory = 'message' ";
$sql .= "and default_setting_name = 'text' ";
$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) {
// insert message
$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 .= "'login', ";
$sql .= "'message', ";
$sql .= "'text', ";
$sql .= "'".$text['login-message_text']."', ";
$sql .= "'true', ";
$sql .= "'' ";
$sql .= ")";
$db->exec(check_sql($sql));
unset($sql);
// insert message
$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 .= "'login', ";
$sql .= "'message', ";
$sql .= "'text', ";
$sql .= "'".$text['login-message_text']."', ";
$sql .= "'true', ";
$sql .= "'' ";
$sql .= ")";
$db->exec(check_sql($sql));
unset($sql);
}
else {
}
else {
// get current message value
$sql = "select default_setting_uuid, default_setting_value ";
$sql .= "from v_default_settings ";
$sql .= "where default_setting_category = 'login' ";
$sql .= "and default_setting_subcategory = 'message' ";
$sql .= "and default_setting_name = 'text' ";
$prep_statement = $db->prepare($sql);
if ($prep_statement) {
$prep_statement->execute();
$result = $prep_statement->fetchAll(PDO::FETCH_NAMED);
if (count($result) > 0) {
foreach($result as $row) {
$current_default_setting_uuid = $row["default_setting_uuid"];
$current_default_setting_value = $row["default_setting_value"];
break;
}
// compare to message in language file, update and enable if different
$new_default_setting_value = str_replace("''", "'", $text['login-message_text']);
if ($current_default_setting_value != $new_default_setting_value) {
$sql = "update v_default_settings set ";
$sql .= "default_setting_value = '".$text['login-message_text']."', ";
$sql .= "default_setting_enabled = 'true' ";
$sql .= "where default_setting_uuid = '".$current_default_setting_uuid."' ";
$db->exec(check_sql($sql));
unset($sql);
}
// get current message value
$sql = "select default_setting_uuid, default_setting_value ";
$sql .= "from v_default_settings ";
$sql .= "where default_setting_category = 'login' ";
$sql .= "and default_setting_subcategory = 'message' ";
$sql .= "and default_setting_name = 'text' ";
$prep_statement = $db->prepare($sql);
if ($prep_statement) {
$prep_statement->execute();
$result = $prep_statement->fetchAll(PDO::FETCH_NAMED);
if (count($result) > 0) {
foreach($result as $row) {
$current_default_setting_uuid = $row["default_setting_uuid"];
$current_default_setting_value = $row["default_setting_value"];
break;
}
// compare to message in language file, update and enable if different
$new_default_setting_value = str_replace("''", "'", $text['login-message_text']);
if ($current_default_setting_value != $new_default_setting_value) {
$sql = "update v_default_settings set ";
$sql .= "default_setting_value = '".$text['login-message_text']."', ";
$sql .= "default_setting_enabled = 'true' ";
$sql .= "where default_setting_uuid = '".$current_default_setting_uuid."' ";
$db->exec(check_sql($sql));
unset($sql);
}
unset($prep_statement, $result);
}
unset($prep_statement, $result);
}
}
}
}
}
?>

32
core/upgrade/index.php
View File

@@ -17,7 +17,7 @@
The Initial Developer of the Original Code is
Mark J Crane <markjcrane@fusionpbx.com>
Portions created by the Initial Developer are Copyright (C) 2008-2012
Portions created by the Initial Developer are Copyright (C) 2008-2015
the Initial Developer. All Rights Reserved.
Contributor(s):
@@ -70,28 +70,18 @@ if (sizeof($_POST) > 0) {
}
else {
//update scripts folder, if allowed (default)
if ($_SESSION['switch']['scripts_update']['boolean'] != 'false' && $_SESSION['switch']['scripts']['dir'] != '') {
$scripts_dir_target = $_SESSION['switch']['scripts']['dir'];
$scripts_dir_source = realpath($_SERVER["DOCUMENT_ROOT"].PROJECT_PATH.'/resources/install/scripts');
foreach (new RecursiveIteratorIterator(new RecursiveDirectoryIterator($scripts_dir_source)) as $file_path_source) {
if (
substr_count($file_path_source, '/..') == 0 &&
substr_count($file_path_source, '/.') == 0 &&
substr_count($file_path_source, '/.svn') == 0 &&
substr_count($file_path_source, '/.git') == 0
) {
$file_path_target = str_replace($scripts_dir_source, $scripts_dir_target, $file_path_source);
if ($file_path_target != $scripts_dir_target.'/resources/config.lua') {
//echo $file_path_source.' ---> '.$file_path_target.'<br>';
copy($file_path_source, $file_path_target);
chmod($file_path_target, 0755);
}
}
}
$response_message = $text['message-upgrade_source_scripts'];
if ($_SESSION['switch']['scripts']['dir'] != '') {
//copy the files and directories from resources/install
$install = new install;
$install->domain_uuid = $domain_uuid;
$install->switch_scripts_dir = $_SESSION['switch']['scripts']['dir'];
$install->copy_scripts();
//set the message
$response_message = $text['message-upgrade_source_scripts'];
}
else {
$response_message = $text['message-upgrade_source'];
//set the message
$response_message = $text['message-upgrade_source'];
}
}
}