Minor changes / code style, method naming

YahnisElsts · Sep 11, 2014 · 595b058 · 595b058
1 parent 2ae6823
commit 595b058
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/includes/Wpup/UpdateServer.php b/includes/Wpup/UpdateServer.php
@@ -11,7 +11,7 @@ public function __construct($serverUrl = null, $serverDirectory = null) {
 			$serverDirectory = realpath(__DIR__ . '/../..');
 		}
 		if ( $serverUrl === null ) {
-			$serverUrl = self::determineServerUrl();
+			$serverUrl = self::guessServerUrl();
 		}
 
 		$this->serverUrl = $serverUrl;
@@ -21,15 +21,15 @@ public function __construct($serverUrl = null, $serverDirectory = null) {
 	}
 
 	/**
-	 * Determine the Server Url based on the current request.
+	 * Guess the Server Url based on the current request.
 	 *
 	 * Defaults to the current URL minus the query and "index.php".
 	 *
 	 * @static
 	 *
 	 * @return string Url
 	 */
-	public static function determineServerUrl() {
+	public static function guessServerUrl() {
 		$serverUrl = ( self::isSsl() ? 'https' : 'http' );
 		$serverUrl .= '://' . $_SERVER['HTTP_HOST'];
 		$path = $_SERVER['SCRIPT_NAME'];
@@ -64,8 +64,7 @@ public static function isSsl() {
 			if ( $_SERVER['HTTPS'] == '1' || strtolower($_SERVER['HTTPS']) === 'on' ) {
 				return true;
 			}
-		}
-		elseif ( isset($_SERVER['SERVER_PORT']) && ( '443' == $_SERVER['SERVER_PORT'] ) ) {
+		} elseif ( isset($_SERVER['SERVER_PORT']) && ( '443' == $_SERVER['SERVER_PORT'] ) ) {
 			return true;
 		}
 		return false;
@@ -389,7 +388,7 @@ protected function exitWithError($message = '', $httpStatus = 500) {
 	 */
 	protected static function addQueryArg($args, $url = null ) {
 		if ( !isset($url) ) {
-			$url = self::determineServerUrl();
+			$url = self::guessServerUrl();
 		}
 		if ( strpos($url, '?') !== false ) {
 			$parts = explode('?', $url, 2);