Kolab Groupware OBS

roundcubemail.spec Changed

debian.changelog Changed

roundcubemail-1.4-alpha5.tar.gz/autogen.sh Deleted

roundcubemail-1.4-alpha5.tar.gz/skins/elastic/styles/widgets/searchbar.less Deleted

@@ -1,135 +0,0 @@
-/**
- * Roundcube webmail styles for the Elastic skin
- *
- * Copyright (c) 2017-2018, The Roundcube Dev Team
- *
- * The contents are subject to the Creative Commons Attribution-ShareAlike
- * License. It is allowed to copy, distribute, transmit and to adapt the work
- * by keeping credits to the original authors in the README.md file.
- * See http://creativecommons.org/licenses/by-sa/3.0/ for details.
- */
-
-/*** Searchbar and searchoptions widgets ***/
-
-.searchbar {
-    height: @layout-searchbar-height;
-    line-height: @layout-searchbar-height;
-    background-color: @color-layout-header-background;
-    border-bottom: 1px solid @color-list-border;
-    display: flex;
-    align-items: center;
-    white-space: nowrap;
-    padding: 0 .5rem;
-    overflow: hidden;
-    position: relative;
-
-    form {
-        flex: 1;
-        display: flex;
-
-        &:before {
-            &:extend(.font-icon-class);
-            content: @fa-var-search;
-            height: @layout-searchbar-height;
-        }
-    }
-
-    input {
-        width: 100%;
-        border: 0;
-        background: transparent;
-        padding: .5rem;
-    }
-
-    a.button {
-        height: @layout-searchbar-height;
-        min-width: auto;
-
-        &:before {
-            &:extend(.font-icon-class);
-        }
-
-
-        &.options {
-            &:before {
-                content: @fa-var-filter;
-                font-size: 1em;
-            }
-        }
-
-        &.reset {
-            display: none;
-            position: absolute;
-            right: .5rem;
-
-            &:before {
-                content: @fa-var-times;
-                font-size: 1em;
-            }
-        }
-
-        &.options + .reset {
-            right: 2.5rem;
-        }
-
-        &.search {
-            display: none;
-        }
-    }
-
-    span.inner {
-        display: none;
-    }
-
-    &.active {
-        form:before {
-            color: @color-searchbar-icon-active;
-        }
-
-        a.button.reset {
-            display: inline;
-        }
-    }
-
-    &.open a.button.options:before {
-        content: @fa-var-angle-up;
-        font-size: 1.25em;
-        line-height: 1.25;
-    }
-}
-
-.searchoptions {
-    button.search {
-        width: 100%;
-    }
-
-    ul.proplist {
-        li {
-            margin: 0;
-        }
-
-        & + div {
-            margin-top: 1rem;
-        }
-    }
-
-    .input-group {
-        &:not(:last-child) {
-            margin-bottom: .5rem;
-        }
-
-        .input-group-prepend {
-            width: 30%;
-        }
-
-        label {
-            width: 100%;
-        }
-    }
-
-    .formbuttons {
-        // this is needed because we hide .formbuttons on small devices
-        // we don't want it for search options form
-        display: block !important;
-    }
-}

roundcubemail-1.4-alpha5.tar.gz/CHANGELOG -> roundcubemail-1.4-alpha6.tar.gz/CHANGELOG Changed

@@ -57,6 +57,7 @@
 - Reset onerror on images if placeholder does not exist to prevent from requests storm
 - Unified and simplified code for loading content frame for responses and identities
 - Display contact import and advanced search in popup dialogs
+- Display a dialog for mail import with supported format description and upload size hint
 - Make possible to set (some) config options from a skin
 - Added optional checkbox selection for the list widget
 - Make 'compose' command always enabled
@@ -66,6 +67,7 @@
 - Plugin API: Added 'show_bytes' hook (#5001)
 - Add option to not indent quoted text on top-posting reply (#5105)
 - Removed global $CONFIG variable
+- Removed debug_level setting
 - Support AUTHENTICATE LOGIN for IMAP connections (#5563)
 - Support LDAP GSSAPI authentication (#5703)
 - Localized timezone selector (#4983)
@@ -88,6 +90,7 @@
 - Fix bug where some parts of quota information could have been ignored (#6280)
 - Fix bug where some escape sequences in html styles could bypass security checks
 - Fix bug where some forbidden characters on Cyrus-IMAP were not prevented from use in folder names
+- Fix bug where only attachments with the same name would be ignored on zip download (#6301)
 
 RELEASE 1.3.6
 -------------

roundcubemail-1.4-alpha5.tar.gz/INSTALL -> roundcubemail-1.4-alpha6.tar.gz/INSTALL Changed

roundcubemail-1.4-alpha5.tar.gz/bin/transifexpull.sh -> roundcubemail-1.4-alpha6.tar.gz/bin/transifexpull.sh Changed

roundcubemail-1.4-alpha5.tar.gz/config/defaults.inc.php -> roundcubemail-1.4-alpha6.tar.gz/config/defaults.inc.php Changed

roundcubemail-1.4-alpha5.tar.gz/installer/config.php -> roundcubemail-1.4-alpha6.tar.gz/installer/config.php Changed

roundcubemail-1.4-alpha5.tar.gz/logs/errors.log -> roundcubemail-1.4-alpha6.tar.gz/logs/errors.log Changed

roundcubemail-1.4-alpha5.tar.gz/plugins/enigma/localization/de_CH.inc -> roundcubemail-1.4-alpha6.tar.gz/plugins/enigma/localization/de_CH.inc Changed

@@ -25,6 +25,7 @@
 $labels['keytype'] = 'Schlüsseltyp';
 $labels['fingerprint'] = 'Fingerprint';
 $labels['subkeys'] = 'Sub-Schlüssel';
+$labels['keyprops'] = 'Schlüsseleigenschaften';
 $labels['basicinfo'] = 'Allgemeine Informationen';
 $labels['userids'] = 'Zusätzliche Benutzer';
 $labels['typepublickey'] = 'Öffentlicher Schlüssel';
@@ -63,18 +64,30 @@
 $labels['keyrevoke'] = 'Widerrufen';
 $labels['keysend'] = 'Öffentlichen Schlüssel versenden';
 $labels['keychpass'] = 'Passwort ändern';
+$labels['newkeyident'] = 'Identität';
 $labels['newkeypass'] = 'Passwort';
+$labels['newkeypassconfirm'] = 'Passwort bestätigen';
+$labels['newkeysize'] = 'Schlüssellänge';
 $labels['key2048'] = '2048 bits - standard';
 $labels['key4096'] = '4096 bits - sicher';
 $labels['keygenerating'] = 'Schlüssel generieren...';
 $labels['encryptionoptions'] = 'Verschlüsselungsoptionen';
 $labels['encryptmsg'] = 'Diese Nachricht verschlüsseln';
 $labels['signmsg'] = 'Diese Nachricht digital signieren';
+$labels['sendunencrypted'] = 'Unverschlüsselt senden';
 $labels['enterkeypasstitle'] = 'Bitte Schlüssel Passwort eingeben';
 $labels['enterkeypass'] = 'Ein Passwort wird benötigt um den privaten Schlüssel ($keyid) für Benutzer: $user zu entsperren';
 $labels['arialabelkeyexportoptions'] = 'Optionen für Schlüsselexport';
 $labels['attachpubkeymsg'] = 'Meinen öffentlichen Schlüssel anfügen';
+$labels['keyexportprompt'] = 'Möchten Sie geheime Schlüssel in die gespeicherte OpenPGP-Schlüsseldatei mit aufnehmen?';
+$labels['onlypubkeys'] = 'Nur öffentliche Schlüssel exportieren';
+$labels['withprivkeys'] = 'Geheime Schlüssel exportieren';
+$labels['findkey'] = 'Auf Schlüsselserver(n) suchen';
 $labels['keyimportlabel'] = 'Aus Datei importieren';
+$labels['keyimportsearchlabel'] = 'Auf Schlüsselserver(n) suchen';
+$labels['managekeys'] = 'PGP-Schlüssel verwalten';
+$labels['identitymatchingprivkeys'] = 'Für diesen Absender sind $nr private Schlüssel in Ihrem Schlüsselbund gespeichert:';
+$labels['identitynoprivkeys'] = 'Für diesen Absender existiert noch kein PGP Schlüsselpaar in Ihrem  Schlüsselbund.';
 $messages['sigvalid'] = 'Signatur von $sender wurde erfolgreich überprüft.';
 $messages['sigvalidpartial'] = 'Signatur von $sender wurde überprüft, aber ein Teil der Nachricht wurde nicht signiert.';
 $messages['siginvalid'] = 'Ungültige Signatur von $sender.';
@@ -84,10 +97,12 @@
 $messages['decryptok'] = 'Nachricht entschlüsselt.';
 $messages['decrypterror'] = 'Entschlüsselung fehlgeschlagen.';
 $messages['decryptnokey'] = 'Entschlüsselung fehlgeschlagen. Privater Schlüssel wurde nicht gefunden. Schlüssel-ID: $keyid.';
+$messages['decryptbadpass'] = 'Entschlüsselung fehlgeschlagen. Passwort ungültig.';
 $messages['decryptnopass'] = 'Entschlüsselung fehlgeschlagen. Schlüsselpasswort wird benötigt.';
 $messages['decryptpartial'] = 'Nachricht entschlüsselt, aber ein Teil der Nachricht wurde nicht verschlüsselt.';
 $messages['signerror'] = 'Signierung fehlgeschlagen.';
 $messages['signnokey'] = 'Signierung fehlgeschlagen. Privater Schlüssel wurde nicht gefunden.';
+$messages['signbadpass'] = 'Signierung fehlgeschlagen. Passwort ungültig.';
 $messages['signnopass'] = 'Signierung fehlgeschlagen. Schlüsselpasswort wird benötigt.';
 $messages['encrypterror'] = 'Verschlüsselung fehlgeschlagen.';
 $messages['encryptnokey'] = 'Verschlüsselung fehlgeschlagen. Öffentlicher Schlüssel für $email nicht gefunden';
@@ -102,10 +117,12 @@
 $messages['keyremovesuccess'] = 'Schlüssel erfolgreich gelöscht.';
 $messages['keyremoveerror'] = 'Löschung der Schlüssel nicht möglich.';
 $messages['keyimporttext'] = 'Private und öffentliche Schlüssel sowie zurückgerufene Signaturen können im ASCII-Armor Format importiert werden.';
+$messages['keyimportsearchtext'] = 'Sie können für öffentliche Schlüssel nach dem Schlüsselbezeichner, Benutzername oder der E-Mail-Adresse suchen und diese dann direkt importieren.';
 $messages['formerror'] = 'Bitte, alle Eingabefelder ausfüllen. Alle Eingabefelder werden benötigt!';
 $messages['passwordsdiffer'] = 'Passwörter stimmen nicht überein.';
 $messages['keygenerateerror'] = 'Schlüsselgenerierung fehlgeschlagen.';
 $messages['keygeneratesuccess'] = 'Schlüsselpaar erfolgreich generiert und importiert.';
 $messages['keygennosupport'] = 'Dein Browser unterstützt keine Kryptopgraphiefunktionen. Konnte Schlüsselpaar nicht generieren!';
+$messages['noidentselected'] = 'Sie müssen mindestens eine Identität für den Schlüssel auswählen!';
 $messages['nonameident'] = 'Identität muss einen Benutzernamen definiert haben.';
 ?>

roundcubemail-1.4-alpha5.tar.gz/plugins/enigma/localization/de_DE.inc -> roundcubemail-1.4-alpha6.tar.gz/plugins/enigma/localization/de_DE.inc Changed

roundcubemail-1.4-alpha5.tar.gz/plugins/managesieve/Changelog -> roundcubemail-1.4-alpha6.tar.gz/plugins/managesieve/Changelog Changed

roundcubemail-1.4-alpha5.tar.gz/plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php -> roundcubemail-1.4-alpha6.tar.gz/plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php Changed

@@ -1508,8 +1508,10 @@
             $out .= sprintf("\n" . '<div class="form-group row">'
                 . '<label for="%s" class="col-sm-4 col-form-label">%s</label>'
                 . '<div class="col-sm-8">%s</div></div>',
-                $field_id, rcube::Q($this->plugin->gettext('filterset')),
-                $this->filtersets_list(array('id' => 'sievescriptname'), true));
+                'sievescriptname',
+                rcube::Q($this->plugin->gettext('filterset')),
+                $this->filtersets_list(array('id' => 'sievescriptname'), true)
+            );
         }
         else if ($compact) {
             $out .= sprintf("\n" . '<div class="form-group row form-check">'
@@ -2396,9 +2398,10 @@
 
         // mailbox select
         if ($action['type'] == 'fileinto') {
-            $mailbox = $this->mod_mailbox($action['target'], 'out');
             // make sure non-existing (or unsubscribed) mailbox is listed (#1489956)
-            $additional = array($mailbox);
+            if ($mailbox = $this->mod_mailbox($action['target'], 'out')) {
+                $additional = array($mailbox);
+            }
         }
         else {
             $mailbox = '';

roundcubemail-1.4-alpha5.tar.gz/plugins/managesieve/localization/de_CH.inc -> roundcubemail-1.4-alpha6.tar.gz/plugins/managesieve/localization/de_CH.inc Changed

@@ -21,6 +21,7 @@
 $labels['newfilter'] = 'Neuer Filter';
 $labels['filteradd'] = 'Filter hinzufügen';
 $labels['filterdel'] = 'Filter löschen';
+$labels['rules'] = 'Regeln';
 $labels['actions'] = 'Aktionen';
 $labels['scope'] = 'Suchbereich';
 $labels['moveup'] = 'Nach oben';
@@ -40,6 +41,14 @@
 $labels['filternotregex'] = 'entspricht regulärem Ausdruck';
 $labels['filterunder'] = 'unter';
 $labels['filterover'] = 'über';
+$labels['mime'] = 'MIME:';
+$labels['mimepart'] = 'MIME-Teil:';
+$labels['mime-message'] = 'Nachricht';
+$labels['mime-anychild'] = 'weiteres';
+$labels['mime-type'] = 'Typ';
+$labels['mime-subtype'] = 'Untertyp';
+$labels['mime-contenttype'] = 'Inhaltstyp';
+$labels['mime-param'] = 'Parameter';
 $labels['addrule'] = 'Regel hinzufügen';
 $labels['delrule'] = 'Regel löschen';
 $labels['messagemoveto'] = 'Verschiebe Nachricht nach';
@@ -69,9 +78,11 @@
 $labels['filterset'] = 'Filtersätze';
 $labels['filtersets'] = 'Filtersätze';
 $labels['filtersetadd'] = 'Filtersatz anlegen';
+$labels['filtersetdel'] = 'Filtersatz löschen';
 $labels['filtersetact'] = 'Aktuellen Filtersatz aktivieren';
 $labels['filtersetdeact'] = 'Aktuellen Filtersatz deaktivieren';
 $labels['filterseteditraw'] = 'Filtersatz bearbeiten';
+$labels['filtersetswitch'] = 'Filtersatz aktivieren/deaktivieren';
 $labels['filterdef'] = 'Filterdefinition';
 $labels['filtersetname'] = 'Filtersatzname';
 $labels['newfilterset'] = 'Neuer Filtersatz';
@@ -184,10 +195,13 @@
 $labels['vacation.discard'] = 'Verwerfen';
 $labels['vacation.redirect'] = 'Weiterleiten an';
 $labels['vacation.copy'] = 'Kopie an';
+$labels['forward'] = 'Weiterleitung';
 $labels['forward.redirect'] = 'Weiterleiten an';
 $labels['forward.copy'] = 'Kopie an';
 $labels['forward.on'] = 'Ein';
 $labels['forward.off'] = 'Aus';
+$labels['forward.status'] = 'Status:';
+$labels['forward.action'] = 'Für eingehende Mails die folgende Aktion ausführen:';
 $labels['forward.saving'] = 'Speichere Daten...';
 $labels['filladdresses'] = 'Mit allen meiner Adressen ausfüllen';
 $labels['arialabelfiltersetactions'] = 'Filtersatz-Aktionen';
@@ -197,6 +211,7 @@
 $labels['ariasummaryfiltersetslist'] = 'Filtersatzliste';
 $labels['filterstitle'] = 'Eingehende Nachrichtenfilter bearbeiten';
 $labels['vacationtitle'] = 'Abwesenheitsregel bearbeiten';
+$labels['forwardtitle'] = 'Mail-Weiterleitungsregel bearbeiten';
 $labels['message'] = 'Nachricht';
 $labels['duplicate'] = 'ist doppelt';
 $labels['notduplicate'] = 'ist nicht doppelt';
@@ -241,6 +256,8 @@
 $messages['invaliddateformat'] = 'Ungültiges Datumsformat';
 $messages['saveerror'] = 'Fehler beim Speichern (Serverfehler)';
 $messages['vacationsaved'] = 'Abwesenheitsnotiz erfolgreich gespeichert.';
+$messages['forwardsaved'] = 'Weiterleitungsdaten erfolgreich gespeichert.';
 $messages['emptyvacationbody'] = 'Mitteilungstext ist erforderlich!';
 $messages['duplicate.conflict.err'] = 'Kopfzeile und eindeutiger Bezeichner sind nicht zusammen erlaubt.';
+$messages['disabledaction'] = 'Aktion nicht erlaubt.';
 ?>

roundcubemail-1.4-alpha5.tar.gz/plugins/managesieve/localization/de_DE.inc -> roundcubemail-1.4-alpha6.tar.gz/plugins/managesieve/localization/de_DE.inc Changed

@@ -42,7 +42,9 @@
 $labels['filterunder'] = 'unter';
 $labels['filterover'] = 'über';
 $labels['mime'] = 'MIME:';
+$labels['mimepart'] = 'MIME-Teil:';
 $labels['mime-message'] = 'Nachricht';
+$labels['mime-anychild'] = 'weiteres';
 $labels['mime-type'] = 'Typ';
 $labels['mime-subtype'] = 'Untertyp';
 $labels['mime-contenttype'] = 'Inhaltstyp';
@@ -173,22 +175,22 @@
 $labels['asciinumeric'] = 'numerisch (ascii-numeric)';
 $labels['index'] = 'index:';
 $labels['indexlast'] = 'rückwärts';
-$labels['vacation'] = 'Urlaub';
+$labels['vacation'] = 'Abwesenheit ';
 $labels['vacation.reply'] = 'Antwort';
 $labels['vacation.advanced'] = 'Erweiterte Einstellungen';
 $labels['vacation.from'] = 'Antwort E-Mail-Adresse:';
 $labels['vacation.subject'] = 'Betreff';
-$labels['vacation.body'] = 'Hauptteil';
-$labels['vacation.start'] = 'Beginn des Urlaubs';
-$labels['vacation.end'] = 'Ende des Urlaubs';
+$labels['vacation.body'] = 'Nachricht';
+$labels['vacation.start'] = 'Beginn des Abwesenheit';
+$labels['vacation.end'] = 'Ende des Abwesenheit';
 $labels['vacation.status'] = 'Status';
 $labels['vacation.on'] = 'An';
 $labels['vacation.off'] = 'Aus';
 $labels['vacation.addresses'] = 'Meine E-Mail-Adressen';
 $labels['vacation.interval'] = 'Antwort Intervall';
-$labels['vacation.after'] = 'Setze Urlaubsregel nach';
+$labels['vacation.after'] = 'Setze Filterregel nach';
 $labels['vacation.saving'] = 'Speichere Daten...';
-$labels['vacation.action'] = 'Eingehende Nachrichtaktion';
+$labels['vacation.action'] = 'Aktion bei eingehende Nachrichten';
 $labels['vacation.keep'] = 'Behalten';
 $labels['vacation.discard'] = 'Verwerfen';
 $labels['vacation.redirect'] = 'Weiterleiten an';
@@ -253,7 +255,7 @@
 $messages['nodata'] = 'Mindestens eine Position muss ausgewählt werden!';
 $messages['invaliddateformat'] = 'Ungültiges Datum oder Teil-Format';
 $messages['saveerror'] = 'Ein Serverfehler ist aufgetreten, Speicherung war nicht möglich.';
-$messages['vacationsaved'] = 'Urlaubsdaten erfolgreich gespeichert.';
+$messages['vacationsaved'] = 'Abwesenheitdaten erfolgreich gespeichert.';
 $messages['forwardsaved'] = 'Weiterleitungsdaten erfolgreich gespeichert.';
 $messages['emptyvacationbody'] = 'Inhalt der Abwesenheitsbenachrichtigung wird benötigt!';
 $messages['duplicate.conflict.err'] = 'Beides, Kopfzeilen und eindeutige Kennzeichner, sind nicht erlaubt.';

roundcubemail-1.4-alpha5.tar.gz/plugins/managesieve/localization/en_US.inc -> roundcubemail-1.4-alpha6.tar.gz/plugins/managesieve/localization/en_US.inc Changed

@@ -177,20 +177,20 @@
 $labels['asciinumeric'] = 'numeric (ascii-numeric)';
 $labels['index'] = 'index:';
 $labels['indexlast'] = 'backwards';
-$labels['vacation'] = 'Vacation';
+$labels['vacation'] = 'Out of Office';
 $labels['vacation.reply'] = 'Reply message';
 $labels['vacation.advanced'] = 'Advanced settings';
 $labels['vacation.from'] = 'Reply sender address';
 $labels['vacation.subject'] = 'Subject';
 $labels['vacation.body'] = 'Body';
-$labels['vacation.start'] = 'Vacation start';
-$labels['vacation.end'] = 'Vacation end';
+$labels['vacation.start'] = 'Start time';
+$labels['vacation.end'] = 'End time';
 $labels['vacation.status'] = 'Status';
 $labels['vacation.on'] = 'On';
 $labels['vacation.off'] = 'Off';
 $labels['vacation.addresses'] = 'My e-mail addresses';
 $labels['vacation.interval'] = 'Reply interval';
-$labels['vacation.after'] = 'Put vacation rule after';
+$labels['vacation.after'] = 'Put the out-of-office rule after';
 $labels['vacation.saving'] = 'Saving data...';
 $labels['vacation.action'] = 'Incoming message action';
 $labels['vacation.keep'] = 'Keep';
@@ -259,7 +259,7 @@
 $messages['nodata'] = 'At least one position must be selected!';
 $messages['invaliddateformat'] = 'Invalid date or date part format';
 $messages['saveerror'] = 'Unable to save data. Server error occurred.';
-$messages['vacationsaved'] = 'Vacation data saved successfully.';
+$messages['vacationsaved'] = 'Out-of-office data saved successfully.';
 $messages['forwardsaved'] = 'Forward data saved successfully.';
 $messages['emptyvacationbody'] = 'Body of vacation message is required!';
 $messages['duplicate.conflict.err'] = 'Both header and unique identifier are not allowed.';

roundcubemail-1.4-alpha5.tar.gz/plugins/zipdownload/localization/de_CH.inc -> roundcubemail-1.4-alpha6.tar.gz/plugins/zipdownload/localization/de_CH.inc Changed

roundcubemail-1.4-alpha5.tar.gz/plugins/zipdownload/localization/de_DE.inc -> roundcubemail-1.4-alpha6.tar.gz/plugins/zipdownload/localization/de_DE.inc Changed

roundcubemail-1.4-alpha5.tar.gz/plugins/zipdownload/zipdownload.php -> roundcubemail-1.4-alpha6.tar.gz/plugins/zipdownload/zipdownload.php Changed

roundcubemail-1.4-alpha5.tar.gz/program/include/rcmail_install.php -> roundcubemail-1.4-alpha6.tar.gz/program/include/rcmail_install.php Changed

roundcubemail-1.4-alpha5.tar.gz/program/include/rcmail_output_html.php -> roundcubemail-1.4-alpha6.tar.gz/program/include/rcmail_output_html.php Changed

roundcubemail-1.4-alpha5.tar.gz/program/js/app.js -> roundcubemail-1.4-alpha6.tar.gz/program/js/app.js Changed

roundcubemail-1.4-alpha5.tar.gz/program/js/tinymce/langs/de.js -> roundcubemail-1.4-alpha6.tar.gz/program/js/tinymce/langs/de.js Changed

roundcubemail-1.4-alpha5.tar.gz/program/lib/Roundcube/rcube.php -> roundcubemail-1.4-alpha6.tar.gz/program/lib/Roundcube/rcube.php Changed

@@ -1352,7 +1352,7 @@
     }
 
     /**
-     * Report error according to configured debug_level
+     * Log an error
      *
      * @param array $arg_arr Named parameters
      * @see self::raise_error()
@@ -1360,58 +1360,31 @@
     public static function log_bug($arg_arr)
     {
         $program = strtoupper($arg_arr['type'] ?: 'php');
-        $level   = self::get_instance()->config->get('debug_level');
-
-        // disable errors for ajax requests, write to log instead (#1487831)
-        if (($level & 4) && !empty($_REQUEST['_remote'])) {
-            $level = ($level ^ 4) | 1;
-        }
 
         // write error to local log file
-        if (($level & 1) || !empty($arg_arr['fatal'])) {
-            if ($_SERVER['REQUEST_METHOD'] == 'POST') {
-                foreach (array('_task', '_action') as $arg) {
-                    if ($_POST[$arg] && !$_GET[$arg]) {
-                        $post_query[$arg] = $_POST[$arg];
-                    }
-                }
-
-                if (!empty($post_query)) {
-                    $post_query = (strpos($_SERVER['REQUEST_URI'], '?') != false ? '&' : '?')
-                        . http_build_query($post_query, '', '&');
+        if ($_SERVER['REQUEST_METHOD'] == 'POST') {
+            foreach (array('_task', '_action') as $arg) {
+                if ($_POST[$arg] && !$_GET[$arg]) {
+                    $post_query[$arg] = $_POST[$arg];
                 }
             }
 
-            $log_entry = sprintf("%s Error: %s%s (%s %s)",
-                $program,
-                $arg_arr['message'],
-                $arg_arr['file'] ? sprintf(' in %s on line %d', $arg_arr['file'], $arg_arr['line']) : '',
-                $_SERVER['REQUEST_METHOD'],
-                $_SERVER['REQUEST_URI'] . $post_query);
-
-            if (!self::write_log('errors', $log_entry)) {
-                // send error to PHPs error handler if write_log didn't succeed
-                trigger_error($arg_arr['message'], E_USER_WARNING);
+            if (!empty($post_query)) {
+                $post_query = (strpos($_SERVER['REQUEST_URI'], '?') != false ? '&' : '?')
+                    . http_build_query($post_query, '', '&');
             }
         }
 
-        // report the bug to the global bug reporting system
-        if ($level & 2) {
-            // TODO: Send error via HTTP
-        }
-
-        // show error if debug_mode is on
-        if ($level & 4) {
-            print "<b>$program Error";
-
-            if (!empty($arg_arr['file']) && !empty($arg_arr['line'])) {
-                print " in $arg_arr[file] ($arg_arr[line])";
-            }
+        $log_entry = sprintf("%s Error: %s%s (%s %s)",
+            $program,
+            $arg_arr['message'],
+            $arg_arr['file'] ? sprintf(' in %s on line %d', $arg_arr['file'], $arg_arr['line']) : '',
+            $_SERVER['REQUEST_METHOD'],
+            $_SERVER['REQUEST_URI'] . $post_query);
 
-            print ':</b>&nbsp;';
-            print nl2br($arg_arr['message']);
-            print '<br />';
-            flush();
+        if (!self::write_log('errors', $log_entry)) {
+            // send error to PHPs error handler if write_log didn't succeed
+            trigger_error($arg_arr['message'], E_USER_WARNING);
         }
     }

roundcubemail-1.4-alpha5.tar.gz/program/lib/Roundcube/rcube_config.php -> roundcubemail-1.4-alpha6.tar.gz/program/lib/Roundcube/rcube_config.php Changed

@@ -245,20 +245,14 @@
         }
 
         // set PHP error logging according to config
-        if ($this->prop['debug_level'] & 1) {
-            $error_log = $this->prop['log_driver'];
-            if ($error_log != 'syslog') {
-                $error_log  = $this->prop['log_dir'] . '/errors';
-                $error_log .= isset($this->prop['log_file_ext']) ? $this->prop['log_file_ext'] : '.log';
-            }
+        $error_log = $this->prop['log_driver'];
+        if ($error_log != 'syslog') {
+            $error_log  = $this->prop['log_dir'] . '/errors';
+            $error_log .= isset($this->prop['log_file_ext']) ? $this->prop['log_file_ext'] : '.log';
 
             ini_set('error_log', $error_log);
-            ini_set('log_errors', 1);
         }
 
-        // enable display_errors in 'show' level, but not for ajax requests
-        ini_set('display_errors', intval(empty($_REQUEST['_remote']) && ($this->prop['debug_level'] & 4)));
-
         // remove deprecated properties
         unset($this->prop['dst_active']);
     }

roundcubemail-1.4-alpha5.tar.gz/program/localization/de_CH/labels.inc -> roundcubemail-1.4-alpha6.tar.gz/program/localization/de_CH/labels.inc Changed

roundcubemail-1.4-alpha5.tar.gz/program/localization/de_CH/messages.inc -> roundcubemail-1.4-alpha6.tar.gz/program/localization/de_CH/messages.inc Changed

roundcubemail-1.4-alpha5.tar.gz/program/localization/de_DE/labels.inc -> roundcubemail-1.4-alpha6.tar.gz/program/localization/de_DE/labels.inc Changed

@@ -114,7 +114,7 @@
 $labels['forwardinline'] = 'innerhalb der Nachricht';
 $labels['forwardattachment'] = 'Als Anhang weiterleiten';
 $labels['forwardmessage'] = 'Nachricht weiterleiten';
-$labels['bouncemsg'] = 'Resend (bounce)';
+$labels['bouncemsg'] = 'Erneut senden (falls unzustellbar)';
 $labels['bounce'] = 'Erneut senden';
 $labels['deletemessage'] = 'Nachricht löschen';
 $labels['movemessagetotrash'] = 'Nachricht in den Papierkorb verschieben';
@@ -129,8 +129,8 @@
 $labels['markmessages'] = 'Nachrichten markieren';
 $labels['markread'] = 'Als gelesen';
 $labels['markunread'] = 'Als ungelesen';
-$labels['markflagged'] = 'Markierung hinzufügen';
-$labels['markunflagged'] = 'Markierung entfernen';
+$labels['markflagged'] = 'Als wichtig';
+$labels['markunflagged'] = 'Als unwichtig';
 $labels['moreactions'] = 'Mehr …';
 $labels['markallread'] = 'Alle als gelesen markieren';
 $labels['folders-cur'] = 'Nur ausgewählten Ordner';
@@ -152,8 +152,8 @@
 $labels['currpage'] = 'Aktuelle Seite';
 $labels['isread'] = 'Gelesen';
 $labels['unread'] = 'Ungelesene';
-$labels['flagged'] = 'Markierte';
-$labels['unflagged'] = 'Nicht gekennzeichnet';
+$labels['flagged'] = 'Als wichtig markiert';
+$labels['unflagged'] = 'Als unwichtig markiert';
 $labels['unanswered'] = 'Unbeantwortete';
 $labels['withattachment'] = 'Mit Anhang';
 $labels['deleted'] = 'Gelöschte';
@@ -180,8 +180,8 @@
 $labels['asc'] = 'aufsteigend';
 $labels['desc'] = 'absteigend';
 $labels['listcolumns'] = 'Spalten';
-$labels['listsorting'] = 'Sortierung';
-$labels['listorder'] = 'Ordnung';
+$labels['listsorting'] = 'Sortieren nach';
+$labels['listorder'] = 'Sortierung';
 $labels['listmode'] = 'Anzeigemodus';
 $labels['lmode'] = 'Listen-Modus';
 $labels['layout'] = 'Layout';
@@ -204,8 +204,8 @@
 $labels['quotastorage'] = 'Festplattenspeicher';
 $labels['quotamessage'] = 'Nachrichtenanzahl';
 $labels['shortheaderdate'] = 'Am $date';
-$labels['shortheaderto'] = 'An $to vom $date';
-$labels['shortheaderfrom'] = 'Von $from vom $date';
+$labels['shortheaderto'] = 'An $to am $date';
+$labels['shortheaderfrom'] = 'Von $from am $date';
 $labels['quicksearch'] = 'Schnellsuche';
 $labels['searchplaceholder'] = 'Suchen …';
 $labels['resetsearch'] = 'Suche zurücksetzen';
@@ -248,6 +248,7 @@
 $labels['encryptmessagemailvelope'] = 'Nachricht mit Mailvelope verschlüsseln';
 $labels['importpubkeys'] = 'Öffentliche Schlüssel importieren';
 $labels['encryptedsendialog'] = 'Verschlüsselte Nachricht wird gesendet';
+$labels['encryptandsign'] = 'Verschlüsseln und unterschreiben';
 $labels['keyid'] = 'Schlüsselkennung';
 $labels['keylength'] = 'Bits';
 $labels['keyexpired'] = 'Abgelaufen';
@@ -255,6 +256,7 @@
 $labels['bccinstead'] = 'Blindkopie verwenden';
 $labels['addheader'] = 'Empfänger hinzufügen (Kopfzeile)';
 $labels['recipient'] = 'Empfänger';
+$labels['recipientedit'] = 'Empfänger bearbeiten';
 $labels['editidents'] = 'Identitäten bearbeiten';
 $labels['spellcheck'] = 'Rechtschreibung';
 $labels['checkspelling'] = 'Rechtschreibung prüfen';
@@ -272,7 +274,7 @@
 $labels['editresponses'] = 'Schnellantworten bearbeiten';
 $labels['responsename'] = 'Name';
 $labels['responsetext'] = 'Text der Antwort';
-$labels['attach'] = 'Anhängen';
+$labels['attach'] = 'Anhang';
 $labels['attachments'] = 'Anhänge';
 $labels['upload'] = 'Hochladen';
 $labels['uploadprogress'] = '$percent ($current von $total)';
@@ -309,6 +311,14 @@
 $labels['receiptread'] = 'Empfangsbestätigung (gelesen)';
 $labels['yourmessage'] = 'Dies ist eine Empfangsbestätigung für Ihre Nachricht';
 $labels['receiptnote'] = 'Hinweis: Der Empfänger hat den Empfang der Nachricht bestätigt. Dies ist keine Garantie, dass die Nachricht gelesen und verstanden wurde.';
+$labels['zoomin'] = 'Vergrößern';
+$labels['zoomout'] = 'Verkleinern';
+$labels['rotate'] = 'Drehen';
+$labels['increaseimage'] = 'Bild vergrößern';
+$labels['decreaseimage'] = 'Bild verkleinern';
+$labels['rotateimage'] = 'Bild drehen';
+$labels['showtools'] = 'Bild-Tools anzeigen';
+$labels['hidetools'] = 'Bild-Tools ausblenden';
 $labels['name'] = 'Angezeigter Name';
 $labels['firstname'] = 'Vorname';
 $labels['surname'] = 'Nachname';
@@ -393,7 +403,7 @@
 $labels['addgroup'] = 'Gruppe hinzufügen';
 $labels['grouprename'] = 'Gruppe umbenennen';
 $labels['groupdelete'] = 'Gruppe löschen';
-$labels['groupassign'] = 'Zur Gruppe hinzufügen...';
+$labels['groupassign'] = 'Zu Gruppe hinzufügen...';
 $labels['groupremove'] = 'Aus Gruppe entfernen';
 $labels['groupremoveselected'] = 'Gewählte Kontakte aus Gruppe entfernen';
 $labels['uponelevel'] = 'Eine Ebene nach oben';
@@ -415,7 +425,6 @@
 $labels['importgroups'] = 'Gruppenzuordnungen importieren';
 $labels['importgroupsall'] = 'Alle (Gruppen erstellen wenn nötig)';
 $labels['importgroupsexisting'] = 'Nur für existierende Gruppen';
-$labels['importdesc'] = 'Sie können Kontakte von einem vorhandenen Adressbuch hochladen.<br/>Zur Zeit wird der Import von Adressen im <a href="http://de.wikipedia.org/wiki/VCard">vCard</a> oder <a href="http://de.wikipedia.org/wiki/CSV_(Dateiformat)">CSV</a>Format unterstützt.';
 $labels['done'] = 'Fertig';
 $labels['settingsfor'] = 'Einstellungen für';
 $labels['about'] = 'Über';
@@ -562,7 +571,11 @@
 $labels['dualuselabel'] = 'Kann nur enthalten';
 $labels['dualusemail'] = 'Nachrichten';
 $labels['dualusefolder'] = 'Ordner';
+$labels['generate'] = 'Generieren';
 $labels['encryptioncreatekey'] = 'Neues Schlüsselpaar erstellen';
+$labels['openmailvelopesettings'] = 'Mailvelope-Einstellungen öffnen';
+$labels['encryptionprivkeysinmailvelope'] = 'Sie haben $nr passende private Schlüssel in Ihrem Mailvelope-Schlüsselverzeichnis:';
+$labels['encryptionnoprivkeysinmailvelope'] = 'Für diese Absender-Identität ist bis jetzt kein privater PGP-Schlüssel in Ihrer Mailvelope gespeichert. Wollen Sie einen Schlüssel erstellen, damit eine verschlüsselte Kommunikation möglich ist?';
 $labels['sortby'] = 'Sortieren nach';
 $labels['sortasc'] = 'Aufsteigend sortieren';
 $labels['sortdesc'] = 'Absteigend sortieren';
@@ -630,6 +643,7 @@
 $labels['arialabelforwardingoptions'] = 'Weiterleitungsoptionen';
 $labels['arialabelreplyalloptions'] = 'Allen antworten-Optionen';
 $labels['arialabelmoremessageactions'] = 'Weitere Nachrichtenaktionen';
+$labels['arialabelmorecontactactions'] = 'Weitere Kontakt-Aktionen';
 $labels['arialabelmarkmessagesas'] = 'Ausgewählte Nachricht markieren als …';
 $labels['arialabelcomposeoptions'] = 'Erstellungsoptionen';
 $labels['arialabelresponsesmenu'] = 'Schnellantworten Menü';
@@ -646,6 +660,7 @@
 $labels['arialabelsearchterms'] = 'Suchbegriffe';
 $labels['arialabeldropactionmenu'] = 'Aktionsmenü für das Ziehen und Loslassen';
 $labels['arialabelheadersmenu'] = 'Menü zum Hinzufügen der Empfänger (Kopfzeile) ';
+$labels['arialabelimagetools'] = 'Bild-Tools';
 $labels['helplistnavigation'] = 'Tastaturnavigation auflisten';
 $labels['helplistkeyboardnavigation'] = "Pfeil hoch/runter: Zeilenfokus/Zeilenselektion verschieben
 Leerzeichen: Selektiere ausgewählte Zeile

roundcubemail-1.4-alpha5.tar.gz/program/localization/de_DE/messages.inc -> roundcubemail-1.4-alpha6.tar.gz/program/localization/de_DE/messages.inc Changed

@@ -34,7 +34,6 @@
 $messages['invalidrequest'] = 'Ungültige Anfrage! Es wurden keine Daten gespeichert.';
 $messages['invalidhost'] = 'Ungültiger Servername.';
 $messages['nomessagesfound'] = 'Keine Nachrichten in diesem Postfach.';
-$messages['loggedout'] = 'Sie haben Ihre Sitzung erfolgreich beendet. Auf Wiedersehen!';
 $messages['mailboxempty'] = 'Postfach ist leer';
 $messages['nomessages'] = 'Keine Nachrichten';
 $messages['refreshing'] = 'Aktualisierung läuft …';
@@ -165,6 +164,7 @@
 $messages['smtpfromerror'] = 'SMTP Fehler ($code): Der Absender "$from" konnte nicht gesetzt werden ($msg).';
 $messages['smtptoerror'] = 'SMTP Fehler ($code): Der Empfänger "$to" konnte nicht gesetzt werden ($msg).';
 $messages['smtprecipientserror'] = 'SMTP Fehler: Die Empfängerliste konnte nicht verarbeitet werden.';
+$messages['smtputf8error'] = 'SMTP-Fehler: Der Server unterstützt Unicode in der E-Mail-Adresse nicht.';
 $messages['smtpsizeerror'] = 'SMTP-Fehler: Nachrichtengröße übersteigt die Servergrenze ($limit)';
 $messages['smtperror'] = 'SMTP Fehler: $msg';
 $messages['emailformaterror'] = 'Ungültige E-Mail-Adresse: $email';
@@ -214,3 +214,8 @@
 $messages['errcomposesessionexplain'] = 'Angeforderte Verfasssitzung nicht gefunden.';
 $messages['clicktocompose'] = 'Klicken Sie hier, um eine neue Nachricht zu verfassen';
 $messages['nosupporterror'] = 'Diese Funktion wird von Ihrem Webbrowser nicht unterstützt.';
+$messages['siginserted'] = 'Signatur erfolgreich eingefügt.';
+$messages['responseinserted'] = 'Antwort erfolgreich eingefügt.';
+$messages['listempty'] = 'Die Liste ist leer.';
+$messages['listusebutton'] = 'Um einen neuen Datensatz hinzufügen, verwenden Sie bitte die Schaltfläche \'Erstellen\'.';
+$messages['keypaircreatesuccess'] = 'En neues Schlüsselpaar wurde erfolgreich für $identity erstellt.';

roundcubemail-1.4-alpha5.tar.gz/program/localization/en_US/labels.inc -> roundcubemail-1.4-alpha6.tar.gz/program/localization/en_US/labels.inc Changed

@@ -224,6 +224,8 @@
 $labels['compact'] = 'Compact';
 $labels['empty'] = 'Empty';
 $labels['importmessages'] = 'Import messages';
+$labels['mailimportdesc'] = 'You can upload mail using files in <a href="https://en.wikipedia.org/wiki/Email#Message_format">MIME</a> or <a href="https://en.wikipedia.org/wiki/Mbox">Mbox</a> format.';
+$labels['mailimportzip'] = 'Multiple files can be compressed into zip archives.';
 
 $labels['quota'] = 'Disk usage';
 $labels['unknown'] = 'unknown';
@@ -481,7 +483,7 @@
 $labels['importgroups'] = 'Import group assignments';
 $labels['importgroupsall'] = 'All (create groups if necessary)';
 $labels['importgroupsexisting'] = 'Only for existing groups';
-$labels['importdesc'] = 'You can upload contacts from an existing address book.<br/>We currently support importing addresses from the <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> or CSV (comma-separated) data format.';
+$labels['importdesc'] = 'You can upload contacts from an existing address book.<br/>We currently support importing addresses from the <a href="https://en.wikipedia.org/wiki/VCard">vCard</a> or CSV (comma-separated) data format.';
 $labels['done'] = 'Done';
 
 // settings

roundcubemail-1.4-alpha5.tar.gz/program/steps/addressbook/import.inc -> roundcubemail-1.4-alpha6.tar.gz/program/steps/addressbook/import.inc Changed

roundcubemail-1.4-alpha5.tar.gz/program/steps/mail/func.inc -> roundcubemail-1.4-alpha6.tar.gz/program/steps/mail/func.inc Changed

@@ -1687,16 +1687,23 @@
 {
     global $RCMAIL;
 
-    $RCMAIL->output->add_label('selectimportfile','importwait');
+    $RCMAIL->output->add_label('selectimportfile', 'importwait', 'importmessages');
 
-    $input_attr = array(
+    $description = $RCMAIL->gettext('mailimportdesc');
+    $input_attr  = array(
         'multiple' => true,
         'name'     => '_file[]',
-        'accept'   => ".eml, .mbox, message/rfc822, text/*",
+        'accept'   => '.eml, .mbox, .msg, message/rfc822, text/*',
     );
 
+    if (class_exists('ZipArchive', false)) {
+        $input_attr['accept'] .= '.zip, application/zip, application/x-zip';
+        $description          .= ' ' . $RCMAIL->gettext('mailimportzip');
+    }
+
     $attrib['prefix'] = html::tag('input', array('type' => 'hidden', 'name' => '_unlock', 'value' => ''))
-        . html::tag('input', array('type' => 'hidden', 'name' => '_framed', 'value' => '1'));
+        . html::tag('input', array('type' => 'hidden', 'name' => '_framed', 'value' => '1'))
+        . html::p(null, $description);
 
     return $RCMAIL->upload_form($attrib, 'importform', 'import-messages', $input_attr);
 }

roundcubemail-1.4-alpha5.tar.gz/program/steps/utils/error.inc -> roundcubemail-1.4-alpha6.tar.gz/program/steps/utils/error.inc Changed

roundcubemail-1.4-alpha5.tar.gz/skins/elastic/templates/includes/mail-menu.html -> roundcubemail-1.4-alpha6.tar.gz/skins/elastic/templates/includes/mail-menu.html Changed

@@ -63,7 +63,8 @@
 	<ul class="toolbarmenu listing" role="menu" aria-labelledby="aria-label-message-menu">
 		<roundcube:button type="link-menuitem" command="print" label="printmessage" class="print" classAct="print active" data-hidden="small"/>
 		<roundcube:if condition="template:name != 'message'" />
-			<roundcube:button type="link-menuitem" command="import-messages" label="import" class="import" classAct="import active" name="messageimport" onclick="if (rcmail.command_enabled('import-messages')) rcmail.upload_input('uploadform')" />
+			<roundcube:button type="link-menuitem" command="import-messages" label="import" class="import" classAct="import active"
+				name="messageimport" onclick="UI.import_dialog()" />
 		<roundcube:endif />
 		<roundcube:button type="link-menuitem" command="download" label="export" class="download" classAct="download active" />
 		<roundcube:button type="link-menuitem" command="edit" prop="new" label="editasnew" class="edit asnew" classAct="edit asnew active" />
@@ -85,3 +86,7 @@
 		<roundcube:container name="markmenu" id="markmessage-menu" />
 	</ul>
 </div>
+
+<roundcube:if condition="template:name != 'message'" />
+	<roundcube:object name="messageimportform" id="uploadform" class="popupmenu formcontent" buttons="no" />
+<roundcube:endif />

roundcubemail-1.4-alpha5.tar.gz/skins/elastic/templates/mail.html -> roundcubemail-1.4-alpha6.tar.gz/skins/elastic/templates/mail.html Changed

roundcubemail-1.4-alpha5.tar.gz/skins/elastic/ui.js -> roundcubemail-1.4-alpha6.tar.gz/skins/elastic/ui.js Changed

@@ -59,6 +59,7 @@
     this.popup_init = popup_init;
     this.about_dialog = about_dialog;
     this.headers_dialog = headers_dialog;
+    this.import_dialog = import_dialog;
     this.headers_show = headers_show;
     this.spellmenu = spellmenu;
     this.searchmenu = searchmenu;
@@ -112,6 +113,10 @@
         // Intercept jQuery-UI dialogs...
         $.ui && $.widget('ui.dialog', $.ui.dialog, {
             open: function() {
+                // .. to unify min width for iframe'd dialogs
+                if ($(this.element).is('.iframe')) {
+                    this.options.width = Math.max(576, this.options.width);
+                }
                 this._super();
                 // ... to re-style them on dialog open
                 dialog_open(this);
@@ -727,7 +732,10 @@
         var supported_controls = 'input:not(.button,[type=button],[type=file],[type=radio],[type=checkbox]),textarea';
         $(supported_controls, $('.propform', context)).addClass('form-control');
         $('[type=checkbox]', $('.propform', context)).addClass('form-check-input');
-        $('select', context).addClass('custom-select');
+
+        // Note: On selects we add form-control to get consistent focus
+        //       and to not have to create separate rules for selects and inputs
+        $('select', context).addClass('form-control custom-select');
 
         if (context != document) {
             $(supported_controls, context).addClass('form-control');
@@ -1977,6 +1985,7 @@
                                         break;
                                     }
                                 }
+                                return false; // prevents from scrolling the whole page
                         }
                     });
 
@@ -2267,8 +2276,7 @@
 
         dialog = rcmail.simple_dialog(dialog, rcmail.gettext('listoptionstitle'), save_func, {
             closeOnEscape: true,
-            minWidth: 400,
-            width: width
+            minWidth: 400
         });
     };
 
@@ -2290,7 +2298,6 @@
             button: support_button,
             button_class: 'help',
             cancel_button: 'close',
-            width: 600,
             height: 400
         });
     };
@@ -2314,12 +2321,29 @@
 
         rcmail.simple_dialog(dialog, rcmail.gettext('arialabelmessageheaders'), null, {
             cancel_button: 'close',
-            width: 600,
             height: 400
         });
     };
 
     /**
+     * Mail import dialog
+     */
+    function import_dialog()
+    {
+        var content = $('#uploadform'),
+            dialog = content.clone();
+
+        var save_func = function(e) {
+            return rcmail.command('import-messages', $(dialog.find('form')[0]));
+        };
+
+        rcmail.simple_dialog(dialog, rcmail.gettext('importmessages'), save_func, {
+            closeOnEscape: true,
+            minWidth: 400
+        });
+    };
+
+    /**
      * Search options menu popup
      */
     function searchmenu(obj)
@@ -2605,6 +2629,9 @@
                     rcmail.simple_dialog(p.table, 'quota', null, {cancel_button: 'close'});
                 });
         }
+        else {
+            element.tooltip('dispose').tooltip({trigger: 'hover click'}); // click for mobile
+        }
     };
 
     /**
@@ -2998,6 +3025,7 @@
                                     break;
                                 }
                             }
+                            return false; // prevents from scrolling the whole page
                     }
                 });

roundcubemail-1.4-alpha5.tar.gz/skins/larry/templates/mail.html -> roundcubemail-1.4-alpha6.tar.gz/skins/larry/templates/mail.html Changed

@@ -171,7 +171,7 @@
 		<roundcube:button command="expunge" type="link-menuitem" label="compact" classAct="active" />
 		<roundcube:button command="purge" type="link-menuitem" label="empty" classAct="active" />
 		<roundcube:button command="mark-all-read" type="link-menuitem" label="markallread" classAct="active" />
-		<roundcube:button command="import-messages" type="link-menuitem" name="messageimport" classAct="active" label="importmessages" onclick="if (rcmail.command_enabled('import-messages')) rcmail.upload_input('uploadform')" />
+		<roundcube:button command="import-messages" type="link-menuitem" name="messageimport" classAct="active" label="importmessages" onclick="UI.import_dialog()" />
 		<roundcube:button command="folders" task="settings" type="link-menuitem" label="managefolders" classAct="active" />
 		<roundcube:container name="mailboxoptions" id="mailboxoptionsmenu" />
 	</ul>
@@ -262,7 +262,7 @@
 	</div>
 </div>
 
-<roundcube:object name="messageimportform" id="uploadform" mode="smart" />
+<roundcube:object name="messageimportform" id="uploadform" buttons="no" class="popupdialog" />
 
 <roundcube:include file="/includes/footer.html" />

roundcubemail-1.4-alpha5.tar.gz/skins/larry/ui.js -> roundcubemail-1.4-alpha6.tar.gz/skins/larry/ui.js Changed

@@ -40,9 +40,9 @@
   this.show_popup = show_popup;
   this.toggle_popup = toggle_popup;
   this.add_popup = add_popup;
+  this.import_dialog = import_dialog;
   this.set_searchmod = set_searchmod;
   this.set_searchscope = set_searchscope;
-  this.show_uploadform = show_uploadform;
   this.show_header_row = show_header_row;
   this.hide_header_row = hide_header_row;
   this.update_quota = update_quota;
@@ -181,8 +181,7 @@
         }
       }
       else if (rcmail.env.action == 'compose') {
-        rcmail.addEventListener('aftersend-attachment', show_uploadform)
-          .addEventListener('fileappended', function(e) { if (e.attachment.complete) attachmentmenu_append(e.item); })
+        rcmail.addEventListener('fileappended', function(e) { if (e.attachment.complete) attachmentmenu_append(e.item); })
           .addEventListener('aftertoggle-editor', function(e) {
             window.setTimeout(function() { layout_composeview() }, 200);
             if (e && e.mode)
@@ -235,8 +234,7 @@
         rcmail.init_pagejumper('#pagejumper');
 
         rcmail.addEventListener('setquota', update_quota)
-          .addEventListener('layout-change', mail_layout)
-          .addEventListener('afterimport-messages', show_uploadform);
+          .addEventListener('layout-change', mail_layout);
       }
       else if (rcmail.env.action == 'get') {
         new rcube_splitter({ id:'mailpartsplitterv', p1:'#messagepartheader', p2:'#messagepartcontainer',
@@ -300,8 +298,7 @@
     }
     /***  addressbook task  ***/
     else if (rcmail.env.task == 'addressbook') {
-      rcmail.addEventListener('afterupload-photo', show_uploadform)
-        .addEventListener('beforepushgroup', push_contactgroup)
+      rcmail.addEventListener('beforepushgroup', push_contactgroup)
         .addEventListener('beforepopgroup', pop_contactgroup)
         .addEventListener('menu-open', menu_toggle)
         .addEventListener('menu-close', menu_toggle);
@@ -1078,63 +1075,24 @@
       });
   }
 
-  function show_uploadform(e)
+  /**
+   * Mail import dialog
+   */
+  function import_dialog()
   {
-    var $dialog = $('#upload-dialog');
+    var content = $('#uploadform'),
+      dialog = content.clone().removeClass('popupdialog');
 
-    // close the dialog
-    if ($dialog.is(':visible')) {
-      $dialog.dialog('close');
-      return;
-    }
+    var save_func = function(e) {
+      return rcmail.command('import-messages', $(dialog.find('form')[0]));
+    };
 
-    // do nothing if mailvelope editor is active
-    if (rcmail.mailvelope_editor)
-      return;
-
-    // add icons to clone file input field
-    if (rcmail.env.action == 'compose' && !$dialog.data('extended')) {
-      $('<a>')
-        .addClass('iconlink add')
-        .attr('href', '#add')
-        .html('Add')
-        .appendTo($('input[type="file"]', $dialog).parent())
-        .click(add_uploadfile);
-      $dialog.data('extended', true);
-    }
-
-    $dialog.dialog({
-      modal: true,
-      resizable: false,
+    rcmail.simple_dialog(dialog, rcmail.gettext('importmessages'), save_func, {
       closeOnEscape: true,
-      title: $dialog.attr('title'),
-      open: function(e) {
-        if (!document.all)
-          $('input[type=file]', $dialog).first().click();
-      },
-      close: function() {
-        try { $('#upload-dialog form').get(0).reset(); }
-        catch(e){ }  // ignore errors
-
-        $dialog.dialog('destroy').hide();
-        $('div.addline', $dialog).remove();
-      },
-      width: 480
-    }).show();
-  }
-
-  function add_uploadfile(e)
-  {
-    var div = $(this).parent();
-    var clone = div.clone().addClass('addline').insertAfter(div);
-    clone.children('.iconlink').click(add_uploadfile);
-    clone.children('input').val('');
-
-    if (!document.all)
-      $('input[type=file]', clone).click();
+      minWidth: 400
+    });
   }
 
-
   /**
    *
    */

roundcubemail-1.4-alpha5.tar.gz/temp/js_cache/tinymce-langs-4.5.8.tmp -> roundcubemail-1.4-alpha6.tar.gz/temp/js_cache/tinymce-langs-4.5.8.tmp Changed

roundcubemail.dsc Changed

Changes of Revision 105