diff --git a/logconverter/poti2/poti2petit.php b/logconverter/poti2/poti2petit.php index 729e2c0..c7a06e2 100644 --- a/logconverter/poti2/poti2petit.php +++ b/logconverter/poti2/poti2petit.php @@ -90,8 +90,8 @@ $no=$i+1; - // list($_no,$date,$name,$email,$sub,$com,$url,$host,$hash,$ext,$w,$h,$_time,$img_md5,$_ptime,,$pchext,$thumbnail,$painttime) - list($_no,$date,$name,$email,$sub,$com,$url,$host,$hash,$ext,$w,$h,$_time,$img_md5,$_ptime,,,,$tool,$logver) + // list($_no,$date,$name,$email,$sub,$com,$url,$host,$hash,$ext,$w,$h,$_time,$log_img_hash,$_ptime,,$pchext,$thumbnail,$painttime) + list($_no,$date,$name,$email,$sub,$com,$url,$host,$hash,$ext,$w,$h,$_time,$log_img_hash,$_ptime,,,,$tool,$logver) =explode(",",rtrim(t($line[$j])).',,,,,,,,'); $paintsec=is_numeric($_ptime) ? $_ptime :''; @@ -187,15 +187,15 @@ $sub = $sub ? $sub : DEF_SUB; if($k===0){//スレッドの親の時 - $thread[$i][]="$no\t$sub\t$name\t\t$com\t$url\t$imgfile\t$w\t$h\t$thumbnail\t$painttime\t$img_md5\t$tool\t$pchext\t$time\t$time\t$host\t$userid\t$hash\toya\n"; + $thread[$i][]="$no\t$sub\t$name\t\t$com\t$url\t$imgfile\t$w\t$h\t$thumbnail\t$painttime\t$log_img_hash\t$tool\t$pchext\t$time\t$time\t$host\t$userid\t$hash\toya\n"; $strcut_com=mb_strcut($com,0,120); - $oya_arr[$i]= "$no\t$sub\t$name\t\t$strcut_com\t$url\t$imgfile\t$w\t$h\t$thumbnail\t$painttime\t$img_md5\t$tool\t$pchext\t$time\t$time\t$host\t$userid\t$hash\toya\n"; + $oya_arr[$i]= "$no\t$sub\t$name\t\t$strcut_com\t$url\t$imgfile\t$w\t$h\t$thumbnail\t$painttime\t$log_img_hash\t$tool\t$pchext\t$time\t$time\t$host\t$userid\t$hash\toya\n"; }else{ - $res = "$no\t$sub\t$name\t\t$com\t$url\t$imgfile\t$w\t$h\t$thumbnail\t$painttime\t$img_md5\t$tool\t$pchext\t$time\t$time\t$host\t$userid\t$hash\tres\n"; + $res = "$no\t$sub\t$name\t\t$com\t$url\t$imgfile\t$w\t$h\t$thumbnail\t$painttime\t$log_img_hash\t$tool\t$pchext\t$time\t$time\t$host\t$userid\t$hash\tres\n"; $thread[$i][]=$res; diff --git a/logexporter/petit2poti/petit2poti.php b/logexporter/petit2poti/petit2poti.php index 50d5f77..d9a10c8 100644 --- a/logexporter/petit2poti/petit2poti.php +++ b/logexporter/petit2poti/petit2poti.php @@ -116,7 +116,7 @@ foreach($logs as $k=>$val){//1スレッド分のログを処理 - list($no,$sub,$name,$verified,$com,$url,$imgfile,$w,$h,$thumbnail,$painttime,$log_md5,$tool,$pchext,$time,$first_posted_time,$host,$userid,$hash,$oya)=explode("\t",$val); + list($no,$sub,$name,$verified,$com,$url,$imgfile,$w,$h,$thumbnail,$painttime,$log_img_hash,$tool,$pchext,$time,$first_posted_time,$host,$userid,$hash,$oya)=explode("\t",$val); $origin_time=$time; $time=(strlen($time)>15) ? substr($time,0,-3) : $time; $ext = $imgfile ? '.'.pathinfo($imgfile,PATHINFO_EXTENSION ) :''; @@ -161,7 +161,7 @@ $now=now_date($now_time); $now .= $userid ? " ID:" . $userid : ""; $tool =switch_tool($tool); - $newlog[]="$__no,$now,$name,$email,$sub,$com,$url,$host,$hash,$ext,$w,$h,$time,$log_md5,$painttime,,$pchext,$thumbnail,$tool,6\n"; + $newlog[]="$__no,$now,$name,$email,$sub,$com,$url,$host,$hash,$ext,$w,$h,$time,$log_img_hash,$painttime,,$pchext,$thumbnail,$tool,6\n"; $tree[]=$__no;