Commit: ebefc4e7bfd62d78f53c666ee0a92f2088d67b9c - pukiwiki-fork (git)

Commit MetaInfo

• Revision: ebefc4e7bfd62d78f53c666ee0a92f2088d67b9c (tree)
• Time: 2017-09-02 12:50:22
• Author: umorigu <umorigu@gmai...>
• Commiter: umorigu

Log Message

BugTrack/2213 Use relative path for link URI

Add URI type enum.

* PKWK_URI_RELATIVE : relative path (ex: ./, index.php )
* PKWK_URI_ROOT : Root relative path (ex: /wiki/)
* PKWK_URI_ABSOLUTE : Absolute URI (ex: http://example.com/wiki/)

Change Summary

• modified: lib/func.php
• modified: lib/init.php

Incremental Difference

--- a/lib/func.php
+++ b/lib/func.php
@@ -8,6 +8,14 @@
 //
 // General functions
 
+// URI type enum
+/** Relative path. */
+define('PKWK_URI_RELATIVE', 0);
+/** Root relative URI. */
+define('PKWK_URI_ROOT', 1);
+/** Absolute URI. */
+define('PKWK_URI_ABSOLUTE', 2);
+
 function pkwk_log($message)
 {
 	$log_filepath = 'log/error.log.php';
@@ -692,40 +700,77 @@ function get_autolink_pattern_sub(& $pages, $start, $end, $pos)
 }
 
 // Get absolute-URI of this script
-function get_script_uri($init_uri = '')
+/**
+ * Get propery URI of this script
+ *
+ * @param $uri_type relative or absolute potion
+ *        PKWK_URI_RELATIVE, PKWK_URI_ROOT or PKWK_URI_ABSOLUTE
+ */
+function get_script_uri($uri_type = PKWK_URI_RELATIVE)
 {
-	global $script_directory_index;
-	static $script;
-
-	if ($init_uri == '') {
-		// Get
-		if (isset($script)) return $script;
-
-		// Set automatically
-		$msg     = 'get_script_uri() failed: Please set $script at INI_FILE manually';
-		$script = guess_script_absolute_uri();
-		if (! is_url($script, TRUE) && php_sapi_name() == 'cgi')
-			die_message($msg);
-		unset($msg);
-
-	} else {
-		// Set manually
-		if (isset($script)) die_message('$script: Already init');
-		if (! is_url($init_uri, TRUE)) die_message('$script: Invalid URI');
-		$script = $init_uri;
+	switch ($uri_type) {
+		case PKWK_URI_RELATIVE:
+			return pkwk_script_uri_base(PKWK_URI_RELATIVE);
+		case PKWK_URI_ROOT:
+			return pkwk_script_uri_base(PKWK_URI_ROOT);
+		case PKWK_URI_ABSOLUTE:
+			return pkwk_script_uri_base(PKWK_URI_ABSOLUTE);
+		default:
+			die_message('Invalid uri_type in get_script_uri()');
 	}
+}
 
-	// Cut filename or not
-	if (isset($script_directory_index)) {
-		if (! file_exists($script_directory_index))
-			die_message('Directory index file not found: ' .
-				htmlsc($script_directory_index));
-		$matches = array();
-		if (preg_match('#^(.+/)' . preg_quote($script_directory_index, '#') . '$#',
-			$script, $matches)) $script = $matches[1];
+/**
+ * Get or initialize Script URI
+ *
+ * @param $uri_type relative or absolute potion
+ *        PKWK_URI_RELATIVE, PKWK_URI_ROOT or PKWK_URI_ABSOLUTE
+ * @param $initialize true if you initialize URI
+ * @param $uri_set URI set manually
+ */
+ function pkwk_script_uri_base($uri_type, $initialize, $uri_set) {
+	global $script_directory_index;
+	static $initialized = false;
+	static $uri_absolute, $uri_root, $uri_relative;
+	//$script_directory_index = 'index.php';
+	if (isset($initialize) && $initialize) {
+		if (isset($uri_set)) {
+			$uri_absolute = $uri_set;
+		} else {
+			$uri_absolute = guess_script_absolute_uri();
+			// Support $script_directory_index (cut 'index.php')
+			if (isset($script_directory_index)) {
+				$slash_index = '/' . $script_directory_index;
+				$len = strlen($slash_index);
+				if (substr($uri_absolute,  -1 * $len) === $slash_index) {
+					$uri_absolute = substr($uri_absolute, 0, strlen($uri_absolute) - $len + 1);
+				}
+			}
+		}
+		$elements = parse_url($uri_absolute);
+		$uri_root = $elements['path'];
+		if (substr($uri_root, -1) === '/') {
+			$uri_relative = './';
+		} else {
+			$pos = mb_strrpos($uri_root, '/');
+			if ($pos >= 0) {
+				$uri_relative = substr($uri_root, $pos + 1);
+			} else {
+				$uri_relative = $uri_root;
+			}
+		}
+		$initialized = true;
+	}
+	switch ($uri_type) {
+		case PKWK_URI_RELATIVE:
+			return $uri_relative;
+		case PKWK_URI_ROOT:
+			return $uri_root;
+		case PKWK_URI_ABSOLUTE:
+			return $uri_absolute;
+		default:
+			die_message('Invalid uri_type in pkwk_script_uri_base()');
 	}
-
-	return $script;
 }
 
 /**

--- a/lib/init.php
+++ b/lib/init.php
@@ -134,9 +134,12 @@ $weeklabels = $_msg_week;
 // INI_FILE: Init $script
 
 if (isset($script)) {
-	get_script_uri($script); // Init manually
+	// Init manually
+	pkwk_script_uri_base(PKWK_URI_ABSOLUTE, true, $script);
 } else {
-	$script = get_script_uri(); // Init automatically
+	// Init automatically
+	$__uri_absolute = pkwk_script_uri_base(PKWK_URI_ABSOLUTE, true);
+	$script = $__uri_absolute;
 }
 
 // INI_FILE: Auth settings