[0004461] Installer: added info about needed user database permissions.

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

diff --git a/install/index.php b/install/index.php
index 9bc9a41ea92d028cc2e69be2e5531b1f8a0fa3fc..5a2b24bc7b9a65f9a87f5098c542e8aa8acd5a8a 100644 (file)
--- a/install/index.php
+++ b/install/index.php
@@ -144,10 +144,12 @@ function do_install() {
                $db_connections = array (0=> array (
                 'name' => $con['name'],
                 'host' => $con['host'],
+                'port' => $con['port'],
+                'dbname' => $con['dbname'],
+                'collation' => $con['collation'],
+                'tbpref' => $table_prefix,
                 'dbuser' => $con['dbuser'],
                 'dbpassword' => $con['dbpassword'],
-                'dbname' => $con['dbname'],
-                'tbpref' => $table_prefix
                ));
 
                $_SESSION['wa_current_user']->cur_con = 0;
@@ -189,12 +191,14 @@ function do_install() {
 if (!isset($_SESSION['inst_set']))  // default settings
        $_SESSION['inst_set'] = array(
                'host'=>'localhost', 
+               'port' => '', // 3306
                'dbuser' => 'root',
                'dbpassword' => '',
                'username' => 'admin',
                'tbpref' => '0_',
                'admin' => 'admin',
-               'inst_lang' => 'C'
+               'inst_lang' => 'C',
+               'collation' => 'xx',
        );
 
 if (!@$_POST['Tests'])
@@ -214,6 +218,10 @@ elseif (isset($_POST['db_test'])) {
                display_error(_('Host name cannot be empty.'));
                set_focus('host');
        }
+       elseif ($_POST['port'] != '' && !is_numeric($_POST['port'])) {
+               display_error(_('Database port have to be numeric or empty.'));
+               set_focus('port');
+       }
        elseif ($_POST['dbuser']=='') {
                display_error(_('Database user name cannot be empty.'));
                set_focus('dbuser');
@@ -225,12 +233,14 @@ elseif (isset($_POST['db_test'])) {
        else {
                $_SESSION['inst_set'] = array_merge($_SESSION['inst_set'], array(
                        'host' => $_POST['host'],
+                       'port' => $_POST['port'],
                        'dbuser' => $_POST['dbuser'],
                        'dbpassword' => $_POST['dbpassword'],
                        'dbname' => $_POST['dbname'],
                        'tbpref' => $_POST['tbpref'] ? '0_' : '',
                        'sel_langs' => check_value('sel_langs'),
                        'sel_coas' => check_value('sel_coas'),
+                       'collation' => $_POST['collation'],
                ));
                if (install_connect_db()) {
                        $_POST['Page'] = check_value('sel_langs') ? 3 :
@@ -312,9 +322,6 @@ if (list_updated('inst_lang')) {
 start_form();
        switch(@$_POST['Page']) {
                default:
-//                     include ('../install.html');
-//                     submit_center('continue', _('Continue >>'));
-//                     break;
                case '1':
                        div_start('welcome');
                        subpage_title(_('System Diagnostics'));
@@ -342,15 +349,20 @@ start_form();
                        subpage_title(_('Database Server Settings'));
                        start_table(TABLESTYLE);
                        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(_("Server Port:"), 'port', 30, 60);
                        text_row_ex(_("Database Name:"), 'dbname', 30);
+                       text_row_ex(_("Database User:"), 'dbuser', 30);
+                       password_row(_("Database Password:"), 'dbpassword', '');
+                       collations_list_row(_("Database Collation:"), 'collation');
                        yesno_list_row(_("Use '0_' Table Prefix:"), 'tbpref', 1, _('Yes'), _('No'), false);
                        check_row(_("Install Additional Language Packs from FA Repository:"), 'sel_langs');
                        check_row(_("Install Additional COAs from FA Repository:"), 'sel_coas');
                        end_table(1);
-                       display_note(_('Use table prefix if you share selected database for more than one FA company.'));
+                       display_note(_("Use database user/password with permissions to create new database, or use proper credentials for previously created empty database."));
+                       display_note(_("Select collation you want to use. If you are unsure or you will use various languages, select unicode collation."));
+                       display_note(_("Use table prefix if you share selected database for more than one FA company using the same collation."));
                        display_note(_("Do not select additional langs nor COAs if you have no working internet connection right now. You can install them later."));
+                       display_note(_("Set Only Port value if you cannot use the default port 3306."));
                        submit_center_first('back', _('<< Back'));
                        submit_center_last('db_test', _('Continue >>'));
                        break;
@@ -390,7 +402,7 @@ start_form();
                        languages_list_row(_("Select Default Language:"), 'lang');
                        end_table(1);
                        submit_center_first('back', _('<< Back'));
-                       submit_center_last('set_admin', _('Continue >>'));
+                       submit_center_last('set_admin', _('Install'), _('Start installation process'), 'default nonajax');
                        break;
 
                case '6': // final screen