X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=install%2Findex.php;h=68654246352d4eeada3fe642abb9fac1025955de;hb=5ac9ea61baac0cf298b07317051da51e781645b7;hp=590b5b4d0672d7a16d225f923bd8602ac6ad994f;hpb=c128e08aea1e33a74bf918578013998a4d8b5c36;p=fa-stable.git
diff --git a/install/index.php b/install/index.php
index 590b5b4d..68654246 100644
--- a/install/index.php
+++ b/install/index.php
@@ -23,14 +23,15 @@ 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)
{
global $path_to_root;
- echo '
+ echo '
';
$page = @$_POST['Page'] ? $_POST['Page'] : 1;
@@ -121,13 +122,16 @@ 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;
}
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'];
@@ -140,19 +144,21 @@ 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;
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'."));
@@ -172,11 +178,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;
@@ -190,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'])
@@ -227,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 :
@@ -261,11 +268,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.'));
@@ -291,6 +298,7 @@ elseif (isset($_POST['set_admin'])) {
'pass' => $_POST['pass'],
'name' => $_POST['name'],
'admin' => $_POST['admin'],
+ 'lang' => $_POST['lang']
));
if (do_install()) {
$_POST['Page'] = 6;
@@ -336,15 +344,17 @@ 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 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 suing 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 >>'));
@@ -370,6 +380,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);
@@ -380,13 +395,14 @@ 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
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;
@@ -398,4 +414,3 @@ end_form(1);
end_page(false, false, true);
-?>