File roundcubemail-1.1-assets.patch of Package roundcubemail

File roundcubemail-1.1-assets.patch of Package roundcubemail (Revision 036cf939c79aeec7d3fa830aad78396c)

Currently displaying revision 036cf939c79aeec7d3fa830aad78396c , Show latest

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;
             }
+
+            $path = rtrim(RCUBE_INSTALL_PATH, '/');
+            $path .= '/' . $skin_path . $file;
+            $path = realpath($path);
+
+            if ($skin_path[0] != '/' && is_file($path)) {
+                return $path;
+            }
         }
 
         return false;
@@ -551,6 +559,10 @@
                 }
             }
 
+            if (!is_readable($path) && $path[0] != '/' && is_readable(rtrim(RCUBE_INSTALL_PATH, '/') . '/' . $path)) {
+                $path = rtrim(RCUBE_INSTALL_PATH, '/') . '/' . $path;
+            }
+
             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