Kolab Groupware OBS

roundcubemail.spec Changed

debian.changelog Changed

roundcubemail-1.2.3.tar.gz/.htaccess -> roundcubemail-1.2.4.tar.gz/.htaccess Changed

roundcubemail-1.2.3.tar.gz/CHANGELOG -> roundcubemail-1.2.4.tar.gz/CHANGELOG Changed

@@ -1,6 +1,31 @@
 CHANGELOG Roundcube Webmail
 ===========================
 
+RELEASE 1.2.4
+-------------
+- Managesieve: Fix handling of scripts with nested rules (#5540)
+- Managesieve: Fix parser issue with empty lines between comments (#5657)
+- Managesieve: Fix possible defect in handling \r\n in scripts (#5685)
+- Enigma: Fix handling of messages with nested PGP encrypted parts (#5634)
+- Enigma: Fix PHP fatal error when decrypting a message with invalid signature (#5555)
+- Enigma: Fix missing require statement for Crypt_GPG_KeyGenerator (#5641)
+- Fix variable substitution in ldap host for some use-cases, e.g. new_user_identity (#5544)
+- Fix adding images to new identity signatures
+- Fix rsync error handling in installto.sh script (#5562)
+- Fix some advanced search issues with multiple addressbooks (#5572)
+- Fix so group/addressbook selection is retained on page refresh
+- Fix bug where image data URIs in css style were treated as evil/remote in mail preview (#5580)
+- Fix bug where external content in src attribute of input/video tags was not secured (#5583)
+- Fix PHP error on update of a contact with multiple email addresses when using PHP 7.1 (#5587)
+- Fix bug where mail content frame couldn't be reset in some corner cases (#5608)
+- Fix bug where some classic skin images were not displayed in IE/Edge (#5614)
+- Fix bug where signature couldn't be added above the quote in Firefox 51 (#5628)
+- Fix regression where groups with email address were resolved to its members' addresses
+- Fix update of group name in the contacts list header on group rename (#5648)
+- Add rewrite rule to disable access to /vendor/bin folder in .htaccess (#5630)
+- Fix bug where it was too easy accidentally move a folder when using the subscription checkbox (#5655)
+- Fix XSS issue in handling of a style tag inside of an svg element
+
 RELEASE 1.2.3
 -------------
 - Searching in both contacts and groups when LDAP addressbook with group_filters option is used

roundcubemail-1.2.3.tar.gz/bin/installto.sh -> roundcubemail-1.2.4.tar.gz/bin/installto.sh Changed

@@ -42,7 +42,6 @@
 $input = trim(fgets(STDIN));
 
 if (strtolower($input) == 'y') {
-  $err = false;
   echo "Copying files to target location...";
 
   // Save a copy of original .htaccess file (#1490623)
@@ -56,16 +55,16 @@
   }
   foreach ($dirs as $dir) {
     // @FIXME: should we use --delete for all directories?
-    $delete = in_array($dir, array('program', 'installer')) ? '--delete ' : '';
-    if (!system("rsync -avC " . $delete . INSTALL_PATH . "$dir/* $target_dir/$dir/")) {
-      $err = true;
-      break;
+    $delete  = in_array($dir, array('program', 'installer')) ? '--delete ' : '';
+    $command = "rsync -aC --out-format \"%n\" " . $delete . INSTALL_PATH . "$dir/* $target_dir/$dir/";
+    if (!system($command, $ret) || $ret > 0) {
+      rcube::raise_error("Failed to execute command: $command", false, true);
     }
   }
   foreach (array('index.php','.htaccess','config/defaults.inc.php','composer.json-dist','CHANGELOG','README.md','UPGRADING','LICENSE','INSTALL') as $file) {
-    if (!system("rsync -av " . INSTALL_PATH . "$file $target_dir/$file")) {
-      $err = true;
-      break;
+    $command = "rsync -a --out-format \"%n\" " . INSTALL_PATH . "$file $target_dir/$file";
+    if (file_exists(INSTALL_PATH . $file) && (!system($command, $ret) || $ret > 0)) {
+      rcube::raise_error("Failed to execute command: $command", false, true);
     }
   }
 
@@ -96,13 +95,12 @@
       echo "done.\n\n";
   }
 
-  if (!$err) {
-    echo "Running update script at target...\n";
-    system("cd $target_dir && php bin/update.sh --version=$oldversion");
-    echo "All done.\n";
-  }
+  echo "Running update script at target...\n";
+  system("cd $target_dir && php bin/update.sh --version=$oldversion");
+  echo "All done.\n";
 }
-else
+else {
   echo "Update cancelled. See ya!\n";
+}
 
 ?>

roundcubemail-1.2.3.tar.gz/index.php -> roundcubemail-1.2.4.tar.gz/index.php Changed

roundcubemail-1.2.3.tar.gz/installer/index.php -> roundcubemail-1.2.4.tar.gz/installer/index.php Changed

roundcubemail-1.2.3.tar.gz/plugins/enigma/README -> roundcubemail-1.2.4.tar.gz/plugins/enigma/README Changed

roundcubemail-1.2.3.tar.gz/plugins/enigma/lib/enigma_driver_gnupg.php -> roundcubemail-1.2.4.tar.gz/plugins/enigma/lib/enigma_driver_gnupg.php Changed

@@ -281,6 +281,8 @@
      */
     public function gen_key($data)
     {
+        require_once 'Crypt/GPG/KeyGenerator.php';
+
         try {
             $debug  = $this->rc->config->get('enigma_debug');
             $keygen = new Crypt_GPG_KeyGenerator(array(
@@ -409,17 +411,20 @@
      */
     protected function parse_signature($sig)
     {
-        $user = $sig->getUserId();
-
         $data = new enigma_signature();
+
         $data->id          = $sig->getId();
         $data->valid       = $sig->isValid();
         $data->fingerprint = $sig->getKeyFingerprint();
         $data->created     = $sig->getCreationDate();
         $data->expires     = $sig->getExpirationDate();
-        $data->name        = $user->getName();
-        $data->comment     = $user->getComment();
-        $data->email       = $user->getEmail();
+
+        // In case of ERRSIG user may not be set
+        if ($user = $sig->getUserId()) {
+            $data->name    = $user->getName();
+            $data->comment = $user->getComment();
+            $data->email   = $user->getEmail();
+        }
 
         return $data;
     }

roundcubemail-1.2.3.tar.gz/plugins/enigma/lib/enigma_engine.php -> roundcubemail-1.2.4.tar.gz/plugins/enigma/lib/enigma_engine.php Changed

roundcubemail-1.2.3.tar.gz/plugins/managesieve/Changelog -> roundcubemail-1.2.4.tar.gz/plugins/managesieve/Changelog Changed

roundcubemail-1.2.3.tar.gz/plugins/managesieve/lib/Roundcube/rcube_sieve_script.php -> roundcubemail-1.2.4.tar.gz/plugins/managesieve/lib/Roundcube/rcube_sieve_script.php Changed

@@ -562,7 +562,8 @@
                     $prefix .= $line . "\n";
                 }
 
-                $position = $endl + 1;
+                // skip empty lines after the comment (#5657)
+                $position = self::ltrim_position($script, $endl + 1);
             }
 
             // handle script header
@@ -805,6 +806,11 @@
             $token     = !empty($tokens) ? array_shift($tokens) : $separator;
 
             switch ($token) {
+            case 'if':
+                // nested 'if' conditions, ignore the whole rule (#5540)
+                $this->_parse_actions($content, $position);
+                continue 2;
+
             case 'discard':
             case 'keep':
             case 'stop':
@@ -890,8 +896,9 @@
                 break;
             }
 
-            if ($separator == $end)
+            if ($separator == $end) {
                 break;
+            }
         }
 
         return $result;
@@ -1208,7 +1215,7 @@
                         if ($str[$position] == "\n") {
                             $position++;
                         }
-                        else if ($str[$position] == "\r" && $str[$position] == "\n") {
+                        else if ($str[$position] == "\r" && $str[$position + 1] == "\n") {
                             $position += 2;
                         }

roundcubemail-1.2.4.tar.gz/plugins/managesieve/tests/src/parser_nesting Added

@@ -0,0 +1,25 @@
+# Sieve Filter
+# Erzeugt von Ingo (http://www.horde.org/ingo/) (30.09.2016, 16:02)
+
+# Nested rules aren't supported and will be ignored (#5540)
+
+require ["vacation", "regex"];
+
+# Abwesenheit
+if allof ( not exists ["list-help", "list-unsubscribe", "list-subscribe", "list-owner", "list-post", "list-archive", "list-id", "Mailing-List"],
+  not header :is "Precedence" ["list", "bulk", "junk"],
+  not header :matches "To" "Multiple recipients of*") {
+    if header :regex "Received" "^.*(2016) (\$.*\$ )?..:..:.. (\$.*\$ )?(\\+|\\-)....( \$.*\$)?$" {
+    if header :regex "Received" "^.*(Oct) (\$.*\$ )?.... (\$.*\$ )?..:..:.. (\$.*\$ )?(\\+|\\-)....( \$.*\$)?$" {
+    if header :regex "Received" "^.*([0 ]4|[0 ]5|[0 ]6|[0 ]7) (\$.*\$ )?... (\$.*\$ )?.... (\$.*\$ )?..:..:.. (\$.*\$ )?(\\+|\\-)....( \$.*\$)?$" {
+    vacation :days 7 :addresses "test@company.com" :subject "vacation" "blablabla";
+}
+}
+}
+}
+
+# Ausgeschlossene Adressen
+if address :is ["From", "Sender", "Resent-From"] "noreply@example.org"  {
+    discard;
+    stop;
+}

roundcubemail-1.2.4.tar.gz/plugins/managesieve/tests/src/parser_nesting.out Added

roundcubemail-1.2.3.tar.gz/program/include/iniset.php -> roundcubemail-1.2.4.tar.gz/program/include/iniset.php Changed

roundcubemail-1.2.3.tar.gz/program/js/app.js -> roundcubemail-1.2.4.tar.gz/program/js/app.js Changed

@@ -339,8 +339,21 @@
           // init message compose form
           this.init_messageform();
         }
-        else if (this.env.action == 'get')
-          this.enable_command('download', 'print', true);
+        else if (this.env.action == 'get') {
+          this.enable_command('download', true);
+
+          // Mozilla's PDF.js viewer does not allow printing from host page (#5125)
+          // to minimize user confusion we disable the Print button
+          if (bw.mz && this.env.mimetype == 'application/pdf') {
+            n = 0; // there will be two onload events, first for the preload page
+            $(this.gui_objects.messagepartframe).on('load', function() {
+              if (n++) try { this.contentWindow.document; ref.enable_command('print', true); }
+                catch (e) {/* ignore */}
+            });
+          }
+          else
+            this.enable_command('print', true);
+        }
         // show printing dialog
         else if (this.env.action == 'print' && this.env.uid
           && !this.env.is_pgp_content && !this.env.pgp_mime_part
@@ -3228,7 +3241,8 @@
     var r_uids = [],
       post_data = this.selection_post_data({_uid: this.uids_to_list(a_uids), _flag: 'delete'}),
       lock = this.display_message(this.get_label('markingmessage'), 'loading'),
-      rows = this.message_list ? this.message_list.rows : {},
+      list = this.message_list,
+      rows = list ? list.rows : {},
       count = 0;
 
     for (var i=0, len=a_uids.length; i<len; i++) {
@@ -3239,7 +3253,7 @@
 
         if (this.env.skip_deleted) {
           count += this.update_thread(uid);
-          this.message_list.remove_row(uid, (this.env.display_next && i == this.message_list.selection.length-1));
+          list.remove_row(uid, (this.env.display_next && i == list.selection.length-1));
         }
         else
           this.set_message(uid, 'deleted', true);
@@ -3247,9 +3261,9 @@
     }
 
     // make sure there are no selected rows
-    if (this.env.skip_deleted && this.message_list) {
-      if (!this.env.display_next)
-        this.message_list.clear_selection();
+    if (this.env.skip_deleted && list) {
+      if (!this.env.display_next || !list.rowcount)
+        list.clear_selection();
       if (count < 0)
         post_data._count = (count*-1);
       else if (count > 0)
@@ -3987,6 +4001,8 @@
       // add signature according to selected identity
       // if we have HTML editor, signature is added in a callback
       if (input_from.prop('type') == 'select-one') {
+        // for some reason the caret initially is not at pos=0 in Firefox 51 (#5628)
+        this.set_caret_pos(input_message, 0);
         this.change_identity(input_from[0]);
       }
 
@@ -5572,6 +5588,9 @@
       url._search = this.env.search_request;
 
     this.http_request(this.env.task == 'mail' ? 'list-contacts' : 'list', url, lock);
+
+    if (this.env.task != 'mail')
+      this.update_state({_source: src, _page: page && page > 1 ? page : null, _gid: group});
   };
 
   this.list_contacts_clear = function()
@@ -5602,9 +5621,6 @@
 
       boxtitle.append($('<span>').text(prop ? prop.name : this.get_label('contacts')));
     }
-
-    if (prop)
-      this.triggerEvent('groupupdate', prop);
   };
 
   // load contact record
@@ -6030,6 +6046,7 @@
     else {
       $(this.treelist.get_item(key)).children().first().html(prop.name);
       this.env.contactfolders[key].name = this.env.contactgroups[key].name = prop.name;
+      this.set_group_prop(prop);
     }
 
     // update list node and re-sort it
@@ -6502,7 +6519,7 @@
       .addEventListener('collapse', function(node) { ref.folder_collapsed(node) })
       .addEventListener('expand', function(node) { ref.folder_collapsed(node) })
       .addEventListener('search', function(p) { if (p.query) ref.subscription_select(); })
-      .draggable({cancel: 'li.mailbox.root'})
+      .draggable({cancel: 'li.mailbox.root,input,div.treetoggle'})
       .droppable({
         // @todo: find better way, accept callback is executed for every folder
         // on the list when dragging starts (and stops), this is slow, but

roundcubemail-1.2.3.tar.gz/program/lib/Roundcube/bootstrap.php -> roundcubemail-1.2.4.tar.gz/program/lib/Roundcube/bootstrap.php Changed

roundcubemail-1.2.3.tar.gz/program/lib/Roundcube/rcube_ldap.php -> roundcubemail-1.2.4.tar.gz/program/lib/Roundcube/rcube_ldap.php Changed

roundcubemail-1.2.3.tar.gz/program/lib/Roundcube/rcube_ldap_generic.php -> roundcubemail-1.2.4.tar.gz/program/lib/Roundcube/rcube_ldap_generic.php Changed

roundcubemail-1.2.3.tar.gz/program/lib/Roundcube/rcube_utils.php -> roundcubemail-1.2.4.tar.gz/program/lib/Roundcube/rcube_utils.php Changed

roundcubemail-1.2.3.tar.gz/program/lib/Roundcube/rcube_washtml.php -> roundcubemail-1.2.4.tar.gz/program/lib/Roundcube/rcube_washtml.php Changed

roundcubemail-1.2.3.tar.gz/program/steps/addressbook/func.inc -> roundcubemail-1.2.4.tar.gz/program/steps/addressbook/func.inc Changed

@@ -152,14 +152,18 @@
     else
         $CONTACTS->set_page(isset($_SESSION['page']) ? $_SESSION['page'] : 1);
 
-    if (!empty($_REQUEST['_gid']))
-        $CONTACTS->set_group(rcube_utils::get_input_value('_gid', rcube_utils::INPUT_GPC));
+    if (!empty($_REQUEST['_gid'])) {
+        $group = rcube_utils::get_input_value('_gid', rcube_utils::INPUT_GPC);
+        $CONTACTS->set_group($group);
+    }
 
-    if (!$init_env)
+    if (!$init_env) {
         return $CONTACTS;
+    }
 
     $OUTPUT->set_env('readonly', $CONTACTS->readonly);
     $OUTPUT->set_env('source', (string) $source);
+    $OUTPUT->set_env('group', $group);
 
     // reduce/extend $CONTACT_COLTYPES with specification from the current $CONTACT object
     if (is_array($CONTACTS->coltypes)) {
@@ -666,8 +670,9 @@
                 }
 
                 // hack: create empty values array to force this field to be displayed
-                if (empty($values) && $colprop['visible'])
-                    $values[] = '';
+                if (empty($values) && $colprop['visible']) {
+                    $values = array('');
+                }
 
                 if (!is_array($values)) {
                     // $values can be an object, don't use (array)$values syntax
@@ -676,8 +681,9 @@
 
                 $rows = '';
                 foreach ($values as $i => $val) {
-                    if ($subtypes[$i])
+                    if ($subtypes[$i]) {
                         $subtype = $subtypes[$i];
+                    }
 
                     $colprop['id'] = 'ff_' . $col . intval($coltypes[$field]['count']);

roundcubemail-1.2.3.tar.gz/program/steps/addressbook/search.inc -> roundcubemail-1.2.4.tar.gz/program/steps/addressbook/search.inc Changed

roundcubemail-1.2.3.tar.gz/program/steps/mail/autocomplete.inc -> roundcubemail-1.2.4.tar.gz/program/steps/mail/autocomplete.inc Changed

@@ -30,10 +30,10 @@
         $result    = $abook->list_records($RCMAIL->config->get('contactlist_fields'));
         $members   = array();
 
-        while ($result && ($sql_arr = $result->iterate())) {
-            $emails = (array) $abook->get_col_values('email', $sql_arr, true);
+        while ($result && ($record = $result->iterate())) {
+            $emails = (array) $abook->get_col_values('email', $record, true);
             if (!empty($emails) && ($email = array_shift($emails))) {
-                $members[] = format_email_recipient($email, rcube_addressbook::compose_list_name($sql_arr));
+                $members[] = format_email_recipient($email, rcube_addressbook::compose_list_name($record));
             }
         }
 
@@ -70,9 +70,9 @@
         $abook->set_pagesize($MAXNUM);
 
         if ($result = $abook->search($RCMAIL->config->get('contactlist_fields'), $search, $mode, true, true, 'email')) {
-            while ($sql_arr = $result->iterate()) {
+            while ($record = $result->iterate()) {
                 // Contact can have more than one e-mail address
-                $email_arr = (array)$abook->get_col_values('email', $sql_arr, true);
+                $email_arr = (array)$abook->get_col_values('email', $record, true);
                 $email_cnt = count($email_arr);
                 $idx       = 0;
 
@@ -81,7 +81,7 @@
                         continue;
                     }
 
-                    $name    = rcube_addressbook::compose_list_name($sql_arr);
+                    $name    = rcube_addressbook::compose_list_name($record);
                     $contact = format_email_recipient($email, $name);
 
                     // skip entries that don't match
@@ -93,12 +93,17 @@
 
                     // skip duplicates
                     if (empty($contacts[$index])) {
-                        $contact = array('name' => $contact, 'type' => $sql_arr['_type']);
+                        $contact = array('name' => $contact, 'type' => $record['_type']);
 
-                        if (($display = rcube_addressbook::compose_search_name($sql_arr, $email, $name)) && $display != $contact['name']) {
+                        if (($display = rcube_addressbook::compose_search_name($record, $email, $name)) && $display != $contact['name']) {
                             $contact['display'] = $display;
                         }
 
+                        // groups with defined email address will not be expanded to its members' addresses
+                        if ($record['_type'] == 'group') {
+                            $contact['email'] = $email;
+                        }
+
                         $contacts[$index]  = $contact;
                         $sort_keys[$index] = sprintf('%s %03d', $contact['display'] ?: $name, $idx++);

roundcubemail-1.2.3.tar.gz/program/steps/mail/func.inc -> roundcubemail-1.2.4.tar.gz/program/steps/mail/func.inc Changed

roundcubemail-1.2.3.tar.gz/program/steps/mail/get.inc -> roundcubemail-1.2.4.tar.gz/program/steps/mail/get.inc Changed

roundcubemail-1.2.3.tar.gz/program/steps/settings/func.inc -> roundcubemail-1.2.4.tar.gz/program/steps/settings/func.inc Changed

roundcubemail-1.2.3.tar.gz/program/steps/settings/save_identity.inc -> roundcubemail-1.2.4.tar.gz/program/steps/settings/save_identity.inc Changed

roundcubemail-1.2.3.tar.gz/program/steps/settings/upload.inc -> roundcubemail-1.2.4.tar.gz/program/steps/settings/upload.inc Changed

roundcubemail-1.2.3.tar.gz/skins/classic/images/buttons/bg.gif -> roundcubemail-1.2.4.tar.gz/skins/classic/images/buttons/bg.gif Changed

roundcubemail-1.2.3.tar.gz/skins/classic/images/pagenav.gif -> roundcubemail-1.2.4.tar.gz/skins/classic/images/pagenav.gif Changed

roundcubemail-1.2.3.tar.gz/skins/classic/images/searchfield.gif -> roundcubemail-1.2.4.tar.gz/skins/classic/images/searchfield.gif Changed

roundcubemail-1.2.3.tar.gz/skins/classic/images/tabs-left.gif -> roundcubemail-1.2.4.tar.gz/skins/classic/images/tabs-left.gif Changed

roundcubemail-1.2.3.tar.gz/skins/classic/images/tabs-right.gif -> roundcubemail-1.2.4.tar.gz/skins/classic/images/tabs-right.gif Changed

roundcubemail-1.2.3.tar.gz/skins/classic/images/taskicons.gif -> roundcubemail-1.2.4.tar.gz/skins/classic/images/taskicons.gif Changed

roundcubemail-1.2.3.tar.gz/skins/classic/images/watermark.gif -> roundcubemail-1.2.4.tar.gz/skins/classic/images/watermark.gif Changed

roundcubemail-1.2.3.tar.gz/tests/Framework/Utils.php -> roundcubemail-1.2.4.tar.gz/tests/Framework/Utils.php Changed

roundcubemail-1.2.3.tar.gz/tests/Framework/Washtml.php -> roundcubemail-1.2.4.tar.gz/tests/Framework/Washtml.php Changed

roundcubemail.dsc Changed

Changes of Revision 45