nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix some warnings.

Browse Source
This commit is contained in:
Michal Čihař
2004-12-30 15:53:51 +00:00
parent d569a94052
commit 62dd3ea75a
2 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -5,6 +5,9 @@ phpMyAdmin - Changelog
$Id$ $Id$
$Source$ $Source$
2004-12-30 Michal Čihař <michal@cihar.com>
* libraries/fpdf/ufpdf.php: Fix some warnings.
2004-12-29 Michal Čihař <michal@cihar.com> 2004-12-29 Michal Čihař <michal@cihar.com>
* libraries/export/sql.php: Fix typo. * libraries/export/sql.php: Fix typo.
* server_databases.php: Use same sort order as in left frame (bug * server_databases.php: Use same sort order as in left frame (bug

30
libraries/fpdf/ufpdf.php
View File

@@ -15,7 +15,7 @@ if(!class_exists('UFPDF'))
{ {
define('UFPDF_VERSION','0.1'); define('UFPDF_VERSION','0.1');
include_once 'fpdf.php'; include_once './libraries/fpdf/fpdf.php';
class UFPDF extends FPDF class UFPDF extends FPDF
{ {
@@ -315,23 +315,24 @@ function utf8_to_utf16be(&$txt, $bom = true) {
while (ord($txt{$i + 1}) >= 0x80 && ord($txt{$i + 1}) < 0xC0) { ++$i; } while (ord($txt{$i + 1}) >= 0x80 && ord($txt{$i + 1}) < 0xC0) { ++$i; }
continue; continue;
} }
$q = array($c); $q = array($c);
// Fetch rest of sequence // Fetch rest of sequence
while (ord($txt{$i + 1}) >= 0x80 && ord($txt{$i + 1}) < 0xC0) { ++$i; $q[] = ord($txt{$i}); } $l = strlen($txt);
while ($i + 1 < $l && ord($txt{$i + 1}) >= 0x80 && ord($txt{$i + 1}) < 0xC0) { ++$i; $q[] = ord($txt{$i}); }
// Check length // Check length
if (count($q) != $s) { if (count($q) != $s) {
$out .= "\xFF\xFD"; $out .= "\xFF\xFD";
continue; continue;
} }
switch ($s) { switch ($s) {
case 2: case 2:
$cp = (($q[0] ^ 0xC0) << 6) | ($q[1] ^ 0x80); $cp = (($q[0] ^ 0xC0) << 6) | ($q[1] ^ 0x80);
// Overlong sequence // Overlong sequence
if ($cp < 0x80) { if ($cp < 0x80) {
$out .= "\xFF\xFD"; $out .= "\xFF\xFD";
} }
else { else {
$out .= chr($cp >> 8); $out .= chr($cp >> 8);
@@ -343,7 +344,7 @@ function utf8_to_utf16be(&$txt, $bom = true) {
$cp = (($q[0] ^ 0xE0) << 12) | (($q[1] ^ 0x80) << 6) | ($q[2] ^ 0x80); $cp = (($q[0] ^ 0xE0) << 12) | (($q[1] ^ 0x80) << 6) | ($q[2] ^ 0x80);
// Overlong sequence // Overlong sequence
if ($cp < 0x800) { if ($cp < 0x800) {
$out .= "\xFF\xFD"; $out .= "\xFF\xFD";
} }
// Check for UTF-8 encoded surrogates (caused by a bad UTF-8 encoder) // Check for UTF-8 encoded surrogates (caused by a bad UTF-8 encoder)
else if ($c > 0xD800 && $c < 0xDFFF) { else if ($c > 0xD800 && $c < 0xDFFF) {
@@ -363,14 +364,14 @@ function utf8_to_utf16be(&$txt, $bom = true) {
} }
// Outside of the Unicode range // Outside of the Unicode range
else if ($cp >= 0x10FFFF) { else if ($cp >= 0x10FFFF) {
$out .= "\xFF\xFD"; $out .= "\xFF\xFD";
} }
else { else {
// Use surrogates // Use surrogates
$cp -= 0x10000; $cp -= 0x10000;
$s1 = 0xD800 | ($cp >> 10); $s1 = 0xD800 | ($cp >> 10);
$s2 = 0xDC00 | ($cp & 0x3FF); $s2 = 0xDC00 | ($cp & 0x3FF);
$out .= chr($s1 >> 8); $out .= chr($s1 >> 8);
$out .= chr($s1 & 0xFF); $out .= chr($s1 & 0xFF);
$out .= chr($s2 >> 8); $out .= chr($s2 >> 8);
@@ -416,17 +417,18 @@ function utf8_to_codepoints(&$txt) {
while (ord($txt{$i + 1}) >= 0x80 && ord($txt{$i + 1}) < 0xC0) { ++$i; } while (ord($txt{$i + 1}) >= 0x80 && ord($txt{$i + 1}) < 0xC0) { ++$i; }
continue; continue;
} }
$q = array($c); $q = array($c);
// Fetch rest of sequence // Fetch rest of sequence
while (ord($txt{$i + 1}) >= 0x80 && ord($txt{$i + 1}) < 0xC0) { ++$i; $q[] = ord($txt{$i}); } $l = strlen($txt);
while ($i + 1 < $l && ord($txt{$i + 1}) >= 0x80 && ord($txt{$i + 1}) < 0xC0) { ++$i; $q[] = ord($txt{$i}); }
// Check length // Check length
if (count($q) != $s) { if (count($q) != $s) {
$out[] = 0xFFFD; $out[] = 0xFFFD;
continue; continue;
} }
switch ($s) { switch ($s) {
case 2: case 2:
$cp = (($q[0] ^ 0xC0) << 6) | ($q[1] ^ 0x80); $cp = (($q[0] ^ 0xC0) << 6) | ($q[1] ^ 0x80);