From: Janusz Dobrowolski Date: Fri, 13 Feb 2009 21:58:02 +0000 (+0000) Subject: Install error handling bug fixed. X-Git-Tag: v2.4.2~19^2~1532 X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=commitdiff_plain;h=63ac6425e9e925da331083f83706cfa34fe853d4;hp=ed87d09dc92261eccbb1e9e3dc4cbe5e519eabcd;p=fa-stable.git Install error handling bug fixed. --- diff --git a/CHANGELOG.txt b/CHANGELOG.txt index ebf3ca65..35853f27 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -27,6 +27,8 @@ $ /access/login.php /lang/installed_languages.inc # Message typo fixed $ /admin/display_prefs.php +# Unified display_error function name in install wizard and main code +$ /install/save.php 13-Feb-2009 Joe Hunt # Minor bug fix in Quick Entry tax account choice for Journal Entry. diff --git a/install/save.php b/install/save.php index 659e9ca6..1396d806 100644 --- a/install/save.php +++ b/install/save.php @@ -21,8 +21,9 @@ if(!defined('SESSION_STARTED')) define('SESSION_STARTED', true); } -// Function to set error -function set_error($message) +// Installer version of display_error function. +// +function display_error($message) { global $_POST; if(isset($message) AND $message != '') @@ -145,7 +146,7 @@ else // Set error if no post vars found if (!isset($_POST['company_name'])) { - set_error('Please fill-in the form below'); + display_error('Please fill-in the form below'); } // End check to see if form was even submitted @@ -154,7 +155,7 @@ if (!isset($_POST['company_name'])) // Check if user has entered the installation url if (!isset($_POST['ba_url']) || $_POST['ba_url'] == '') { - set_error('Please enter an absolute URL'); + display_error('Please enter an absolute URL'); } else { @@ -184,7 +185,7 @@ if(substr($ba_url, strlen($ba_url) - 1, 1) == "\\") // Get operating system if (!isset($_POST['operating_system']) || $_POST['operating_system'] != 'linux' && $_POST['operating_system'] != 'windows') { - set_error('Please select a valid operating system'); + display_error('Please select a valid operating system'); } else { @@ -212,7 +213,7 @@ else // Check if user has entered a database host if (!isset($_POST['database_host']) || $_POST['database_host'] == '') { - set_error('Please enter a database host name'); + display_error('Please enter a database host name'); } else { @@ -221,7 +222,7 @@ else // Check if user has entered a database username if (!isset($_POST['database_username']) || $_POST['database_username'] == '') { - set_error('Please enter a database username'); + display_error('Please enter a database username'); } else { @@ -230,7 +231,7 @@ else // Check if user has entered a database password if (!isset($_POST['database_password'])) { - set_error('Please enter a database password'); + display_error('Please enter a database password'); } else { @@ -239,7 +240,7 @@ else // Check if user has entered a database name if (!isset($_POST['database_name']) || $_POST['database_name'] == '') { - set_error('Please enter a database name'); + display_error('Please enter a database name'); } else { @@ -266,7 +267,7 @@ else // Get company name if (!isset($_POST['company_name']) || $_POST['company_name'] == '') { - set_error('Please enter a company name'); + display_error('Please enter a company name'); } else { @@ -277,13 +278,13 @@ else // Check if the user has entered a correct path if (!file_exists($path_to_root.'/sql/en_US-demo.sql')) { - set_error('It appears the Absolute path that you entered is incorrect'); + display_error('It appears the Absolute path that you entered is incorrect'); } // Get admin email and validate it if (!isset($_POST['admin_email']) || $_POST['admin_email'] == '') { - set_error('Please enter an email for the Administrator account'); + display_error('Please enter an email for the Administrator account'); } else { @@ -293,13 +294,13 @@ else } else { - set_error('Please enter a valid email address for the Administrator account'); + display_error('Please enter a valid email address for the Administrator account'); } } // Get the two admin passwords entered, and check that they match if (!isset($_POST['admin_password']) || $_POST['admin_password'] == '') { - set_error('Please enter a password for the Administrator account'); + display_error('Please enter a password for the Administrator account'); } else { @@ -307,7 +308,7 @@ else } if (!isset($_POST['admin_repassword']) || $_POST['admin_repassword'] == '') { - set_error('Please make sure you re-enter the password for the Administrator account'); + display_error('Please make sure you re-enter the password for the Administrator account'); } else { @@ -315,7 +316,7 @@ else } if ($admin_password != $admin_repassword) { - set_error('Sorry, the two Administrator account passwords you entered do not match'); + display_error('Sorry, the two Administrator account passwords you entered do not match'); } // End admin user details code @@ -339,18 +340,18 @@ $config_filename = $path_to_root . '/config_db.php'; $err = write_config_db($table_prefix != ""); if ($err == -1) - set_error("Cannot open the configuration file ($config_filename)"); + display_error("Cannot open the configuration file ($config_filename)"); else if ($err == -2) - set_error("Cannot write to the configuration file ($config_filename)"); + display_error("Cannot write to the configuration file ($config_filename)"); else if ($err == -3) - set_error("The configuration file $config_filename is not writable. Change its permissions so it is, then re-run step 4."); + display_error("The configuration file $config_filename is not writable. Change its permissions so it is, then re-run step 4."); // Try connecting to database $db = mysql_connect($database_host, $database_username, $database_password); if (!$db) { - set_error('Database host name, username and/or password incorrect. MySQL Error:
'.mysql_error()); + display_error('Database host name, username and/or password incorrect. MySQL Error:
'.mysql_error()); } if($install_tables == true) @@ -363,8 +364,7 @@ if($install_tables == true) mysql_select_db($database_name, $db); } $import_filename = $path_to_root."/sql/en_US-demo.sql"; - if (!db_import($import_filename, $db_connections[$id])) - set_error("Import error, try to import $import_filename manually via phpMyAdmin"); + db_import($import_filename, $db_connections[$id]); } else {