diff --git a/database_updates.php b/database_updates.php index d2391cc7..2458f3fa 100644 --- a/database_updates.php +++ b/database_updates.php @@ -1180,11 +1180,18 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) { mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.6.6'"); } - //if (CURRENT_DATABASE_VERSION == '0.6.6') { - //Insert queries here required to update to DB version 0.6.7 + if (CURRENT_DATABASE_VERSION == '0.6.6') { + + mysqli_query($mysqli, "ALTER TABLE `settings` ADD `config_start_page` VARCHAR(200) DEFAULT 'clients.php' AFTER `config_current_database_version`"); + + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.6.7'"); + } + + //if (CURRENT_DATABASE_VERSION == '0.6.7') { + //Insert queries here required to update to DB version 0.6.8 // Then, update the database to the next sequential version - //mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.6.7'"); + //mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.6.8'"); //} } else { diff --git a/database_version.php b/database_version.php index bbc00391..5dbf1e07 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.6.6"); +DEFINE("LATEST_DATABASE_VERSION", "0.6.7"); diff --git a/get_settings.php b/get_settings.php index 2d9352f9..a1ad9a5a 100644 --- a/get_settings.php +++ b/get_settings.php @@ -27,6 +27,7 @@ $config_imap_username = $row['config_imap_username']; $config_imap_password = $row['config_imap_password']; // Defaults +$config_start_page = $row['config_start_page']; $config_default_transfer_from_account = intval($row['config_default_transfer_from_account']); $config_default_transfer_to_account = intval($row['config_default_transfer_to_account']); $config_default_payment_account = intval($row['config_default_payment_account']); diff --git a/login.php b/login.php index 91884b10..0478cdd9 100644 --- a/login.php +++ b/login.php @@ -36,6 +36,7 @@ $row = mysqli_fetch_array($sql_settings); // Company info $company_name = $row['company_name']; $company_logo = $row['company_logo']; +$config_start_page = nullable_htmlentities($row['config_start_page']); // Mail $config_smtp_host = $row['config_smtp_host']; @@ -165,13 +166,7 @@ if (isset($_POST['login'])) { } } - // Show start page/dashboard depending on role - if ($row['user_role'] == 2) { - header("Location: dashboard_technical.php"); - } else { - header("Location: dashboard_financial.php"); - } - + header("Location: $config_start_page"); } else { diff --git a/post/setting.php b/post/setting.php index 3951173c..bd6b6183 100644 --- a/post/setting.php +++ b/post/setting.php @@ -223,6 +223,7 @@ if (isset($_POST['edit_default_settings'])) { validateAdminRole(); + $start_page = sanitizeInput($_POST['start_page']); $expense_account = intval($_POST['expense_account']); $payment_account = intval($_POST['payment_account']); $payment_method = sanitizeInput($_POST['payment_method']); @@ -232,7 +233,7 @@ if (isset($_POST['edit_default_settings'])) { $calendar = intval($_POST['calendar']); $net_terms = intval($_POST['net_terms']); - mysqli_query($mysqli,"UPDATE settings SET config_default_expense_account = $expense_account, config_default_payment_account = $payment_account, config_default_payment_method = '$payment_method', config_default_expense_payment_method = '$expense_payment_method', config_default_transfer_from_account = $transfer_from_account, config_default_transfer_to_account = $transfer_to_account, config_default_calendar = $calendar, config_default_net_terms = $net_terms WHERE company_id = 1"); + mysqli_query($mysqli,"UPDATE settings SET config_start_page = '$start_page', config_default_expense_account = $expense_account, config_default_payment_account = $payment_account, config_default_payment_method = '$payment_method', config_default_expense_payment_method = '$expense_payment_method', config_default_transfer_from_account = $transfer_from_account, config_default_transfer_to_account = $transfer_to_account, config_default_calendar = $calendar, config_default_net_terms = $net_terms WHERE company_id = 1"); //Logging mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Settings', log_action = 'Modify', log_description = '$session_name modified default settings', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_user_id = $session_user_id"); diff --git a/settings_defaults.php b/settings_defaults.php index 4fad6a63..ae91228d 100644 --- a/settings_defaults.php +++ b/settings_defaults.php @@ -9,6 +9,16 @@ require_once("inc_all_settings.php"); ?>
+
+ +
+
+ +
+ +
+
+