projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Vlrsnup according to Apmuthu's list.
[fa-stable.git]
/
install
/
index.php
diff --git
a/install/index.php
b/install/index.php
index 52adfbef158562c095cdcc2314f9848b180dab0d..91fa338411ac134266ff19454e10d0f77c4e5f60 100644
(file)
--- a/
install/index.php
+++ b/
install/index.php
@@
-23,7
+23,8
@@
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 . "/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)
//-------------------------------------------------------------------------------------------------
function subpage_title($txt)
@@
-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."));
$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;
}
}
return $db;
}
@@
-173,11
+177,10
@@
function do_install() {
return false;
}
// update default language
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();
$dflt_lang = $_POST['lang'];
write_lang();
- if (!isset($installed_extensions))
- update_extensions(array());
return true;
}
return false;
return true;
}
return false;
@@
-262,11
+265,11
@@
elseif(get_post('install_coas'))
$ret &= install_extension($package);
}
if ($ret) {
$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;
}
$_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.'));
// 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'],
'pass' => $_POST['pass'],
'name' => $_POST['name'],
'admin' => $_POST['admin'],
+ 'lang' => $_POST['lang']
));
if (do_install()) {
$_POST['Page'] = 6;
));
if (do_install()) {
$_POST['Page'] = 6;
@@
-371,6
+375,11
@@
start_form();
$_POST[$name] = $val;
set_focus('name');
}
$_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);
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);
end_page(false, false, true);
-?>