From: arino <arino>
Date: Wed, 5 Nov 2003 10:45:47 +0000 (+0900)
Subject: BugTrack/480: ディレクトリの設定をpukiwiki.ini.phpに移動
X-Git-Tag: r1_5_0_rc1~1372
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=cbed35a3fb52b1ddd1f889318429932a3febfbb4;p=pukiwiki%2Fpukiwiki.git

BugTrack/480: ディレクトリの設定をpukiwiki.ini.phpに移動
---

diff --git a/plugin/attach.inc.php b/plugin/attach.inc.php
index e1cef5d..4a65035 100644
--- a/plugin/attach.inc.php
+++ b/plugin/attach.inc.php
@@ -2,7 +2,7 @@
 /////////////////////////////////////////////////
 // PukiWiki - Yet another WikiWikiWeb clone.
 //
-//  $Id: attach.inc.php,v 1.35 2003/10/20 03:12:43 arino Exp $
+//  $Id: attach.inc.php,v 1.36 2003/11/05 10:40:48 arino Exp $
 //
 
 /*
@@ -12,12 +12,6 @@
  modified by PANDA <panda@arino.jp> http://home.arino.jp/
 */
 
-// upload dir(must set end of /)
-if (!defined('UPLOAD_DIR'))
-{
-	define('UPLOAD_DIR','./attach/');
-}
-
 // max file size for upload on PHP(PHP default 2MB)
 ini_set('upload_max_filesize','2M');
 
diff --git a/plugin/counter.inc.php b/plugin/counter.inc.php
index e7ba7ca..1f149e3 100644
--- a/plugin/counter.inc.php
+++ b/plugin/counter.inc.php
@@ -5,15 +5,10 @@
  * CopyRight 2002 Y.MASUI GPL2
  * http://masui.net/pukiwiki/ masui@masui.net
  *
- * $Id: counter.inc.php,v 1.10 2003/04/23 08:26:19 arino Exp $
+ * $Id: counter.inc.php,v 1.11 2003/11/05 10:40:48 arino Exp $
  */
 
 // counter file
-if (!defined('COUNTER_DIR'))
-{
-	define('COUNTER_DIR', './counter/');
-}
-
 if (!defined('COUNTER_EXT'))
 {
 	define('COUNTER_EXT','.count');
diff --git a/plugin/online.inc.php b/plugin/online.inc.php
index fd7f174..c92bad9 100644
--- a/plugin/online.inc.php
+++ b/plugin/online.inc.php
@@ -2,11 +2,11 @@
 /////////////////////////////////////////////////
 // PukiWiki - Yet another WikiWikiWeb clone.
 //
-// $Id: online.inc.php,v 1.6 2003/05/16 05:55:20 arino Exp $
+// $Id: online.inc.php,v 1.7 2003/11/05 10:40:48 arino Exp $
 //
 
 // user list file
-define('USR_LST', 'counter/user.dat');
+define('USR_LST', COUNTER_DIR.'user.dat');
 // time out sec
 define('TIMEOUT', 300);
 
diff --git a/plugin/paint.inc.php b/plugin/paint.inc.php
index 1d8ae1e..60812ea 100644
--- a/plugin/paint.inc.php
+++ b/plugin/paint.inc.php
@@ -2,7 +2,7 @@
 /////////////////////////////////////////////////
 // PukiWiki - Yet another WikiWikiWeb clone.
 //
-// $Id: paint.inc.php,v 1.12 2003/10/01 07:00:37 arino Exp $
+// $Id: paint.inc.php,v 1.13 2003/11/05 10:40:48 arino Exp $
 //
 
 /*
@@ -18,9 +18,6 @@
 
 */
 
-// upload dir(must set end of /) attach.inc.php¤È¹ç¤ï¤»¤ë
-define('PAINT_UPLOAD_DIR','./attach/');
-//
 // ÁÞÆþ¤¹¤ë°ÌÃÖ 1:Íó¤ÎÁ° 0:Íó¤Î¸å
 define('PAINT_INSERT_INS',0);
 //
@@ -69,7 +66,7 @@ function plugin_paint_action()
 		$attachname = preg_replace('/^[^\.]+/',$filename,$file['name']);
 		//¤¹¤Ç¤Ë¸ºß¤·¤¿¾ì¹ç¡¢ ¥Õ¥¡¥¤¥ë̾¤Ë'_0','_1',...¤òÉÕ¤±¤Æ²óÈò(¸È©)
 		$count = '_0';
-		while (file_exists(PAINT_UPLOAD_DIR.encode($vars['refer']).'_'.encode($attachname)))
+		while (file_exists(UPLOAD_DIR.encode($vars['refer']).'_'.encode($attachname)))
 		{
 			$attachname = preg_replace('/^[^\.]+/',$filename.$count++,$file['name']);
 		}
diff --git a/plugin/popular.inc.php b/plugin/popular.inc.php
index 0d61825..e18f2e8 100644
--- a/plugin/popular.inc.php
+++ b/plugin/popular.inc.php
@@ -2,7 +2,7 @@
 /////////////////////////////////////////////////
 // PukiWiki - Yet another WikiWikiWeb clone.
 //
-// $Id: popular.inc.php,v 1.7 2003/08/20 11:11:04 arino Exp $
+// $Id: popular.inc.php,v 1.8 2003/11/05 10:40:48 arino Exp $
 //
 
 /*
@@ -25,10 +25,6 @@
  * 3 - ÄÌ»»(true)¤«º£Æü(false)¤Î°ìÍ÷¤«¤Î¥Õ¥é¥°  default false
  */
 
-// counter file : counter ¥×¥é¥°¥¤¥ó¤ÇÀßÄꤷ¤Æ¤¤¤ë¤â¤Î¤ÈƱ¤¸¤Ë¤·¤Æ²¼¤µ¤¤¡£
-if (!defined('COUNTER_DIR'))
-	define('COUNTER_DIR', './counter/');
-
 function plugin_popular_convert()
 {
 	global $_popular_plugin_frame, $_popular_plugin_today_frame;
diff --git a/plugin/ref.inc.php b/plugin/ref.inc.php
index 55c91e2..71db101 100644
--- a/plugin/ref.inc.php
+++ b/plugin/ref.inc.php
@@ -2,7 +2,7 @@
 /////////////////////////////////////////////////
 // PukiWiki - Yet another WikiWikiWeb clone.
 //
-// $Id: ref.inc.php,v 1.19 2003/06/30 05:06:48 arino Exp $
+// $Id: ref.inc.php,v 1.20 2003/11/05 10:40:48 arino Exp $
 //
 
 /*
@@ -44,12 +44,6 @@ img
 ¥¿¥¤¥È¥ë¤ÎÁ°¤Ë¥«¥ó¥Þ¤ò;ʬ¤ËÆþ¤ì¤ë
 */
 
-// upload dir(must set end of /)
-if (!defined('UPLOAD_DIR'))
-{
-	define('UPLOAD_DIR','./attach/');
-}
-
 // file icon image
 if (!defined('FILE_ICON'))
 {
diff --git a/pukiwiki.ini.php b/pukiwiki.ini.php
index 7eacc5c..1b7db03 100644
--- a/pukiwiki.ini.php
+++ b/pukiwiki.ini.php
@@ -2,7 +2,7 @@
 /////////////////////////////////////////////////
 // PukiWiki - Yet another WikiWikiWeb clone.
 //
-// $Id: pukiwiki.ini.php,v 1.50 2003/10/27 02:45:52 arino Exp $
+// $Id: pukiwiki.ini.php,v 1.51 2003/11/05 10:42:00 arino Exp $
 //
 // PukiWiki setting file
 
@@ -23,6 +23,15 @@ define('PLUGIN_DIR','./plugin/');
 /////////////////////////////////////////////////
 // ¥­¥ã¥Ã¥·¥å¥Õ¥¡¥¤¥ë³ÊǼ¥Ç¥£¥ì¥¯¥È¥ê
 define('CACHE_DIR','./cache/');
+/////////////////////////////////////////////////
+// źÉÕ¥Õ¥¡¥¤¥ë³ÊǼ¥Ç¥£¥ì¥¯¥È¥ê
+define('UPLOAD_DIR','./attach/');
+/////////////////////////////////////////////////
+// ¥«¥¦¥ó¥¿¥Õ¥¡¥¤¥ë³ÊǼ¥Ç¥£¥ì¥¯¥È¥ê
+define('COUNTER_DIR', './counter/');
+/////////////////////////////////////////////////
+// TrackBack¥Õ¥¡¥¤¥ë³ÊǼ¥Ç¥£¥ì¥¯¥È¥ê
+define('TRACKBACK_DIR','./trackback/');
 
 /////////////////////////////////////////////////
 // ¥í¡¼¥«¥ë»þ´Ö
diff --git a/readme.txt b/readme.txt
index a7f648e..f84af44 100644
--- a/readme.txt
+++ b/readme.txt
@@ -58,26 +58,20 @@ DESCRIPTION
     4.  pukiwiki.ini.phpÆâ¤Ç»ØÄꤷ¤¿°Ê²¼¤Î¥Ç¥£¥ì¥¯¥È¥ê¤òºîÀ®¤·¤Þ¤¹¡£
 
         ¥Ç¡¼¥¿¤Î³ÊǼ¥Ç¥£¥ì¥¯¥È¥ê               (¥Ç¥Õ¥©¥ë¥È¤Ïwiki)
-        º¹Ê¬¥Õ¥¡¥¤¥ë¤Î³ÊǼ¥Ç¥£¥ì¥¯¥È¥ê         (¥Ç¥Õ¥©¥ë¥È¤Ïdiff)
-        ¥Ð¥Ã¥¯¥¢¥Ã¥×¥Õ¥¡¥¤¥ë³ÊǼÀè¥Ç¥£¥ì¥¯¥È¥ê (¥Ç¥Õ¥©¥ë¥È¤Ïbackup)
+        º¹Ê¬¥Õ¥¡¥¤¥ë³ÊǼ¥Ç¥£¥ì¥¯¥È¥ê           (¥Ç¥Õ¥©¥ë¥È¤Ïdiff)
+        ¥Ð¥Ã¥¯¥¢¥Ã¥×¥Õ¥¡¥¤¥ë³ÊǼ¥Ç¥£¥ì¥¯¥È¥ê   (¥Ç¥Õ¥©¥ë¥È¤Ïbackup)
         ¥­¥ã¥Ã¥·¥å¥Õ¥¡¥¤¥ë³ÊǼ¥Ç¥£¥ì¥¯¥È¥ê     (¥Ç¥Õ¥©¥ë¥È¤Ïcache)
+        źÉÕ¥Õ¥¡¥¤¥ë³ÊǼ¥Ç¥£¥ì¥¯¥È¥ê           (¥Ç¥Õ¥©¥ë¥È¤Ïattach)
+        ¥«¥¦¥ó¥¿¥Õ¥¡¥¤¥ë³ÊǼ¥Ç¥£¥ì¥¯¥È¥ê       (¥Ç¥Õ¥©¥ë¥È¤Ïcounter)
+        TrackBack¥Õ¥¡¥¤¥ë³ÊǼ¥Ç¥£¥ì¥¯¥È¥ê      (¥Ç¥Õ¥©¥ë¥È¤Ïtrackback)
 
         ¥Ç¥£¥ì¥¯¥È¥êÆâ¤Ë¥Õ¥¡¥¤¥ë¤¬¤¢¤ë¾ì¹ç¤Ë¤Ï¡¢¤½¤Î¥Õ¥¡¥¤¥ë¤Î°À­¤ò
         666¤ËÊѹ¹¤·¤Æ¤¯¤À¤µ¤¤¡£
 
-    5.  attach.inc.phpÆâ¤Ç»ØÄꤷ¤¿¥Ç¥£¥ì¥¯¥È¥ê¤òºîÀ®¤·¤Þ¤¹¡£
-        (¥Ç¥Õ¥©¥ë¥È¤Ï attach)
-
-    6.  counter.inc.phpÆâ¤Ç»ØÄꤷ¤¿¥Ç¥£¥ì¥¯¥È¥ê¤òºîÀ®¤·¤Þ¤¹¡£
-        (¥Ç¥Õ¥©¥ë¥È¤Ï counter)
-
-    7.  trackback.phpÆâ¤Ç»ØÄꤷ¤¿¥Ç¥£¥ì¥¯¥È¥ê¤òºîÀ®¤·¤Þ¤¹¡£
-        (¥Ç¥Õ¥©¥ë¥È¤Ï trackback)
-
-    8.  ¥µ¡¼¥Ð¾å¤Î¥Õ¥¡¥¤¥ë¤ª¤è¤Ó¥Ç¥£¥ì¥¯¥È¥ê¤Î¥Ñ¡¼¥ß¥Ã¥·¥ç¥ó¤ò³Îǧ¤·¤Þ¤¹¡£
+    5.  ¥µ¡¼¥Ð¾å¤Î¥Õ¥¡¥¤¥ë¤ª¤è¤Ó¥Ç¥£¥ì¥¯¥È¥ê¤Î¥Ñ¡¼¥ß¥Ã¥·¥ç¥ó¤ò³Îǧ¤·¤Þ¤¹¡£
         ¥Õ¥¡¥¤¥ë¤Î¥Ñ¡¼¥ß¥Ã¥·¥ç¥ó¤Ë¤Ä¤¤¤Æ¤Ï¼¡¹à¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
 
-    9.  pukiwiki.php¤Ë¥Ö¥é¥¦¥¶¤«¤é¥¢¥¯¥»¥¹¤·¤Þ¤¹¡£
+    6.  pukiwiki.php¤Ë¥Ö¥é¥¦¥¶¤«¤é¥¢¥¯¥»¥¹¤·¤Þ¤¹¡£
 
     ¥Ñ¡¼¥ß¥Ã¥·¥ç¥ó
 
diff --git a/trackback.php b/trackback.php
index f4ef706..1285a7b 100644
--- a/trackback.php
+++ b/trackback.php
@@ -1,5 +1,5 @@
 <?php
-// $Id: trackback.php,v 1.13 2003/09/03 05:53:45 arino Exp $
+// $Id: trackback.php,v 1.14 2003/11/05 10:42:00 arino Exp $
 /*
  * PukiWiki TrackBack ¥×¥í¥°¥é¥à
  * (C) 2003, Katsumi Saito <katsumi@jo1upk.ymt.prug.or.jp>
@@ -22,11 +22,6 @@
  * ref_save($page)        Referer ¥Ç¡¼¥¿Êݸ(¹¹¿·) // pukiwiki.php
  */
 
-if (!defined('TRACKBACK_DIR'))
-{
-	define('TRACKBACK_DIR','./trackback/');
-}
-
 // TrackBack Ping ID¤ò¼èÆÀ
 function tb_get_id($page)
 {