From 996c6038260eca7a71ea7bff162e68b458e0bc0b Mon Sep 17 00:00:00 2001 From: johnnyq Date: Sat, 17 Sep 2022 18:04:26 -0400 Subject: [PATCH] Operation Cleanup Round 4 - Remove config_base_url from settings table in db. This should be in your config.php now, if this is not added this can break things --- admin_side_nav.php | 7 ------- cron.php | 1 - database_updates.php | 9 ++++++++- database_version.php | 2 +- db.sql | 3 +-- get_settings.php | 3 --- post.php | 20 +------------------- setup.php | 3 +-- 8 files changed, 12 insertions(+), 36 deletions(-) diff --git a/admin_side_nav.php b/admin_side_nav.php index 6b55df8d..6fdf137d 100644 --- a/admin_side_nav.php +++ b/admin_side_nav.php @@ -39,13 +39,6 @@
  • SETTINGS
    • - -
  • - "> - -

    General

    -     -
  • " diff --git a/cron.php b/cron.php index b79bff18..eb8637cf 100644 --- a/cron.php +++ b/cron.php @@ -34,7 +34,6 @@ while($row = mysqli_fetch_array($sql_companies)){ $config_mail_from_email = $row['config_mail_from_email']; $config_mail_from_name = $row['config_mail_from_name']; $config_recurring_auto_send_invoice = $row['config_recurring_auto_send_invoice']; - $config_base_url = $row['config_base_url']; // Tickets $config_ticket_prefix = $row['config_ticket_prefix']; diff --git a/database_updates.php b/database_updates.php index 054760b1..94a28d37 100644 --- a/database_updates.php +++ b/database_updates.php @@ -318,9 +318,16 @@ if(LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION){ //if(CURRENT_DATABASE_VERSION == '0.1.8'){ // Insert queries here required to update to DB version 0.1.9 + mysqli_query($mysqli, "ALTER TABLE `settings` DROP `config_base_url`"); + // Then, update the database to the next sequential version + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.1.9'"); + //} + + //if(CURRENT_DATABASE_VERSION == '0.1.9'){ + // Insert queries here required to update to DB version 0.2.0 // Then, update the database to the next sequential version - // mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.1.9'"); + // mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.2.0'"); //} } diff --git a/database_version.php b/database_version.php index be61bdaa..d0c9cc7e 100644 --- a/database_version.php +++ b/database_version.php @@ -5,4 +5,4 @@ * It is used in conjunction with database_updates.php */ -DEFINE("LATEST_DATABASE_VERSION", "0.1.8"); \ No newline at end of file +DEFINE("LATEST_DATABASE_VERSION", "0.1.9"); \ No newline at end of file diff --git a/db.sql b/db.sql index b9a66ff5..a80cd772 100644 --- a/db.sql +++ b/db.sql @@ -991,7 +991,6 @@ DROP TABLE IF EXISTS `settings`; CREATE TABLE `settings` ( `company_id` int(11) NOT NULL, `config_current_database_version` varchar(10) NOT NULL, - `config_base_url` varchar(200) DEFAULT NULL, `config_smtp_host` varchar(200) DEFAULT NULL, `config_smtp_port` int(5) DEFAULT NULL, `config_smtp_encryption` varchar(200) DEFAULT NULL, @@ -1473,4 +1472,4 @@ CREATE TABLE `vendors` ( /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2022-09-17 17:15:06 +-- Dump completed on 2022-09-17 18:03:12 diff --git a/get_settings.php b/get_settings.php index b62b314f..fdc30792 100644 --- a/get_settings.php +++ b/get_settings.php @@ -4,9 +4,6 @@ $sql_settings = mysqli_query($mysqli,"SELECT * FROM settings WHERE company_id = $session_company_id"); $row = mysqli_fetch_array($sql_settings); -// General -$config_base_url = $row['config_base_url']; - // Database version DEFINE("CURRENT_DATABASE_VERSION", $row['config_current_database_version']); diff --git a/post.php b/post.php index 8038cde6..d6b7594f 100644 --- a/post.php +++ b/post.php @@ -498,7 +498,6 @@ if(isset($_POST['add_company'])){ mysqli_query($mysqli,"INSERT INTO companies SET company_name = '$name', company_address = '$address', company_city = '$city', company_state = '$state', company_zip = '$zip', company_country = '$country', company_phone = '$phone', company_email = '$email', company_website = '$website', company_locale = '$locale', company_currency = '$currency_code'"); $company_id = mysqli_insert_id($mysqli); - $config_base_url = mysqli_real_escape_string($mysqli,$_SERVER['HTTP_HOST'] . dirname($_SERVER['REQUEST_URI'])); $current_database_version = CURRENT_DATABASE_VERSION; mkdir("uploads/clients/$company_id"); @@ -551,7 +550,7 @@ if(isset($_POST['add_company'])){ //Set User Company Permissions mysqli_query($mysqli,"INSERT INTO user_companies SET user_id = $session_user_id, company_id = $company_id"); - mysqli_query($mysqli,"INSERT INTO settings SET company_id = $company_id, config_current_database_version = '$current_database_version', config_invoice_prefix = 'INV-', config_invoice_next_number = 1, config_recurring_prefix = 'REC-', config_recurring_next_number = 1, config_invoice_overdue_reminders = '1,3,7', config_quote_prefix = 'QUO-', config_quote_next_number = 1, config_recurring_auto_send_invoice = 1, config_default_net_terms = 7, config_send_invoice_reminders = 1, config_enable_cron = 0, config_ticket_next_number = 1, config_base_url = '$config_base_url'"); + mysqli_query($mysqli,"INSERT INTO settings SET company_id = $company_id, config_current_database_version = '$current_database_version', config_invoice_prefix = 'INV-', config_invoice_next_number = 1, config_recurring_prefix = 'REC-', config_recurring_next_number = 1, config_invoice_overdue_reminders = '1,3,7', config_quote_prefix = 'QUO-', config_quote_next_number = 1, config_recurring_auto_send_invoice = 1, config_default_net_terms = 7, config_send_invoice_reminders = 1, config_enable_cron = 0, config_ticket_next_number = 1"); //Create Some Data @@ -804,23 +803,6 @@ if(isset($_POST['verify'])){ } -if(isset($_POST['edit_general_settings'])){ - - validateAdminRole(); - - $config_base_url = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['config_base_url']))); - - mysqli_query($mysqli,"UPDATE settings SET config_base_url = '$config_base_url' WHERE company_id = $session_company_id"); - - //Logging - mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Settings', log_action = 'Modify', log_description = '$session_name modified general settings', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_user_id = $session_user_id, company_id = $session_company_id"); - - $_SESSION['alert_message'] = "General settings updated"; - - header("Location: " . $_SERVER["HTTP_REFERER"]); - -} - if(isset($_POST['edit_mail_settings'])){ validateAdminRole(); diff --git a/setup.php b/setup.php index 156258f9..85de0542 100644 --- a/setup.php +++ b/setup.php @@ -925,7 +925,6 @@ if(isset($_POST['add_company_settings'])){ mysqli_query($mysqli,"INSERT INTO companies SET company_name = '$name', company_address = '$address', company_city = '$city', company_state = '$state', company_zip = '$zip', company_country = '$country', company_phone = '$phone', company_email = '$email', company_website = '$website', company_locale = '$locale', company_currency = '$currency_code', company_created_at = NOW()"); $company_id = mysqli_insert_id($mysqli); - $config_base_url = mysqli_real_escape_string($mysqli,$_SERVER['HTTP_HOST'] . dirname($_SERVER['REQUEST_URI'])); mkdir_missing("uploads/clients/$company_id"); file_put_contents("uploads/clients/$company_id/index.php", ""); @@ -982,7 +981,7 @@ if(isset($_POST['add_company_settings'])){ mysqli_query($mysqli,"INSERT INTO user_companies SET user_id = $user_id, company_id = $company_id"); $latest_database_version = LATEST_DATABASE_VERSION; - mysqli_query($mysqli,"INSERT INTO settings SET company_id = $company_id, config_current_database_version = '$latest_database_version', config_invoice_prefix = 'INV-', config_invoice_next_number = 1, config_recurring_prefix = 'REC-', config_recurring_next_number = 1, config_invoice_overdue_reminders = '1,3,7', config_quote_prefix = 'QUO-', config_quote_next_number = 1, config_recurring_auto_send_invoice = 1, config_default_net_terms = 30, config_send_invoice_reminders = 1, config_enable_cron = 0, config_ticket_next_number = 1, config_base_url = '$config_base_url'"); + mysqli_query($mysqli,"INSERT INTO settings SET company_id = $company_id, config_current_database_version = '$latest_database_version', config_invoice_prefix = 'INV-', config_invoice_next_number = 1, config_recurring_prefix = 'REC-', config_recurring_next_number = 1, config_invoice_overdue_reminders = '1,3,7', config_quote_prefix = 'QUO-', config_quote_next_number = 1, config_recurring_auto_send_invoice = 1, config_default_net_terms = 30, config_send_invoice_reminders = 1, config_enable_cron = 0, config_ticket_next_number = 1"); //Create Some Data