Kolab Groupware OBS

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Changes of Revision 52

roundcubemail-1.1-collated.patch Changed

@@ -869,223 +869,3 @@
  }
  
  // failed request (wrong step in URL)
-diff -ur roundcubemail-1.1.orig/public_html/.htaccess roundcubemail-1.1/public_html/.htaccess
---- roundcubemail-1.1.orig/public_html/.htaccess	2014-11-04 15:28:27.000000000 +0100
-+++ roundcubemail-1.1/public_html/.htaccess	2014-11-05 12:46:36.166520529 +0100
-@@ -30,7 +30,7 @@
- # security rules:
- # - deny access to files not containing a dot or starting with a dot
- #   in all locations except installer directory
--RewriteRule ^(?!installer)(\.?[^\.]+)$ - [F]
-+RewriteRule ^(?!installer|[a-f0-9]{16})(\.?[^\.]+)$ - [F]
- # - deny access to some locations
- RewriteRule ^/?(\.git|\.tx|SQL|bin|config|logs|temp|tests|program\/(include|lib|localization|steps)) - [F]
- # - deny access to some documentation files
-diff -ur roundcubemail-1.1.orig/public_html/plugins/acl/acl.js roundcubemail-1.1/public_html/plugins/acl/acl.js
---- roundcubemail-1.1.orig/public_html/plugins/acl/acl.js	2014-11-04 15:28:27.000000000 +0100
-+++ roundcubemail-1.1/public_html/plugins/acl/acl.js	2014-11-05 12:46:36.168520531 +0100
-@@ -58,8 +58,11 @@
-     var users = this.acl_get_usernames();
- 
-     if (users && users.length && confirm(this.get_label('acl.deleteconfirm'))) {
--        this.http_request('settings/plugin.acl', '_act=delete&_user='+urlencode(users.join(','))
--            + '&_mbox='+urlencode(this.env.mailbox),
-+        this.http_post('settings/plugin.acl', {
-+                _act: 'delete',
-+                _user: users.join(','),
-+                _mbox: this.env.mailbox
-+            },
-             this.set_busy(true, 'acl.deleting'));
-     }
- }
-@@ -67,7 +70,7 @@
- // Save ACL data
- rcube_webmail.prototype.acl_save = function()
- {
--    var user = $('#acluser', this.acl_form).val(), rights = '', type;
-+    var data, type, rights = '', user = $('#acluser', this.acl_form).val();
- 
-     $((this.env.acl_advanced ? '#advancedrights :checkbox' : '#simplerights :checkbox'), this.acl_form).map(function() {
-         if (this.checked)
-@@ -88,12 +91,18 @@
-         return;
-     }
- 
--    this.http_request('settings/plugin.acl', '_act=save'
--        + '&_user='+urlencode(user)
--        + '&_acl=' +rights
--        + '&_mbox='+urlencode(this.env.mailbox)
--        + (this.acl_id ? '&_old='+this.acl_id : ''),
--        this.set_busy(true, 'acl.saving'));
-+    data = {
-+        _act: 'save',
-+        _user: user,
-+        _acl: rights,
-+        _mbox: this.env.mailbox
-+    }
-+
-+    if (this.acl_id) {
-+        data._old = this.acl_id;
-+    }
-+
-+    this.http_post('settings/plugin.acl', data, this.set_busy(true, 'acl.saving'));
- }
- 
- // Cancel/Hide form
-diff -ur roundcubemail-1.1.orig/public_html/plugins/acl/acl.php roundcubemail-1.1/public_html/plugins/acl/acl.php
---- roundcubemail-1.1.orig/public_html/plugins/acl/acl.php	2014-11-04 15:28:27.000000000 +0100
-+++ roundcubemail-1.1/public_html/plugins/acl/acl.php	2014-11-05 12:46:36.169520532 +0100
-@@ -454,10 +454,10 @@
-      */
-     private function action_save()
-     {
--        $mbox  = trim(rcube_utils::get_input_value('_mbox', rcube_utils::INPUT_GPC, true)); // UTF7-IMAP
--        $user  = trim(rcube_utils::get_input_value('_user', rcube_utils::INPUT_GPC));
--        $acl   = trim(rcube_utils::get_input_value('_acl', rcube_utils::INPUT_GPC));
--        $oldid = trim(rcube_utils::get_input_value('_old', rcube_utils::INPUT_GPC));
-+        $mbox  = trim(rcube_utils::get_input_value('_mbox', rcube_utils::INPUT_POST, true)); // UTF7-IMAP
-+        $user  = trim(rcube_utils::get_input_value('_user', rcube_utils::INPUT_POST));
-+        $acl   = trim(rcube_utils::get_input_value('_acl', rcube_utils::INPUT_POST));
-+        $oldid = trim(rcube_utils::get_input_value('_old', rcube_utils::INPUT_POST));
- 
-         $acl    = array_intersect(str_split($acl), $this->rights_supported());
-         $users  = $oldid ? array($user) : explode(',', $user);
-@@ -510,8 +510,8 @@
-      */
-     private function action_delete()
-     {
--        $mbox = trim(rcube_utils::get_input_value('_mbox', rcube_utils::INPUT_GPC, true)); //UTF7-IMAP
--        $user = trim(rcube_utils::get_input_value('_user', rcube_utils::INPUT_GPC));
-+        $mbox = trim(rcube_utils::get_input_value('_mbox', rcube_utils::INPUT_POST, true)); //UTF7-IMAP
-+        $user = trim(rcube_utils::get_input_value('_user', rcube_utils::INPUT_POST));
- 
-         $user = explode(',', $user);
- 
-diff -ur roundcubemail-1.1.orig/public_html/plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php roundcubemail-1.1/public_html/plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php
---- roundcubemail-1.1.orig/public_html/plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php	2014-11-04 15:28:27.000000000 +0100
-+++ roundcubemail-1.1/public_html/plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php	2014-11-05 12:46:36.171520534 +0100
-@@ -349,7 +349,7 @@
-                 }
-             }
-             else if ($action == 'setact' && !$error) {
--                $script_name = rcube_utils::get_input_value('_set', rcube_utils::INPUT_GPC, true);
-+                $script_name = rcube_utils::get_input_value('_set', rcube_utils::INPUT_POST, true);
-                 $result = $this->activate_script($script_name);
-                 $kep14  = $this->rc->config->get('managesieve_kolab_master');
- 
-@@ -363,7 +363,7 @@
-                 }
-             }
-             else if ($action == 'deact' && !$error) {
--                $script_name = rcube_utils::get_input_value('_set', rcube_utils::INPUT_GPC, true);
-+                $script_name = rcube_utils::get_input_value('_set', rcube_utils::INPUT_POST, true);
-                 $result = $this->deactivate_script($script_name);
- 
-                 if ($result === true) {
-@@ -376,7 +376,7 @@
-                 }
-             }
-             else if ($action == 'setdel' && !$error) {
--                $script_name = rcube_utils::get_input_value('_set', rcube_utils::INPUT_GPC, true);
-+                $script_name = rcube_utils::get_input_value('_set', rcube_utils::INPUT_POST, true);
-                 $result = $this->remove_script($script_name);
- 
-                 if ($result === true) {
-@@ -419,14 +419,14 @@
-                 $this->rc->output->command('managesieve_updatelist', 'list', array('list' => $result));
-             }
-             else if ($action == 'ruleadd') {
--                $rid = rcube_utils::get_input_value('_rid', rcube_utils::INPUT_GPC);
-+                $rid = rcube_utils::get_input_value('_rid', rcube_utils::INPUT_POST);
-                 $id = $this->genid();
-                 $content = $this->rule_div($fid, $id, false);
- 
-                 $this->rc->output->command('managesieve_rulefill', $content, $id, $rid);
-             }
-             else if ($action == 'actionadd') {
--                $aid = rcube_utils::get_input_value('_aid', rcube_utils::INPUT_GPC);
-+                $aid = rcube_utils::get_input_value('_aid', rcube_utils::INPUT_POST);
-                 $id = $this->genid();
-                 $content = $this->action_div($fid, $id, false);
- 
-diff -ur roundcubemail-1.1.orig/public_html/program/js/app.js roundcubemail-1.1/public_html/program/js/app.js
---- roundcubemail-1.1.orig/public_html/program/js/app.js	2014-11-04 15:28:27.000000000 +0100
-+++ roundcubemail-1.1/public_html/program/js/app.js	2014-11-05 12:46:36.179520543 +0100
-@@ -58,7 +58,6 @@
-     request_timeout: 180,  // seconds
-     draft_autosave: 0,     // seconds
-     comm_path: './',
--    blankpage: 'program/resources/blank.gif',
-     recipients_separator: ',',
-     recipients_delimiter: ', ',
-     popup_width: 1150,
-@@ -163,6 +162,10 @@
-       return;
-     }
- 
-+    if (!this.env.blankpage)
-+      this.env.blankpage = (this.env.assets_path ? this.env.assets_path : '') + 'program/resources/blank.gif';
-+ 
-+
-     // find all registered gui containers
-     for (n in this.gui_containers)
-       this.gui_containers[n] = $('#'+this.gui_containers[n]);
-@@ -1405,8 +1408,10 @@
- 
-     if (task == 'mail')
-       url += '&_mbox=INBOX';
--    else if (task == 'logout' && !this.env.server_error)
-+    else if (task == 'logout' && !this.env.server_error) {
-+      url += '&_token=' + this.env.request_token;
-       this.clear_compose_data();
-+    }
- 
-     this.redirect(url);
-   };
-@@ -1416,7 +1421,10 @@
-     if (!url)
-       url = this.env.comm_path;
- 
--    return url.replace(/_task=[a-z0-9_-]+/i, '_task='+task);
-+    if (url.match(/[?&]_task=[a-zA-Z0-9_-]+/))
-+        return url.replace(/_task=[a-zA-Z0-9_-]+/, '_task=' + task);
-+    else
-+        return url.replace(/\?.*$/, '') + '?_task=' + task;
-   };
- 
-   this.reload = function(delay)
-@@ -7982,7 +7990,7 @@
- 
-     img.onload = function() { ref.env.browser_capabilities.tif = 1; };
-     img.onerror = function() { ref.env.browser_capabilities.tif = 0; };
--    img.src = 'program/resources/blank.tif';
-+    img.src = (this.env.assets_path ? this.env.assets_path : '') + 'program/resources/blank.tif';
-   };
- 
-   this.pdf_support_check = function()
-diff -ur roundcubemail-1.1.orig/public_html/program/js/editor.js roundcubemail-1.1/public_html/program/js/editor.js
---- roundcubemail-1.1.orig/public_html/program/js/editor.js	2014-11-04 15:28:27.000000000 +0100