| @@ -11,10 +11,8 @@ | ||
| 11 | 11 | public function isFullUrl( $url ); |
| 12 | 12 | public function currentUrl(); |
| 13 | 13 | } |
| 14 | 14 | |
| 15 | -if( ! defined('HC3_URI_NO_PORT') ) define( 'HC3_URI_NO_PORT', true ); | |
| 16 | - | |
| 17 | 15 | class HC3_Uri implements HC3_IUri |
| 18 | 16 | { |
| 19 | 17 | protected $_hca = 'hca'; |
| 20 | 18 | protected $_hcj = 'hcj'; |
| @@ -54,14 +52,8 @@ | ||
| 54 | 52 | $return = $this->assetsPath ? $this->assetsPath : $this->baseUrl(); |
| 55 | 53 | return $return; |
| 56 | 54 | } |
| 57 | 55 | |
| 58 | - public function setSlug( $slug ) | |
| 59 | - { | |
| 60 | - $this->slug = $slug; | |
| 61 | - return $this; | |
| 62 | - } | |
| 63 | - | |
| 64 | 56 | public function getSlug() |
| 65 | 57 | { |
| 66 | 58 | return $this->slug; |
| 67 | 59 | } |
| @@ -206,39 +198,33 @@ | ||
| 206 | 198 | } |
| 207 | 199 | |
| 208 | 200 | public function isFullUrl( $url ) |
| 209 | 201 | { |
| 210 | - $ret = false; | |
| 202 | + $return = FALSE; | |
| 211 | 203 | |
| 212 | 204 | if( is_array($url) ){ |
| 213 | 205 | $url = array_shift($url); |
| 214 | 206 | } |
| 215 | 207 | |
| 216 | - if( null === $url ){ | |
| 217 | - $url = ''; | |
| 218 | - } | |
| 219 | - | |
| 220 | 208 | $prfx = array( 'http://', 'https://', '//', 'webcal://' ); |
| 221 | 209 | reset( $prfx ); |
| 222 | 210 | foreach( $prfx as $prf ){ |
| 223 | 211 | if( substr($url, 0, strlen($prf)) == $prf ){ |
| 224 | - $ret = true; | |
| 225 | - return $ret; | |
| 212 | + $return = TRUE; | |
| 213 | + return $return; | |
| 226 | 214 | } |
| 227 | 215 | } |
| 228 | 216 | |
| 229 | - if( strpos($url, '.php') !== false ){ | |
| 230 | - $ret = true; | |
| 231 | - return $ret; | |
| 217 | + if( strpos($url, '.php') !== FALSE ){ | |
| 218 | + $return = TRUE; | |
| 219 | + return $return; | |
| 232 | 220 | } |
| 233 | 221 | |
| 234 | - return $ret; | |
| 222 | + return $return; | |
| 235 | 223 | } |
| 236 | 224 | |
| 237 | 225 | public function currentUrl() |
| 238 | 226 | { |
| 239 | - $noPort = defined( 'HC3_URI_NO_PORT' ) && HC3_URI_NO_PORT ? true : false; | |
| 240 | - | |
| 241 | 227 | $return = 'http'; |
| 242 | 228 | if( isset($_SERVER['HTTPS']) && ($_SERVER['HTTPS'] == 'on') ){ |
| 243 | 229 | $return .= 's'; |
| 244 | 230 | } |
| @@ -244,31 +230,19 @@ | ||
| 244 | 230 | } |
| 245 | 231 | |
| 246 | 232 | $return .= "://"; |
| 247 | 233 | |
| 248 | - $host = ''; | |
| 249 | 234 | if( isset($_SERVER['HTTP_HOST']) && $_SERVER['SERVER_PORT'] != '80'){ |
| 250 | 235 | if( FALSE === strpos($_SERVER['HTTP_HOST'], ':') ){ |
| 251 | - $host .= $_SERVER['HTTP_HOST'] . ':' . $_SERVER['SERVER_PORT']; | |
| 236 | + $return .= $_SERVER['HTTP_HOST'] . ':' . $_SERVER['SERVER_PORT']; | |
| 252 | 237 | } |
| 253 | 238 | else { |
| 254 | - $host .= $_SERVER['HTTP_HOST']; | |
| 239 | + $return .= $_SERVER['HTTP_HOST']; | |
| 255 | 240 | } |
| 256 | 241 | } |
| 257 | 242 | else { |
| 258 | - $host = $_SERVER['HTTP_HOST']; | |
| 243 | + $return .= $_SERVER['HTTP_HOST']; | |
| 259 | 244 | } |
| 260 | - | |
| 261 | - if( $noPort ){ | |
| 262 | - if (is_string($host)) { | |
| 263 | - $pos = strpos( $host, ':' ); | |
| 264 | - if( false !== $pos ){ | |
| 265 | - $host = substr( $host, 0, $pos ); | |
| 266 | - } | |
| 267 | - } | |
| 268 | - } | |
| 269 | - | |
| 270 | - $return .= $host; | |
| 271 | 245 | |
| 272 | 246 | if ( ! empty($_SERVER['REQUEST_URI']) ){ |
| 273 | 247 | $return .= $_SERVER['REQUEST_URI']; |
| 274 | 248 | } |
