extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-25 17:33:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

setup will now add english by default

Browse Source
This commit is contained in:
jengo 2000-11-15 17:55:39 +00:00
parent 37d04a6e66
commit 881e68c1f9
2 changed files with 37 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
setup/lang.php
View File

@ -11,33 +11,40 @@
/* $Id$ */ /* $Id$ */
$phpgw_info["flags"] = array("noheader" => True, "nonavbar" => True, "currentapp" => "home", "noapi" => True); if (! $included) {
include("../header.inc.php");
$phpgw_info["server"]["api_dir"] = $phpgw_info["server"]["include_root"]."/phpgwapi"; $phpgw_info["flags"] = array("noheader" => True, "nonavbar" => True, "currentapp" => "home", "noapi" => True);
include("../header.inc.php");
$phpgw_info["server"]["api_dir"] = $phpgw_info["server"]["include_root"]."/phpgwapi";
// Authorize the user to use setup app // Authorize the user to use setup app
include("inc/setup_auth.inc.php"); include("inc/setup_auth.inc.php");
// Does not return unless user is authorized // Does not return unless user is authorized
/* Database setup */ /* Database setup */
include($phpgw_info["server"]["api_dir"] . "/phpgw_db_".$phpgw_info["server"]["db_type"].".inc.php"); include($phpgw_info["server"]["api_dir"] . "/phpgw_db_".$phpgw_info["server"]["db_type"].".inc.php");
$db = new db; $db = new db;
$db->Host = $phpgw_info["server"]["db_host"]; $db->Host = $phpgw_info["server"]["db_host"];
$db->Type = $phpgw_info["server"]["db_type"]; $db->Type = $phpgw_info["server"]["db_type"];
$db->Database = $phpgw_info["server"]["db_name"]; $db->Database = $phpgw_info["server"]["db_name"];
$db->User = $phpgw_info["server"]["db_user"]; $db->User = $phpgw_info["server"]["db_user"];
$db->Password = $phpgw_info["server"]["db_pass"]; $db->Password = $phpgw_info["server"]["db_pass"];
//$db->Halt_On_Error = "report"; //$db->Halt_On_Error = "report";
//$db->Halt_On_Error = "no"; //$db->Halt_On_Error = "no";
echo "<html><head><title>phpGroupWare Setup</title></head>\n"; echo "<html><head><title>phpGroupWare Setup</title></head>\n";
echo "<body bgcolor='#ffffff'>\n"; echo "<body bgcolor='#ffffff'>\n";
include($phpgw_info["server"]["include_root"]."/phpgwapi/phpgw_common.inc.php"); include($phpgw_info["server"]["include_root"]."/phpgwapi/phpgw_common.inc.php");
$common = new common; $common = new common;
$sep = $common->filesystem_separator(); $sep = $common->filesystem_separator();
} else {
$newinstall = True;
$lang_selected["en"] = "en";
$submit = True;
}
if ($submit) { if ($submit) {
if (count($lang_selected)) { if (count($lang_selected)) {
@ -87,10 +94,13 @@
} }
} }
echo "<center>Language files have been installed</center>"; if (! $included) {
exit; echo "<center>Language files have been installed</center>";
exit;
}
} else { } else {
if (! $included) {
?> ?>
<table border="0" align="center" width="<?php echo ($newinstall?"60%":"80%"); ?>"> <table border="0" align="center" width="<?php echo ($newinstall?"60%":"80%"); ?>">
<tr bgcolor="486591"> <tr bgcolor="486591">
@ -105,7 +115,7 @@
<?php echo ($newinstall?'<input type="hidden" name="newinstall" value="True">':""); ?> <?php echo ($newinstall?'<input type="hidden" name="newinstall" value="True">':""); ?>
<select name="lang_selected[]" multiple size="10"> <select name="lang_selected[]" multiple size="10">
<?php <?php
$db->query("select lang_id,lang_name from languages where available='Yes'"); $db->query("select lang_id,lang_name from languages where available='Yes' and lang_id != 'en'");
while ($db->next_record()) { while ($db->next_record()) {
echo '<option value="' . $db->f("lang_id") . '">' . $db->f("lang_name") . '</option>'; echo '<option value="' . $db->f("lang_id") . '">' . $db->f("lang_name") . '</option>';
} }
@ -127,6 +137,6 @@
echo '<center><input type="submit" name="submit" value="Install"></center>'; echo '<center><input type="submit" name="submit" value="Install"></center>';
} }
}

2
setup/sql/common_main.inc.php
View File

@ -25,7 +25,7 @@
include("./sql/".$phpgw_info["server"]["db_type"]."_newtables.inc.php"); include("./sql/".$phpgw_info["server"]["db_type"]."_newtables.inc.php");
include("./sql/common_default_records.inc.php"); include("./sql/common_default_records.inc.php");
$included = True; $included = True;
include("../lang.php"); include($phpgw_info["server"]["server_root"] . "/setup/lang.php");
} }
echo "<table border=\"0\" align=\"center\">\n"; echo "<table border=\"0\" align=\"center\">\n";
echo " <tr bgcolor=\"486591\">\n"; echo " <tr bgcolor=\"486591\">\n";