holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- fixed files-directory check for webdav

Browse Source 
- fix to keep your settings on a validation error
- make Option filesystem translatable
This commit is contained in:
Ralf Becker 2006-03-08 09:41:53 +00:00
parent e3cbf9a4c9
commit ef14c49e04
6 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
setup/config.php
View File

@ -95,6 +95,7 @@
'config_name' => $setting,
'config_app' => 'phpgwapi',
),__LINE__,__FILE__);
unset($newsettings[$setting]);
}
elseif($value)
{
@ -125,12 +126,19 @@
$GLOBALS['egw_setup']->html->show_header(lang('Configuration'),False,'config',$GLOBALS['egw_setup']->ConfigDomain . '(' . $GLOBALS['egw_domain'][$GLOBALS['egw_setup']->ConfigDomain]['db_type'] . ')');
$GLOBALS['egw_setup']->db->select($GLOBALS['egw_setup']->config_table,'*',false,__LINES__,__FILES__);
while($GLOBALS['egw_setup']->db->next_record())
// if we have an validation error, use the new settings made by the user and not the stored config
if($GLOBALS['error'] && is_array($newsettings))
{
$GLOBALS['current_config'][$GLOBALS['egw_setup']->db->f('config_name')] = $GLOBALS['egw_setup']->db->f('config_value');
$GLOBALS['current_config'] = $newsettings;
}
else
{
$GLOBALS['egw_setup']->db->select($GLOBALS['egw_setup']->config_table,'*',false,__LINES__,__FILES__);
while($GLOBALS['egw_setup']->db->next_record())
{
$GLOBALS['current_config'][$GLOBALS['egw_setup']->db->f('config_name')] = $GLOBALS['egw_setup']->db->f('config_value');
}
}
$setup_tpl->pparse('out','T_config_pre_script');
/* Now parse each of the templates we want to show here */

2
setup/inc/hook_config_validate.inc.php
View File

@ -44,7 +44,7 @@
function files_dir($settings)
{
if (!check_dir($settings['files_dir'],$error_msg,true))
if ($settings['file_repository'] == 'sql' && $settings['file_store_contents'] == 'filesystem' && !check_dir($settings['files_dir'],$error_msg,true))
{
$GLOBALS['config_error'] = lang("Your files directory '%1' %2",$settings['files_dir'],$error_msg);
}

4
setup/index.php
View File

@ -430,12 +430,12 @@
{
$config_msg = lang("Your temporary directory '%1' %2",$config['temp_dir'],$error_msg);
}
if (!check_dir($config['files_dir'],$error_msg,true))
if ($config['file_repository'] == 'sql' && $config['file_store_contents'] == 'filesystem' && !check_dir($config['files_dir'],$error_msg,true))
{
$config_msg .= ($config_msg?"<br />\n":'').lang("Your files directory '%1' %2",$config['files_dir'],$error_msg);
}
// set and create the default backup_dir
if (@is_writeable($config['files_dir']) && !isset($config['backup_dir']) && $config['file_store_contents'] == 'filesystem')
if (@is_writeable($config['files_dir']) && !$config['backup_dir'] && $config['file_store_contents'] == 'filesystem')
{
$config['backup_dir'] = $config['files_dir'].'/db_backup';
if (!is_dir($config['backup_dir']) && mkdir($config['backup_dir']))

5
setup/lang/phpgw_de.lang
View File

@ -196,6 +196,7 @@ file setup de DATEI
file type, size, version, etc. setup de Dateityp, Größe, Version usw.
file uploads are switched off: you can not use any of the filemanagers, nor can you attach files in several applications! setup de Dateiuploads sind ausgeschaltet. Sie können keinen der Dateimanager verwenden, noch können Sie in verschiedenen Anwendungen Dateien anhängen!
filename setup de Dateiname
filesystem setup de Dateisystem
for a new install, select import. to convert existing sql accounts to ldap, select export setup de Für eine Neuinstallation, wählen Sie importieren. Um existierende SQL-Accounts zu LDAP zu konvertieren, w&auml;hlen Sie exportieren.
force selectbox setup de Auswahl erzwingen
found existing configuration file. loading settings from the file... setup de Existierende Konfigurationsdatei gefunden. Lade Einstellungen von der Datei ...
@ -328,7 +329,7 @@ passwords did not match, please re-enter setup de Passworte stimmten nicht
path information setup de Pfadinformationen
path to user and group files has to be outside of the webservers document-root!!! setup de Pfad zu Benutzer und Gruppen Dateien MUSS AUSSERHALB des Wurzelverzeichnisses (document root) des Webservers sein!!!
pear is needed by syncml or the ical import+export of calendar. setup de PEAR wird von SyncML oder dem iCal Import+Export des Kalenders benötigt.
pear::log is needed by syncml. setup de PEAR wird von SyncML benötigt.
pear::log is needed by syncml. setup de PEAR::Log wird von SyncML benötigt.
persistent connections setup de Permanente Verbindungen
php plus restore setup de PHP plus Wiederherstellen
php plus restore gives by far the best performance, as it stores the egw enviroment completly in the session. setup de PHP plus Wiederherstellen gibt bei weitem die beste Performanze. Es speichert die eGW Umgebung komplett in der Session.
@ -414,6 +415,7 @@ setup the database setup de Datenbank einzurichten
setup/config admin login setup de Setup-/Konfigurationsadmin-Login
show 'powered by' logo on setup de Zeige "powered by" Logo
size setup de Größe
skip the installation tests (not recommended) setup de Installationstests überspringen (nicht empfohlen)
smtp server hostname or ip address setup de SMTP Server Hostname oder IP Adresse
smtp server port setup de SMTP Server Port
some or all of its tables are missing setup de Einige oder alle Tabellen fehlen
@ -517,6 +519,7 @@ you appear to have %1 support. setup de Sie scheinen %1 Unterst
you appear to have php session support. enabling php sessions. setup de Sie scheinen PHP Session Unterstützung zu haben. PHP Sessions eingeschaltet.
you appear to have xml support enabled setup de Sie scheinen XML Unterstützung zu haben.
you are ready for this stage, but this stage is not yet written.<br /> setup de Sie sind bereit für diesen Schritt, aber dieser Abschnitt wurde noch nicht geschrieben.<br />
you can install it by running: setup de Installation durch ausführen von:
you didn't enter a config password for domain %1 setup de Sie haben kein Passwort für die Domain %1 angegeben
you didn't enter a config username for domain %1 setup de Sie haben keinen Benutzernamen für die Domain %1 angegeben
you didn't enter a header admin password setup de Sie haben kein Passwort für die Headerverwaltung eingegeben

3
setup/lang/phpgw_en.lang
View File

@ -196,6 +196,7 @@ file setup en FILE
file type, size, version, etc. setup en file type, size, version, etc.
file uploads are switched off: you can not use any of the filemanagers, nor can you attach files in several applications! setup en File uploads are switched off: You can NOT use any of the filemanagers, nor can you attach files in several applications!
filename setup en filename
filesystem setup en Filesystem
for a new install, select import. to convert existing sql accounts to ldap, select export setup en For a new install, select import. To convert existing SQL accounts to LDAP, select export
force selectbox setup en Force Selectbox
found existing configuration file. loading settings from the file... setup en Found existing configuration file. Loading settings from the file...
@ -414,6 +415,7 @@ setup the database setup en Setup the database
setup/config admin login setup en Setup/Config Admin Login
show 'powered by' logo on setup en Show 'powered by' logo on
size setup en size
skip the installation tests (not recommended) setup en Skip the installation tests (not recommended)
smtp server hostname or ip address setup en SMTP server hostname or IP address
smtp server port setup en SMTP server port
some or all of its tables are missing setup en Some or all of its tables are missing
@ -517,6 +519,7 @@ you appear to have %1 support. setup en You appear to have %1 support.
you appear to have php session support. enabling php sessions. setup en You appear to have PHP session support. Enabling PHP sessions.
you appear to have xml support enabled setup en You appear to have XML support enabled
you are ready for this stage, but this stage is not yet written.<br /> setup en You are ready for this stage, but this stage is not yet written.<br />
you can install it by running: setup en You can install it by running:
you didn't enter a config password for domain %1 setup en You didn't enter a config password for domain %1
you didn't enter a config username for domain %1 setup en You didn't enter a config username for domain %1
you didn't enter a header admin password setup en You didn't enter a header admin password

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

@ -457,7 +457,7 @@
</td>
<td>
<select name="newsettings[file_store_contents]">
<option value="filesystem"{selected_file_store_contents_filesystem}>Filesystem</option>
<option value="filesystem"{selected_file_store_contents_filesystem}>{lang_Filesystem}</option>
<option value="sql"{selected_file_store_contents_sql}>SQL</option>
</select>
</td>