Commit: 3099d80b8542bbb8e45ee5014b3d08d8f7f9fd62 - teswiki (git)

blogger

Commit MetaInfo

• Revisão: 3099d80b8542bbb8e45ee5014b3d08d8f7f9fd62 (tree)
• Hora: 2017-10-23 00:06:41
• Autor: umorigu <umorigu@gmai...>
• Commiter: umorigu

Mensagem de Log

BugTrack/693 calendar_viewer plugin: Extend the show limit (1 to 4)

Mudança Sumário

• modified: plugin/calendar_viewer.inc.php

Diff

--- a/plugin/calendar_viewer.inc.php
+++ b/plugin/calendar_viewer.inc.php
@@ -55,7 +55,7 @@ function plugin_calendar_viewer_convert()
 	global $_msg_calendar_viewer_right, $_msg_calendar_viewer_left;
 	global $_msg_calendar_viewer_restrict, $_err_calendar_viewer_param2;
 
-	static $viewed = array();
+	static $show_count = array();
 
 	if (func_num_args() < 2)
 		return PLUGIN_CALENDAR_VIEWER_USAGE . '<br />' . "\n";
@@ -102,11 +102,14 @@ function plugin_calendar_viewer_convert()
 	if (isset($func_args[3])) $date_sep = $func_args[3];
 
 	// Avoid Loop etc.
-	if (isset($viewed[$pagename])) {
+	if (!isset($show_count[$pagename])) {
+		$show_count[$pagename] = 0;
+	}
+	$show_count[$pagename] += 1;
+	pkwk_log('show_count: ' . $show_count[$pagename]);
+	if ($show_count[$pagename] > 4) {
 		$s_page = htmlsc($pagename);
-		return "#calendar_viewer(): You already view: $s_page<br />";
-	} else {
-		$viewed[$pagename] = TRUE; // Valid
+		return "#calendar_viewer(): Exceeded the limit of show count: $s_page<br />";
 	}
 
 	// 一覧表示するページ名とファイル名のパターン　ファイル名には年月を含む