提交: c7a32f7e9d6b9ec074fe0faa7de8241f9db5cff4 - pukiwiki-fork (git)

Commit MetaInfo

• 修訂: c7a32f7e9d6b9ec074fe0faa7de8241f9db5cff4 (tree)
• 時間: 2016-11-15 01:57:41
• 作者: umorigu <umorigu@gmai...>
• Commiter: umorigu

Log Message

BugTrack/2396 Redirect pages by Site Administrator

Add new property - $page_redirect_rules in pukiwiki.ini.php

Change Summary

• modified: lib/func.php
• modified: lib/pukiwiki.php
• modified: pukiwiki.ini.php

差異

--- a/lib/func.php
+++ b/lib/func.php
@@ -730,6 +730,29 @@ function htmlsc($string = '', $flags = ENT_COMPAT, $charset = CONTENT_CHARSET)
 	return htmlspecialchars($string, $flags, $charset);	// htmlsc()
 }
 
+// Redirect from an old page to new page
+function manage_page_redirect() {
+	global $page_redirect_rules, $vars;
+	if (isset($vars['page'])) {
+		$page = $vars['page'];
+		foreach ($page_redirect_rules as $rule => $replace) {
+			if (preg_match($rule, $page)) {
+				if (is_string($replace)) {
+					$new_page = preg_replace($rule, $replace, $page);
+				} elseif (is_object($replace) && is_callable($replace)) {
+					$new_page = preg_replace_callback($rule, $replace, $page);
+				} else {
+					die_message('Invalid redirect rule: ' . $rule . '=>' . $replace);
+				}
+				header('Location: ' . get_script_uri() . '?' .
+					pagename_urlencode($new_page));
+				return TRUE;
+			}
+		}
+	}
+	return FALSE;
+}
+
 
 //// Compat ////
 

--- a/lib/pukiwiki.php
+++ b/lib/pukiwiki.php
@@ -65,19 +65,9 @@ if ($notify) {
 
 /////////////////////////////////////////////////
 // Main
-
-if (isset($vars['page'])) {
-	$page = $vars['page'];
-	foreach ($redirect_rules as $rule => $replace) {
-		if (preg_match($rule, $page)) {
-			$new_page = preg_replace($rule, $replace, $page);
-			header('Location: ' . get_script_uri() . '?' .
-				pagename_urlencode($new_page));
-			exit;
-		}
-	}
+if (manage_page_redirect()) {
+	exit;
 }
-
 $retvars = array();
 $is_cmd = FALSE;
 if (isset($vars['cmd'])) {

--- a/pukiwiki.ini.php
+++ b/pukiwiki.ini.php
@@ -421,8 +421,9 @@ $search_non_list = 1;
 
 
 // Page redirect rules
-$redirect_rules = array(
-	//'#^RenamedOldProject($|(/(.+)$))#' => 'NewProject$1',
+$page_redirect_rules = array(
+	//'#^FromProject($|(/(.+)$))#' => 'ToProject$1',
+	//'#^FromProject($|(/(.+)$))#' => function($matches) { return 'ToProject' . $matches[1]; },
 );
 
 /////////////////////////////////////////////////