Extract code constructing current URL to getCurrentUrl() method

 uphpCAS.php

@@ -23,27 +23,7 @@
        if($serviceUrl != NULL) {
            $this->serviceUrl = $serviceUrl;
        } else {
            $url = 'http://';
            $port = 0;
            if(isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') {
                $url = 'https://';
                if(isset($_SERVER['SERVER_PORT'])
                        && $_SERVER['SERVER_PORT'] != '443') {
                    $port = $_SERVER['SERVER_PORT'];
                }
            } elseif(isset($_SERVER['SERVER_PORT'])
                    && $_SERVER['SERVER_PORT'] != '80') {
                $port = $_SERVER['SERVER_PORT'];
            }
			
            $url .= $_SERVER['SERVER_NAME'];
			
            if($port != 0) {
                $url .= ':'.$port;
            }
            $url .= $_SERVER['REQUEST_URI'];
			
            $this->serviceUrl = $url;
            $this->serviceUrl = $this->getCurrentUrl();
        }
        
        if($sessionName) {
@@ -51,6 +31,28 @@
        }
    }
    
    public function getCurrentUrl() {
        $url = 'http://';
        $port = 0;
        if(isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') {
            $url = 'https://';
            if(isset($_SERVER['SERVER_PORT'])
                    && $_SERVER['SERVER_PORT'] != '443') {
                $port = $_SERVER['SERVER_PORT'];
            }
        } elseif(isset($_SERVER['SERVER_PORT'])
                && $_SERVER['SERVER_PORT'] != '80') {
            $port = $_SERVER['SERVER_PORT'];
        }
		
        $url .= $_SERVER['SERVER_NAME'];
		
        if($port != 0) {
            $url .= ':'.$port;
        }
        $url .= $_SERVER['REQUEST_URI'];
    }
	
    public function getServerUrl() {
        return $this->serverUrl;
    }