Fixed a couple of edition ui bugs.

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

diff --git a/install/index.php b/install/index.php
index 53c865ecdf14b64ad8314336e164373ac40f809a..e9e0ef59630379763a9f41588f8940940f3f7c9d 100644 (file)
--- a/install/index.php
+++ b/install/index.php
@@ -117,45 +117,23 @@ 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', $conn["tbpref"]);
 
-       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."));
        }
-       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'];
        if (install_connect_db() && db_import($path_to_root.'/sql/'.$coa, $_SESSION['inst_set'])) {
                $con = $_SESSION['inst_set'];
                $table_prefix = $con['tbpref'];
-               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'])));
-
-               if (!copy($path_to_root. "/config.default.php", $path_to_root. "/config.php")) {
-                       display_error(_("Cannot save system configuration file 'config.php'."));
-                       return false;
-               }
 
                $def_coy = 0;
                $tb_pref_counter = 0;
@@ -167,6 +145,21 @@ function do_install() {
                 'dbname' => $con['dbname'],
                 'tbpref' => $table_prefix
                ));
+
+               $_SESSION['wa_current_user']->cur_con = 0;
+               
+               update_company_prefs(array('coy_name'=>$con['name']));
+               $admin = get_user_by_login('admin');
+               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'."));
+                       return false;
+               }
+
                $err = write_config_db($table_prefix != "");
 
                if ($err == -1) {
@@ -184,7 +177,7 @@ function do_install() {
                $dflt_lang = $_POST['lang'];
                write_lang();
                if (!isset($installed_extensions))
-                       write_extensions(array());
+                       update_extensions(array());
                return true;
        }
        return false;
@@ -394,7 +387,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;