From d8856bac5fd84a8c570fbf76d79137d9214da874 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 28 Dec 2011 01:28:16 +0100 Subject: [PATCH] Fix: Work with PHP < 5.3 --- htdocs/admin/tools/dolibarr_export.php | 21 ++++++++++++--------- htdocs/admin/tools/dolibarr_import.php | 15 ++++++++------- htdocs/admin/tools/export.php | 2 +- 3 files changed, 21 insertions(+), 17 deletions(-) diff --git a/htdocs/admin/tools/dolibarr_export.php b/htdocs/admin/tools/dolibarr_export.php index 1742fd1ff64..8d87ce0a0b1 100644 --- a/htdocs/admin/tools/dolibarr_export.php +++ b/htdocs/admin/tools/dolibarr_export.php @@ -83,6 +83,9 @@ if ($_GET["msg"]) print "\n"; } + +$label=getStaticMember($db, 'label'); + ?> @@ -99,7 +102,7 @@ if ($_GET["msg"])
trans("ExportMethod"); ?>
@@ -112,7 +115,7 @@ if ($_GET["msg"])
@@ -122,7 +125,7 @@ if ($_GET["msg"]) } else { - print 'No method available with database '.$db::$label; + print 'No method available with database '.$label; } ?>
@@ -134,7 +137,7 @@ if ($_GET["msg"])
trans("MySqlExportParameters"); ?> @@ -217,7 +220,7 @@ if ($_GET["msg"])
trans("PostgreSqlExportParameters"); ?> @@ -281,8 +284,8 @@ if ($_GET["msg"]) id="filename_template" value="" />
@@ -296,7 +299,7 @@ $compression=array( // 'zip' => array('function' => 'zip_open', 'id' => 'radio_compression_zip', 'label' => $langs->trans("Zip")), Not open source 'gz' => array('function' => 'gzopen', 'id' => 'radio_compression_gzip', 'label' => $langs->trans("Gzip")), ); -if ($db::$label == 'MySQL') +if ($label == 'MySQL') { $compression['bz']=array('function' => 'bzopen', 'id' => 'radio_compression_bzip', 'label' => $langs->trans("Bzip2")); } @@ -339,10 +342,10 @@ print "\n"; show_documents('systemtools','backup',$conf->admin->dir_output.'/backup',$_SERVER['PHP_SELF'],0,1,'',1,0,0,54,0,'',$langs->trans("PreviousDumpFiles")); //if ($result) print '

'; llxFooter(); $db->close(); +?> \ No newline at end of file diff --git a/htdocs/admin/tools/dolibarr_import.php b/htdocs/admin/tools/dolibarr_import.php index 28c39d2c8b2..9ab484aa75f 100644 --- a/htdocs/admin/tools/dolibarr_import.php +++ b/htdocs/admin/tools/dolibarr_import.php @@ -58,6 +58,8 @@ print $langs->trans("RestoreDesc",DOL_DATA_ROOT).'

'; print $langs->trans("RestoreDesc2",DOL_DATA_ROOT).'

'; print $langs->trans("RestoreDesc3",DOL_DATA_ROOT).'

'; +$label=getStaticMember($db, 'label'); + ?>
@@ -69,7 +71,7 @@ print $langs->trans("RestoreDesc3",DOL_DATA_ROOT).'

';
trans("ImportMethod"); ?>
@@ -78,7 +80,7 @@ print $langs->trans("RestoreDesc3",DOL_DATA_ROOT).'

';
@@ -89,7 +91,7 @@ print $langs->trans("RestoreDesc3",DOL_DATA_ROOT).'

'; } else { - print 'No method available with database '.$db::$label; + print 'No method available with database '.$label; } ?>
@@ -101,7 +103,7 @@ print $langs->trans("RestoreDesc3",DOL_DATA_ROOT).'

';
@@ -135,7 +137,7 @@ if ($db::$label == 'MySQL')
@@ -180,8 +182,7 @@ else if ($db::$label == 'PostgreSQL')
close(); - -llxFooter(); ?> \ No newline at end of file diff --git a/htdocs/admin/tools/export.php b/htdocs/admin/tools/export.php index 7667793ced8..d262b66b359 100644 --- a/htdocs/admin/tools/export.php +++ b/htdocs/admin/tools/export.php @@ -394,7 +394,7 @@ function backup_tables($outputfile, $tables='*') // Print headers and global mysql config vars $sqlhead = ''; - $sqlhead .= "-- ".$db::$label." dump via php + $sqlhead .= "-- ".getStaticMember($db, 'label')." dump via php -- -- Host: ".$db->db->host_info." Database: ".$db->database_name." -- ------------------------------------------------------