extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-07 08:34:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

changed Benjamins rejected lines messages to only show up, if extra debug messages have been explicitly checked

Browse Source
This commit is contained in:
Ralf Becker 2004-07-31 16:19:48 +00:00
parent 804476a890
commit e99cd91035
5 changed files with 41 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
setup/lang.php
View File

@ -33,8 +33,12 @@
$GLOBALS['phpgw_setup']->translation->setup_translation_sql();
$GLOBALS['phpgw_setup']->translation->sql->install_langs(@$_POST['lang_selected'],@$_POST['upgrademethod']);
Header('Location: index.php');
exit;
if( !$GLOBALS['phpgw_setup']->translation->sql->line_rejected )
{
Header('Location: index.php');
exit;
}
}
$tpl_root = $GLOBALS['phpgw_setup']->html->setup_tpl_dir('setup');
@ -84,6 +88,7 @@
$setup_tpl->set_var('blurb_addonlynew',$blurb_addonlynew);
$setup_tpl->set_var('blurb_addmissing',$blurb_addmissing);
$setup_tpl->set_var('blurb_dumpold',$blurb_dumpold);
$setup_tpl->set_var('lang_debug',lang('enable for extra debug-messages'));
$setup_tpl->parse('V_choose_method','B_choose_method');
}
else
@ -91,6 +96,21 @@
$setup_tpl->set_var('V_choose_method','');
}
// Rejected Lines
if($_POST['debug'] && count($GLOBALS['phpgw_setup']->translation->sql->line_rejected))
{
$str = '';
foreach($GLOBALS['phpgw_setup']->translation->sql->line_rejected as $badline)
{
$_f_buffer = split("[/\\]", $badline['appfile']);
$str .= lang('Application: %1, File: %2, Line: "%3"','<b>'.$_f_buffer[count($_f_buffer)-3].'</b>',
'<b>'.$_f_buffer[count($_f_buffer)-1].'</b>',$badline['line'])."<br>\n";
}
$setup_tpl->set_var('V_alert_word', lang('Rejected lines'));
$setup_tpl->set_var('V_alert_msg', $str);
$alert = TRUE;
}
$setup_tpl->set_var('stage_title',$stage_title);
$setup_tpl->set_var('stage_desc',$stage_desc);
$setup_tpl->set_var('tbl_width',$tbl_width);
@ -105,5 +125,9 @@
$GLOBALS['phpgw_setup']->html->show_header("$stage_title",False,'config',$GLOBALS['phpgw_setup']->ConfigDomain . '(' . $phpgw_domain[$GLOBALS['phpgw_setup']->ConfigDomain]['db_type'] . ')');
$setup_tpl->pparse('out','T_lang_main');
if($alert)
$setup_tpl->pparse('out','T_alert_msg');
$GLOBALS['phpgw_setup']->html->show_footer();
?>

3
setup/lang/phpgw_de.lang
View File

@ -33,6 +33,7 @@ application management setup de Verwaltung der Anwendungen
application name and status setup de Name und Status der Anwendung
application name and status information setup de Name und Status Information der Anwendung
application title setup de Titel der Anwendung
application: %1, file: %2, line: "%3" setup de Anwendung: %1, Datei: %2, Zeile: "%3"
are you sure you want to delete your existing tables and data? setup de Sind Sie sicher, dass Sie Ihre bestehenden Tabellen und Daten löschen wollen?
are you sure? setup de SIND SIE SICHER?
at your request, this script is going to attempt to create the database and assign the db user rights to it setup de Auf Ihre Anforderung hin wird dieses Skript nun versuchen, die Datendank zu erstellen und die Benutzerrechte zuzuordnen
@ -64,6 +65,7 @@ cannot create the header.inc.php due to file permission restrictions.<br> instea
change system-charset setup de Systemzeichensatz wechseln
charset setup de ISO-8859-1
charset to convert to setup de Zeichensatz in den konvertiert werden soll
check can only be performed, if called via a webserver, as the user-id/-name of the webserver is not known. setup de Dieser Test kann nur durchgeführt werden, wenn der Aufruf über den Webserver erfolgt, da Benutzer-Id und -name des Webservers nicht bekannt sind.
check installation setup de Installation überprüfen
check ip address of all sessions setup de IP Adresse bei allen Sessions überprüfen
checking extension %1 is loaded or loadable setup de Überprüfe ob die Erweiterung %1 geladen oder ladbar ist
@ -307,6 +309,7 @@ really uninstall all applications setup de WIRKLICH alle Anwendungen deinstallie
recommended: filesystem setup de Empfohlen: Dateisystem
register_globals is turned on, egroupware does not require it and it's generaly more secure to have it turned off setup de register_globals ist eingeschaltet (On), eGroupWare benötigt das NICHT und es ist generell sicherer es auszuschalten (Off)
registered setup de registriert
rejected lines setup de Zurückgewiesende Zeilen
remove setup de Entfernen
remove all setup de Alle Entfernen
requires reinstall or manual repair setup de Erfordert Neuinstallation oder manuelle Reparatur

4
setup/lang/phpgw_en.lang
View File

@ -19,6 +19,7 @@ admin user for header manager setup en Admin user for header manager
admin username setup en Admin username
admins setup en Admins
after retrieving the file, put it into place as the header.inc.php. then, click "continue". setup en After retrieving the file, put it into place as the header.inc.php. Then, click "continue".
all applications setup en all applications
all core tables and the admin and preferences applications setup en all core tables and the admin and preferences applications
all users setup en All Users
analysis setup en Analysis
@ -32,6 +33,7 @@ application management setup en Application Management
application name and status setup en Application Name and Status
application name and status information setup en Application Name and Status Information
application title setup en Application Title
application: %1, file: %2, line: "%3" setup en Application: %1, File: %2, Line: "%3"
are you sure you want to delete your existing tables and data? setup en Are you sure you want to delete your existing tables and data?
are you sure? setup en ARE YOU SURE?
at your request, this script is going to attempt to create the database and assign the db user rights to it setup en At your request, this script is going to attempt to create the database and assign the db user rights to it
@ -62,6 +64,7 @@ cannot create the header.inc.php due to file permission restrictions.<br> instea
change system-charset setup en Change system-charset
charset setup en ISO-8859-1
charset to convert to setup en Charset to convert to
check can only be performed, if called via a webserver, as the user-id/-name of the webserver is not known. setup en Check can only be performed, if called via a webserver, as the user-id/-name of the webserver is not known.
check installation setup en Check installation
check ip address of all sessions setup en check ip address of all sessions
checking extension %1 is loaded or loadable setup en Checking extension %1 is loaded or loadable
@ -303,6 +306,7 @@ really uninstall all applications setup en REALLY Uninstall all applications
recommended: filesystem setup en Recommended: Filesystem
register_globals is turned on, egroupware does not require it and it's generaly more secure to have it turned off setup en register_globals is turned On, eGroupWare does NOT require it and it's generaly more secure to have it turned Off
registered setup en registered
rejected lines setup en Rejected lines
remove setup en Remove
remove all setup en Remove All
requires reinstall or manual repair setup en Requires reinstall or manual repair

9
setup/templates/default/lang_main.tpl
View File

@ -13,11 +13,11 @@
</td>
</tr>
<tr bgcolor="#e6e6e6">
<td {td_align}>
<td {td_align} rowspan="2">
{select_box_desc}
<form method="POST" action="lang.php">
{hidden_var1}
<select name="lang_selected[]" multiple size="10">
<select name="lang_selected[]" multiple size="25">
{select_box_langs}
</select>
</td>
@ -36,6 +36,11 @@
</td>
<!-- END B_choose_method -->
</tr>
<tr bgcolor="#e6e6e6">
<td>
<input type="checkbox" name="debug" value="1"> {lang_debug}
</td>
</tr>
</table>
<div align="center">

2
setup/templates/default/msg_alert_msg.tpl
View File

@ -1,6 +1,6 @@
<!-- begin msg_alert_msg.tpl -->
<div align="center">
<h2>{V_alert_word}:</h2>
<h3>{V_alert_msg}</h3>
{V_alert_msg}
</div>
<!-- end msg_alert_msg.tpl -->