From 4e6e6a5d6a67ac39f60f93c351f63e1bf37a2b66 Mon Sep 17 00:00:00 2001 From: "johnny@pittpc.com" Date: Sat, 24 Aug 2019 22:12:48 -0400 Subject: [PATCH] Readded config_base_url as it broke cron.php --- cron.php | 5 ++--- db.sql | 3 ++- post.php | 7 ++++--- settings-general.php | 10 ++++++++++ setup.php | 4 ++-- 5 files changed, 20 insertions(+), 9 deletions(-) diff --git a/cron.php b/cron.php index c492c24b..de9f76a9 100644 --- a/cron.php +++ b/cron.php @@ -21,7 +21,6 @@ while($row = mysqli_fetch_array($sql_companies)){ $config_invoice_overdue_reminders = $row['config_invoice_overdue_reminders']; $config_invoice_prefix = $row['config_invoice_prefix']; $config_invoice_next_number = $row['config_invoice_next_number']; - $config_recurring_email_auto_send = $row['config_recurring_email_auto_send']; $config_smtp_host = $row['config_smtp_host']; $config_smtp_username = $row['config_smtp_username']; $config_smtp_password = $row['config_smtp_password']; @@ -29,6 +28,7 @@ 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']; if($config_enable_cron == 1){ @@ -86,7 +86,7 @@ while($row = mysqli_fetch_array($sql_companies)){ $client_id = $row['client_id']; $client_name = $row['client_name']; - mysqli_query($mysqli,"INSERT INTO alerts SET alert_type = 'Invoice', alert_message = 'Invoice INV-$invoice_number for $client_name in the amount of $invoice_amount is overdue by $day days', alert_date = NOW(), company_id = $company_id"); + mysqli_query($mysqli,"INSERT INTO alerts SET alert_type = 'Invoice', alert_message = 'Invoice $invoice_number for $client_name in the amount of $invoice_amount is overdue by $day days', alert_date = NOW(), company_id = $company_id"); } } @@ -193,7 +193,6 @@ while($row = mysqli_fetch_array($sql_companies)){ if(strlen($client_phone)>2){ $client_phone = substr($row['client_phone'],0,3)."-".substr($row['client_phone'],3,3)."-".substr($row['client_phone'],6,4); } - $base_url = $_SERVER['HTTP_HOST'] . dirname($_SERVER['REQUEST_URI']); $mail = new PHPMailer(true); diff --git a/db.sql b/db.sql index 3ae563a1..7c98db10 100644 --- a/db.sql +++ b/db.sql @@ -626,6 +626,7 @@ CREATE TABLE `settings` ( `config_enable_cron` int(1) DEFAULT NULL, `enable_alert_domain_expire` int(1) DEFAULT NULL, `enable_alert_low_balance` int(1) DEFAULT NULL, + `config_base_url` varchar(200) DEFAULT NULL, PRIMARY KEY (`company_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; /*!40101 SET character_set_client = @saved_cs_client */; @@ -813,4 +814,4 @@ CREATE TABLE `vendors` ( /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2019-08-24 21:25:45 +-- Dump completed on 2019-08-24 22:12:13 diff --git a/post.php b/post.php index 251c5ad2..277cba7a 100644 --- a/post.php +++ b/post.php @@ -76,6 +76,7 @@ if(isset($_POST['add_company'])){ mysqli_query($mysqli,"INSERT INTO companies SET company_name = '$name', company_created_at = NOW()"); $config_api_key = keygen(); + $config_base_url = $_SERVER['HTTP_HOST'] . dirname($_SERVER['REQUEST_URI']); $company_id = mysqli_insert_id($mysqli); mkdir("uploads/clients/$company_id"); @@ -83,7 +84,7 @@ if(isset($_POST['add_company'])){ mkdir("uploads/settings/$company_id"); mkdir("uploads/tmp/$company_id"); - mysqli_query($mysqli,"INSERT INTO settings SET company_id = $company_id, config_company_name = '$name', config_invoice_prefix = 'INV-', config_invoice_next_number = 1, config_invoice_overdue_reminders = '1,3,7', config_quote_prefix = 'QUO-', config_quote_next_number = 1, config_api_key = '$config_api_key', config_recurring_auto_send_invoice = 1, config_default_net_terms = 7, config_send_invoice_reminders = 0, config_enable_cron = 0"); + mysqli_query($mysqli,"INSERT INTO settings SET company_id = $company_id, config_company_name = '$name', config_invoice_prefix = 'INV-', config_invoice_next_number = 1, config_invoice_overdue_reminders = '1,3,7', config_quote_prefix = 'QUO-', config_quote_next_number = 1, config_api_key = '$config_api_key', config_recurring_auto_send_invoice = 1, config_default_net_terms = 7, config_send_invoice_reminders = 0, config_enable_cron = 0, config_ticket_next_number = 1, config_base_url = '$config_base_url'"); $_SESSION['alert_message'] = "Company added"; @@ -134,7 +135,7 @@ if(isset($_POST['verify'])){ if(isset($_POST['edit_general_settings'])){ $config_start_page = strip_tags(mysqli_real_escape_string($mysqli,$_POST['config_start_page'])); - $config_account_balance_threshold = strip_tags(mysqli_real_escape_string($mysqli,$_POST['config_account_balance_threshold'])); + $config_base_url = strip_tags(mysqli_real_escape_string($mysqli,$_POST['config_base_url'])); $config_api_key = strip_tags(mysqli_real_escape_string($mysqli,$_POST['config_api_key'])); $path = "$config_invoice_logo"; @@ -149,7 +150,7 @@ if(isset($_POST['edit_general_settings'])){ move_uploaded_file($_FILES['file']['tmp_name'], $path); } - mysqli_query($mysqli,"UPDATE settings SET config_start_page = '$config_start_page', config_account_balance_threshold = '$config_account_balance_threshold', config_invoice_logo = '$path', config_api_key = '$config_api_key' WHERE company_id = $session_company_id"); + mysqli_query($mysqli,"UPDATE settings SET config_start_page = '$config_start_page', config_account_balance_threshold = '$config_account_balance_threshold', config_invoice_logo = '$path', config_api_key = '$config_api_key', config_base_url = '$config_base_url' WHERE company_id = $session_company_id"); $_SESSION['alert_message'] = "Settings updated"; diff --git a/settings-general.php b/settings-general.php index d4e5965c..a0b7cb90 100644 --- a/settings-general.php +++ b/settings-general.php @@ -25,6 +25,16 @@ +
+ +
+
+ +
+ +
+
+
diff --git a/setup.php b/setup.php index 51047033..708df4ff 100644 --- a/setup.php +++ b/setup.php @@ -166,7 +166,7 @@ if(isset($_POST['add_company_settings'])){ $config_company_phone = preg_replace("/[^0-9]/", '',$config_company_phone); $config_company_site = strip_tags(mysqli_real_escape_string($mysqli,$_POST['config_company_site'])); $config_api_key = keygen(); - + $config_base_url = $_SERVER['HTTP_HOST'] . dirname($_SERVER['REQUEST_URI']); mysqli_query($mysqli,"INSERT INTO companies SET company_name = '$config_company_name', company_created_at = NOW()"); @@ -179,7 +179,7 @@ if(isset($_POST['add_company_settings'])){ mysqli_query($mysqli,"INSERT INTO user_companies SET user_id = $user_id, company_id = $company_id"); - mysqli_query($mysqli,"INSERT INTO settings SET company_id = $company_id, config_company_name = '$config_company_name', config_company_address = '$config_company_address', config_company_city = '$config_company_city', config_company_state = '$config_company_state', config_company_zip = '$config_company_zip', config_company_phone = $config_company_phone, config_company_site = '$config_company_site', config_start_page = 'dashboard.php', config_invoice_prefix = 'INV-', config_invoice_next_number = 1, config_invoice_overdue_reminders = '1,3,7', config_quote_prefix = 'QUO-', config_quote_next_number = 1, config_api_key = '$config_api_key', config_recurring_auto_send_invoice = 1, config_default_net_terms = 7, config_send_invoice_reminders = 0, config_enable_cron = 0, config_ticket_next_number = 1"); + mysqli_query($mysqli,"INSERT INTO settings SET company_id = $company_id, config_company_name = '$config_company_name', config_company_address = '$config_company_address', config_company_city = '$config_company_city', config_company_state = '$config_company_state', config_company_zip = '$config_company_zip', config_company_phone = $config_company_phone, config_company_site = '$config_company_site', config_start_page = 'dashboard.php', config_invoice_prefix = 'INV-', config_invoice_next_number = 1, config_invoice_overdue_reminders = '1,3,7', config_quote_prefix = 'QUO-', config_quote_next_number = 1, config_api_key = '$config_api_key', config_recurring_auto_send_invoice = 1, config_default_net_terms = 7, config_send_invoice_reminders = 0, config_enable_cron = 0, config_ticket_next_number = 1, config_base_url = '$config_base_url'"); //Create Some Data