diff --git a/ChangeLog b/ChangeLog index 8bf7668ec2c..89cbaa3f791 100644 --- a/ChangeLog +++ b/ChangeLog @@ -116,7 +116,7 @@ Fix: Pb of records not correctly cleaned when module marge is Fix: [ bug #1341 ] Lastname not added by file or direct input in mass e-mailing. Fix: [ bug #1357 ] Invoice creator state not printed in generated invoice documents. Fix: Suppliers invoice mask fails using {tttt} in numbering. -Fix: pdf template name for typhon was not correctly et when enabling module. +Fix: [ bug #1350 ] pdf template name for typhon was not correctly set when enabling module. Fix: Navigation on notes for shipments was not working. Fix: [ bug #1353 ] Email notifications, wrong URL. Fix: [ bug #1362 ] Note is not saved. diff --git a/htdocs/core/lib/doc.lib.php b/htdocs/core/lib/doc.lib.php index 1562cfcf7e7..330d3d2ba39 100644 --- a/htdocs/core/lib/doc.lib.php +++ b/htdocs/core/lib/doc.lib.php @@ -69,8 +69,6 @@ function doc_getlinedesc($line,$outputlangs,$hideref=0,$hidedesc=0,$issupplierli // Description long of product line if ($desc && ($desc != $label)) { - if ( $libelleproduitservice && empty($hidedesc) ) $libelleproduitservice.="\n"; - if ($desc == '(CREDIT_NOTE)' && $line->fk_remise_except) { $discount=new DiscountAbsolute($db); @@ -83,18 +81,17 @@ function doc_getlinedesc($line,$outputlangs,$hideref=0,$hidedesc=0,$issupplierli $discount->fetch($line->fk_remise_except); $libelleproduitservice=$outputlangs->transnoentitiesnoconv("DiscountFromDeposit",$discount->ref_facture_source); // Add date of deposit - if (! empty($conf->global->INVOICE_ADD_DEPOSIT_DATE)) echo ' ('.dol_print_date($discount->datec,'day','',$outputlangs).')'; + if (! empty($conf->global->INVOICE_ADD_DEPOSIT_DATE)) $libelleproduitservice.=' ('.dol_print_date($discount->datec,'day','',$outputlangs).')'; } else { if ($idprod) { - if (empty($hidedesc)) - $libelleproduitservice.=$desc; + if (empty($hidedesc)) $libelleproduitservice=dol_concatdesc($libelleproduitservice, $desc); } else { - $libelleproduitservice.=$desc; + $libelleproduitservice=dol_concatdesc($libelleproduitservice, $desc); } } } @@ -148,7 +145,7 @@ function doc_getlinedesc($line,$outputlangs,$hideref=0,$hidedesc=0,$issupplierli $period='('.$outputlangs->transnoentitiesnoconv('DateUntil',dol_print_date($line->date_end, $format, false, $outputlangs)).')'; } //print '>'.$outputlangs->charset_output.','.$period; - $libelleproduitservice.="\n".$period; + $libelleproduitservice=dol_concatdesc($libelleproduitservice, $period); //print $libelleproduitservice; } diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index f740fa1b6ab..c12f7343986 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -3433,13 +3433,13 @@ function picto_required() * Clean a string from all HTML tags and entities * * @param string $StringHtml String to clean - * @param string $removelinefeed Replace also all lines feeds by a space + * @param string $removelinefeed Replace also all lines feeds by a space, otherwise only last one are removed * @param string $pagecodeto Encoding of input/output string * @return string String cleaned */ function dol_string_nohtmltag($StringHtml,$removelinefeed=1,$pagecodeto='UTF-8') { - $pattern = "/<[^>]+>/"; + $pattern = "/<[^<>]+>/"; $temp = dol_html_entity_decode($StringHtml,ENT_COMPAT,$pagecodeto); $temp = preg_replace($pattern,"",$temp); @@ -3506,7 +3506,6 @@ function dol_htmlentitiesbr($stringtoencode,$nl2brmode=0,$pagecodefrom='UTF-8',$ $newstring=strtr($newstring,array('&'=>'__and__','<'=>'__lt__','>'=>'__gt__','"'=>'__dquot__')); $newstring=dol_htmlentities($newstring,ENT_COMPAT,$pagecodefrom); // Make entity encoding $newstring=strtr($newstring,array('__and__'=>'&','__lt__'=>'<','__gt__'=>'>','__dquot__'=>'"')); - //$newstring=strtr($newstring,array('__li__'=>"
  • \n")); // Restore
  • \n } else { @@ -3551,7 +3550,7 @@ function dol_htmlcleanlastbr($stringtodecode) * Replace html_entity_decode functions to manage errors * * @param string $a Operand a - * @param string $b Operand b + * @param string $b Operand b (ENT_QUOTES=convert simple and double quotes) * @param string $c Operand c * @return string String decoded */ @@ -3691,17 +3690,10 @@ function dol_textishtml($msg,$option=0) { if (preg_match('//i',$msg)) return true; - elseif (preg_match('/
    /i',$msg)) return true; - elseif (preg_match('//i',$msg)) return true; - elseif (preg_match('/
  • /i',$msg)) return true; + elseif (preg_match('/<(br|div|font|img|li|span|strong|table)>/i',$msg)) return true; + elseif (preg_match('/<(br|div|font|img|li|span|strong|table)\s+[^<>\/]*>/i',$msg)) return true; + elseif (preg_match('/<(br|div|font|img|li|span|strong|table)\s+[^<>\/]*\/>/i',$msg)) return true; elseif (preg_match('/&[A-Z0-9]{1,6};/i',$msg)) return true; // Html entities names (http://www.w3schools.com/tags/ref_entities.asp) elseif (preg_match('/&#[0-9]{2,3};/i',$msg)) return true; // Html entities numbers (http://www.w3schools.com/tags/ref_entities.asp) return false; @@ -3709,7 +3701,7 @@ function dol_textishtml($msg,$option=0) } /** - * Concat 2 descriptions (second one after first one) + * Concat 2 descriptions (second one after first one with a new line separator if required) * text1 html + text2 html => text1 + '
    ' + text2 * text1 html + text2 txt => text1 + '
    ' + dol_nl2br(text2) * text1 txt + text2 html => dol_nl2br(text1) + '
    ' + text2 diff --git a/htdocs/includes/odtphp/Segment.php b/htdocs/includes/odtphp/Segment.php index 7a6e15ee48b..9bcfa0f65d1 100644 --- a/htdocs/includes/odtphp/Segment.php +++ b/htdocs/includes/odtphp/Segment.php @@ -136,9 +136,15 @@ class Segment implements IteratorAggregate, Countable if (strpos($this->xml, $this->odf->getConfig('DELIMITER_LEFT') . $key . $this->odf->getConfig('DELIMITER_RIGHT')) === false) { throw new SegmentException("var $key not found in {$this->getName()}"); } + + $value=$this->odf->htmlToUTFAndPreOdf($value); + $value = $encode ? htmlspecialchars($value) : $value; $value = ($charset == 'ISO-8859') ? utf8_encode($value) : $value; - $this->vars[$this->odf->getConfig('DELIMITER_LEFT') . $key . $this->odf->getConfig('DELIMITER_RIGHT')] = str_replace("\n", "", $value); + + $value=$this->odf->preOdfToOdf($value); + + $this->vars[$this->odf->getConfig('DELIMITER_LEFT') . $key . $this->odf->getConfig('DELIMITER_RIGHT')] = $value; return $this; } /** diff --git a/htdocs/includes/odtphp/odf.php b/htdocs/includes/odtphp/odf.php index 2848ddc8ddb..225466ca453 100644 --- a/htdocs/includes/odtphp/odf.php +++ b/htdocs/includes/odtphp/odf.php @@ -122,12 +122,68 @@ class Odf throw new OdfException("var $key not found in the document"); //} } + + $value=$this->htmlToUTFAndPreOdf($value); + $value = $encode ? htmlspecialchars($value) : $value; $value = ($charset == 'ISO-8859') ? utf8_encode($value) : $value; - $this->vars[$tag] = str_replace("\n", "", $value); + + $value=$this->preOdfToOdf($value); + + $this->vars[$tag] = $value; return $this; } + + /** + * Function to convert a HTML string into an ODT string + * + * @param string $value String to convert + */ + public function htmlToUTFAndPreOdf($value) + { + // We decode into utf8, entities + $value=dol_html_entity_decode($value, ENT_QUOTES); + + // We convert html tags + $ishtml=dol_textishtml($value); + if ($ishtml) + { + // If string is "MYPODUCT - Desc bold with é accent
    \n
    \nUn texto en español ?" + // Result after clean must be "MYPODUCT - Desc bold with é accent\n\nUn texto en español ?" + + // We want to ignore \n and we want all
    to be \n + $value=preg_replace('/(\r\n|\r|\n)/i','',$value); + $value=preg_replace('/
    /i',"\n",$value); + $value=preg_replace('/\/]*>/i',"\n",$value); + $value=preg_replace('/\/]*\/>/i',"\n",$value); + + //$value=preg_replace('//','__lt__text:p text:style-name=__quot__bold__quot____gt__',$value); + //$value=preg_replace('/<\/strong>/','__lt__/text:p__gt__',$value); + + $value=dol_string_nohtmltag($value, 0); + } + + return $value; + } + + + /** + * Function to convert a HTML string into an ODT string + * + * @param string $value String to convert + */ + public function preOdfToOdf($value) + { + $value = str_replace("\n", "", $value); + + //$value = str_replace("__lt__", "<", $value); + //$value = str_replace("__gt__", ">", $value); + //$value = str_replace("__quot__", '"', $value); + + return $value; + } + /** * Evaluating php codes inside the ODT and output the buffer (print, echo) inplace of the code * @@ -422,25 +478,25 @@ IMG; public function exportAsAttachedPDF($name="") { global $conf; - + if( $name == "" ) $name = md5(uniqid()); dol_syslog(get_class($this).'::exportAsAttachedPDF $name='.$name, LOG_DEBUG); $this->saveToDisk($name); $execmethod=(empty($conf->global->MAIN_EXEC_USE_POPEN)?1:2); // 1 or 2 - + $name=str_replace('.odt', '', $name); if (!empty($conf->global->MAIN_DOL_SCRIPTS_ROOT)) { $command = $conf->global->MAIN_DOL_SCRIPTS_ROOT.'/scripts/odt2pdf/odt2pdf.sh '.$name; }else { $command = '../../scripts/odt2pdf/odt2pdf.sh '.$name; } - - + + //$dirname=dirname($name); //$command = DOL_DOCUMENT_ROOT.'/includes/odtphp/odt2pdf.sh '.$name.' '.$dirname; - + dol_syslog(get_class($this).'::exportAsAttachedPDF $execmethod='.$execmethod.' Run command='.$command,LOG_DEBUG); if ($execmethod == 1) { @@ -483,7 +539,7 @@ IMG; } else { dol_syslog(get_class($this).'::exportAsAttachedPDF $ret_val='.$retval, LOG_DEBUG); dol_syslog(get_class($this).'::exportAsAttachedPDF $output_arr='.var_export($output_arr,true), LOG_DEBUG); - + if ($retval==126) { throw new OdfException('Permission execute convert script : ' . $command); } diff --git a/htdocs/livraison/fiche.php b/htdocs/livraison/fiche.php index 32c5c474ba1..49049a20783 100644 --- a/htdocs/livraison/fiche.php +++ b/htdocs/livraison/fiche.php @@ -514,16 +514,16 @@ else // Shipment if (($delivery->origin == 'shipment' || $delivery->origin == 'expedition') && $delivery->origin_id > 0) { - $linkback = ''.$langs->trans("BackToList").''; - - // Ref - print ''.$langs->trans("RefSending").''; - print ''; + $linkback = ''.$langs->trans("BackToList").''; + + // Ref + print ''.$langs->trans("RefSending").''; + print ''; // Nav is hidden because on a delivery receipt of a shipment, if we go on next shipment, we may find no tab (a shipment may not have delivery receipt yet) - //print $form->showrefnav($expedition, 'refshipment', $linkback, 1, 'ref', 'ref'); + //print $form->showrefnav($expedition, 'refshipment', $linkback, 1, 'ref', 'ref'); print $form->showrefnav($expedition, 'refshipment', $linkback, 0, 'ref', 'ref'); - print ''; - } + print ''; + } // Ref print ''.$langs->trans("Ref").''; diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php index 4c43c6c9e68..2ac38694b7c 100644 --- a/htdocs/projet/class/project.class.php +++ b/htdocs/projet/class/project.class.php @@ -496,6 +496,7 @@ class Project extends CommonObject $sql = "DELETE FROM " . MAIN_DB_PREFIX . "projet_extrafields"; $sql.= " WHERE fk_object=" . $this->id; + dol_syslog(get_class($this) . "::delete sql=" . $sql, LOG_DEBUG); $resql = $this->db->query($sql); if (!$resql) @@ -540,13 +541,15 @@ class Project extends CommonObject } } - if (empty($error)) { + if (empty($error)) + { $this->db->commit(); return 1; } else - { - foreach ( $this->errors as $errmsg ) { + { + foreach ( $this->errors as $errmsg ) + { dol_syslog(get_class($this) . "::delete " . $errmsg, LOG_ERR); $this->error .= ($this->error ? ', ' . $errmsg : $errmsg); } diff --git a/test/phpunit/FunctionsLibTest.php b/test/phpunit/FunctionsLibTest.php index 85a1aaa7caf..11035d148d5 100755 --- a/test/phpunit/FunctionsLibTest.php +++ b/test/phpunit/FunctionsLibTest.php @@ -168,20 +168,35 @@ class FunctionsLibTest extends PHPUnit_Framework_TestCase $input='xxx yyy zzz'; $after=dol_textishtml($input); $this->assertTrue($after); - $input='xxx
    '; - $after=dol_textishtml($input); - $this->assertTrue($after); $input='text with
    some div
    '; $after=dol_textishtml($input); $this->assertTrue($after); $input='text with HTML   entities'; $after=dol_textishtml($input); $this->assertTrue($after); + $input='xxx
    '; + $after=dol_textishtml($input); + $this->assertTrue($after); + $input='xxx
    '; + $after=dol_textishtml($input); + $this->assertTrue($after); + $input='xxx
    '; + $after=dol_textishtml($input); + $this->assertTrue($after); + $input='xxx
    '; + $after=dol_textishtml($input); + $this->assertTrue($after); // False $input='xxx < br>'; $after=dol_textishtml($input); $this->assertFalse($after); + $input='xxx '; // is html, assertFalse($after); + $input='xxx '; + $after=dol_textishtml($input); + $this->assertFalse($after); } @@ -223,6 +238,53 @@ class FunctionsLibTest extends PHPUnit_Framework_TestCase return true; } + /** + * testDolConcat + * + * @return boolean + */ + public function testDolConcat() + { + $text1="A string 1"; $text2="A string 2"; // text 1 and 2 are text, concat need only \n + $after=dol_concatdesc($text1, $text2); + $this->assertEquals("A string 1\nA string 2",$after); + + $text1="A
    string 1"; $text2="A string 2"; // text 1 is html, concat need
    \n + $after=dol_concatdesc($text1, $text2); + $this->assertEquals("A
    string 1
    \nA string 2",$after); + + $text1="A string 1"; $text2="A string 2"; // text 2 is html, concat need
    \n + $after=dol_concatdesc($text1, $text2); + $this->assertEquals("A string 1
    \nA string 2",$after); + + return true; + } + + + /** + * testDolStringNohtmltag + * + * @return boolean + */ + public function testDolStringNohtmltag() + { + $text="A\nstring\n"; + $after=dol_string_nohtmltag($text,0); + $this->assertEquals("A\nstring",$after,"test1"); + + $text="A string\n\nwith html tag and '<' chars
    \n"; + $after=dol_string_nohtmltag($text, 0); + $this->assertEquals("A string\n\nwith html tag and '<' chars",$after,"test2"); + + $text="A string\n\nwith tag with < chars
    \n"; + $after=dol_string_nohtmltag($text, 1); + $this->assertEquals("A string with tag with < chars",$after,"test3"); + + return true; + } + + + /** * testDolHtmlEntitiesBr *