Commit: 722b904ea18ee3b1fe30824dc1c6490214b41d63 - pukiwiki (git)

Commit MetaInfo

• Revisión: 722b904ea18ee3b1fe30824dc1c6490214b41d63 (tree)
• Tiempo: 2007-07-28 22:50:09
• Autor: henoheno <henoheno>
• Commiter: henoheno

Log Message

BugTrack2/255: Keep it $cantedit

Cambiar Resumen

• modified: lib/func.php
• modified: lib/html.php
• modified: lib/link.php

Diferencia incremental

--- a/lib/func.php
+++ b/lib/func.php
@@ -1,6 +1,6 @@
 <?php
 // PukiWiki - Yet another WikiWikiWeb clone.
-// $Id: func.php,v 1.91 2007/06/24 13:59:46 henoheno Exp $
+// $Id: func.php,v 1.92 2007/07/28 13:50:09 henoheno Exp $
 // Copyright (C)
 //   2002-2007 PukiWiki Developers Team
 //   2001-2002 Originally written by yu-ji
@@ -51,16 +51,30 @@ function is_page($page, $clearcache = FALSE)
 	return file_exists(get_filename($page));
 }
 
-function is_editable($page)
+// Handling $cantedit
+function is_cantedit($page)
 {
 	global $cantedit;
+	static $is_cantedit;
+
+	if (! isset($is_cantedit)) {
+		foreach($cantedit as $key) {
+			$is_cantedit[$key] = TRUE;
+		}
+	}
+
+	return isset($is_cantedit[$page]);
+}
+
+function is_editable($page)
+{
 	static $is_editable = array();
 
 	if (! isset($is_editable[$page])) {
 		$is_editable[$page] = (
 			is_pagename($page) &&
 			! is_freeze($page) &&
-			! in_array($page, $cantedit)
+			! is_cantedit($page)
 		);
 	}
 

--- a/lib/html.php
+++ b/lib/html.php
@@ -1,6 +1,6 @@
 <?php
 // PukiWiki - Yet another WikiWikiWeb clone.
-// $Id: html.php,v 1.63 2007/06/24 13:59:46 henoheno Exp $
+// $Id: html.php,v 1.64 2007/07/28 13:50:09 henoheno Exp $
 // Copyright (C)
 //   2002-2007 PukiWiki Developers Team
 //   2001-2002 Originally written by yu-ji
@@ -12,7 +12,7 @@
 function catbody($title, $page, $body)
 {
 	global $script, $vars, $arg, $defaultpage, $whatsnew, $help_page, $hr;
-	global $attach_link, $related_link, $cantedit, $function_freeze;
+	global $attach_link, $related_link, $function_freeze;
 	global $search_word_color, $_msg_word, $foot_explain, $note_hr, $head_tags;
 	global $javascript, $nofollow;
 	global $_LANG, $_LINK, $_IMAGE;
@@ -82,7 +82,7 @@ function catbody($title, $page, $body)
 	$link_rename    = & $_LINK['rename'];
 
 	// Init flags
-	$is_page = (is_pagename($_page) && ! arg_check('backup') && $_page != $whatsnew);
+	$is_page = (is_pagename($_page) && ! arg_check('backup') && ! is_cantedit($_page));
 	$is_read = (arg_check('read') && is_page($_page));
 	$is_freeze = is_freeze($_page);
 
@@ -157,7 +157,7 @@ function edit_form($page, $postdata, $digest = FALSE, $b_template = TRUE)
 {
 	global $script, $vars, $rows, $cols, $hr, $function_freeze;
 	global $_btn_preview, $_btn_repreview, $_btn_update, $_btn_cancel, $_msg_help;
-	global $whatsnew, $_btn_template, $_btn_load, $load_template_func;
+	global $_btn_template, $_btn_load, $load_template_func;
 	global $notimeupdate;
 
 	// Newly generate $digest or not
@@ -181,7 +181,7 @@ function edit_form($page, $postdata, $digest = FALSE, $b_template = TRUE)
 	if($load_template_func && $b_template) {
 		$pages  = array();
 		foreach(get_existpages() as $_page) {
-			if ($_page == $whatsnew || check_non_list($_page))
+			if (is_cantedit($_page) || check_non_list($_page))
 				continue;
 			$s_page = htmlspecialchars($_page);
 			$pages[$_page] = '   <option value="' . $s_page . '">' .

--- a/lib/link.php
+++ b/lib/link.php
@@ -1,6 +1,6 @@
 <?php
 // PukiWiki - Yet another WikiWikiWeb clone
-// $Id: link.php,v 1.14 2006/09/18 05:23:12 henoheno Exp $
+// $Id: link.php,v 1.15 2007/07/28 13:50:09 henoheno Exp $
 // Copyright (C) 2003-2006 PukiWiki Developers Team
 // License: GPL v2 or (at your option) any later version
 //
@@ -135,8 +135,6 @@ function links_update($page)
 // Init link cache (Called from link plugin)
 function links_init()
 {
-	global $whatsnew;
-
 	if (PKWK_READONLY) return; // Do nothing
 
 	if (ini_get('safe_mode') == '0') set_time_limit(0);
@@ -149,7 +147,7 @@ function links_init()
 
 	$ref   = array(); // 参照元
 	foreach (get_existpages() as $page) {
-		if ($page == $whatsnew) continue;
+		if (is_cantedit($page)) continue;
 
 		$rel   = array(); // 参照先
 		$links = links_get_objects($page);