svnno****@sourc*****
svnno****@sourc*****
2010年 2月 10日 (水) 12:23:48 JST
Revision: 832 http://sourceforge.jp/projects/p2-php/svn/view?view=rev&revision=832 Author: rsk Date: 2010-02-10 12:23:48 +0900 (Wed, 10 Feb 2010) Log Message: ----------- expack: - iPhoneã§ãæ°ã«æ¿ã®ç»é²ãã§ããªãä¸å ·åãä¿®æ£ã - E_NOTICEåæ¸ä¸ã Modified Paths: -------------- p2ex/trunk/js/menu_i.js p2ex/trunk/lib/subject_new.inc.php p2ex/trunk/read_res_hist.php -------------- next part -------------- Modified: p2ex/trunk/js/menu_i.js =================================================================== --- p2ex/trunk/js/menu_i.js 2010-02-01 17:05:26 UTC (rev 831) +++ p2ex/trunk/js/menu_i.js 2010-02-10 03:23:48 UTC (rev 832) @@ -131,6 +131,7 @@ var setFavita = function(div) { var toggled, req, uri, setnum; + toggled = div.getAttribute('toggled') === 'true'; setnum = parseInt(div.className.substring(div.className.indexOf('favita') + 6)); uri = 'httpcmd.php?cmd=setfavita&' + window.iutil.sliding.query + '&setnum=' + setnum; if (toggled) { @@ -139,7 +140,6 @@ uri += '&setfavita=0'; } - toggled = div.getAttribute('toggled') === 'true'; req = new XMLHttpRequest(); req.open('GET', uri, true); req.onreadystatechange = generateOnToggle(req, div, toggled); Modified: p2ex/trunk/lib/subject_new.inc.php =================================================================== --- p2ex/trunk/lib/subject_new.inc.php 2010-02-01 17:05:26 UTC (rev 831) +++ p2ex/trunk/lib/subject_new.inc.php 2010-02-10 03:23:48 UTC (rev 832) @@ -16,12 +16,14 @@ $spmode = false; } +$idx_host_bbs_dir_s = P2Util::idxDirOfHostBbs($host, $bbs); +$p2_sb_keys_txt = $idx_host_bbs_dir_s . 'p2_sb_keys.txt'; +$p2_setting_txt = $idx_host_bbs_dir_s . 'p2_setting.txt'; + // {{{ sb_keys Ýè if (!$spmode) { - $sb_keys_txt = P2Util::idxDirOfHostBbs($host, $bbs) . 'p2_sb_keys.txt'; - - if ($pre_sb_cont = FileCtl::file_read_contents($sb_keys_txt)) { + if ($pre_sb_cont = FileCtl::file_read_contents($p2_sb_keys_txt)) { $pre_subject_keys = @unserialize($pre_sb_cont); if (!is_array($pre_subject_keys)) { $pre_subject_keys = array(); @@ -35,7 +37,21 @@ } // }}} +// {{{ itaj Ýè +$itaj = null; +if ($p2_setting_cont = FileCtl::file_read_contents($p2_setting_txt)) { + $p2_setting = @unserialize($p2_setting_cont); + if (is_array($p2_setting) && array_key_exists('itaj', $p2_setting)) { + $itaj = $p2_setting['itaj']; + } +} +if ($itaj === null || $itaj === '') { + $itaj = P2Util::getItaName($host, $bbs); +} + +// }}} + //============================================================ // C //============================================================ @@ -44,13 +60,12 @@ // ÂÆ[hÌZbg =================================== if ($spmode) { - if ($spmode == "taborn" or $spmode == "soko") { - $aThreadList->setIta($host, $bbs, P2Util::getItaName($host, $bbs)); + if ($spmode == 'taborn' or $spmode == 'soko') { + $aThreadList->setIta($host, $bbs, $itaj); } $aThreadList->setSpMode($spmode); } else { - // if(!$p2_setting['itaj']){$p2_setting['itaj'] = P2Util::getItaName($host, $bbs);} - $aThreadList->setIta($host, $bbs, $p2_setting['itaj']); + $aThreadList->setIta($host, $bbs, $itaj); // Xbh Ú[ñXgÇ $taborn_file = $aThreadList->getIdxDir() . 'p2_threads_aborn.idx'; Modified: p2ex/trunk/read_res_hist.php =================================================================== --- p2ex/trunk/read_res_hist.php 2010-02-01 17:05:26 UTC (rev 831) +++ p2ex/trunk/read_res_hist.php 2010-02-10 03:23:48 UTC (rev 832) @@ -21,7 +21,7 @@ // ÁêÈOu //================================================================ // í -if ($_POST['submit'] == $deletemsg_st or isset($_GET['checked_hists'])) { +if ((isset($_POST['submit']) && $_POST['submit'] == $deletemsg_st) or isset($_GET['checked_hists'])) { $checked_hists = array(); if (isset($_POST['checked_hists'])) { $checked_hists = $_POST['checked_hists'];