* @package filemanager
- * @version $Id$
*/
-
@import (reference) "../../../pixelegg/less/definitions.less";
@import (reference) "../../../pixelegg/less/def_mobile.less";
@import (less) "../default/app.css";
diff --git a/mail/lang/egw_de.lang b/mail/lang/egw_de.lang
index 1063d32ac2..f9b97233ad 100644
--- a/mail/lang/egw_de.lang
+++ b/mail/lang/egw_de.lang
@@ -129,7 +129,8 @@ default sorting order mail de Wählen Sie die Standard-Sortierreihenfolge aus.
default toolbar actions shown in mail's html editor mail de Aktivierte Funktionen in der HTML-Editor-Symbolleiste beim E-Mail verfassen
default value for remembering s/mime passphrase in minutes mail de Standardwert für die Erinnerung an die S/MIME-Passphrase in Minuten
default your name and email common de z.B. Ihr Name und Ihre E-Mail-Adresse
-defines what to show as contact label for added contact into to/cc/bcc when composing an email. default is firstname lastname and empty means include eveything available. mail de Legt fest, was als Kontaktbeschriftung für hinzugefügte Kontakte in An/Cc/Bcc beim Verfassen einer E-Mail angezeigt werden soll. Standard ist Vorname Nachname und leer bedeutet, dass alles mögliche verwendet wird.
+defines what to show as contact label for added contact into to/cc/bcc when composing an email. default is firstname lastname and empty means include eveything available. mail de Legt fest, was als Kontaktbeschriftung für hinzugefügte Kontakte in An/Kopie/Blindkopie
+ beim Verfassen einer E-Mail angezeigt werden soll. Standard ist Vorname Nachname und leer bedeutet, dass alles mögliche verwendet wird.
defines what to show as identity label on mail folder header common de Definiert, was im Kopf des E-Mail-Postfach angezeigt werden soll.
delete folder mail de Ordner löschen
delete folder %1 ? mail de Ordner %1 löschen?
@@ -198,13 +199,12 @@ emails in whitelisted domains are not marked as spam mail de E-Mailadressen aus
empty junk mail de Spam-Ordner leeren
empty trash mail de Papierkorb leeren
empty trash and junk mail de Papierkorb und Spam-Ordner leeren
-enable mail de aktivieren
+enable mail de Einschalten
+enabled mail de Eingeschaltet
enabled! mail de aktiviert!
encrypt mail de Verschlüsseln
encrypt your message with smime certificate mail de Verschlüsseln Sie Ihre Nachricht mit einem S/MIME-Zertifikat
encryption mail de Verschlüsselung
-enable mail de Einschalten
-enabled mail de Eingeschaltet
enter the name for the new folder: mail de Tragen Sie hier den Namen für den neuen Ordner ein:
error saving %1! mail de Fehler beim Speichern von %1!
error while setting acl for folder %1! mail de Fehler beim Speichern von Zugriffsrechten für den Ordner %1!
@@ -486,8 +486,8 @@ report as ham mail de Als "gute E-Mail" kennzeichnen
report as spam mail de Als Spam kennzeichnen
report this email content as ham (not spam) - spam solutions like spamtitan will learn mail de Markiert die Nachricht als "gute E-Mail" (kein Spam) - Spam-Lösungen wie SpamTitan lernen entsprechend
report this email content as spam - spam solutions like spamtitan will learn mail de Markiert die Nachricht als Spam - Spam-Lösungen wie SpamTitan lernen entsprechend
-required to disable if you use dovecot with private seen flags on shared or user folder! mail de Muss ausgeschaltet werden, wenn Sie Dovecot mit privaten Gelesen Flags auf geteilten oder freigegebenen Ordnern benutzern!
required pear class mail/mimedecode.php not found. mail de Die benötigte PEAR Klasse Mail/mimeDecode.php konnte nicht gefunden werden.
+required to disable if you use dovecot with private seen flags on shared or user folder! mail de Muss ausgeschaltet werden, wenn Sie Dovecot mit privaten Gelesen Flags auf geteilten oder freigegebenen Ordnern benutzern!
resend after how many days? mail de Nach wie vielen Tagen erneut senden?
respond to mail sent to: mail de Benachrichtigung für
restrict acl management admin de ACL-Verwaltung beschränken
diff --git a/mail/lang/egw_it.lang b/mail/lang/egw_it.lang
index 881e0879ff..c2842eaca8 100644
--- a/mail/lang/egw_it.lang
+++ b/mail/lang/egw_it.lang
@@ -6,8 +6,6 @@
%1 is not writable by you! mail it %1 non è scrivibile da te!
%1 mails selected mail it % messaggi selezionati
(*) please consider, forward to multiple addresses will not work if number of addresses exceeds the limit. for most mail servers the limit is 4 by default, please contact your mail server administrator for further info. mail it (*) Per favore considerare che l'inoltro a indirizzi multipli non funzionerà se il limite di indirizzi venisse superato. Per la maggior parte dei server di posta il limite predefinito è di 4. Per favore contattare l'amministratore del proprio server di posta per delucidazioni.
-(*) wildcards (*,?) may be used. if you are trying to match * or ? itself, you must escape them with a backslash (\). if you check "use regular expressions" you must use valid regular expressions. mail it (*) possono essere usate le wildcard (jolly). Se si cerca il carattere * o ? invece, bisogna usare (\) davanti. Se si seleziona "Usa espressioni regolari" è necessario usare espressioni regolari valide.
-sieve_edit_instructions mail it (*) possono essere usate le wildcard (jolly). Se si cerca il carattere * o ? invece, bisogna usare (\) davanti. Se si seleziona "Usa espressioni regolari" è necessario usare espressioni regolari valide. Per il punto esclamativo quando non usato come operatore "NOT", usare regex e backslash (\) (p.es. \!)
(leave empty for no quota) mail it (Lasciare vuoto per non assegnare una quota)
(no subject) mail it (nessun oggetto)
(not connected) mail it (non connesso)
@@ -491,7 +489,7 @@ set / remove labels mail it Imposta / Rimuovi etichette
set it as default: mail it imposta come predefinito
should new messages show up on the home page mail it I nuovi messaggi devono apparire in Home Page
should signature be inserted after (standard) or before a reply or inline forward, and should signature be visible and changeable during compose. mail it La firma dovrebbe essere inserita dopo (standard) o prima del testo di risposta o inoltro? La firma deve essere visibile e modificabile in fase di composizione?
-show mail it mostrra
+show mail it Mostra
show all addresses mail it Mostra tutti gli indirizzi
show all attachments mail it Mostra tutti gli allegati
show all folders mail it mostra tutte le cartelle
@@ -509,6 +507,7 @@ sieve connection status mail it Salva lo stato della connessione
sieve not activated mail it Sieve non attivato
sieve script name mail it Nome script sieve
sieve server mail it Server sieve
+sieve_edit_instructions mail it (*) possono essere usate le wildcard (jolly). Se si cerca il carattere * o ? invece, bisogna usare (\) davanti. Se si seleziona "Usa espressioni regolari" è necessario usare espressioni regolari valide. Per il punto esclamativo quando non usato come operatore "NOT", usare regex e backslash (\) (p.es. \!)
signature mail it Firma
signature at top mail it firma in cima
signature position and visibility mail it Posizione e visibilità della firma
@@ -557,6 +556,7 @@ the mimeparser can not parse this message. mail it Il mime parser non riesce a i
the rule with priority %1 successfully saved! mail it La regola con priorità %1 è stata salvata
then mail it DI
there is no imap server configured. mail it Non c'è alcun server IMAP configurato!
+this mail contains external images served via insecure http protocol. be aware showing or allowing them can compromise your security! mail it Questo messaggio contiene immagini da recuperare tramite protocollo HTTP non sicuro. Fare attenzione poiché quest'azione potrebbe compromettere la sicurezza!
this message is smime encrypted and password protected. mail it Questo messaggio è criptato via smime e protetto da password
timeout on connections to your imap server mail it Timeout della connessione al server IMAP
to do mail it da fare
diff --git a/setup/inc/class.setup.inc.php b/setup/inc/class.setup.inc.php
index 0fbe3d8413..149bb3d8be 100644
--- a/setup/inc/class.setup.inc.php
+++ b/setup/inc/class.setup.inc.php
@@ -283,10 +283,8 @@ class setup
$auth_type = strtolower($_auth_type);
$GLOBALS['egw_info']['setup']['HeaderLoginMSG'] = $GLOBALS['egw_info']['setup']['ConfigLoginMSG'] = '';
- if(!$this->checkip(isset($_SERVER['HTTP_X_FORWARDED_FOR']) ?
- $_SERVER['HTTP_X_FORWARDED_FOR'] : $_SERVER['REMOTE_ADDR']))
+ if (($GLOBALS['egw_info']['setup']['ConfigLoginMSG'] = self::checkip()))
{
- //error_log(__METHOD__."('$auth_type') invalid IP");
return false;
}
@@ -405,15 +403,19 @@ class setup
* Check for correct IP, if an IP address should be enforced
*
* @param string $remoteip
- * @return boolean
+ * @return string error-message or null on success
*/
- function checkip($remoteip='')
+ public static function checkip($remoteip=null)
{
+ if (!isset($remoteip))
+ {
+ $remoteip = $_SERVER['HTTP_X_FORWARDED_FOR'] ?: $_SERVER['REMOTE_ADDR'];
+ }
//echo "setup::checkip($remoteip) against setup_acl='".$GLOBALS['egw_info']['server']['setup_acl']."'
\n";
$allowed_ips = explode(',',@$GLOBALS['egw_info']['server']['setup_acl']);
if(empty($GLOBALS['egw_info']['server']['setup_acl']) || !is_array($allowed_ips))
{
- return True; // no test
+ return null; // no test
}
$remotes = explode('.',$remoteip);
foreach($allowed_ips as $value)
@@ -433,12 +435,11 @@ class setup
}
if ($i == count($values))
{
- return True; // match
+ return null; // match
}
}
- $GLOBALS['egw_info']['setup']['ConfigLoginMSG'] = lang('Invalid IP address').' '.$remoteip;
error_log(__METHOD__.'-> checking IP failed:'.print_r($remoteip,true));
- return False;
+ return lang('Invalid IP address').' '.$remoteip;
}
/**