/[suikacvs]/messaging/newsportal/newsportal.php
Suika

Diff of /messaging/newsportal/newsportal.php

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.5 by wakaba, Sat Dec 1 12:19:50 2001 UTC revision 1.28 by wakaba, Sun Dec 2 01:34:45 2001 UTC
# Line 448  function headerDecode($value) { Line 448  function headerDecode($value) {
448        $newvalue=headerDecode($newvalue);  // maybe there are more encoded        $newvalue=headerDecode($newvalue);  // maybe there are more encoded
449      return(mb_convert_encoding($newvalue, "EUC-JP", "auto"));      // parts      return(mb_convert_encoding($newvalue, "EUC-JP", "auto"));      // parts
450    } else {    } else {
451      if (eregi('".*"',$value)) {  // quoted-printable decoding      return(mb_convert_encoding(decode_structured_body($value), "EUC-JP", "auto"));
       $result1=eregi_replace('(.*)"(.*)"(.*)','\1',$value);  
       $result2=eregi_replace('(.*)"(.*)"(.*)','\2',$value);  
       $result3=eregi_replace('(.*)"(.*)"(.*)','\3',$value);  
       $result2=eregi_replace('\\(.)','\1',$result2);  
       $newvalue=$result1.$result2.$result3;  
       return(mb_convert_encoding($newvalue, "EUC-JP", "auto"));  
     } else {   // there wasn't anything encoded, return the original string  
       return(mb_convert_encoding($value, "EUC-JP", "auto"));  
     }  
452    }    }
453  }  }
454    
# Line 506  function parse_header($hdr,$number="") { Line 497  function parse_header($hdr,$number="") {
497            $header->id=$value;            $header->id=$value;
498            break;            break;
499          case "subject:":          case "subject:":
500            $header->subject=headerDecode($value);            $header->subject = decode_unstructured_body($value);
501            break;            break;
502          case "newsgroups:":          case "newsgroups:":
503            $header->newsgroups=$value;            $header->newsgroups=$value;
504            break;            break;
505          case "organization:":          case "organization:":
506            $header->organization=$value;            $header->organization = decode_unstructured_body($value);
507            break;            break;
508          case "content-transfer-encoding:":          case "content-transfer-encoding:":
509            $header->content_transfer_encoding=trim(strtolower($value));            $header->content_transfer_encoding=trim(strtolower($value));
# Line 559  function parse_header($hdr,$number="") { Line 550  function parse_header($hdr,$number="") {
550          case "x-newsreader:":          case "x-newsreader:":
551          case "x-mailer:":          case "x-mailer:":
552          case "user-agent:":          case "user-agent:":
553            $header->user_agent=trim($value);            $header->user_agent= decode_structured_body($value);
554              break;
555            case "x-moe:":
556              $header->x_moe= decode_structured_body($value);
557            break;            break;
558          case "x-face:":          case "x-face:":
559  //          echo "<p>-".base64_decode($value)."-</p>";  //          echo "<p>-".base64_decode($value)."-</p>";
# Line 574  function parse_header($hdr,$number="") { Line 568  function parse_header($hdr,$number="") {
568    return $header;    return $header;
569  }  }
570    
571    function decode_unstructured_body ($body) {
572      $patterns = array (
573          "/(=\\?[^\\x00-\\x20()<>@,;:\\\"\\/\\[\\]?.=\\x7F]+\\?[BQ]\\?[^\\x00-\\x20\\x3F\\x7F]*\\?=)/ei",
574      );
575      $replace = array (
576          "mb_decode_mimeheader('\\1')",
577      );
578      return preg_replace ($patterns, $replace,
579                           mb_convert_encoding(fake_jisx0213($body), "EUC-JP", "auto"));
580    }
581    
582    function decode_structured_body ($body) {
583      $patterns = array (
584          "/\"((?:[^\"\\\\]+|\\\\.)*)\"/e",
585          "/\(((?:[^()\\\\]+|\\\\.|(?:\((?:[^()\\\\]+|\\\\.|(?:\((?:[^)\\\\]+|\\\\.\
586    )*\)))*\)))*)\)/e",
587      );
588      $replace = array (
589        "mb_convert_encoding(fake_jisx0213(decode_quoted_pair('\\1')),'EUC-JP','auto')",
590        "'('.mb_convert_encoding(fake_jisx0213(decode_quoted_pair('\\1')),
591                                 'EUC-JP','auto').')'",
592      );
593      return preg_replace ($patterns, $replace, $body);
594    }
595    
596    function decode_quoted_pair($value) {
597      $value = ereg_replace('\\\\(\\\\")', "\\1", $value);
598      return ereg_replace('\\\\(.)', "\\1", $value);
599    }
600    
601    function fake_jisx0213 ($value) {
602      $value = preg_replace ("/\\x1B\\\$\\(O/", "\x1B\\\$B", $value);
603      $value = preg_replace ("/\\x1B\\\$\\(P/", "\x1B\\\$(D", $value);
604      return $value;
605    }
606    
607  function decode_body($body,$encoding) {  function decode_body($body,$encoding) {
608    $bodyzeile="";    $bodyzeile="";
609    switch ($encoding) {    switch ($encoding) {
# Line 691  function parse_message($rawmessage) { Line 721  function parse_message($rawmessage) {
721  //      if ($body=="") $body=" ";  //      if ($body=="") $body=" ";
722  //    }  //    }
723      $body=decode_body($body,$message->header->content_transfer_encoding);      $body=decode_body($body,$message->header->content_transfer_encoding);
724      $message->body[0]=$body;      $message->body[0] = mb_convert_encoding($body, "EUC-JP", "auto");
725    }    }
726      if (!isset($message->header->content_type_charset))      if (!isset($message->header->content_type_charset))
727        $message->header->content_type_charset=array("ISO-8859-1");        $message->header->content_type_charset=array("ISO-8859-1");
# Line 763  function read_message($id,$bodynum=0,$gr Line 793  function read_message($id,$bodynum=0,$gr
793        return false;        return false;
794      $rawmessage=array();      $rawmessage=array();
795      $line=lieszeile($ns);      $line=lieszeile($ns);
796   $line=mb_convert_encoding($line, "EUC-JP", "ISO-2022-JP");   #$line=mb_convert_encoding($line, "EUC-JP", "ISO-2022-JP");
797      while(strcmp($line,".") != 0) {      while(strcmp($line,".") != 0) {
798        $rawmessage[]=$line;        $rawmessage[]=$line;
799        $line=lieszeile($ns);        $line=lieszeile($ns);
800   $line=mb_convert_encoding($line, "EUC-JP", "ISO-2022-JP");   #$line=mb_convert_encoding($line, "EUC-JP", "ISO-2022-JP");
801      }      }
802      $message=parse_message($rawmessage);      $message=parse_message($rawmessage);
803      if (ereg('^[0-9]+$',$id)) $message->header->number=$id;      if (ereg('^[0-9]+$',$id)) $message->header->number=$id;
# Line 1507  function show_header($head,$group) { Line 1537  function show_header($head,$group) {
1537        echo "<!-- User-Agent: ".htmlspecialchars($head->user_agent)." -->\n";        echo "<!-- User-Agent: ".htmlspecialchars($head->user_agent)." -->\n";
1538      }      }
1539    }    }
1540      if (isset($head->x_moe)) {
1541        if ((isset($article_show["X-Moe"])) && ($article_show["X-Moe"])) {
1542          echo "<span class=\"field x-moe\"><span class=\"name\">".$text_header["X-Moe"]
1543              ."</span> <span class=\"body\">"
1544              .htmlspecialchars($head->x_moe)."</span>\n";
1545        }
1546      }
1547    if ((isset($attachment_show)) && ($attachment_show==true) &&    if ((isset($attachment_show)) && ($attachment_show==true) &&
1548        (isset($head->content_type[1]))) {        (isset($head->content_type[1]))) {
1549      echo $text_header["attachments"];      echo $text_header["attachments"];
# Line 1691  function verschicken($subject,$from,$new Line 1728  function verschicken($subject,$from,$new
1728  //    fputs($ns,"Mime-Version: 1.0\r\n");  //    fputs($ns,"Mime-Version: 1.0\r\n");
1729  //    fputs($ns,"Content-Type: text/plain; charset=ISO-8859-1\r\n");  //    fputs($ns,"Content-Type: text/plain; charset=ISO-8859-1\r\n");
1730  //    fputs($ns,"Content-Transfer-Encoding: 8bit\r\n");  //    fputs($ns,"Content-Transfer-Encoding: 8bit\r\n");
1731      fputs($ns,"User-Agent: $text_ua["user_agent"]\r\n");      fputs($ns,"User-Agent: ".$text_ua["user_agent"]."\r\n");
1732      if ($send_poster_host)      if ($send_poster_host)
1733        fputs($ns,'X-HTTP-Posting-Host: '.gethostbyaddr(getenv("REMOTE_ADDR"))."\r\n");        fputs($ns,'X-HTTP-Posting-Host: '.gethostbyaddr(getenv("REMOTE_ADDR"))."\r\n");
1734      if ($ref!=false) fputs($ns,'References: '.$ref."\r\n");      if ($ref!=false) fputs($ns,'References: '.$ref."\r\n");
Legend:
Removed from v.1.5  
changed lines
  Added in v.1.28
admin@suikawiki.org
 ViewVC Help
Powered by ViewVC 1.1.24