X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=install%2Findex.php;h=9bc9a41ea92d028cc2e69be2e5531b1f8a0fa3fc;hb=cfaa5cec1f5137bcc1599a4306879e3265d1dacd;hp=e9e0ef59630379763a9f41588f8940940f3f7c9d;hpb=46c5f7a65a7659a44ae8254c63152074363d3987;p=fa-stable.git
diff --git a/install/index.php b/install/index.php
index e9e0ef59..9bc9a41e 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,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;
}
@@ -173,11 +177,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))
- update_extensions(array());
return true;
}
return false;
@@ -262,11 +265,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.'));
@@ -292,6 +295,7 @@ elseif (isset($_POST['set_admin'])) {
'pass' => $_POST['pass'],
'name' => $_POST['name'],
'admin' => $_POST['admin'],
+ 'lang' => $_POST['lang']
));
if (do_install()) {
$_POST['Page'] = 6;
@@ -337,7 +341,7 @@ 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 User:"), 'dbuser', 30);
text_row_ex(_("Database Password:"), 'dbpassword', 30);
text_row_ex(_("Database Name:"), 'dbname', 30);
@@ -371,6 +375,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);
@@ -400,4 +409,3 @@ end_form(1);
end_page(false, false, true);
-?>