svnno****@sourc*****
svnno****@sourc*****
2010年 1月 16日 (土) 06:36:43 JST
Revision: 785 http://sourceforge.jp/projects/p2-php/svn/view?view=rev&revision=785 Author: akid Date: 2010-01-16 06:36:43 +0900 (Sat, 16 Jan 2010) Log Message: ----------- FileCtl.phpãrequire_onceããã¿ã¤ãã³ã°ãconf_system.inc.phpã«ç§»ããã Modified Paths: -------------- p2/trunk/conf/conf_system.inc.php p2/trunk/edit_aborn_word.php p2/trunk/edit_indexmenui.php p2/trunk/edit_indexmenuk.php p2/trunk/editfavita.php p2/trunk/editfavita_i.php p2/trunk/editfile.php p2/trunk/editpref.php p2/trunk/editpref_i.php p2/trunk/index.php p2/trunk/info.php p2/trunk/info_i.php p2/trunk/lib/BbsMap.php p2/trunk/lib/BrdCtl.php p2/trunk/lib/BrdMenu.php p2/trunk/lib/Login.php p2/trunk/lib/P2HttpExt.php p2/trunk/lib/P2Util.php p2/trunk/lib/Thread.php p2/trunk/lib/ThreadRead.php p2/trunk/lib/dele.funcs.php p2/trunk/lib/downloadDatCha2.func.php p2/trunk/lib/downloadDatMachiBbs.func.php p2/trunk/lib/downloadDatShitaraba.func.php p2/trunk/lib/login2ch.func.php p2/trunk/lib/read_new.funcs.php p2/trunk/lib/setFav.func.php p2/trunk/lib/setFavIta.func.php p2/trunk/lib/setPalace.func.php p2/trunk/lib/settaborn.func.php p2/trunk/lib/settaborn_off.inc.php p2/trunk/login.php p2/trunk/login2ch.php p2/trunk/post.php p2/trunk/read.php p2/trunk/read_filter_i.php p2/trunk/read_filter_k.php p2/trunk/setting.php p2/trunk/subject.php p2/trunk/subject_i.php p2/trunk/subject_new.php -------------- next part -------------- Modified: p2/trunk/conf/conf_system.inc.php =================================================================== --- p2/trunk/conf/conf_system.inc.php 2010-01-15 20:56:23 UTC (rev 784) +++ p2/trunk/conf/conf_system.inc.php 2010-01-15 21:36:43 UTC (rev 785) @@ -63,6 +63,7 @@ require_once P2_LIB_DIR . DIRECTORY_SEPARATOR . 'Login.php'; require_once P2_LIB_DIR . DIRECTORY_SEPARATOR . 'UA.php'; require_once P2_LIB_DIR . DIRECTORY_SEPARATOR . 'P2View.php'; +require_once P2_LIB_DIR . DIRECTORY_SEPARATOR . 'FileCtl.php'; // }}} Modified: p2/trunk/edit_aborn_word.php =================================================================== --- p2/trunk/edit_aborn_word.php 2010-01-15 20:56:23 UTC (rev 784) +++ p2/trunk/edit_aborn_word.php 2010-01-15 21:36:43 UTC (rev 785) @@ -4,7 +4,6 @@ */ include_once './conf/conf.inc.php'; -require_once P2_LIB_DIR . '/FileCtl.php'; $_login->authorize(); // [UFØ Modified: p2/trunk/edit_indexmenui.php =================================================================== --- p2/trunk/edit_indexmenui.php 2010-01-15 20:56:23 UTC (rev 784) +++ p2/trunk/edit_indexmenui.php 2010-01-15 21:36:43 UTC (rev 785) @@ -2,8 +2,6 @@ // p2 gÑTOPj [ÌÒW require_once './conf/conf.inc.php'; -require_once P2_LIB_DIR . '/FileCtl.php'; -require_once P2_LIB_DIR . '/UA.php'; $_login->authorize(); // [UFØ Modified: p2/trunk/edit_indexmenuk.php =================================================================== --- p2/trunk/edit_indexmenuk.php 2010-01-15 20:56:23 UTC (rev 784) +++ p2/trunk/edit_indexmenuk.php 2010-01-15 21:36:43 UTC (rev 785) @@ -2,8 +2,6 @@ // p2 gÑTOPj [ÌÒW require_once './conf/conf.inc.php'; -require_once P2_LIB_DIR . '/FileCtl.php'; -require_once P2_LIB_DIR . '/UA.php'; $_login->authorize(); // [UFØ Modified: p2/trunk/editfavita.php =================================================================== --- p2/trunk/editfavita.php 2010-01-15 20:56:23 UTC (rev 784) +++ p2/trunk/editfavita.php 2010-01-15 21:36:43 UTC (rev 785) @@ -4,10 +4,7 @@ */ require_once './conf/conf.inc.php'; -require_once P2_LIB_DIR . '/FileCtl.php'; -require_once P2_LIB_DIR . '/UA.php'; - $_login->authorize(); // [UFØ // {{{ ÁêÈO Modified: p2/trunk/editfavita_i.php =================================================================== --- p2/trunk/editfavita_i.php 2010-01-15 20:56:23 UTC (rev 784) +++ p2/trunk/editfavita_i.php 2010-01-15 21:36:43 UTC (rev 785) @@ -6,9 +6,6 @@ require_once './conf/conf.inc.php'; -require_once P2_LIB_DIR . '/FileCtl.php'; -require_once P2_LIB_DIR . '/UA.php'; - $_login->authorize(); // [UFØ // {{{ ÁêÈO Modified: p2/trunk/editfile.php =================================================================== --- p2/trunk/editfile.php 2010-01-15 20:56:23 UTC (rev 784) +++ p2/trunk/editfile.php 2010-01-15 21:36:43 UTC (rev 785) @@ -4,7 +4,6 @@ */ require_once './conf/conf.inc.php'; -require_once P2_LIB_DIR . '/FileCtl.php'; $_login->authorize(); // [UFØ Modified: p2/trunk/editpref.php =================================================================== --- p2/trunk/editpref.php 2010-01-15 20:56:23 UTC (rev 784) +++ p2/trunk/editpref.php 2010-01-15 21:36:43 UTC (rev 785) @@ -5,9 +5,6 @@ require_once './conf/conf.inc.php'; -require_once P2_LIB_DIR . '/FileCtl.php'; -require_once P2_LIB_DIR . '/P2View.php'; - $_login->authorize(); // [UFØ // «ñ¾XÌOð_E[h Modified: p2/trunk/editpref_i.php =================================================================== --- p2/trunk/editpref_i.php 2010-01-15 20:56:23 UTC (rev 784) +++ p2/trunk/editpref_i.php 2010-01-15 21:36:43 UTC (rev 785) @@ -6,9 +6,6 @@ require_once './conf/conf.inc.php'; -require_once P2_LIB_DIR . '/FileCtl.php'; -require_once P2_LIB_DIR . '/P2View.php'; - $_login->authorize(); // [UFØ // «ñ¾XÌOð_E[h Modified: p2/trunk/index.php =================================================================== --- p2/trunk/index.php 2010-01-15 20:56:23 UTC (rev 784) +++ p2/trunk/index.php 2010-01-15 21:36:43 UTC (rev 785) @@ -2,7 +2,6 @@ // p2 - CfbNXy[W require_once './conf/conf.inc.php'; -require_once P2_LIB_DIR . '/FileCtl.php'; $_login->authorize(); // [UFØ Modified: p2/trunk/info.php =================================================================== --- p2/trunk/info.php 2010-01-15 20:56:23 UTC (rev 784) +++ p2/trunk/info.php 2010-01-15 21:36:43 UTC (rev 785) @@ -5,8 +5,8 @@ require_once './conf/conf.inc.php'; require_once P2_LIB_DIR . '/Thread.php'; -require_once P2_LIB_DIR . '/FileCtl.php'; require_once P2_LIB_DIR . '/dele.funcs.php'; // ípÌÖS +require_once P2_LIB_DIR . '/P2Validate.php'; $_login->authorize(); // [UFØ Modified: p2/trunk/info_i.php =================================================================== --- p2/trunk/info_i.php 2010-01-15 20:56:23 UTC (rev 784) +++ p2/trunk/info_i.php 2010-01-15 21:36:43 UTC (rev 785) @@ -12,7 +12,6 @@ } require_once P2_LIB_DIR . '/Thread.php'; -require_once P2_LIB_DIR . '/FileCtl.php'; require_once P2_LIB_DIR . '/dele.funcs.php'; // ípÌÖS require_once P2_LIB_DIR . '/P2Validate.php'; Modified: p2/trunk/lib/BbsMap.php =================================================================== --- p2/trunk/lib/BbsMap.php 2010-01-15 20:56:23 UTC (rev 784) +++ p2/trunk/lib/BbsMap.php 2010-01-15 21:36:43 UTC (rev 785) @@ -1,6 +1,4 @@ <?php -require_once P2_LIB_DIR . '/FileCtl.php'; - // {{{ class BbsMap /** Modified: p2/trunk/lib/BrdCtl.php =================================================================== --- p2/trunk/lib/BrdCtl.php 2010-01-15 20:56:23 UTC (rev 784) +++ p2/trunk/lib/BrdCtl.php 2010-01-15 21:36:43 UTC (rev 785) @@ -1,5 +1,4 @@ <?php -require_once P2_LIB_DIR . '/FileCtl.php'; require_once P2_LIB_DIR . '/BrdMenu.php'; /** Modified: p2/trunk/lib/BrdMenu.php =================================================================== --- p2/trunk/lib/BrdMenu.php 2010-01-15 20:56:23 UTC (rev 784) +++ p2/trunk/lib/BrdMenu.php 2010-01-15 21:36:43 UTC (rev 785) @@ -1,9 +1,4 @@ <?php -/* vim: set fileencoding=cp932 ai et ts=4 sw=4 sts=0 fdm=marker: */ -/* mi: charset=Shift_JIS */ - -require_once P2_LIB_DIR . '/FileCtl.php'; - /** * p2 - {[hj [NX for menu.php */ Modified: p2/trunk/lib/Login.php =================================================================== --- p2/trunk/lib/Login.php 2010-01-15 20:56:23 UTC (rev 784) +++ p2/trunk/lib/Login.php 2010-01-15 21:36:43 UTC (rev 785) @@ -1,5 +1,4 @@ <?php -require_once P2_LIB_DIR . '/FileCtl.php'; require_once P2_LIB_DIR . '/Session.php'; /** Modified: p2/trunk/lib/P2HttpExt.php =================================================================== --- p2/trunk/lib/P2HttpExt.php 2010-01-15 20:56:23 UTC (rev 784) +++ p2/trunk/lib/P2HttpExt.php 2010-01-15 21:36:43 UTC (rev 785) @@ -3,9 +3,6 @@ * rep2expack feat. pecl_http */ -require_once P2_LIB_DIR . '/FileCtl.php'; -require_once P2_LIB_DIR . '/P2Util.php'; - // {{{ CONSTANTS define('P2HTTPEXT_DEBUG', 0); Modified: p2/trunk/lib/P2Util.php =================================================================== --- p2/trunk/lib/P2Util.php 2010-01-15 20:56:23 UTC (rev 784) +++ p2/trunk/lib/P2Util.php 2010-01-15 21:36:43 UTC (rev 785) @@ -1,6 +1,5 @@ <?php require_once P2_LIB_DIR . '/DataPhp.php'; -require_once P2_LIB_DIR . '/FileCtl.php'; /** * p2pÌ[eBeBNX Modified: p2/trunk/lib/Thread.php =================================================================== --- p2/trunk/lib/Thread.php 2010-01-15 20:56:23 UTC (rev 784) +++ p2/trunk/lib/Thread.php 2010-01-15 21:36:43 UTC (rev 785) @@ -1,6 +1,4 @@ <?php -require_once P2_LIB_DIR . '/FileCtl.php'; - /** * p2 - XbhNX */ Modified: p2/trunk/lib/ThreadRead.php =================================================================== --- p2/trunk/lib/ThreadRead.php 2010-01-15 20:56:23 UTC (rev 784) +++ p2/trunk/lib/ThreadRead.php 2010-01-15 21:36:43 UTC (rev 785) @@ -1,6 +1,4 @@ <?php -require_once P2_LIB_DIR . '/FileCtl.php'; - /** * p2 - ThreadRead NX */ Modified: p2/trunk/lib/dele.funcs.php =================================================================== --- p2/trunk/lib/dele.funcs.php 2010-01-15 20:56:23 UTC (rev 784) +++ p2/trunk/lib/dele.funcs.php 2010-01-15 21:36:43 UTC (rev 785) @@ -3,7 +3,6 @@ p2 - Xbhf[^ADATðí·é½ßÌÖS */ -require_once P2_LIB_DIR . '/FileCtl.php'; require_once P2_LIB_DIR . '/setFav.func.php'; require_once P2_LIB_DIR . '/setPalace.func.php'; Modified: p2/trunk/lib/downloadDatCha2.func.php =================================================================== --- p2/trunk/lib/downloadDatCha2.func.php 2010-01-15 20:56:23 UTC (rev 784) +++ p2/trunk/lib/downloadDatCha2.func.php 2010-01-15 21:36:43 UTC (rev 785) @@ -1,8 +1,6 @@ <?php // p2 - `bg¿áñËé cha2.net ÌÖ -require_once P2_LIB_DIR . '/FileCtl.php'; - /** * `bg¿áñËé cha2.net Ì dat ðÇñÅÛ¶·éÖ * i·ªæ¾ÉÍ¢Îj Modified: p2/trunk/lib/downloadDatMachiBbs.func.php =================================================================== --- p2/trunk/lib/downloadDatMachiBbs.func.php 2010-01-15 20:56:23 UTC (rev 784) +++ p2/trunk/lib/downloadDatMachiBbs.func.php 2010-01-15 21:36:43 UTC (rev 785) @@ -5,8 +5,6 @@ // http://www.machi.to/offlaw.txt // ªIPîñªÜÜêĢȢB¡ÌƱëÍpµÄ¢È¢ -require_once P2_LIB_DIR . '/FileCtl.php'; - /** * Ü¿BBSÌ read.cgi ðÇñÅ datÉÛ¶·éÖ * Modified: p2/trunk/lib/downloadDatShitaraba.func.php =================================================================== --- p2/trunk/lib/downloadDatShitaraba.func.php 2010-01-15 20:56:23 UTC (rev 784) +++ p2/trunk/lib/downloadDatShitaraba.func.php 2010-01-15 21:36:43 UTC (rev 785) @@ -1,8 +1,6 @@ <?php // p2 - µ½çÎJBBSijbbs.livedoor.jpjÌÖ -require_once P2_LIB_DIR . '/FileCtl.php'; - /** * µ½çÎJBBSÌ rawmode.cgi ðÇñÅAdatÉÛ¶·éi2chÉ®`j * @see http://blog.livedoor.jp/bbsnews/archives/50283526.html Modified: p2/trunk/lib/login2ch.func.php =================================================================== --- p2/trunk/lib/login2ch.func.php 2010-01-15 20:56:23 UTC (rev 784) +++ p2/trunk/lib/login2ch.func.php 2010-01-15 21:36:43 UTC (rev 785) @@ -1,6 +1,5 @@ <?php require_once './conf/conf.inc.php'; -require_once P2_LIB_DIR . '/FileCtl.php'; require_once P2_LIB_DIR . '/wap.class.php'; /** Modified: p2/trunk/lib/read_new.funcs.php =================================================================== --- p2/trunk/lib/read_new.funcs.php 2010-01-15 20:56:23 UTC (rev 784) +++ p2/trunk/lib/read_new.funcs.php 2010-01-15 21:36:43 UTC (rev 785) @@ -3,8 +3,6 @@ p2 - for read_new.php, read_new_k.php, read_new_i.php */ -require_once P2_LIB_DIR . '/FileCtl.php'; - /** * V ÜÆßÇÝÌLbV ðc· * Modified: p2/trunk/lib/setFav.func.php =================================================================== --- p2/trunk/lib/setFav.func.php 2010-01-15 20:56:23 UTC (rev 784) +++ p2/trunk/lib/setFav.func.php 2010-01-15 21:36:43 UTC (rev 785) @@ -11,7 +11,6 @@ Xbh\¦Ì¨CÉX\¦ ¨ Xbh.idx ðQÆ */ -require_once P2_LIB_DIR . '/FileCtl.php'; require_once P2_LIB_DIR . '/P2Validate.php'; /** Modified: p2/trunk/lib/setFavIta.func.php =================================================================== --- p2/trunk/lib/setFavIta.func.php 2010-01-15 20:56:23 UTC (rev 784) +++ p2/trunk/lib/setFavIta.func.php 2010-01-15 21:36:43 UTC (rev 785) @@ -1,5 +1,4 @@ <?php -require_once P2_LIB_DIR . '/FileCtl.php'; require_once P2_LIB_DIR . '/P2Validate.php'; /** Modified: p2/trunk/lib/setPalace.func.php =================================================================== --- p2/trunk/lib/setPalace.func.php 2010-01-15 20:56:23 UTC (rev 784) +++ p2/trunk/lib/setPalace.func.php 2010-01-15 21:36:43 UTC (rev 785) @@ -1,6 +1,4 @@ <?php -require_once P2_LIB_DIR . '/FileCtl.php'; - /** * Xða°üèÉZbg·éÖ * Modified: p2/trunk/lib/settaborn.func.php =================================================================== --- p2/trunk/lib/settaborn.func.php 2010-01-15 20:56:23 UTC (rev 784) +++ p2/trunk/lib/settaborn.func.php 2010-01-15 21:36:43 UTC (rev 785) @@ -1,6 +1,4 @@ <?php -require_once P2_LIB_DIR . '/FileCtl.php'; - /** * Xbh Ú[ñðIIt·éÖ * Modified: p2/trunk/lib/settaborn_off.inc.php =================================================================== --- p2/trunk/lib/settaborn_off.inc.php 2010-01-15 20:56:23 UTC (rev 784) +++ p2/trunk/lib/settaborn_off.inc.php 2010-01-15 21:36:43 UTC (rev 785) @@ -1,6 +1,4 @@ <?php -require_once P2_LIB_DIR . '/FileCtl.php'; - /** * Xbh Ú[ñð¡êð·éÖ * Modified: p2/trunk/login.php =================================================================== --- p2/trunk/login.php 2010-01-15 20:56:23 UTC (rev 784) +++ p2/trunk/login.php 2010-01-15 21:36:43 UTC (rev 785) @@ -4,7 +4,6 @@ */ require_once './conf/conf.inc.php'; -require_once P2_LIB_DIR . '/FileCtl.php'; $_login->authorize(); // [UFØ Modified: p2/trunk/login2ch.php =================================================================== --- p2/trunk/login2ch.php 2010-01-15 20:56:23 UTC (rev 784) +++ p2/trunk/login2ch.php 2010-01-15 21:36:43 UTC (rev 785) @@ -4,7 +4,6 @@ */ require_once './conf/conf.inc.php'; -require_once P2_LIB_DIR . '/FileCtl.php'; require_once P2_LIB_DIR . '/P2Validate.php'; $_login->authorize(); // [UFØ Modified: p2/trunk/post.php =================================================================== --- p2/trunk/post.php 2010-01-15 20:56:23 UTC (rev 784) +++ p2/trunk/post.php 2010-01-15 21:36:43 UTC (rev 785) @@ -9,7 +9,6 @@ require_once './conf/conf.inc.php'; require_once P2_LIB_DIR . '/DataPhp.php'; -require_once P2_LIB_DIR . '/FileCtl.php'; require_once P2_LIB_DIR . '/P2Validate.php'; $_login->authorize(); // [UFØ Modified: p2/trunk/read.php =================================================================== --- p2/trunk/read.php 2010-01-15 20:56:23 UTC (rev 784) +++ p2/trunk/read.php 2010-01-15 21:36:43 UTC (rev 785) @@ -8,7 +8,6 @@ require_once P2_LIB_DIR . '/Thread.php'; require_once P2_LIB_DIR . '/ThreadRead.php'; -require_once P2_LIB_DIR . '/FileCtl.php'; require_once P2_LIB_DIR . '/NgAbornCtl.php'; require_once P2_LIB_DIR . '/ShowThread.php'; require_once P2_LIB_DIR . '/P2Validate.php'; Modified: p2/trunk/read_filter_i.php =================================================================== --- p2/trunk/read_filter_i.php 2010-01-15 20:56:23 UTC (rev 784) +++ p2/trunk/read_filter_i.php 2010-01-15 21:36:43 UTC (rev 785) @@ -28,8 +28,6 @@ // }}} // {{{ OñtB^lÇÝÝ -require_once P2_LIB_DIR . '/FileCtl.php'; - $cachefile = $_conf['pref_dir'] . '/p2_res_filter.txt'; $res_filter = array(); Modified: p2/trunk/read_filter_k.php =================================================================== --- p2/trunk/read_filter_k.php 2010-01-15 20:56:23 UTC (rev 784) +++ p2/trunk/read_filter_k.php 2010-01-15 21:36:43 UTC (rev 785) @@ -28,8 +28,6 @@ // }}} // {{{ OñtB^lÇÝÝ -require_once P2_LIB_DIR . '/FileCtl.php'; - $cachefile = $_conf['pref_dir'] . '/p2_res_filter.txt'; $res_filter = array(); Modified: p2/trunk/setting.php =================================================================== --- p2/trunk/setting.php 2010-01-15 20:56:23 UTC (rev 784) +++ p2/trunk/setting.php 2010-01-15 21:36:43 UTC (rev 785) @@ -2,7 +2,6 @@ // p2 - ÝèÇy[W require_once './conf/conf.inc.php'; -require_once P2_LIB_DIR . '/FileCtl.php'; $_login->authorize(); // [UFØ Modified: p2/trunk/subject.php =================================================================== --- p2/trunk/subject.php 2010-01-15 20:56:23 UTC (rev 784) +++ p2/trunk/subject.php 2010-01-15 21:36:43 UTC (rev 785) @@ -9,7 +9,6 @@ require_once './conf/conf.inc.php'; require_once P2_LIB_DIR . '/ThreadList.php'; require_once P2_LIB_DIR . '/Thread.php'; -require_once P2_LIB_DIR . '/FileCtl.php'; require_once P2_LIB_DIR . '/P2Validate.php'; require_once P2_LIB_DIR . '/subject.funcs.php'; Modified: p2/trunk/subject_i.php =================================================================== --- p2/trunk/subject_i.php 2010-01-15 20:56:23 UTC (rev 784) +++ p2/trunk/subject_i.php 2010-01-15 21:36:43 UTC (rev 785) @@ -10,7 +10,6 @@ require_once P2_LIB_DIR . '/ThreadList.php'; require_once P2_LIB_DIR . '/Thread.php'; -require_once P2_LIB_DIR . '/FileCtl.php'; require_once P2_LIB_DIR . '/P2Validate.php'; require_once P2_LIB_DIR . '/subject.funcs.php'; Modified: p2/trunk/subject_new.php =================================================================== --- p2/trunk/subject_new.php 2010-01-15 20:56:23 UTC (rev 784) +++ p2/trunk/subject_new.php 2010-01-15 21:36:43 UTC (rev 785) @@ -16,7 +16,6 @@ //require_once './conf/conf.inc.php'; require_once P2_LIB_DIR . '/ThreadList.php'; require_once P2_LIB_DIR . '/Thread.php'; -require_once P2_LIB_DIR . '/FileCtl.php'; require_once P2_LIB_DIR . '/subject.funcs.php';