svnno****@sourc*****
svnno****@sourc*****
2010年 1月 26日 (火) 22:01:48 JST
Revision: 813 http://sourceforge.jp/projects/p2-php/svn/view?view=rev&revision=813 Author: rsk Date: 2010-01-26 22:01:48 +0900 (Tue, 26 Jan 2010) Log Message: ----------- expack: - rev 100126.2200. - rep2 1.8.xã«ãªãã£ã¦FileCtl::mkdir_for()ãFileCtl::mkdirFor()ã« lowerCamelCaseåããã Revision Links: -------------- http://sourceforge.jp/projects/p2-php/svn/view?view=rev&revision=100126 Modified Paths: -------------- p2ex/trunk/conf/conf.inc.php p2ex/trunk/edit_user_font.php p2ex/trunk/ic2.php p2ex/trunk/index.php p2ex/trunk/iv2.php p2ex/trunk/lib/BbsMap.php p2ex/trunk/lib/FavSetManager.php p2ex/trunk/lib/HostCheck.php p2ex/trunk/lib/P2DataStore/AbstractDataStore.php p2ex/trunk/lib/P2HttpExt.php p2ex/trunk/lib/P2Lock.php p2ex/trunk/lib/P2Util.php p2ex/trunk/lib/SettingTxt.php p2ex/trunk/lib/SubjectTxt.php p2ex/trunk/lib/ThreadRead.php p2ex/trunk/lib/bootstrap.php p2ex/trunk/lib/expack/rss/parser.inc.php p2ex/trunk/lib/read_shitaraba.inc.php p2ex/trunk/lib/setfav.inc.php p2ex/trunk/read.php p2ex/trunk/read_async.php p2ex/trunk/read_new.php p2ex/trunk/read_new_k.php p2ex/trunk/tgrepc.php p2ex/trunk/title.php -------------- next part -------------- Modified: p2ex/trunk/conf/conf.inc.php =================================================================== --- p2ex/trunk/conf/conf.inc.php 2010-01-26 12:06:59 UTC (rev 812) +++ p2ex/trunk/conf/conf.inc.php 2010-01-26 13:01:48 UTC (rev 813) @@ -7,7 +7,7 @@ // o[Wîñ $_conf = array( 'p2version' => '1.7.29+1.8.x', // rep2Ìo[W - 'p2expack' => '100126.0900', // g£pbNÌo[W + 'p2expack' => '100126.2200', // g£pbNÌo[W 'p2name' => 'expack', // rep2̼O ); Modified: p2ex/trunk/edit_user_font.php =================================================================== --- p2ex/trunk/edit_user_font.php 2010-01-26 12:06:59 UTC (rev 812) +++ p2ex/trunk/edit_user_font.php 2010-01-26 13:01:48 UTC (rev 813) @@ -86,7 +86,7 @@ // }}} if (!is_dir($_conf['compile_dir'])) { - FileCtl::mkdir_r($_conf['compile_dir']); + FileCtl::mkdirRecursive($_conf['compile_dir']); } // ev[gðRpC Modified: p2ex/trunk/ic2.php =================================================================== --- p2ex/trunk/ic2.php 2010-01-26 12:06:59 UTC (rev 812) +++ p2ex/trunk/ic2.php 2010-01-26 13:01:48 UTC (rev 813) @@ -50,7 +50,7 @@ } if (!is_dir($_conf['tmp_dir'])) { - FileCtl::mkdir_r($_conf['tmp_dir']); + FileCtl::mkdirRecursive($_conf['tmp_dir']); } if (!empty($uri)) { Modified: p2ex/trunk/index.php =================================================================== --- p2ex/trunk/index.php 2010-01-26 12:06:59 UTC (rev 812) +++ p2ex/trunk/index.php 2010-01-26 13:01:48 UTC (rev 813) @@ -159,7 +159,7 @@ $hta = $dir . '/.htaccess'; if (!file_exists($hta)) { if (!is_dir($dir)) { - FileCtl::mkdir_for($hta); + FileCtl::mkdirFor($hta); } $data = 'Order allow,deny'."\n".'Deny from all'."\n"; FileCtl::file_write_contents($hta, $data); Modified: p2ex/trunk/iv2.php =================================================================== --- p2ex/trunk/iv2.php 2010-01-26 12:06:59 UTC (rev 812) +++ p2ex/trunk/iv2.php 2010-01-26 13:01:48 UTC (rev 813) @@ -276,7 +276,7 @@ ); if (!is_dir($_conf['compile_dir'])) { - FileCtl::mkdir_r($_conf['compile_dir']); + FileCtl::mkdirRecursive($_conf['compile_dir']); } $flexy = new HTML_Template_Flexy($_flexy_options); Modified: p2ex/trunk/lib/BbsMap.php =================================================================== --- p2ex/trunk/lib/BbsMap.php 2010-01-26 12:06:59 UTC (rev 812) +++ p2ex/trunk/lib/BbsMap.php 2010-01-26 13:01:48 UTC (rev 813) @@ -287,7 +287,7 @@ return self::$_map; } } else { - FileCtl::mkdir_for($map_cache_path); + FileCtl::mkdirFor($map_cache_path); } touch($map_cache_path); clearstatcache(); Modified: p2ex/trunk/lib/FavSetManager.php =================================================================== --- p2ex/trunk/lib/FavSetManager.php 2010-01-26 12:06:59 UTC (rev 812) +++ p2ex/trunk/lib/FavSetManager.php 2010-01-26 13:01:48 UTC (rev 813) @@ -115,7 +115,7 @@ //LbV ÉÛ¶·é if (!is_dir($_conf['pref_dir'])) { - FileCtl::mkdir_for($cache_file); + FileCtl::mkdirFor($cache_file); } file_put_contents($cache_file, serialize(array($_conf['favlists'], $_conf['favitas']))); Modified: p2ex/trunk/lib/HostCheck.php =================================================================== --- p2ex/trunk/lib/HostCheck.php 2010-01-26 12:06:59 UTC (rev 812) +++ p2ex/trunk/lib/HostCheck.php 2010-01-26 13:01:48 UTC (rev 813) @@ -70,7 +70,7 @@ } if (!file_exists($_conf['hostcheck_db_path'])) { - FileCtl::mkdir_for($_conf['hostcheck_db_path']); + FileCtl::mkdirFor($_conf['hostcheck_db_path']); } $kvs = P2KeyValueStore::getStore($_conf['hostcheck_db_path']); Modified: p2ex/trunk/lib/P2DataStore/AbstractDataStore.php =================================================================== --- p2ex/trunk/lib/P2DataStore/AbstractDataStore.php 2010-01-26 12:06:59 UTC (rev 812) +++ p2ex/trunk/lib/P2DataStore/AbstractDataStore.php 2010-01-26 13:01:48 UTC (rev 813) @@ -44,7 +44,7 @@ } if (!file_exists($databasePath) && !is_dir(dirname($databasePath))) { - FileCtl::mkdir_for($databasePath); + FileCtl::mkdirFor($databasePath); } try { Modified: p2ex/trunk/lib/P2HttpExt.php =================================================================== --- p2ex/trunk/lib/P2HttpExt.php 2010-01-26 12:06:59 UTC (rev 812) +++ p2ex/trunk/lib/P2HttpExt.php 2010-01-26 13:01:48 UTC (rev 813) @@ -302,7 +302,7 @@ if (!isset($options['lastmodified']) && file_exists($destination)) { $options['lastmodified'] = filemtime($destination); } else { - FileCtl::mkdir_for($destination); + FileCtl::mkdirFor($destination); } $this->_destination = $destination; Modified: p2ex/trunk/lib/P2Lock.php =================================================================== --- p2ex/trunk/lib/P2Lock.php 2010-01-26 12:06:59 UTC (rev 812) +++ p2ex/trunk/lib/P2Lock.php 2010-01-26 13:01:48 UTC (rev 813) @@ -48,7 +48,7 @@ $this->_filename = p2_realpath($name . $suffix); $this->_remove = $remove; - FileCtl::mkdir_for($this->_filename); + FileCtl::mkdirFor($this->_filename); $this->_fh = fopen($this->_filename, 'wb'); if (!$this->_fh) { Modified: p2ex/trunk/lib/P2Util.php =================================================================== --- p2ex/trunk/lib/P2Util.php 2010-01-26 12:06:59 UTC (rev 812) +++ p2ex/trunk/lib/P2Util.php 2010-01-26 13:01:48 UTC (rev 813) @@ -357,7 +357,7 @@ $cachefile = $_conf['cache_dir'] . '/' . $save_uri; - FileCtl::mkdir_for($cachefile); + FileCtl::mkdirFor($cachefile); return $cachefile; } @@ -1972,7 +1972,7 @@ global $_conf; if (!is_dir($_conf['db_dir'])) { - FileCtl::mkdir_r($_conf['db_dir']); + FileCtl::mkdirRecursive($_conf['db_dir']); } try { Modified: p2ex/trunk/lib/SettingTxt.php =================================================================== --- p2ex/trunk/lib/SettingTxt.php 2010-01-26 12:06:59 UTC (rev 812) +++ p2ex/trunk/lib/SettingTxt.php 2010-01-26 13:01:48 UTC (rev 813) @@ -80,7 +80,7 @@ $perm = (isset($_conf['dl_perm'])) ? $_conf['dl_perm'] : 0606; - FileCtl::mkdir_for($this->_setting_txt); // ÂfBNgª³¯êÎìé + FileCtl::mkdirFor($this->_setting_txt); // ÂfBNgª³¯êÎìé if (file_exists($this->_setting_srd) && file_exists($this->_setting_txt)) { // XVµÈ¢êÍA»ÌêŲ¯ÄµÜ¤ Modified: p2ex/trunk/lib/SubjectTxt.php =================================================================== --- p2ex/trunk/lib/SubjectTxt.php 2010-01-26 12:06:59 UTC (rev 812) +++ p2ex/trunk/lib/SubjectTxt.php 2010-01-26 13:01:48 UTC (rev 813) @@ -92,7 +92,7 @@ $perm = (isset($_conf['dl_perm'])) ? $_conf['dl_perm'] : 0606; if ($this->storage == 'file') { - FileCtl::mkdir_for($this->subject_file); // ÂfBNgª³¯êÎìé + FileCtl::mkdirFor($this->subject_file); // ÂfBNgª³¯êÎìé if (file_exists($this->subject_file)) { if (!empty($_REQUEST['norefresh']) || (empty($_REQUEST['refresh']) && isset($_REQUEST['word']))) { Modified: p2ex/trunk/lib/ThreadRead.php =================================================================== --- p2ex/trunk/lib/ThreadRead.php 2010-01-26 12:06:59 UTC (rev 812) +++ p2ex/trunk/lib/ThreadRead.php 2010-01-26 13:01:48 UTC (rev 813) @@ -1472,7 +1472,7 @@ } else { // gzip tempt@CÉÛ¶EPHPÅðÇÝÝ if (!is_dir($_conf['tmp_dir'])) { - FileCtl::mkdir_r($_conf['tmp_dir']); + FileCtl::mkdirRecursive($_conf['tmp_dir']); } $gztempfile = tempnam($_conf['tmp_dir'], 'gz_'); Modified: p2ex/trunk/lib/bootstrap.php =================================================================== --- p2ex/trunk/lib/bootstrap.php 2010-01-26 12:06:59 UTC (rev 812) +++ p2ex/trunk/lib/bootstrap.php 2010-01-26 13:01:48 UTC (rev 813) @@ -633,7 +633,7 @@ if ($_conf['session_save'] == 'p2' and session_module_name() == 'files') { if (!is_dir($_conf['session_dir'])) { - FileCtl::mkdir_r($_conf['session_dir']); + FileCtl::mkdirRecursive($_conf['session_dir']); } elseif (!is_writable($_conf['session_dir'])) { p2die("ZbVf[^Û¶fBNg ({$_conf['session_dir']}) É«Ý Àª èܹñB"); } Modified: p2ex/trunk/lib/expack/rss/parser.inc.php =================================================================== --- p2ex/trunk/lib/expack/rss/parser.inc.php 2010-01-26 12:06:59 UTC (rev 812) +++ p2ex/trunk/lib/expack/rss/parser.inc.php 2010-01-26 13:01:48 UTC (rev 813) @@ -47,7 +47,7 @@ // Û¶pfBNgªÈ¯êÎÂé if (!is_dir(dirname($localpath))) { - FileCtl::mkdir_for($localpath); + FileCtl::mkdirFor($localpath); } // If-Modified-Since«Å_E[hit@Cª³¢©Aâ©A§[hÌÆ«j @@ -167,7 +167,7 @@ // Û¶pfBNgªÈ¯êÎÂé if (!is_dir(dirname($output))) { - FileCtl::mkdir_for($output); + FileCtl::mkdirFor($output); } // Ï· Modified: p2ex/trunk/lib/read_shitaraba.inc.php =================================================================== --- p2ex/trunk/lib/read_shitaraba.inc.php 2010-01-26 12:06:59 UTC (rev 812) +++ p2ex/trunk/lib/read_shitaraba.inc.php 2010-01-26 13:01:48 UTC (rev 813) @@ -45,7 +45,7 @@ $tempfile = $aThread->keydat.'.dat.temp'; - FileCtl::mkdir_for($tempfile); + FileCtl::mkdirFor($tempfile); $machiurl_res = P2Util::fileDownload($machiurl, $tempfile); if ($machiurl_res->isError()) { Modified: p2ex/trunk/lib/setfav.inc.php =================================================================== --- p2ex/trunk/lib/setfav.inc.php 2010-01-26 12:06:59 UTC (rev 812) +++ p2ex/trunk/lib/setfav.inc.php 2010-01-26 13:01:48 UTC (rev 813) @@ -38,7 +38,7 @@ $idxfile = P2Util::idxDirOfHostBbs($host, $bbs) . $key . '.idx'; // ÂfBNgª³¯êÎìé - // FileCtl::mkdir_for($idxfile); + // FileCtl::mkdirFor($idxfile); // ùÉidxf[^ª éÈçÇÝÞ if ($lines = FileCtl::file_read_lines($idxfile, FILE_IGNORE_NEW_LINES)) { Modified: p2ex/trunk/read.php =================================================================== --- p2ex/trunk/read.php 2010-01-26 12:06:59 UTC (rev 812) +++ p2ex/trunk/read.php 2010-01-26 13:01:48 UTC (rev 813) @@ -107,7 +107,7 @@ } // ÂfBNgª³¯êÎìé -// FileCtl::mkdir_for($aThread->keyidx); +// FileCtl::mkdirFor($aThread->keyidx); $aThread->itaj = P2Util::getItaName($host, $bbs); if (!$aThread->itaj) { $aThread->itaj = $aThread->bbs; } Modified: p2ex/trunk/read_async.php =================================================================== --- p2ex/trunk/read_async.php 2010-01-26 12:06:59 UTC (rev 812) +++ p2ex/trunk/read_async.php 2010-01-26 13:01:48 UTC (rev 813) @@ -42,7 +42,7 @@ } // ÂfBNgª³¯êÎìé -//FileCtl::mkdir_for($aThread->keyidx); +//FileCtl::mkdirFor($aThread->keyidx); $aThread->itaj = P2Util::getItaName($host, $bbs); if (!$aThread->itaj) { Modified: p2ex/trunk/read_new.php =================================================================== --- p2ex/trunk/read_new.php 2010-01-26 12:06:59 UTC (rev 812) +++ p2ex/trunk/read_new.php 2010-01-26 13:01:48 UTC (rev 813) @@ -374,7 +374,7 @@ // hostðªðµÄidxt@CÌpXðßé $aThread->setThreadPathInfo($aThread->host, $aThread->bbs, $aThread->key); - // FileCtl::mkdir_for($aThread->keyidx); // ÂfBNgª³¯êÎìé // ±Ììͨ»çsv + // FileCtl::mkdirFor($aThread->keyidx); // ÂfBNgª³¯êÎìé // ±Ììͨ»çsv $aThread->itaj = P2Util::getItaName($aThread->host, $aThread->bbs); if (!$aThread->itaj) { $aThread->itaj = $aThread->bbs; } Modified: p2ex/trunk/read_new_k.php =================================================================== --- p2ex/trunk/read_new_k.php 2010-01-26 12:06:59 UTC (rev 812) +++ p2ex/trunk/read_new_k.php 2010-01-26 13:01:48 UTC (rev 813) @@ -342,7 +342,7 @@ //hostðªðµÄidxt@CÌpXðßé $aThread->setThreadPathInfo($aThread->host, $aThread->bbs, $aThread->key); - //FileCtl::mkdir_for($aThread->keyidx); // ÂfBNgª³¯êÎìé //±Ììͨ»çsv + //FileCtl::mkdirFor($aThread->keyidx); // ÂfBNgª³¯êÎìé //±Ììͨ»çsv $aThread->itaj = P2Util::getItaName($aThread->host, $aThread->bbs); if (!$aThread->itaj) { $aThread->itaj = $aThread->bbs; } Modified: p2ex/trunk/tgrepc.php =================================================================== --- p2ex/trunk/tgrepc.php 2010-01-26 12:06:59 UTC (rev 812) +++ p2ex/trunk/tgrepc.php 2010-01-26 13:01:48 UTC (rev 813) @@ -67,7 +67,7 @@ 'automaticSerialization' => true, ); if (!is_dir($cache_options['cacheDir'])) { - FileCtl::mkdir_r($cache_options['cacheDir']); + FileCtl::mkdirRecursive($cache_options['cacheDir']); } $cache = new Cache_Lite($cache_options); $cache_id_result = md5($query); Modified: p2ex/trunk/title.php =================================================================== --- p2ex/trunk/title.php 2010-01-26 12:06:59 UTC (rev 812) +++ p2ex/trunk/title.php 2010-01-26 13:01:48 UTC (rev 813) @@ -184,7 +184,7 @@ $ver_txt_url = $_conf['expack.web_url'] . 'version.txt'; $cachefile = P2Util::cacheFileForDL($ver_txt_url); - FileCtl::mkdir_for($cachefile); + FileCtl::mkdirFor($cachefile); if (file_exists($cachefile)) { // LbV ÌXVªwèÔÈàÈç