plugins/calendar

Thomas Brüderli bruederli at kolabsys.com
Wed Aug 13 19:22:20 CEST 2014


 plugins/calendar/calendar.php |   16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

New commits:
commit 31ee64d7e187b34247f434d9d5cdce505793461a
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Wed Aug 13 19:18:47 2014 +0200

    Use new core utility function to create valid absolute URLs (#3265).
    
    ATTENTION: requires https://github.com/roundcube/roundcubemail/commit/06fdaf8

diff --git a/plugins/calendar/calendar.php b/plugins/calendar/calendar.php
index 4063bd9..402d15b 100644
--- a/plugins/calendar/calendar.php
+++ b/plugins/calendar/calendar.php
@@ -2778,21 +2778,7 @@ class calendar extends rcube_plugin
   public function get_url($param = array())
   {
     $param += array('task' => 'calendar');
-    
-    $schema = 'http';
-    $default_port = 80;
-    if (rcube_https_check()) {
-      $schema = 'https';
-      $default_port = 443;
-    }
-    $url = $schema . '://' . preg_replace('/:\d+$/', '', $_SERVER['HTTP_HOST']);
-    if ($_SERVER['SERVER_PORT'] != $default_port)
-      $url .= ':' . $_SERVER['SERVER_PORT'];
-    if (dirname($_SERVER['SCRIPT_NAME']) != '/')
-      $url .= dirname($_SERVER['SCRIPT_NAME']);
-    $url .= preg_replace('!^\./!', '/', $this->rc->url($param));
-    
-    return $url; 
+    return $this->rc->url($param, true, true);
   }
 
 




More information about the commits mailing list