diff options
| author | Michael Tänzer <neo@nhng.de> | 2012-07-23 17:40:24 +0200 |
|---|---|---|
| committer | Michael Tänzer <neo@nhng.de> | 2012-07-23 17:40:24 +0200 |
| commit | e0f7339704f2e6045774301b0359be3502f4b486 (patch) | |
| tree | b8560ed68f42b15585611bba78627740140a80d7 /www/capnew.php | |
| parent | 30ac5366838978bd685da21208974c83883cd9d6 (diff) | |
| parent | fd4fbe21e9ef63c555469b595f7748fadfb977f4 (diff) | |
| download | cacert-devel-e0f7339704f2e6045774301b0359be3502f4b486.tar.gz cacert-devel-e0f7339704f2e6045774301b0359be3502f4b486.tar.xz cacert-devel-e0f7339704f2e6045774301b0359be3502f4b486.zip | |
Merge branch 'release' into bug-964
Diffstat (limited to 'www/capnew.php')
| -rw-r--r-- | www/capnew.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/www/capnew.php b/www/capnew.php index 3136993..41a0894 100644 --- a/www/capnew.php +++ b/www/capnew.php @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -// $Id: capnew.php,v 1.3 2011-06-10 18:30:41 wytze Exp $ -define('REV', '$Revision: 1.3 $'); +// $Id: capnew.php,v 1.4 2012-01-24 14:26:05 root Exp $ +define('REV', '$Revision: 1.4 $'); /* ** Created from old cap.php 2003, which used the now obsoleted ftpdf package @@ -168,7 +168,7 @@ define('REV', '$Revision: 1.3 $'); ** $_GET['format'] paper format required A0-A6,Letter, Folio, B0-B6 (dflt A4) ** $_GET['watermark'] watermark on the page ** $_GET['orientation'] paper orientation default 'portrait' -** $_SESSION['_config']['language'] for 'ja_JP' japanese default != ja_JP +** $_SESSION['_config']['language'] for 'ja' japanese default != ja ** $_SESSION['_config']['recode'] = 'format' recode() uses it: needed ? ** recode() is aliased to php lib function recode_string() ** $_REQUEST['bw'] if exists use black/white, default use colour @@ -336,7 +336,7 @@ define('DFL_FORMAT', 'html..utf-8'); // Japanese is not supported? if( array_key_exists('_config', $_SESSION) ) { if( isset($_SESSION['_config']['language']) ) { - if($_SESSION['_config']['language'] == 'ja_JP') + if($_SESSION['_config']['language'] == 'ja') define('FONT','SJIS'); else define( 'FONT', 'freesans'); } @@ -387,7 +387,7 @@ function utf8_is_ascii_ctrl($str) { // extend TCPF with custom functions class CAPPDF extends TCPDF { - // do cap form version numbering automatically '$Revision: 1.3 $' + // do cap form version numbering automatically '$Revision: 1.4 $' /*public*/ function Version() { strtok(REV, ' '); return(strtok(' ')); |