From 2d2687a642062aad8c61798d66bc4531ae7f7dd3 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Sun, 3 May 2009 17:28:14 +0000 Subject: [PATCH] Fix: bug affichage code barre --- htdocs/admin/barcode.php | 4 +++- .../includes/barcode/html.formbarcode.class.php | 3 ++- .../includes/barcode/php-barcode/php-barcode.php | 8 ++++---- .../modules/barcode/phpbarcode.modules.php | 16 ++++++++-------- htdocs/viewimage.php | 8 ++++---- 5 files changed, 21 insertions(+), 18 deletions(-) diff --git a/htdocs/admin/barcode.php b/htdocs/admin/barcode.php index d075b08b581..31d4d491e2e 100644 --- a/htdocs/admin/barcode.php +++ b/htdocs/admin/barcode.php @@ -41,6 +41,7 @@ if ($_POST["action"] == 'setcoder') $sqlp = "UPDATE ".MAIN_DB_PREFIX."c_barcode_type"; $sqlp.= " SET coder = '" . $_POST["coder"]."'"; $sqlp.= " WHERE rowid = ". $_POST["code_id"]; + $resql=$db->query($sqlp); //print $sqlp; } @@ -132,7 +133,8 @@ print ''.$langs->trans("CodeBarGenerator").'' print "\n"; $sql = "SELECT rowid, code as encoding, libelle, coder, example"; -$sql .= " FROM ".MAIN_DB_PREFIX."c_barcode_type"; +$sql.= " FROM ".MAIN_DB_PREFIX."c_barcode_type"; + dol_syslog("admin/barcode.php sql=".$sql); $resql=$db->query($sql); if ($resql) diff --git a/htdocs/includes/barcode/html.formbarcode.class.php b/htdocs/includes/barcode/html.formbarcode.class.php index 2ca3adbe4a7..f095d0dbd28 100644 --- a/htdocs/includes/barcode/html.formbarcode.class.php +++ b/htdocs/includes/barcode/html.formbarcode.class.php @@ -62,7 +62,8 @@ class FormBarCode $disable = ''; // On vérifie si le code de barre est déjà sélectionné par défaut dans le module produit - if ($conf->produit->enabled && $conf->global->PRODUIT_DEFAULT_BARCODE_TYPE == $code_id) + if (($conf->produit->enabled && $conf->global->PRODUIT_DEFAULT_BARCODE_TYPE == $code_id) || + ($conf->societe->enabled && $conf->global->GENBARCODE_BARCODETYPE_THIRDPARTY == $code_id)) { $disable = 'disabled="disabled"'; } diff --git a/htdocs/includes/barcode/php-barcode/php-barcode.php b/htdocs/includes/barcode/php-barcode/php-barcode.php index dd57eff3ed1..5338dd7d130 100644 --- a/htdocs/includes/barcode/php-barcode/php-barcode.php +++ b/htdocs/includes/barcode/php-barcode/php-barcode.php @@ -65,8 +65,8 @@ $font_loc = DOL_DOCUMENT_ROOT.'/includes/barcode/php-barcode/fonts/AerialBd.ttf' /* Automatic-Detection of Font if running Windows * kick this lines if you don't need them! */ -if (isset($_ENV['windir']) && file_exists($_ENV['windir'])){ - $font_loc=$_ENV['windir']."\Fonts\arialbd.ttf"; +if (isset($_SERVER['WINDIR']) && file_exists($_SERVER['WINDIR'])){ + $font_loc=$_SERVER['WINDIR']."\Fonts\arialbd.ttf"; } /* ******************************************************************** */ @@ -76,7 +76,7 @@ if (isset($_ENV['windir']) && file_exists($_ENV['windir'])){ * leave blank if you don't have them :( * genbarcode is needed to render encodings other than EAN-12/EAN-13/ISBN */ -if (isset($_ENV['windir']) && file_exists($_ENV['windir'])) +if (isset($_SERVER['WINDIR']) && file_exists($_SERVER['WINDIR'])) { $genbarcode_loc = DOL_DOCUMENT_ROOT.'/includes/barcode/php-barcode/genbarcode/genbarcode.exe'; } @@ -85,7 +85,7 @@ else //$genbarcode_loc = "/usr/local/bin/genbarcode"; $genbarcode_loc = $conf->global->GENBARCODE_LOCATION; } -//dol_syslog("genbarcode_loc=".$genbarcode_loc); +//dol_syslog("genbarcode_loc=".$genbarcode_loc." - env_windows=".$_SERVER['WINDIR']); /* CONFIGURATION ENDS HERE */ diff --git a/htdocs/includes/modules/barcode/phpbarcode.modules.php b/htdocs/includes/modules/barcode/phpbarcode.modules.php index 82e86fd69c0..611906f63b2 100644 --- a/htdocs/includes/modules/barcode/phpbarcode.modules.php +++ b/htdocs/includes/modules/barcode/phpbarcode.modules.php @@ -81,12 +81,12 @@ class modPhpbarcode extends ModeleBarCode return $supported; } - /** + /** * \brief Return an image file on output * \param $code Valeur numérique a coder * \param $encoding Mode de codage * \param $readable Code lisible - */ + */ function buildBarCode($code,$encoding,$readable='Y') { global $_GET,$_ENV,$_SERVER; @@ -111,15 +111,15 @@ class modPhpbarcode extends ModeleBarCode return 1; } - /** + /** * \brief Save an image file on disk * \param $code Valeur numérique a coder * \param $encoding Mode de codage * \param $readable Code lisible - */ - function writeBarCode($code,$encoding,$readable='Y') - { - global $conf,$filebarcode; + */ + function writeBarCode($code,$encoding,$readable='Y') + { + global $conf,$filebarcode; create_exdir($conf->barcode->dir_temp); @@ -130,7 +130,7 @@ class modPhpbarcode extends ModeleBarCode $result=$this->buildBarCode($code,$encoding,$readable); return $result; - } + } } diff --git a/htdocs/viewimage.php b/htdocs/viewimage.php index 1bf60fcce24..de2b6395cce 100644 --- a/htdocs/viewimage.php +++ b/htdocs/viewimage.php @@ -292,21 +292,21 @@ if ($modulepart) elseif ($modulepart == 'barcode') { $accessallowed=1; - $original_file=''; // No files are built on disk + $original_file=$conf->barcode->dir_temp.'/'.$original_file; } // images des stats du commercial elseif ($modulepart == 'graph_comm') { $accessallowed=1; - $original_file= $conf->commercial->dir_temp . '/' .$original_file ; // No files are built on disk + $original_file= $conf->commercial->dir_temp . '/' .$original_file; // No files are built on disk } // Wrapping generique (allows any module to open a file if file is in directory // called DOL_DATA_ROOT/modulepart. else { $accessallowed=1; - $original_file=DOL_DATA_ROOT.'/'.$modulepart.'/'.$original_file; + $original_file=DOL_DATA_ROOT.'/'.$modulepart.'/'.$original_file; } } @@ -367,7 +367,7 @@ else exit; } - // Les drois sont ok et fichier trouv� + // Les drois sont ok et fichier trouve if ($type) { header('Content-type: '.$type);