PHP 5.3 compatibility
This commit is contained in:
parent
4384b0a32a
commit
2bd8c5f569
|
@ -918,8 +918,6 @@ function Image($file,$x,$y,$w=0,$h=0,$type='',$link='')
|
||||||
$type=substr($file,$pos+1);
|
$type=substr($file,$pos+1);
|
||||||
}
|
}
|
||||||
$type=strtolower($type);
|
$type=strtolower($type);
|
||||||
$mqr=get_magic_quotes_runtime();
|
|
||||||
set_magic_quotes_runtime(0);
|
|
||||||
if($type=='jpg' || $type=='jpeg')
|
if($type=='jpg' || $type=='jpeg')
|
||||||
$info=$this->_parsejpg($file);
|
$info=$this->_parsejpg($file);
|
||||||
elseif($type=='png')
|
elseif($type=='png')
|
||||||
|
@ -932,7 +930,6 @@ function Image($file,$x,$y,$w=0,$h=0,$type='',$link='')
|
||||||
$this->Error('Unsupported image type: '.$type);
|
$this->Error('Unsupported image type: '.$type);
|
||||||
$info=$this->$mtd($file);
|
$info=$this->$mtd($file);
|
||||||
}
|
}
|
||||||
set_magic_quotes_runtime($mqr);
|
|
||||||
$info['i']=count($this->images)+1;
|
$info['i']=count($this->images)+1;
|
||||||
$this->images[$file]=$info;
|
$this->images[$file]=$info;
|
||||||
}
|
}
|
||||||
|
@ -1173,8 +1170,6 @@ function _putfonts()
|
||||||
$this->_out('<</Type /Encoding /BaseEncoding /WinAnsiEncoding /Differences ['.$diff.']>>');
|
$this->_out('<</Type /Encoding /BaseEncoding /WinAnsiEncoding /Differences ['.$diff.']>>');
|
||||||
$this->_out('endobj');
|
$this->_out('endobj');
|
||||||
}
|
}
|
||||||
$mqr=get_magic_quotes_runtime();
|
|
||||||
set_magic_quotes_runtime(0);
|
|
||||||
foreach($this->FontFiles as $file=>$info)
|
foreach($this->FontFiles as $file=>$info)
|
||||||
{
|
{
|
||||||
//Font file embedding
|
//Font file embedding
|
||||||
|
@ -1212,7 +1207,6 @@ function _putfonts()
|
||||||
$this->_putstream($font);
|
$this->_putstream($font);
|
||||||
$this->_out('endobj');
|
$this->_out('endobj');
|
||||||
}
|
}
|
||||||
set_magic_quotes_runtime($mqr);
|
|
||||||
foreach($this->fonts as $k=>$font)
|
foreach($this->fonts as $k=>$font)
|
||||||
{
|
{
|
||||||
//Font objects
|
//Font objects
|
||||||
|
|
|
@ -171,8 +171,6 @@ function draw_server_tree()
|
||||||
*/
|
*/
|
||||||
function initialize_session_tree()
|
function initialize_session_tree()
|
||||||
{
|
{
|
||||||
// From the PHP manual: If you use $_SESSION don't use
|
|
||||||
// session_register(), session_is_registered() or session_unregister()!
|
|
||||||
if( ! array_key_exists( 'tree', $_SESSION ) )
|
if( ! array_key_exists( 'tree', $_SESSION ) )
|
||||||
$_SESSION['tree'] = array();
|
$_SESSION['tree'] = array();
|
||||||
if( ! array_key_exists( 'tree_icons', $_SESSION ) )
|
if( ! array_key_exists( 'tree_icons', $_SESSION ) )
|
||||||
|
|
|
@ -49,9 +49,6 @@ setlanguage();
|
||||||
|
|
||||||
// Unset pdf structure definitions in session if set
|
// Unset pdf structure definitions in session if set
|
||||||
if(isset($_SESSION['currentPDFStructure'])) {
|
if(isset($_SESSION['currentPDFStructure'])) {
|
||||||
session_unregister('currentPDFStructure');
|
|
||||||
session_unregister('availablePDFFields');
|
|
||||||
session_unregister('currentPageDefinitions');
|
|
||||||
unset($_SESSION['currentPDFStructure']);
|
unset($_SESSION['currentPDFStructure']);
|
||||||
unset($_SESSION['availablePDFFields']);
|
unset($_SESSION['availablePDFFields']);
|
||||||
unset($_SESSION['currentPageDefinitions']);
|
unset($_SESSION['currentPageDefinitions']);
|
||||||
|
|
Loading…
Reference in New Issue