Kolab Groupware OBS

Changes of Revision 34

roundcubemail-1.1-assets.patch Changed

@@ -1,16 +1,31 @@
-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 @@
+diff --git a/program/include/rcmail_output_html.php b/program/include/rcmail_output_html.php
+index aae54d4..3df5589 100644
+--- a/program/include/rcmail_output_html.php
++++ b/program/include/rcmail_output_html.php
+@@ -184,7 +184,7 @@ EOF;
              }
  
              $path = (rcube_utils::https_check() ? 'https' : 'http') . '://'
 -                . $_SERVER['SERVER_NAME'] . $base . '/' . $path;
-+                . $_SERVER['SERVER_NAME'] . rtrim($base, '/') . '/' . ltrim($path, '/');
++                . $_SERVER['HTTP_HOST'] . rtrim($base, '/') . '/' . ltrim($path, '/');
          }
  
          $this->assets_path = $path;
-@@ -310,6 +310,14 @@
+@@ -306,10 +306,27 @@ EOF;
+         }
+ 
+         foreach ($skin_paths as $skin_path) {
+-            $path = realpath($skin_path . $file);
++            $path = $skin_path . $file;
++
++            if (is_file($path)) {
++                return $skin_path . $file;
++            }
++
++            $path = rtrim(RCUBE_INSTALL_PATH, '/');
++            $path .= '/' . 'public_html/assets/';
++            $path .= rtrim($skin_path, '/') . '/' . $file;
++
              if (is_file($path)) {
                  return $skin_path . $file;
              }
@@ -25,7 +40,20 @@
          }
  
          return false;
-@@ -551,6 +559,10 @@
+@@ -491,9 +491,10 @@ EOF;
+ 
+             // fallback to deprecated template names
+             if (!is_readable($path) && $this->deprecated_templates[$realname]) {
+-                $path = "$skin_path/templates/" . $this->deprecated_templates[$realname] . ".html";
++                // Try an old path
++                $tpath = "$skin_path/templates/" . $this->deprecated_templates[$realname] . ".html";
+ 
+-                if (is_readable($path)) {
++                if (is_readable($tpath)) {
+                     rcube::raise_error(array(
+                         'code' => 502, 'type' => 'php',
+                         'file' => __FILE__, 'line' => __LINE__,
+@@ -552,6 +569,10 @@ EOF;
                  }
              }
  
@@ -36,4 +64,3 @@
              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