From 82757e6d03b0cab91503bce87803e02d9c596e59 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 15 Jan 2020 12:23:14 +0100 Subject: [PATCH] Move files --- dev/initdata/{ => dbf}/import-dbf.php | 6 +++--- dev/initdata/{ => dbf}/importdb-products.php | 4 ++-- dev/initdata/{ => dbf}/importdb-thirdparties.php | 2 +- dev/initdata/{ => dbf}/includes/dbase.class.php | 2 -- dev/initdata/generate-invoice.php | 2 +- dev/initdata/generate-order.php | 2 +- dev/initdata/generate-product.php | 2 +- dev/initdata/generate-proposal.php | 2 +- dev/initdata/generate-thirdparty.php | 2 +- dev/initdata/import-products.php | 2 +- dev/initdata/import-thirdparties.php | 2 +- dev/initdata/import-users.php | 2 +- 12 files changed, 14 insertions(+), 16 deletions(-) rename dev/initdata/{ => dbf}/import-dbf.php (95%) rename dev/initdata/{ => dbf}/importdb-products.php (97%) rename dev/initdata/{ => dbf}/importdb-thirdparties.php (98%) rename dev/initdata/{ => dbf}/includes/dbase.class.php (99%) diff --git a/dev/initdata/import-dbf.php b/dev/initdata/dbf/import-dbf.php similarity index 95% rename from dev/initdata/import-dbf.php rename to dev/initdata/dbf/import-dbf.php index de904ca76e1..a694a878404 100644 --- a/dev/initdata/import-dbf.php +++ b/dev/initdata/dbf/import-dbf.php @@ -20,9 +20,9 @@ */ /** - * \file dev/initdata/import-product.php + * \file dev/initdata/import-dbf.php * \brief Script example to create a table from a large DBF file (openoffice) - * To purge data, you can have a look at purge-data.php + * To purge data, you can have a look at purge-data.php */ // Test si mode batch $sapi_type = php_sapi_name(); @@ -30,7 +30,7 @@ $script_file = basename(__FILE__); $path = dirname(__FILE__) . '/'; if (substr($sapi_type, 0, 3) == 'cgi') { - echo "Erreur: Vous utilisez l'interpreteur PHP pour le mode CGI. Pour executer mailing-send.php en ligne de commande, vous devez utiliser l'interpreteur PHP pour le mode CLI.\n"; + echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n"; exit; } diff --git a/dev/initdata/importdb-products.php b/dev/initdata/dbf/importdb-products.php similarity index 97% rename from dev/initdata/importdb-products.php rename to dev/initdata/dbf/importdb-products.php index 08e960dfdc6..845064f0688 100644 --- a/dev/initdata/importdb-products.php +++ b/dev/initdata/dbf/importdb-products.php @@ -29,7 +29,7 @@ $sapi_type = php_sapi_name(); $script_file = basename(__FILE__); $path = dirname(__FILE__) . '/'; if (substr($sapi_type, 0, 3) == 'cgi') { - echo "Erreur: Vous utilisez l'interpreteur PHP pour le mode CGI. Pour executer mailing-send.php en ligne de commande, vous devez utiliser l'interpreteur PHP pour le mode CLI.\n"; + echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n"; exit; } @@ -75,7 +75,7 @@ dol_syslog($script_file . " launched with arg " . implode(',', $argv)); $table = $argv[1]; if (empty($argv[1])) { - print "Error: Quelle table ?\n"; + print "Error: Which table ?\n"; print "\n"; exit(-1); } diff --git a/dev/initdata/importdb-thirdparties.php b/dev/initdata/dbf/importdb-thirdparties.php similarity index 98% rename from dev/initdata/importdb-thirdparties.php rename to dev/initdata/dbf/importdb-thirdparties.php index 195c1d16b82..8f0eb0635f0 100644 --- a/dev/initdata/importdb-thirdparties.php +++ b/dev/initdata/dbf/importdb-thirdparties.php @@ -29,7 +29,7 @@ $sapi_type = php_sapi_name(); $script_file = basename(__FILE__); $path = dirname(__FILE__) . '/'; if (substr($sapi_type, 0, 3) == 'cgi') { - echo "Erreur: Vous utilisez l'interpreteur PHP pour le mode CGI. Pour executer mailing-send.php en ligne de commande, vous devez utiliser l'interpreteur PHP pour le mode CLI.\n"; + echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n"; exit; } diff --git a/dev/initdata/includes/dbase.class.php b/dev/initdata/dbf/includes/dbase.class.php similarity index 99% rename from dev/initdata/includes/dbase.class.php rename to dev/initdata/dbf/includes/dbase.class.php index ba0e18db15d..f7383d344a2 100644 --- a/dev/initdata/includes/dbase.class.php +++ b/dev/initdata/dbf/includes/dbase.class.php @@ -10,7 +10,6 @@ define('DBASE_TYPE_FOXPRO', 1); class DBase { - private $fd; private $headerLength = 0; private $fields = array(); @@ -392,5 +391,4 @@ if (!function_exists('dbase_open')) { { return $dbase_identifier->pack(); } - } diff --git a/dev/initdata/generate-invoice.php b/dev/initdata/generate-invoice.php index 0c754b1c874..220144f2a7d 100755 --- a/dev/initdata/generate-invoice.php +++ b/dev/initdata/generate-invoice.php @@ -26,7 +26,7 @@ // Test si mode batch $sapi_type = php_sapi_name(); if (substr($sapi_type, 0, 3) == 'cgi') { - echo "Erreur: Vous utilisez l'interpreteur PHP pour le mode CGI. Pour executer mailing-send.php en ligne de commande, vous devez utiliser l'interpreteur PHP pour le mode CLI.\n"; + echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n"; exit; } diff --git a/dev/initdata/generate-order.php b/dev/initdata/generate-order.php index b66d3a3abc9..129313c70fd 100755 --- a/dev/initdata/generate-order.php +++ b/dev/initdata/generate-order.php @@ -27,7 +27,7 @@ // Test si mode batch $sapi_type = php_sapi_name(); if (substr($sapi_type, 0, 3) == 'cgi') { - echo "Erreur: Vous utilisez l'interpreteur PHP pour le mode CGI. Pour executer mailing-send.php en ligne de commande, vous devez utiliser l'interpreteur PHP pour le mode CLI.\n"; + echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n"; exit; } diff --git a/dev/initdata/generate-product.php b/dev/initdata/generate-product.php index 83951c57df7..49fd9860467 100755 --- a/dev/initdata/generate-product.php +++ b/dev/initdata/generate-product.php @@ -27,7 +27,7 @@ // Test si mode batch $sapi_type = php_sapi_name(); if (substr($sapi_type, 0, 3) == 'cgi') { - echo "Erreur: Vous utilisez l'interpreteur PHP pour le mode CGI. Pour executer mailing-send.php en ligne de commande, vous devez utiliser l'interpreteur PHP pour le mode CLI.\n"; + echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n"; exit; } diff --git a/dev/initdata/generate-proposal.php b/dev/initdata/generate-proposal.php index ad8cf6025bb..d0b2cd4aa56 100755 --- a/dev/initdata/generate-proposal.php +++ b/dev/initdata/generate-proposal.php @@ -27,7 +27,7 @@ // Test si mode batch $sapi_type = php_sapi_name(); if (substr($sapi_type, 0, 3) == 'cgi') { - echo "Erreur: Vous utilisez l'interpreteur PHP pour le mode CGI. Pour executer mailing-send.php en ligne de commande, vous devez utiliser l'interpreteur PHP pour le mode CLI.\n"; + echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n"; exit; } diff --git a/dev/initdata/generate-thirdparty.php b/dev/initdata/generate-thirdparty.php index 9f740b5705d..91c7c969b75 100755 --- a/dev/initdata/generate-thirdparty.php +++ b/dev/initdata/generate-thirdparty.php @@ -27,7 +27,7 @@ // Test si mode batch $sapi_type = php_sapi_name(); if (substr($sapi_type, 0, 3) == 'cgi') { - echo "Erreur: Vous utilisez l'interpreteur PHP pour le mode CGI. Pour executer mailing-send.php en ligne de commande, vous devez utiliser l'interpreteur PHP pour le mode CLI.\n"; + echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n"; exit; } diff --git a/dev/initdata/import-products.php b/dev/initdata/import-products.php index e55f13c7c82..4288c5bf3b1 100755 --- a/dev/initdata/import-products.php +++ b/dev/initdata/import-products.php @@ -30,7 +30,7 @@ $sapi_type = php_sapi_name(); $script_file = basename(__FILE__); $path=dirname(__FILE__).'/'; if (substr($sapi_type, 0, 3) == 'cgi') { - echo "Erreur: Vous utilisez l'interpreteur PHP pour le mode CGI. Pour executer mailing-send.php en ligne de commande, vous devez utiliser l'interpreteur PHP pour le mode CLI.\n"; + echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n"; exit; } diff --git a/dev/initdata/import-thirdparties.php b/dev/initdata/import-thirdparties.php index 558745e8d06..ef1dfcc99ab 100755 --- a/dev/initdata/import-thirdparties.php +++ b/dev/initdata/import-thirdparties.php @@ -30,7 +30,7 @@ $sapi_type = php_sapi_name(); $script_file = basename(__FILE__); $path=dirname(__FILE__).'/'; if (substr($sapi_type, 0, 3) == 'cgi') { - echo "Erreur: Vous utilisez l'interpreteur PHP pour le mode CGI. Pour executer mailing-send.php en ligne de commande, vous devez utiliser l'interpreteur PHP pour le mode CLI.\n"; + echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n"; exit; } diff --git a/dev/initdata/import-users.php b/dev/initdata/import-users.php index 64af2f9eb64..60a672adf12 100755 --- a/dev/initdata/import-users.php +++ b/dev/initdata/import-users.php @@ -30,7 +30,7 @@ $sapi_type = php_sapi_name(); $script_file = basename(__FILE__); $path=dirname(__FILE__).'/'; if (substr($sapi_type, 0, 3) == 'cgi') { - echo "Erreur: Vous utilisez l'interpreteur PHP pour le mode CGI. Pour executer mailing-send.php en ligne de commande, vous devez utiliser l'interpreteur PHP pour le mode CLI.\n"; + echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n"; exit; }