diff --git a/htdocs/admin/barcode.php b/htdocs/admin/barcode.php index 66d4268ba38..07254c9d3fc 100644 --- a/htdocs/admin/barcode.php +++ b/htdocs/admin/barcode.php @@ -77,9 +77,9 @@ else if ($action == 'GENBARCODE_BARCODETYPE_THIRDPARTY') if($action && $action!='setcoder') { if (! $res > 0) $error++; - + if (! $error) - { + { $mesg = "".$langs->trans("SetupSaved").""; } else @@ -207,8 +207,7 @@ if ($resql) if ($module->encodingIsSupported($obj->encoding)) { // Build barcode on disk (not used, this is done to make debug easier) - $result=$module->writeBarCode($obj->example,$obj->encoding,'Y'); - + $result=$module->writeBarCode($obj->example,$obj->encoding,'Y'); // Generate on the fly and output barcode with generator $url=DOL_URL_ROOT.'/viewimage.php?modulepart=barcode&generator='.urlencode($obj->coder).'&code='.urlencode($obj->example).'&encoding='.urlencode($obj->encoding); //print $url; diff --git a/htdocs/core/modules/barcode/phpbarcode.modules.php b/htdocs/core/modules/barcode/phpbarcode.modules.php index 7891b12ee93..7eb8f6fab32 100644 --- a/htdocs/core/modules/barcode/phpbarcode.modules.php +++ b/htdocs/core/modules/barcode/phpbarcode.modules.php @@ -89,10 +89,11 @@ class modPhpbarcode extends ModeleBarCode } /** - * \brief Return an image file on the fly (no need to write on disk) - * \param $code Value to encode - * \param $encoding Mode of encoding - * \param $readable Code can be read + * Return an image file on the fly (no need to write on disk) + * + * @param string $code Value to encode + * @param string $encoding Mode of encoding + * @param string $readable Code can be read */ function buildBarCode($code,$encoding,$readable='Y') { @@ -119,7 +120,7 @@ class modPhpbarcode extends ModeleBarCode if (! is_array($result)) { $this->error=$result; - print $this->error;exit; + print $this->error; return -1; } @@ -127,10 +128,11 @@ class modPhpbarcode extends ModeleBarCode } /** - * \brief Save an image file on disk (with no output) - * \param $code Value to encode - * \param $encoding Mode of encoding - * \param $readable Code can be read + * Save an image file on disk (with no output) + * + * @param string $code Value to encode + * @param string $encoding Mode of encoding + * @param string $readable Code can be read */ function writeBarCode($code,$encoding,$readable='Y') {