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 26

roundcubemail-1.1-assets.patch Changed

@@ -1,14 +1,16 @@
-commit 21b9c3b6c012822b60a8fb4cb9a59247eaa2d156
-Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>
-Date:   Thu Aug 28 18:56:15 2014 +0200
-
-    Allow assets to be entirely separated from the main Roundcube program facilities.
-
-diff --git a/program/include/rcmail_output_html.php b/program/include/rcmail_output_html.php
-index a848246..d196ec1 100644
---- a/program/include/rcmail_output_html.php
-+++ b/program/include/rcmail_output_html.php
-@@ -263,6 +263,14 @@ EOF;
+diff -ur roundcubemail-1.1-1-csrf/program/include/rcmail_output_html.php roundcubemail-1.1/program/include/rcmail_output_html.php
+--- roundcubemail-1.1-1-csrf/program/include/rcmail_output_html.php	2014-09-06 14:30:33.917366435 +0200
++++ roundcubemail-1.1/program/include/rcmail_output_html.php	2014-09-06 14:32:50.414471617 +0200
+@@ -184,7 +184,7 @@
+             }
+ 
+             $path = (rcube_utils::https_check() ? 'https' : 'http') . '://'
+-                . $_SERVER['SERVER_NAME'] . $base . '/' . $path;
++                . $_SERVER['SERVER_NAME'] . rtrim($base, '/') . '/' . ltrim($path, '/');
+         }
+ 
+         $this->assets_path = $path;
+@@ -310,6 +310,14 @@
              if (is_file($path)) {
                  return $skin_path . $file;
              }
@@ -23,7 +25,7 @@
          }
  
          return false;
-@@ -503,6 +511,10 @@ EOF;
+@@ -551,6 +559,10 @@
                  }
              }
  
@@ -34,3 +36,4 @@
              if (is_readable($path)) {
                  $this->config->set('skin_path', $skin_path);
                  $this->base_path = preg_replace('!plugins/\w+/!', '', $skin_path);  // set base_path to core skin directory (not plugin's skin)
+Only in roundcubemail-1.1/program/include: rcmail_output_html.php.orig

roundcubemail-1.1-csrf.patch Changed

@@ -1,21 +1,7 @@
-diff --git a/.htaccess b/.htaccess
-index f21cf34..d0efd31 100644
---- a/.htaccess
-+++ b/.htaccess
-@@ -31,7 +31,7 @@ RewriteRule ^favicon\.ico$ skins/larry/images/favicon.ico
- # 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 --git a/config/defaults.inc.php b/config/defaults.inc.php
-index 56791fb..3297dc2 100644
---- a/config/defaults.inc.php
-+++ b/config/defaults.inc.php
-@@ -532,6 +532,23 @@ $config['email_dns_check'] = false;
+diff -ur roundcubemail-1.1.orig/config/defaults.inc.php roundcubemail-1.1/config/defaults.inc.php
+--- roundcubemail-1.1.orig/config/defaults.inc.php	2014-09-04 13:26:10.000000000 +0200
++++ roundcubemail-1.1/config/defaults.inc.php	2014-09-06 14:30:33.910366429 +0200
+@@ -532,6 +532,23 @@
  // Note: useful when SMTP server stores sent mail in user mailbox
  $config['no_save_sent_messages'] = false;
  
@@ -39,11 +25,22 @@
  // ----------------------------------
  // PLUGINS
  // ----------------------------------
-diff --git a/index.php b/index.php
-index 3154daf..7001918 100644
---- a/index.php
-+++ b/index.php
-@@ -90,9 +90,9 @@ $RCMAIL->action = $startup['action'];
+diff -ur roundcubemail-1.1.orig/.htaccess roundcubemail-1.1/.htaccess
+--- roundcubemail-1.1.orig/.htaccess	2014-09-04 13:26:10.000000000 +0200
++++ roundcubemail-1.1/.htaccess	2014-09-06 14:30:33.908366428 +0200
+@@ -31,7 +31,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/index.php roundcubemail-1.1/index.php
+--- roundcubemail-1.1.orig/index.php	2014-09-04 13:26:10.000000000 +0200
++++ roundcubemail-1.1/index.php	2014-09-06 14:30:33.911366430 +0200
+@@ -90,9 +90,9 @@
  
  // try to log in
  if ($RCMAIL->task == 'login' && $RCMAIL->action == 'login') {
@@ -55,7 +52,7 @@
      $RCMAIL->kill_session();
  
      $auth = $RCMAIL->plugins->exec_hook('authenticate', array(
-@@ -140,7 +140,7 @@ if ($RCMAIL->task == 'login' && $RCMAIL->action == 'login') {
+@@ -140,7 +140,7 @@
          unset($redir['abort'], $redir['_err']);
  
          // send redirect
@@ -64,7 +61,7 @@
      }
      else {
          if (!$auth['valid']) {
-@@ -171,10 +171,10 @@ if ($RCMAIL->task == 'login' && $RCMAIL->action == 'login') {
+@@ -171,10 +171,10 @@
      }
  }
  
@@ -79,7 +76,7 @@
      $userdata = array(
          'user' => $_SESSION['username'],
          'host' => $_SESSION['storage_host'],
-@@ -234,32 +234,9 @@ if (empty($RCMAIL->user->ID)) {
+@@ -234,32 +234,9 @@
  
      $OUTPUT->send($plugin['task']);
  }
@@ -114,11 +111,10 @@
  
      // check access to disabled actions
      $disabled_actions = (array) $RCMAIL->config->get('disabled_actions');
-diff --git a/plugins/acl/acl.js b/plugins/acl/acl.js
-index e59ac72..1463453 100644
---- a/plugins/acl/acl.js
-+++ b/plugins/acl/acl.js
-@@ -58,8 +58,11 @@ rcube_webmail.prototype.acl_delete = function()
+diff -ur roundcubemail-1.1.orig/plugins/acl/acl.js roundcubemail-1.1/plugins/acl/acl.js
+--- roundcubemail-1.1.orig/plugins/acl/acl.js	2014-09-04 13:26:10.000000000 +0200
++++ roundcubemail-1.1/plugins/acl/acl.js	2014-09-06 14:30:33.911366430 +0200
+@@ -58,8 +58,11 @@
      var users = this.acl_get_usernames();
  
      if (users && users.length && confirm(this.get_label('acl.deleteconfirm'))) {
@@ -132,7 +128,7 @@
              this.set_busy(true, 'acl.deleting'));
      }
  }
-@@ -67,7 +70,7 @@ rcube_webmail.prototype.acl_delete = function()
+@@ -67,7 +70,7 @@
  // Save ACL data
  rcube_webmail.prototype.acl_save = function()
  {
@@ -141,7 +137,7 @@
  
      $((this.env.acl_advanced ? '#advancedrights :checkbox' : '#simplerights :checkbox'), this.acl_form).map(function() {
          if (this.checked)
-@@ -88,12 +91,18 @@ rcube_webmail.prototype.acl_save = function()
+@@ -88,12 +91,18 @@
          return;
      }
  
@@ -166,11 +162,10 @@
  }
  
  // Cancel/Hide form
-diff --git a/plugins/acl/acl.php b/plugins/acl/acl.php
-index 33bd91e..cb1a720 100644
---- a/plugins/acl/acl.php
-+++ b/plugins/acl/acl.php
-@@ -452,10 +452,10 @@ class acl extends rcube_plugin
+diff -ur roundcubemail-1.1.orig/plugins/acl/acl.php roundcubemail-1.1/plugins/acl/acl.php
+--- roundcubemail-1.1.orig/plugins/acl/acl.php	2014-09-04 13:26:10.000000000 +0200
++++ roundcubemail-1.1/plugins/acl/acl.php	2014-09-06 14:30:33.912366431 +0200
+@@ -452,10 +452,10 @@
       */
      private function action_save()
      {
@@ -185,7 +180,7 @@
  
          $acl    = array_intersect(str_split($acl), $this->rights_supported());
          $users  = $oldid ? array($user) : explode(',', $user);
-@@ -508,8 +508,8 @@ class acl extends rcube_plugin
+@@ -508,8 +508,8 @@
       */
      private function action_delete()
      {
@@ -196,11 +191,10 @@
  
          $user = explode(',', $user);
  
-diff --git a/plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php b/plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php
-index 59e116f..8fba018 100644
---- a/plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php
-+++ b/plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php
-@@ -312,7 +312,7 @@ class rcube_sieve_engine
+diff -ur roundcubemail-1.1.orig/plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php roundcubemail-1.1/plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php
+--- roundcubemail-1.1.orig/plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php	2014-09-04 13:26:10.000000000 +0200
++++ roundcubemail-1.1/plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php	2014-09-06 14:30:33.914366432 +0200
+@@ -349,7 +349,7 @@
                  }
              }
              else if ($action == 'setact' && !$error) {
@@ -209,7 +203,7 @@
                  $result = $this->activate_script($script_name);
                  $kep14  = $this->rc->config->get('managesieve_kolab_master');
  
-@@ -326,7 +326,7 @@ class rcube_sieve_engine
+@@ -363,7 +363,7 @@
                  }
              }
              else if ($action == 'deact' && !$error) {
@@ -218,7 +212,7 @@
                  $result = $this->deactivate_script($script_name);
  
                  if ($result === true) {
-@@ -339,7 +339,7 @@ class rcube_sieve_engine
+@@ -376,7 +376,7 @@
                  }
              }
              else if ($action == 'setdel' && !$error) {
@@ -227,7 +221,7 @@
                  $result = $this->remove_script($script_name);
  
                  if ($result === true) {
-@@ -382,14 +382,14 @@ class rcube_sieve_engine
+@@ -419,14 +419,14 @@
                  $this->rc->output->command('managesieve_updatelist', 'list', array('list' => $result));
              }
              else if ($action == 'ruleadd') {
@@ -244,138 +238,11 @@
                  $id = $this->genid();
                  $content = $this->action_div($fid, $id, false);
  
-diff --git a/program/include/rcmail.php b/program/include/rcmail.php
-index ceb369a..fba537e 100644
---- a/program/include/rcmail.php
-+++ b/program/include/rcmail.php
-@@ -753,47 +753,14 @@ class rcmail extends rcube
-     }
- 
-     /**
--     * Generate a unique token to be used in a form request
--     *
--     * @return string The request token
--     */
--    public function get_request_token()

roundcubemail-1.1.tar.gz Changed