plugins/kolab_files
Aleksander Machniak
machniak at kolabsys.com
Sun Aug 24 11:44:14 CEST 2014
plugins/kolab_files/lib/kolab_files_engine.php | 28 -------------------------
1 file changed, 1 insertion(+), 27 deletions(-)
New commits:
commit c15bec9ae60eb60f2e11c5cfc79b7bf1de66e5eb
Author: Aleksander Machniak <machniak at kolabsys.com>
Date: Sun Aug 24 11:43:42 2014 +0200
Use rcube_utils::resolve_url() (Note: this requires current Roundcube git-master)
diff --git a/plugins/kolab_files/lib/kolab_files_engine.php b/plugins/kolab_files/lib/kolab_files_engine.php
index 6e81e1a..8cb408b 100644
--- a/plugins/kolab_files/lib/kolab_files_engine.php
+++ b/plugins/kolab_files/lib/kolab_files_engine.php
@@ -34,7 +34,7 @@ class kolab_files_engine
*/
public function __construct($plugin, $url)
{
- $this->url = $this->resolve_url($url);
+ $this->url = rcube_utils::resolve_url($url);
$this->plugin = $plugin;
$this->rc = $plugin->rc;
}
@@ -1017,30 +1017,4 @@ class kolab_files_engine
return $mimetypes;
}
-
- /**
- * Resolve relative URL
- */
- protected function resolve_url($url)
- {
- // prepend protocol://hostname:port
- if (!preg_match('|^https?://|', $url)) {
- $schema = 'http';
- $default_port = 80;
-
- if (rcube_utils::https_check()) {
- $schema = 'https';
- $default_port = 443;
- }
-
- $prefix = $schema . '://' . preg_replace('/:\d+$/', '', $_SERVER['HTTP_HOST']);
- if ($_SERVER['SERVER_PORT'] != $default_port) {
- $prefix .= ':' . $_SERVER['SERVER_PORT'];
- }
-
- $url = $prefix . ($url[0] == '/' ? '' : '/') . $url;
- }
-
- return $url;
- }
}
More information about the commits
mailing list