diff options
author | alecpl <alec@alec.pl> | 2012-01-05 09:51:41 +0000 |
---|---|---|
committer | alecpl <alec@alec.pl> | 2012-01-05 09:51:41 +0000 |
commit | f5d62f7157a629d8d1611d848be6e4167dd17075 (patch) | |
tree | 8599384d352947c658ec75e5449369f9070473e2 /program/include/rcube_shared.inc | |
parent | 48be8f6428ba3be7375b84aea2b73d1c67de6da1 (diff) |
- Fix bug in handling of base href and inline content (#1488290)
Diffstat (limited to 'program/include/rcube_shared.inc')
-rw-r--r-- | program/include/rcube_shared.inc | 46 |
1 files changed, 0 insertions, 46 deletions
diff --git a/program/include/rcube_shared.inc b/program/include/rcube_shared.inc index abaa8aa03..aef08341d 100644 --- a/program/include/rcube_shared.inc +++ b/program/include/rcube_shared.inc @@ -164,52 +164,6 @@ function show_bytes($bytes) } /** - * Convert paths like ../xxx to an absolute path using a base url - * - * @param string Relative path - * @param string Base URL - * @return string Absolute URL - */ -function make_absolute_url($path, $base_url) -{ - $host_url = $base_url; - $abs_path = $path; - - // check if path is an absolute URL - if (preg_match('/^[fhtps]+:\/\//', $path)) - return $path; - - // cut base_url to the last directory - if (strrpos($base_url, '/')>7) - { - $host_url = substr($base_url, 0, strpos($base_url, '/', 7)); - $base_url = substr($base_url, 0, strrpos($base_url, '/')); - } - - // $path is absolute - if ($path[0] == '/') - $abs_path = $host_url.$path; - else - { - // strip './' because its the same as '' - $path = preg_replace('/^\.\//', '', $path); - - if (preg_match_all('/\.\.\//', $path, $matches, PREG_SET_ORDER)) - foreach ($matches as $a_match) - { - if (strrpos($base_url, '/')) - $base_url = substr($base_url, 0, strrpos($base_url, '/')); - - $path = substr($path, 3); - } - - $abs_path = $base_url.'/'.$path; - } - - return $abs_path; -} - -/** * Wrapper function for wordwrap */ function rc_wordwrap($string, $width=75, $break="\n", $cut=false) |