Fixed a couple of problems in installation procedures.

[fa-stable.git] / install / index.php

diff --git a/install/index.php b/install/index.php
index 2b43068dafb95adc936542e6b0ac39ecdf1f8ef0..91fa338411ac134266ff19454e10d0f77c4e5f60 100644 (file)
--- a/install/index.php
+++ b/install/index.php
@@ -23,7 +23,8 @@ include($path_to_root . "/includes/ui.inc");
 include($path_to_root . "/includes/system_tests.inc");
 include($path_to_root . "/admin/db/maintenance_db.inc");
 include($path_to_root . "/includes/packages.inc");
-@include($path_to_root . "/installed_extensions.php");
+if (file_exists($path_to_root . "/installed_extensions.php"))
+       include($path_to_root . "/installed_extensions.php");
 //-------------------------------------------------------------------------------------------------
 
 function subpage_title($txt) 
@@ -117,29 +118,20 @@ function install_connect_db() {
        global $db;
 
        $conn = $_SESSION['inst_set'];
-       
-       $db = mysql_connect($conn["host"] , $conn["dbuser"], $conn["dbpassword"]);
-       if(!$db) {
-               display_error('Cannot connect to database server. Host name, username and/or password incorrect.');
-               return false;
-       }
-       if (!defined('TB_PREF'))
-               define('TB_PREF', '&TB_PREF&');
 
-       if (!mysql_select_db($conn["dbname"], $db)) {
-               $sql = "CREATE DATABASE " . $conn["dbname"];
-               if (!mysql_query($sql)) {
-                       display_error('Cannot create database. Check your permissions to database creation or selct already created database.');
-                       return false;
-               }
-               return mysql_select_db($conn["dbname"], $db);
+       $db = db_create_db($conn);
+       if (!$db) {
+               display_error(_("Cannot connect to database. User or password is invalid or you have no permittions to create database."));
+       } else {
+               if (strncmp(db_get_version(), "5.6", 3) >= 0) 
+                       db_query("SET sql_mode = ''");
        }
-       return true;
+       return $db;
 }
 
 function do_install() {
 
-       global $path_to_root, $db_connections, $def_coy, $installed_extensions, 
+       global $path_to_root, $db_connections, $def_coy, $installed_extensions, $tb_pref_counter,
                $dflt_lang, $installed_languages;
 
        $coa = $_SESSION['inst_set']['coa'];
@@ -162,9 +154,10 @@ function do_install() {
                
                update_company_prefs(array('coy_name'=>$con['name']));
                $admin = get_user_by_login('admin');
-//             update_admin_password($con, md5($con['pass']));
-               update_user_prefs($admin['id'], array('language' => $_POST['lang'], 
-                       'password' => md5($con['pass'])));
+               update_user_prefs($admin['id'], array(
+                       'language' => $con['lang'], 
+                       'password' => md5($con['pass']),
+                       'user_id' => $con['admin']));
 
                if (!copy($path_to_root. "/config.default.php", $path_to_root. "/config.php")) {
                        display_error(_("Cannot save system configuration file 'config.php'."));
@@ -184,11 +177,10 @@ function do_install() {
                        return false;
                }
                // update default language
-               include_once($path_to_root . "/lang/installed_languages.inc");
+               if (file_exists($path_to_root . "/lang/installed_languages.inc"))
+                       include_once($path_to_root . "/lang/installed_languages.inc");
                $dflt_lang = $_POST['lang'];
                write_lang();
-               if (!isset($installed_extensions))
-                       write_extensions(array());
                return true;
        }
        return false;
@@ -273,11 +265,11 @@ elseif(get_post('install_coas'))
                        $ret &= install_extension($package);
                }
        if ($ret) {
-               @include($path_to_root.'/installed_extensions.php');
+               if (file_exists($path_to_root . '/installed_extensions.php'))
+                       include($path_to_root.'/installed_extensions.php');
                $_POST['Page'] = 5;
        }
-}
-elseif (isset($_POST['set_admin'])) {
+} elseif (isset($_POST['set_admin'])) {
        // check company settings
        if (get_post('name')=='') {
                display_error(_('Company name cannot be empty.'));
@@ -303,6 +295,7 @@ elseif (isset($_POST['set_admin'])) {
                        'pass' => $_POST['pass'],
                        'name' => $_POST['name'],
                        'admin' => $_POST['admin'],
+                       'lang' => $_POST['lang']
                ));
                if (do_install()) {
                        $_POST['Page'] = 6;
@@ -348,7 +341,7 @@ start_form();
                        }
                        subpage_title(_('Database Server Settings'));
                        start_table(TABLESTYLE);
-                       text_row_ex(_("Server Host:"), 'host', 30);
+                       text_row_ex(_("Server Host:"), 'host', 30, 60);
                        text_row_ex(_("Database User:"), 'dbuser', 30);
                        text_row_ex(_("Database Password:"), 'dbpassword', 30);
                        text_row_ex(_("Database Name:"), 'dbname', 30);
@@ -382,6 +375,11 @@ start_form();
                                        $_POST[$name] = $val;
                                set_focus('name');
                        }
+                       if (!isset($installed_extensions)) {
+                               $installed_extensions = array();
+                               update_extensions($installed_extensions);
+                       }
+
                        subpage_title(_('Company Settings'));
                        start_table(TABLESTYLE);
                        text_row_ex(_("Company Name:"), 'name', 30);
@@ -398,7 +396,8 @@ start_form();
                case '6': // final screen
                        subpage_title(_('FrontAccounting ERP has been installed successsfully.'));
                        display_note(_('Please do not forget to remove install wizard folder.'));
-                       $install_done = true;
+                       session_unset();
+                       session_destroy();
                        hyperlink_no_params($path_to_root.'/index.php', _('Click here to start.'));
                        break;
 
@@ -410,4 +409,3 @@ end_form(1);
 
 end_page(false, false, true);
 
-?>