Commit 409ae42a authored by stimpy's avatar stimpy

fixed iconv charset to be compatible with older versions of php

parent 56910b7d
......@@ -203,7 +203,7 @@
break;
case 'UTF-8':
case 'UTF-8 4':
$chrs = 'UTF8';
$chrs = 'UTF-8';
break;
case 'IBMPC 2':
case 'IBMPC':
......@@ -213,7 +213,7 @@
$chrs = 'CP437';
break;
}
if ( $chrs != 'UTF8' ) $msg['SUBJECT'][0] = iconv( $chrs, 'UTF8', $msg['SUBJECT'][0] );
if ( $chrs != 'UTF-8' ) $msg['SUBJECT'][0] = iconv( $chrs, 'UTF-8', $msg['SUBJECT'][0] );
$ret[] = $msg;
}
......@@ -259,7 +259,7 @@
break;
case 'UTF-8':
case 'UTF-8 4':
$chrs = 'UTF8';
$chrs = 'UTF-8';
break;
case 'IBMPC 2':
case 'IBMPC':
......@@ -273,7 +273,7 @@
$fp = fopen( $filename .'.jdt', 'rb' );
if ( flock( $fp, LOCK_SH ) ) {
fseek( $fp, $ret['header']['offset'] );
$ret['text'] = iconv( $chrs, 'UTF8', fread( $fp, $ret['header']['txtlen'] ) );
$ret['text'] = iconv( $chrs, 'UTF-8', fread( $fp, $ret['header']['txtlen'] ) );
fflush( $fp );
flock( $fp, LOCK_UN );
} else {
......
......@@ -203,7 +203,7 @@
break;
case 'UTF-8':
case 'UTF-8 4':
$chrs = 'UTF8';
$chrs = 'UTF-8';
break;
case 'IBMPC 2':
case 'IBMPC':
......@@ -213,7 +213,7 @@
$chrs = 'CP437';
break;
}
if ( $chrs != 'UTF8' ) $msg['SUBJECT'][0] = iconv( $chrs, 'UTF8', $msg['SUBJECT'][0] );
if ( $chrs != 'UTF-8' ) $msg['SUBJECT'][0] = iconv( $chrs, 'UTF-8', $msg['SUBJECT'][0] );
$ret[] = $msg;
}
......@@ -259,7 +259,7 @@
break;
case 'UTF-8':
case 'UTF-8 4':
$chrs = 'UTF8';
$chrs = 'UTF-8';
break;
case 'IBMPC 2':
case 'IBMPC':
......@@ -273,7 +273,7 @@
$fp = fopen( $filename .'.jdt', 'rb' );
if ( flock( $fp, LOCK_SH ) ) {
fseek( $fp, $ret['header']['offset'] );
$ret['text'] = iconv( $chrs, 'UTF8', fread( $fp, $ret['header']['txtlen'] ) );
$ret['text'] = iconv( $chrs, 'UTF-8', fread( $fp, $ret['header']['txtlen'] ) );
fflush( $fp );
flock( $fp, LOCK_UN );
} else {
......
......@@ -3,6 +3,11 @@ filename=/mnt/nas/www/website_jamreader/src/data/internal/netmail
group=netmail
description=(netmail)
[futest]
filename="/mnt/nas/www/website_jamreader/src/data/test/kuehlbox_en"
group="test"
description="(Test)"
[agn_ads]
filename="/mnt/nas/www/website_jamreader/src/data/agoranet/agn_ads"
group="agoranet"
......
......@@ -23,6 +23,7 @@
'origin' => 'Anything wrong with this mail? Please tell me!',
'readonly' => false,
'groups' => array( 'netmail' => '2:240/5853.1',
'test' => '2:240/5853.1',
'fidonet' => '2:240/5853.1',
'bbsnet' => '75:49/2.1',
'survnet' => '9:92/6.1',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment