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 '<center><img src="'.$path_to_root.'/themes/default/images/logo_frontaccounting.png" width="250" height="50" alt="Logo" />
+ echo '<center><img src="'.$path_to_root.'/themes/default/images/logo_frontaccounting.png" width="250" height="50" alt="Logo" >
</center>';
$page = @$_POST['Page'] ? $_POST['Page'] : 1;
$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;
}
$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;
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))
- update_extensions(array());
return true;
}
return false;
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'])
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');
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 :
$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.'));
'pass' => $_POST['pass'],
'name' => $_POST['name'],
'admin' => $_POST['admin'],
+ 'lang' => $_POST['lang']
));
if (do_install()) {
$_POST['Page'] = 6;
start_form();
switch(@$_POST['Page']) {
default:
-// include ('../install.html');
-// submit_center('continue', _('Continue >>'));
-// break;
case '1':
div_start('welcome');
subpage_title(_('System Diagnostics'));
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;
$_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);
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
end_page(false, false, true);
-?>
projects / fa-stable.git / blobdiff