From 465e91a4d3f888489ece10cb6fa4a91d68c50eb6 Mon Sep 17 00:00:00 2001
From: henoheno <henoheno>
Date: Sat, 5 Mar 2005 23:20:12 +0900
Subject: [PATCH] BugTrack/798: Added documented but not implemented features:
 &_date; &_time; &_now; (by Mizar)

---
 lib/init.php     |  6 +++++-
 pukiwiki.ini.php |  6 +++++-
 rules.ini.php    | 19 ++++++++++++-------
 3 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/lib/init.php b/lib/init.php
index c49afaa..4f20bc6 100644
--- a/lib/init.php
+++ b/lib/init.php
@@ -1,6 +1,6 @@
 <?php
 // PukiWiki - Yet another WikiWikiWeb clone.
-// $Id: init.php,v 1.26 2005/02/20 14:24:50 henoheno Exp $
+// $Id: init.php,v 1.27 2005/03/05 14:20:12 henoheno Exp $
 //
 // Init PukiWiki here
 
@@ -376,6 +376,10 @@ require(DATA_HOME . 'rules.ini.php');
 // ¸½ºß»þ¹ï
 $now = format_date(UTIME);
 
+// Æü»þÃÖ´¹¥ë¡¼¥ë¤ò$line_rules¤Ë²Ã¤¨¤ë
+if ($usedatetime) $line_rules += $datetime_rules;
+unset($datetime_rules);
+
 // ¥Õ¥§¥¤¥¹¥Þ¡¼¥¯¤ò$line_rules¤Ë²Ã¤¨¤ë
 if ($usefacemark) $line_rules += $facemark_rules;
 unset($facemark_rules);
diff --git a/pukiwiki.ini.php b/pukiwiki.ini.php
index 2a322ec..abb7814 100644
--- a/pukiwiki.ini.php
+++ b/pukiwiki.ini.php
@@ -1,6 +1,6 @@
 <?php
 // PukiWiki - Yet another WikiWikiWeb clone
-// $Id: pukiwiki.ini.php,v 1.111 2005/02/07 13:22:40 henoheno Exp $
+// $Id: pukiwiki.ini.php,v 1.112 2005/03/05 14:20:11 henoheno Exp $
 //
 // PukiWiki main setting file
 
@@ -373,6 +373,10 @@ $preformat_ltrim = 1;
 $line_break = 0;
 
 /////////////////////////////////////////////////
+// Use date-time rules (See rules.ini.php)
+$usedatetime = 1;
+
+/////////////////////////////////////////////////
 // User-Agent settings
 //
 // If you want to ignore embedded browsers for rich-content-wikisite,
diff --git a/rules.ini.php b/rules.ini.php
index 0bf2eba..183c673 100644
--- a/rules.ini.php
+++ b/rules.ini.php
@@ -1,21 +1,26 @@
 <?php
-/////////////////////////////////////////////////
 // PukiWiki - Yet another WikiWikiWeb clone.
-//
-// $Id: rules.ini.php,v 1.3 2004/07/13 13:12:15 henoheno Exp $
+// $Id: rules.ini.php,v 1.4 2005/03/05 14:20:11 henoheno Exp $
 //
 // PukiWiki setting file
 
 /////////////////////////////////////////////////
-// ¥æ¡¼¥¶ÄêµÁ¥ë¡¼¥ë
-//
+// Æü»þÃÖ´¹¥ë¡¼¥ë (±ÜÍ÷»þ¤ËÃÖ´¹)
+// $usedatetime = 1¤Ê¤éÆü»þÃÖ´¹¥ë¡¼¥ë¤¬Å¬ÍѤµ¤ì¤Þ¤¹
+// ɬÍפΤʤ¤Êý¤Ï $usedatetime¤ò0¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£
+$datetime_rules = array(
+	'&amp;_now;'	=> format_date(UTIME),
+	'&amp;_date;'	=> get_date($date_format),
+	'&amp;_time;'	=> get_date($time_format),
+);
+
+/////////////////////////////////////////////////
+// ¥æ¡¼¥¶ÄêµÁ¥ë¡¼¥ë(Êݸ»þ¤ËÃÖ´¹)
 //  Àµµ¬É½¸½¤Çµ­½Ò¤·¤Æ¤¯¤À¤µ¤¤¡£?(){}-*./+\$^|¤Ê¤É
 //  ¤Ï \? ¤Î¤è¤¦¤Ë¥¯¥©¡¼¥È¤·¤Æ¤¯¤À¤µ¤¤¡£
 //  Á°¸å¤Ëɬ¤º / ¤ò´Þ¤á¤Æ¤¯¤À¤µ¤¤¡£¹ÔƬ»ØÄê¤Ï ^ ¤òƬ¤Ë¡£
 //  ¹ÔËö»ØÄê¤Ï $ ¤ò¸å¤í¤Ë¡£
 //
-/////////////////////////////////////////////////
-// ¥æ¡¼¥¶ÄêµÁ¥ë¡¼¥ë(ľÀÜ¥½¡¼¥¹¤òÃÖ´¹)
 $str_rules = array(
 	'now\?' 	=> format_date(UTIME),
 	'date\?'	=> get_date($date_format),
-- 
2.11.0