X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=install%2Findex.php;h=2d67867b9cdfcf91e14c3d6d7411cca742d29376;hb=31d8a82446920511a28c940ce9f4678906e4fcf1;hp=fc27f03038097a200e43db1cb57bf2ddf46d6ae2;hpb=24a22844421c7b78b7988e23e8d7c4d6fd30f749;p=fa-stable.git
diff --git a/install/index.php b/install/index.php
index fc27f030..2d67867b 100644
--- a/install/index.php
+++ b/install/index.php
@@ -31,7 +31,7 @@ function subpage_title($txt)
{
global $path_to_root;
- echo '
+ echo '
';
$page = @$_POST['Page'] ? $_POST['Page'] : 1;
@@ -122,6 +122,9 @@ function install_connect_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 $db;
}
@@ -141,10 +144,11 @@ function do_install() {
$db_connections = array (0=> array (
'name' => $con['name'],
'host' => $con['host'],
+ '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;
@@ -191,7 +195,8 @@ if (!isset($_SESSION['inst_set'])) // default settings
'username' => 'admin',
'tbpref' => '0_',
'admin' => 'admin',
- 'inst_lang' => 'C'
+ 'inst_lang' => 'C',
+ 'collation' => 'xx',
);
if (!@$_POST['Tests'])
@@ -228,6 +233,7 @@ elseif (isset($_POST['db_test'])) {
'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 :
@@ -292,6 +298,7 @@ elseif(get_post('install_coas'))
'pass' => $_POST['pass'],
'name' => $_POST['name'],
'admin' => $_POST['admin'],
+ 'lang' => $_POST['lang']
));
if (do_install()) {
$_POST['Page'] = 6;
@@ -308,9 +315,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'));
@@ -338,14 +342,16 @@ start_form();
subpage_title(_('Database Server Settings'));
start_table(TABLESTYLE);
text_row_ex(_("Server Host:"), 'host', 30, 60);
+ text_row_ex(_("Database Name:"), 'dbname', 30);
text_row_ex(_("Database User:"), 'dbuser', 30);
text_row_ex(_("Database Password:"), 'dbpassword', 30);
- text_row_ex(_("Database Name:"), 'dbname', 30);
+ 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(_("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."));
submit_center_first('back', _('<< Back'));
submit_center_last('db_test', _('Continue >>'));
@@ -386,7 +392,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
@@ -405,4 +411,3 @@ end_form(1);
end_page(false, false, true);
-?>