Updating patches again...Another patch was added that properly fixes the locale detection code in slbackup-php...
Mike -- DAS-NETZWERKTEAM mike gabriel, dorfstr. 27, 24245 barmissen fon: +49 (4302) 281418, fax: +49 (4302) 281419 GnuPG Key ID 0xB588399B mail: [email protected], http://das-netzwerkteam.de freeBusy: https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.xfb
Description: Fix returning to the login page on every click Fix returning to the login page on every click This patch closes Debian BTS issue #655832. . This patch is not forwarded to upstream as Debian Edu seems to become upstream and package maintainer for next (wheezy) release. Forwarded: not-needed Author: Mike Gabriel <[email protected]> --- a/src/index.php +++ b/src/index.php @@ -570,21 +570,33 @@ loadConfig () ; require('/usr/share/php/smarty/libs/Smarty.class.php') ; session_start() ; -$authenticated = ($_COOKIE['Authenticated'] == "True") ; loadLocale () ; ob_start (); $smarty = new Smarty(); $smarty->template_dir = $smarty_templ ; $smarty->compile_dir = $smarty_compile ; +unset ($_COOKIE['smarty_templ']); +unset ($_COOKIE['smarty_compile']); # fetch script to use whith passing the ssh-password $ssh_askpass = sprintf ("%s/script/mypass.sh", dirname (dirname ($_SERVER["SCRIPT_FILENAME"]))); +$arguments = $_REQUEST; + +# merge _COOKIE and _REQUEST +$allowed_cookie_keys = array('nonhttps', 'xorstring', 'PHPSESSID', 'locale',); +foreach ($_COOKIE as $key => $value) { + if ((! array_key_exists($key, $arguments)) && (in_array($key, $allowed_cookie_keys))) { + if (is_string($key) && is_string($value)) { + $arguments[$key] = $value; + } + } +} # Fetch arguments passed as the script is executed -foreach ($_REQUEST as $key => $value) { +foreach ($arguments as $key => $value) { switch ($key) { case "smarty_templ": case "smarty_compile": @@ -597,7 +609,7 @@ break ; case "xorstring": if (empty($passwd)) - $xorstring = $value ; + $xorstring = base64_decode($value) ; else break ; if (empty ($value)) break ; @@ -640,6 +652,8 @@ } } +unset ($arguments); + if ($submit == "logout") { unset ($passwd) ; unset ($xorstring) ; @@ -666,7 +680,7 @@ $xorstring = xorstring ($encrypt, $passwd) ; } -setcookie ('xorstring', $xorstring) ; +setcookie ('xorstring', base64_encode($xorstring)) ; $scheduler = readcron ($passwd) ;
Description: Fix restoring files with blanks in their name. Fix restoring files with blanks in their name. This patch is not forwarded to upstream as Debian Edu seems to become upstream and package maintainer for next (wheezy) release. This patch closes Debian BTS issue #565181. Forwarded: not-needed Author: Cyril ETCHEVERRIA <[email protected]> --- a/templates/restore.tpl +++ b/templates/restore.tpl @@ -42,13 +42,13 @@ <IMG SRC="/icons/generic.gif" alt="[ ]"> {/if} {if $dir.type == "file"} - <A HREF=index.php?restorefile&client={$client}&sub={$dir.sub}&location={$location}>{$dir.name}</A> + <A HREF="index.php?restorefile&client={$client}&sub={$dir.sub}&location={$location}>{$dir.name}"</A> {elseif $dir.type == "delfile"} - <A HREF=index.php?restorefile&client={$client}&sub={$dir.sub}&location={$location}>{$dir.name}(deleted)</A> + <A HREF="index.php?restorefile&client={$client}&sub={$dir.sub}&location={$location}>{$dir.name}(deleted)"</A> {elseif $dir.type == deldir} - <A HREF=index.php?restorelocation&client={$client}&sub={$dir.sub}&location={$location}>{$dir.name} ({t}Deleted{/t})</A> + <A HREF="index.php?restorelocation&client={$client}&sub={$dir.sub}&location={$location}>{$dir.name} ({t}Deleted{/t})"</A> {else} - <A HREF=index.php?restorelocation&client={$client}&sub={$dir.sub}&location={$location}>{$dir.name}</A> + <A HREF="index.php?restorelocation&client={$client}&sub={$dir.sub}&location={$location}>{$dir.name}"</A> {/if} <BR> {/foreach} @@ -59,13 +59,13 @@ <IMG SRC="/icons/transfer.gif" alt="[ ]"> {/if} {if $version.type == "parent"} - <A HREF=index.php?restorelocation&client={$client}&sub={$version.sub}&location={$location}>{$version.name}</A> + <A HREF="index.php?restorelocation&client={$client}&sub={$version.sub}&location={$location}>{$version.name}"</A> {elseif $version.type == "currentfile"} - <A HREF=index.php?restorefile&client={$client}&file={$version.sub}&location={$location}&revision=current>current</A> + <A HREF="index.php?restorefile&client={$client}&file={$version.sub}&location={$location}&revision=current">current</A> {elseif $version.type == "diff.gz"} - <A HREF=index.php?restorefile&client={$client}&parent={$version.parent}&location={$location}&revision={$version.revision}&name={$version.name}>{$version.ts}</A> + <A HREF="index.php?restorefile&client={$client}&parent={$version.parent}&location={$location}&revision={$version.revision}&name={$version.name}>{$version.ts}"</A> {elseif $version.type == "snapshot.gz"} - <A HREF=index.php?restorefile&client={$client}&parent={$version.parent}&location={$location}&revision={$version.revision}&name={$version.name}>{$version.ts}</A> + <A HREF="index.php?restorefile&client={$client}&parent={$version.parent}&location={$location}&revision={$version.revision}&name={$version.name}>{$version.ts}"</A> {else} unknown snapshot type $version.type {/if} --- a/src/index.php +++ b/src/index.php @@ -71,7 +71,7 @@ function removesnapshots ($passwd, $clientdir, $snapshot) { global $backuphost, $backupuser, $ssh_options, $ssh_askpass ; - $cmd = sprintf ("ssh %s %s@%s 'rdiff-backup --force --remove-older-than %s %s'", + $cmd = sprintf ("ssh %s %s@%s 'rdiff-backup --force --remove-older-than %s \"%s\"'", $ssh_options, $backupuser, $backuphost, $snapshot, $clientdir) ; @@ -98,7 +98,7 @@ function listsnapshots ($passwd, $clientdir) { global $backuphost, $backupuser, $ssh_options, $ssh_askpass ; - $cmd = sprintf ("ssh %s %s@%s 'find %s/rdiff-backup-data -maxdepth 1 -name \"increments.*\" -printf %s'", + $cmd = sprintf ("ssh %s %s@%s 'find \"%s/rdiff-backup-data\" -maxdepth 1 -name \"increments.*\" -printf %s'", $ssh_options, $backupuser, $backuphost, $clientdir, '"%P\n"') ; @@ -126,7 +126,7 @@ function fetchfile ($passwd, $clientdir, $location, $file) { global $backuphost, $backupuser, $ssh_options, $ssh_askpass ; - $cmd = sprintf ("ssh %s %s@%s 'cat %s%s/%s'", + $cmd = sprintf ("ssh %s %s@%s 'cat \"%s%s/%s\"'", $ssh_options, $backupuser, $backuphost, $clientdir, $location, $file ) ; @@ -169,7 +169,7 @@ } else unset ($tempfile) ; if (empty($tempfile)) return ; - $cmd = sprintf ("ssh %s %s@%s 'rdiff-backup --force %s/rdiff-backup-data/increments%s/%s %s'", + $cmd = sprintf ("ssh %s %s@%s 'rdiff-backup --force \"%s/rdiff-backup-data/increments%s/%s %s\"'", $ssh_options, $backupuser, $backuphost, $clientdir, $location, $file, $tempfile ) ; @@ -180,7 +180,7 @@ fclose ($pipes[1]) ; proc_close ($proc) ; } - $cmd = sprintf ("ssh %s %s@%s 'cat %s && rm %s'", + $cmd = sprintf ("ssh %s %s@%s 'cat \"%s\" && rm \"%s\"'", $ssh_options, $backupuser, $backuphost, $tempfile, $tempfile) ; $proc = proc_open ($cmd, $desc, $pipes, '/tmp', $env) ; @@ -213,7 +213,7 @@ $env = array ('SSH_ASKPASS' => $ssh_askpass, 'DISPLAY' => ':nowhere') ; - $cmd = sprintf ("ssh %s %s@%s 'find %s%s/%s -maxdepth 1 -mindepth 1 -type f -name %s'", + $cmd = sprintf ("ssh %s %s@%s 'find \"%s%s/%s\" -maxdepth 1 -mindepth 1 -type f -name \"%s\"'", $ssh_options, $backupuser, $backuphost, $clientdir, $location, $parent, $base ) ; $proc = proc_open ($cmd, $desc, $pipes, '/tmp', $env) ; @@ -230,7 +230,7 @@ proc_close ($proc) ; } $baselen= strlen ($base) ; - $cmd = sprintf ("ssh %s %s@%s 'find %s/rdiff-backup-data/increments%s/%s -maxdepth 1 -mindepth 1 -type f -name \"%s*.gz\"'", + $cmd = sprintf ("ssh %s %s@%s 'find \"%s/rdiff-backup-data/increments%s/%s\" -maxdepth 1 -mindepth 1 -type f -name \"%s*.gz\"'", $ssh_options, $backupuser, $backuphost, $clientdir, $location, $parent, $base ) ; @@ -283,7 +283,7 @@ $env = array ('SSH_ASKPASS' => $ssh_askpass, 'DISPLAY' => ':nowhere') ; - $cmd = sprintf ("ssh %s %s@%s 'find %s%s/%s -maxdepth 1 -mindepth 1 -type d'", + $cmd = sprintf ("ssh %s %s@%s 'find \"%s%s/%s\" -maxdepth 1 -mindepth 1 -type d'", $ssh_options, $backupuser, $backuphost, $clientdir, $location, $sub ) ; $proc = proc_open ($cmd, $desc, $pipes, '/tmp', $env) ; @@ -299,7 +299,7 @@ fclose ($pipes[1]) ; proc_close ($proc) ; } - $cmd = sprintf ("ssh %s %s@%s 'find %s/rdiff-backup-data/increments%s/%s -maxdepth 1 -mindepth 1 -type d'", + $cmd = sprintf ("ssh %s %s@%s 'find \"%s/rdiff-backup-data/increments%s/%s\" -maxdepth 1 -mindepth 1 -type d'", $ssh_options, $backupuser, $backuphost, $clientdir, $location, $sub ) ; $proc = proc_open ($cmd, $desc, $pipes, '/tmp', $env) ; @@ -322,7 +322,7 @@ fclose ($pipes[1]) ; proc_close ($proc) ; } - $cmd = sprintf ("ssh %s %s@%s 'find %s%s/%s -maxdepth 1 -mindepth 1 -type f'", + $cmd = sprintf ("ssh %s %s@%s 'find \"%s%s/%s\" -maxdepth 1 -mindepth 1 -type f'", $ssh_options, $backupuser, $backuphost, $clientdir, $location, $sub ) ; @@ -339,7 +339,7 @@ fclose ($pipes[1]) ; proc_close ($proc) ; } - $cmd = sprintf ("ssh %s %s@%s 'find %s/rdiff-backup-data/increments%s/%s -maxdepth 1 -mindepth 1 -type f -name \"*.snapshot.gz\"'", + $cmd = sprintf ("ssh %s %s@%s 'find \"%s/rdiff-backup-data/increments%s/%s\" -maxdepth 1 -mindepth 1 -type f -name \"*.snapshot.gz\"'", $ssh_options, $backupuser, $backuphost, $clientdir, $location, $sub ) ; $proc = proc_open ($cmd, $desc, $pipes, '/tmp', $env) ;
--- a/src/functions.php
+++ b/src/functions.php
@@ -100,8 +100,11 @@
if (isset ($found_locale)) {
$locale = setlocale (LC_ALL, $found_locale) ;
- if (empty($locale))
- setlocale (LC_ALL, $found_locale . ".UTF8");
+ if (empty($locale)) {
+ $locale = setlocale (LC_ALL, $found_locale . ".UTF8");
+ if (empty($locale))
+ $locale = setlocale (LC_ALL, $found_locale . "_" . strtoupper($found_locale) . ".UTF8");
+ }
bindtextdomain ("slbackup-php", "../locales/");
bind_textdomain_codeset ("slbackup-php", "UTF-8");
textdomain ("slbackup-php");
Description: German translation of the SLBackup WebGUI German translation of the SLBackup WebGUI. This patch is not forwarded to upstream as Debian Edu seems to become upstream and package maintainer for next (wheezy) release. Forwarded: not-needed Author: Mike Gabriel <[email protected]> --- /dev/null +++ b/po/de.po @@ -0,0 +1,285 @@ +# translation of de.po to +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: de\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2012-01-15 13:57+0100\n" +"PO-Revision-Date: 2012-01-15 21:53+0100\n" +"Last-Translator: Mike Gabriel <[email protected]>\n" +"Language-Team: <[email protected]>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.1\n" + +#. templates/maint.tpl +#. templates/header.tpl +#: standard input:2 +#: standard input:26 +msgid "Maintenance" +msgstr "Wartung" + +#. templates/maint.tpl +#. templates/config.tpl +#. templates/restore.tpl +#: standard input:5 +#: standard input:74 +#: standard input:110 +msgid "Choose" +msgstr "Auswählen" + +#. templates/maint.tpl +#: standard input:8 +msgid "Oldest snapshot to keep:" +msgstr "Älteste Sicherungskopie, die aufbewahrt werden soll:" + +#. templates/maint.tpl +#: standard input:11 +msgid "Delete older" +msgstr "Ältere löschen" + +#. templates/header.tpl +#: standard input:14 +msgid "SLBackup Configuration" +msgstr "SL-Backup Konfiguration" + +#. templates/header.tpl +#: standard input:17 +msgid "Status" +msgstr "Status" + +#. templates/header.tpl +#: standard input:20 +msgid "Config" +msgstr "Konfiguration" + +#. templates/header.tpl +#: standard input:23 +msgid "Restore" +msgstr "Wiederherstellen" + +#. templates/header.tpl +#: standard input:29 +msgid "Logout" +msgstr "Abmelden" + +#. templates/config.tpl +#: standard input:32 +msgid "Server scheduler" +msgstr "Datensicherung planen" + +#. templates/config.tpl +#: standard input:35 +msgid "Backup enabled" +msgstr "Backups aktiviert" + +#. templates/config.tpl +#: standard input:38 +msgid "Run backup at" +msgstr "Datensicherung ausführen um" + +#. templates/config.tpl +#: standard input:41 +#: standard input:62 +#: src/index.php:924 +msgid "Update" +msgstr "Aktualisieren" + +#. templates/config.tpl +#. templates/login.tpl +#: standard input:44 +#: standard input:65 +#: standard input:95 +#: standard input:170 +msgid "Reset" +msgstr "Zurücksetzen" + +#. templates/config.tpl +#: standard input:47 +msgid "Server config" +msgstr "Server-Konfiguration" + +#. templates/config.tpl +#: standard input:50 +#: standard input:83 +msgid "Address" +msgstr "Adresse" + +#. templates/config.tpl +#: standard input:53 +msgid "Destdir" +msgstr "Zielverzeichnis" + +#. templates/config.tpl +#: standard input:56 +msgid "Servertype" +msgstr "Server-Typ" + +#. templates/config.tpl +#: standard input:59 +#: standard input:92 +msgid "User" +msgstr "Benutzer" + +#. templates/config.tpl +#: standard input:68 +msgid "Client config" +msgstr "Client-Konfiguration" + +#. templates/config.tpl +#: standard input:71 +msgid "Client:" +msgstr "Client-System:" + +#. templates/config.tpl +#: standard input:77 +msgid "New" +msgstr "Neu" + +#. templates/config.tpl +#: standard input:80 +msgid "Remove" +msgstr "Entfernen" + +#. templates/config.tpl +#: standard input:86 +msgid "Backup Age" +msgstr "Backup-Alter" + +#. templates/config.tpl +#: standard input:89 +msgid "Clienttype" +msgstr "Client-Typ" + +#. templates/config.tpl +#. templates/restore.tpl +#: standard input:98 +#: standard input:113 +msgid "Locations:" +msgstr "Speicherorte:" + +#. templates/config.tpl +#: standard input:101 +#: src/index.php:922 +msgid "Add" +msgstr "Hinzufügen" + +#. templates/config.tpl +#: standard input:104 +msgid "Delete" +msgstr "Löschen" + +#. templates/restore.tpl +#: standard input:107 +msgid "Client to restore" +msgstr "Wiederherzustellendes Client-System auswählen" + +#. templates/restore.tpl +#: standard input:116 +msgid "Browse" +msgstr "Durchsuchen" + +#. templates/restore.tpl +#: standard input:119 +msgid "Restore of %1" +msgstr "Wiederherstellung von %1" + +#. templates/restore.tpl +#: standard input:122 +msgid "Deleted" +msgstr "Gelöscht" + +#. templates/status.tpl +#: standard input:125 +msgid "Clients" +msgstr "Client-Systeme" + +#. templates/status.tpl +#: standard input:128 +msgid "OK at %1" +msgstr "Erfolgreich ausgeführt um %1" + +#. templates/status.tpl +#: standard input:131 +msgid "Failed at %1" +msgstr "Fehlgeschlagen um %1" + +#. templates/status.tpl +#: standard input:134 +msgid "Client never backed up" +msgstr "Client-System wurde noch nie gesichert" + +#. templates/status.tpl +#: standard input:137 +msgid "ssh-keys are working" +msgstr "SSH-Schlüssel sind einsatzbereit" + +#. templates/status.tpl +#: standard input:140 +msgid "rdiff-backup-versions differ" +msgstr "rdiff-Backup Versionen sind unterschiedlich" + +#. templates/status.tpl +#: standard input:143 +msgid "ssh-keys are not working" +msgstr "SSH-Schlüssel funktionieren nicht" + +#. templates/status.tpl +#: standard input:146 +msgid "Backup status" +msgstr "Backup-Status" + +#. templates/status.tpl +#: standard input:149 +msgid "Backup last finished at %1" +msgstr "Letzte Datensicherung beendet um %1" + +#. templates/status.tpl +#: standard input:152 +msgid "A new backup started at %1" +msgstr "Eine neue Sicherung wurde um %1 gestartet" + +#. templates/login.tpl +#: standard input:155 +msgid "To read the configuration, you must log in as %1 on %2." +msgstr "Um die Konfiguration einzusehen, müssen Sie sich als %1 auf %2 anmelden." + +#. templates/login.tpl +#: standard input:158 +msgid "Please enter the password for the %1 account on %2:" +msgstr "Bitte das Kennwort für das Konto %1 auf %2 eingeben:" + +#. templates/login.tpl +#: standard input:161 +msgid "WARNING: you are about to send you password over an unencrypted link, please ask your administrator to enable https" +msgstr "WARNUNG: Sie sind kurz davor, Ihr Kennwort über eine nicht-verschlüsselte Verbindung zu schicken. Bitten Sie Ihren System-Administrator darum, Verschlüsselung für die SL-Backup Seite zu aktivieren." + +#. templates/login.tpl +#: standard input:164 +msgid "Login to this application is denied without the use of https. Please ask your administrator to enable https" +msgstr "Anmeldung an dieser Anwendung wird verweigert, wenn Webseiten-Verschlüsselung (https) deaktiviert ist. Bitten Sie Ihren System-Administrator darum, Verschlüsselung für die SL-Backup Seite zu aktivieren." + +#. templates/login.tpl +#: standard input:167 +msgid "Login" +msgstr "Anmeldung" + +#: src/index.php:735 +#, php-format +msgid "No client specified :(" +msgstr "Kein Client-System ausgewählt :(" + +#: src/index.php:740 +#, php-format +msgid "Unable to find %s in the list of clients." +msgstr "Kann %s nicht in der Liste der Client-Systeme finden." + +#: src/index.php:774 +#, php-format +msgid "Unable to find %s in the locations of %s." +msgstr "Kann %s nicht unter den gesicherten Verzeichnissen von %s finden." +
pgp1alPOGngIl.pgp
Description: Digitale PGP-Unterschrift
