* Admin/Setup: button to mount backup directory under /backup into VFS

admin/lang/egw_de.lang

@@ -100,6 +100,7 @@ authentication / accounts	admin	de	Benutzerauthentifizierung / Benutzerkonten
 auto create account records for authenticated users	admin	de	Automatisch Benutzerkonten für authentifizierte Benutzer anlegen
 available placeholders	admin	de	Verfügbare Platzhalter
 back to the list	admin	de	zurück zur Liste
+backup directory %1 mounted as %2	admin	de	Datensicherungsverzeichnis %1 unter %2 gemounted
 bi-dir passthrough	admin	de	Weiterleitung in beide Richtungen
 bi-directional	admin	de	beide Richtungen
 bottom	admin	de	unten
@@ -272,6 +273,7 @@ exists	admin	de	existiert
 expires	admin	de	abgelaufen
 explanation of ldapman	admin	de	Dieses Modul ist derzeit nur für folgende Konfiguration getestet: Postfix, LDAP, Courier-Imap, Procmail und erfordert die Schemas: core und qmail(OID 7914). Weitere Konfigurationshinweise sind im README.ldapman im DOC Verzeichnis des Moduls ADMIN zu finden.
 failed to change password for account "%1"!	admin	de	Fehler beim Ändern des Passwortes für Benutzer "%1"!
+failed to mount backup directory!	admin	de	Konnte Datensicherungsverzeichnis nicht mounten!
 fallback (after each pageview)	admin	de	Ausweichmöglichkeit (nach jedem Seitenaufbau)
 false	admin	de	Falsch
 field '%1' already exists !!!	admin	de	Feld '%1' existiert bereits !!!
@@ -386,6 +388,7 @@ mode	admin	de	Modus
 modified	admin	de	Geändert
 month	admin	de	Monat
 more secure	admin	de	sicherer
+mount backup directory to %1	admin	de	Datensicherungsverzeichnis unter %1 mounten
 must change password upon next login	admin	de	Muss das Passwort beim nächsten Login ändern
 name must not be empty !!!	admin	de	Name darf nicht leer sein !!!
 name of the egroupware instance, eg. default	admin	de	Name der EGroupware Instanz, z.B. default

admin/lang/egw_en.lang

@@ -641,3 +641,6 @@ you need to select some users first!	admin	en	You need to select some users firs
 you will need to remove the subcategories before you can delete this category	admin	en	Remove the sub categories before deleting this category!
 your last submission was less then %1 days ago!	admin	en	Your last submission was less than %1 days ago!
 your session could not be verified.	admin	en	Your session could not be verified.
+backup directory %1 mounted as %2	admin	en	Backup directory %1 mounted as %2
+failed to mount backup directory!	admin	en	Failed to mount Backup directory!
+mount backup directory to %1	admin	en	Mount backup directory to %1

setup/db_backup.php

@@ -96,6 +96,16 @@ if ($_POST['save_backup_settings'])
 		}
 	}
 }
+if ($_POST['mount'])
+{
+	egw_vfs::$is_root = true;
+	echo '<div align="center">'.
+		(egw_vfs::mount('filesystem://default'.$db_backup->backup_dir.'?group=Admins&mode=070','/backup',false) ?
+			lang('Backup directory %1 mounted as %2',$db_backup->backup_dir,'/backup') :
+			lang('Failed to mount Backup directory!')).
+		"</div>\n";
+	egw_vfs::$is_root = false;
+}
 // create a backup now
 if($_POST['backup'])
 {
@@ -129,6 +139,7 @@ $setup_tpl->set_var('backup_files','<input type="checkbox" name="backup_files" v
 // do NOT allow to change "backup files" outside of setup
 	($is_setup ? '' : ' disabled="true" title="'.htmlspecialchars(lang('Can only be change via Setup!')).'"').'/>');
 $setup_tpl->set_var('backup_save_settings','<input type="submit" name="save_backup_settings" value="'.htmlspecialchars(lang('save')).'" />');
+$setup_tpl->set_var('backup_mount','<input type="submit" name="mount" value="'.htmlspecialchars(lang('Mount backup directory to %1','/backup')).'" />');
 
 if ($_POST['upload'] && is_array($_FILES['uploaded']) && !$_FILES['uploaded']['error'] &&
 	is_uploaded_file($_FILES['uploaded']['tmp_name']))

setup/lang/egw_de.lang

@@ -94,6 +94,7 @@ backup '%1' deleted	setup	de	Datensicherung '%1' gelöscht
 backup '%1' renamed to '%2'	setup	de	Datensicherung '%1' nach '%2' umbenannt
 backup '%1' restored	setup	de	Datensicherung '%1' zurückgesichert
 backup and restore	setup	de	Datensicherung und Wiederherstellung
+backup directory %1 mounted as %2	setup	de	Datensicherungsverzeichnis %1 unter %2 gemounted
 backup failed	setup	de	Datensicherung fehlgeschlagen
 backup files (needs ziparchive)	setup	de	Datensicherung der  EGroupware Dateiumgebung (files Verzeichnis) (benötigt die PHP Bibliothek ZipArchive)
 backup finished	setup	de	Datensicherung beendet
@@ -284,6 +285,7 @@ error in group-creation !!!	setup	de	Fehler beim Anlegen der Gruppen !!!
 error listing "dn=%1"!	setup	de	Fehler beim Auflisten von "dn=%1"!
 error modifying dn=%1: %2='%3'!	setup	de	Fehler beim Ändern von dn=%1: %2='%3'!
 export has been completed!	setup	de	Export ist abgeschlossen!
+failed to mount backup directory!	setup	de	Konnte Datensicherungsverzeichnis nicht mounten!
 failed writing configuration file header.inc.php, check the permissions !!!	setup	de	Fehler beim Schreiben der Konfigurationsdatei header.inc.php, bitte überprüfen Sie die Zugriffsrechte !!!
 false	setup	de	Falsch
 file	setup	de	DATEI
@@ -402,6 +404,7 @@ modifications have been completed!	setup	de	Änderung ist abgeschlossen!
 modified	setup	de	geändert
 modify	setup	de	Ändern
 month	setup	de	Monat
+mount backup directory to %1	setup	de	Datensicherungsverzeichnis unter %1 mounten
 multi-language support setup	setup	de	Mehr-Sprachen Unterstützung einrichten
 name of database	setup	de	Name der Datenbank
 name of db user egroupware uses to connect	setup	de	Name des Datenbank-Benutzers den eGroupWare verwendet
@@ -543,6 +546,7 @@ 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
+smtp-authentication required	setup	de	SMTP Authentifizierung benötigt
 some or all of its tables are missing	setup	de	Einige oder alle Tabellen fehlen
 sources deleted/missing	setup	de	Quellen gelöscht/fehlen
 sql encryption type	setup	de	SQL-Verschlüsselungstyp für das Passwort
@@ -550,6 +554,7 @@ ssl validation:	setup	de	SSL Validierung:
 standard (login-name identical to egroupware user-name)	setup	de	Standard (Loginname identisch zu eGroupWare Benutzername)
 standard mailserver settings (used for mail authentication too)	setup	de	Standard Mailserver Einstellungen (werden auch für die Mail Authentifizierung benutzt)
 standard, as defined above	setup	de	Standard, wie darüber definiert
+start installing application %1 ...	setup	de	Beginne mit Installation der Anwendung %1 ...
 start the postmaster	setup	de	Starten Sie den postmaster
 start updating languages %1 ...	setup	de	Starte Aktualisierung der Sprachen %1 ...
 start updating the database ...	setup	de	Starte Aktualisierung der Datenbank ...
@@ -594,7 +599,9 @@ the session extension is needed to use php sessions (db-sessions work without).
 the session extension is required!	setup	de	Die SESSION Erweiterung wird unbedingt benötigt!
 the table definition was correct, and the tables were installed	setup	de	Die Tabellen Definition war korrekt und die Tabellen wurden installiert
 the tables	setup	de	die Tabellen
+the tidy extension is need in merge-print to clean up html before inserting it in office documents.	setup	de	Die tidy PHP Erweiterung wird im Sammeldruck benötigt um HTML zu reinigen bevor es in Office Dokumente eingefügt wird.
 the username/passwords are: demo/guest, demo2/guest and demo3/guest.	setup	de	Die Benutzernamen/Passworte sind: demo/guest, demo2/guest und demo3/guest
+the xmlreader extension is required by egroupware in several applications.	setup	de	Die xmlreader PHP Erweiterung wird in EGroupware von vielen Anwendungen benötigt.
 there was a problem trying to connect to your ldap server. <br />	setup	de	Es gab ein Problem eine Verbindung zu Ihrem LDAP-Server herzustellen.<br />
 there was a problem trying to connect to your ldap server. <br />please check your ldap server configuration	setup	de	Es gab ein Problem eine Verbindung zu Ihrem LDAP-Server herzustellen.<br />Bitte überprüfen Sie die Konfiguration Ihres LDAP-Servers.
 this has to be outside the webservers document-root!!!	setup	de	Muss außerhalb des Wurzelverzeichnisses (document root) des Webservers sein!!!

setup/lang/egw_en.lang

@@ -94,6 +94,7 @@ backup '%1' deleted	setup	en	Backup '%1' deleted.
 backup '%1' renamed to '%2'	setup	en	Backup '%1' renamed to '%2' .
 backup '%1' restored	setup	en	Backup '%1' restored.
 backup and restore	setup	en	Backup and restore
+backup directory %1 mounted as %2	setup	en	Backup directory %1 mounted as %2
 backup failed	setup	en	Backup failed.
 backup files (needs ziparchive)	setup	en	Backup files (needs ZipArchive)
 backup finished	setup	en	Backup finished.
@@ -284,6 +285,7 @@ error in group-creation !!!	setup	en	Error in group creation!
 error listing "dn=%1"!	setup	en	Error listing "dn=%1"!
 error modifying dn=%1: %2='%3'!	setup	en	Error modifying dn=%1: %2='%3'!
 export has been completed!	setup	en	Export has been completed!
+failed to mount backup directory!	setup	en	Failed to mount Backup directory!
 failed writing configuration file header.inc.php, check the permissions !!!	setup	en	Failed writing configuration file header.inc.php, check the permissions!
 false	setup	en	False
 file	setup	en	FILE
@@ -402,6 +404,7 @@ modifications have been completed!	setup	en	Modifications have been completed!
 modified	setup	en	Modified
 modify	setup	en	Modify
 month	setup	en	Month
+mount backup directory to %1	setup	en	Mount backup directory to %1
 multi-language support setup	setup	en	Multi language support setup
 name of database	setup	en	Name of database
 name of db user egroupware uses to connect	setup	en	Name of db user EGroupware uses to connect
@@ -543,6 +546,7 @@ 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
+smtp-authentication required	setup	en	SMTP-authentication required
 some or all of its tables are missing	setup	en	Some or all of its tables are missing
 sources deleted/missing	setup	en	Sources deleted/missing
 sql encryption type	setup	en	SQL encryption type for passwords
@@ -550,6 +554,7 @@ ssl validation:	setup	en	SSL validation:
 standard (login-name identical to egroupware user-name)	setup	en	Standard, login name identical to EGroupware user name
 standard mailserver settings (used for mail authentication too)	setup	en	Standard mail server settings, used for Mail authentication too
 standard, as defined above	setup	en	Standard, as defined above
+start installing application %1 ...	setup	en	Start installing application %1 ...
 start the postmaster	setup	en	Start the postmaster
 start updating languages %1 ...	setup	en	Start updating languages %1 ...
 start updating the database ...	setup	en	Start updating the database ...
@@ -594,7 +599,9 @@ the session extension is needed to use php sessions (db-sessions work without).
 the session extension is required!	setup	en	The session extension is required!
 the table definition was correct, and the tables were installed	setup	en	The table definition was correct, and the tables were installed
 the tables	setup	en	the tables
+the tidy extension is need in merge-print to clean up html before inserting it in office documents.	setup	en	The tidy extension is need in merge-print to clean up html before inserting it in office documents.
 the username/passwords are: demo/guest, demo2/guest and demo3/guest.	setup	en	The username/passwords are: demo/guest, demo2/guest and demo3/guest.
+the xmlreader extension is required by egroupware in several applications.	setup	en	The xmlreader extension is required by EGroupware in several applications.
 there was a problem trying to connect to your ldap server. <br />	setup	en	There was a problem trying to connect to your LDAP server. <br />
 there was a problem trying to connect to your ldap server. <br />please check your ldap server configuration	setup	en	There was a problem trying to connect to your LDAP server. <br />please check your LDAP server configuration
 this has to be outside the webservers document-root!!!	setup	en	This has to be outside the web servers document-root!

setup/templates/default/db_backup.tpl

@@ -145,7 +145,10 @@ function sort_table(id)
 		</td>
 	</tr>
 	<tr bgcolor="#e6e6ee">
-		<td colspan="2" align="right">
+		<td>
+			{backup_mount}
+		</td>
+		<td align="right">
 			{backup_save_settings}
 		</td>
 	</tr>