fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in bugfix/HOR-4158 (pull request #6296)

Browse Source 
HOR-4158

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
This commit is contained in:
Ronald Quenta
2018-01-25 12:41:13 +00:00
committed by Julio Cesar Laura Avendaño
parent 9d6b35b69d
commit 33244d2dad
3 changed files with 89 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
thirdparty/pear/SOAP/Transport/HTTP.php vendored
View File

@@ -583,7 +583,7 @@ class SOAP_Transport_HTTP extends SOAP_Transport
if (defined('CURLOPT_HTTP_VERSION')) { if (defined('CURLOPT_HTTP_VERSION')) {
curl_setopt($ch, CURLOPT_HTTP_VERSION, 1); curl_setopt($ch, CURLOPT_HTTP_VERSION, 1);
} }
if (!ini_get('safe_mode') && !ini_get('open_basedir')) { if (!ini_get('open_basedir')) {
curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1); curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1);
} }
$cookies = $this->_generateCookieHeader($options); $cookies = $this->_generateCookieHeader($options);

132
thirdparty/phpmailer/class.phpmailer.php vendored
View File

@@ -171,7 +171,7 @@ class PHPMailer {
* @var boolean * @var boolean
*/ */
public $UseSendmailOptions = true; public $UseSendmailOptions = true;
/** /**
* Path to PHPMailer plugins. Useful if the SMTP class * Path to PHPMailer plugins. Useful if the SMTP class
* is in a different directory than the PHP include path. * is in a different directory than the PHP include path.
@@ -264,7 +264,7 @@ class PHPMailer {
* @var string * @var string
*/ */
public $AuthType = ''; public $AuthType = '';
/** /**
* Sets SMTP realm. * Sets SMTP realm.
* @var string * @var string
@@ -496,27 +496,28 @@ class PHPMailer {
// METHODS, VARIABLES // METHODS, VARIABLES
///////////////////////////////////////////////// /////////////////////////////////////////////////
/** /**
* Calls actual mail() function, but in a safe_mode aware fashion * Calls actual mail() function
* Also, unless sendmail_path points to sendmail (or something that * Also, unless sendmail_path points to sendmail (or something that
* claims to be sendmail), don't pass params (not a perfect fix, * claims to be sendmail), don't pass params (not a perfect fix,
* but it will do) * but it will do)
* @param string $to To * @param string $to To
* @param string $subject Subject * @param string $subject Subject
* @param string $body Message Body * @param string $body Message Body
* @param string $header Additional Header(s) * @param string $header Additional Header(s)
* @param string $params Params * @param string $params Params
* @access private * @access private
* @return bool * @return bool
*/ */
private function mail_passthru($to, $subject, $body, $header, $params) { private function mail_passthru($to, $subject, $body, $header, $params)
if ( ini_get('safe_mode') || !($this->UseSendmailOptions) ) { {
$rt = @mail($to, $this->EncodeHeader($this->SecureHeader($subject)), $body, $header); if (!$this->UseSendmailOptions) {
} else { $rt = @mail($to, $this->EncodeHeader($this->SecureHeader($subject)), $body, $header);
$rt = @mail($to, $this->EncodeHeader($this->SecureHeader($subject)), $body, $header, $params); } else {
$rt = @mail($to, $this->EncodeHeader($this->SecureHeader($subject)), $body, $header, $params);
}
return $rt;
} }
return $rt;
}
/** /**
* Outputs debugging info via user-defined method * Outputs debugging info via user-defined method
@@ -907,52 +908,53 @@ class PHPMailer {
return true; return true;
} }
/** /**
* Sends mail using the PHP mail() function. * Sends mail using the PHP mail() function.
* @param string $header The message headers * @param string $header The message headers
* @param string $body The message body * @param string $body The message body
* @throws phpmailerException * @throws phpmailerException
* @access protected * @access protected
* @return bool * @return bool
*/ */
protected function MailSend($header, $body) { protected function MailSend($header, $body)
$toArr = array(); {
foreach($this->to as $t) { $toArr = array();
$toArr[] = $this->AddrFormat($t); foreach ($this->to as $t) {
} $toArr[] = $this->AddrFormat($t);
$to = implode(', ', $toArr); }
$to = implode(', ', $toArr);
if (empty($this->Sender)) { if (empty($this->Sender)) {
$params = "-oi "; $params = "-oi ";
} else { } else {
$params = sprintf("-oi -f%s", $this->Sender); $params = sprintf("-oi -f%s", $this->Sender);
}
if ($this->Sender != '') {
$old_from = ini_get('sendmail_from');
ini_set('sendmail_from', $this->Sender);
}
$rt = false;
if ($this->SingleTo === true && count($toArr) > 1) {
foreach ($toArr as $val) {
$rt = $this->mail_passthru($val, $this->Subject, $body, $header, $params);
// implement call back function if it exists
$isSent = ($rt == 1) ? 1 : 0;
$this->doCallback($isSent, $val, $this->cc, $this->bcc, $this->Subject, $body);
}
} else {
$rt = $this->mail_passthru($to, $this->Subject, $body, $header, $params);
// implement call back function if it exists
$isSent = ($rt == 1) ? 1 : 0;
$this->doCallback($isSent, $to, $this->cc, $this->bcc, $this->Subject, $body);
}
if (isset($old_from)) {
ini_set('sendmail_from', $old_from);
}
if (!$rt) {
throw new phpmailerException($this->Lang('instantiate'), self::STOP_CRITICAL);
}
return true;
} }
if ($this->Sender != '' and !ini_get('safe_mode')) {
$old_from = ini_get('sendmail_from');
ini_set('sendmail_from', $this->Sender);
}
$rt = false;
if ($this->SingleTo === true && count($toArr) > 1) {
foreach ($toArr as $val) {
$rt = $this->mail_passthru($val, $this->Subject, $body, $header, $params);
// implement call back function if it exists
$isSent = ($rt == 1) ? 1 : 0;
$this->doCallback($isSent, $val, $this->cc, $this->bcc, $this->Subject, $body);
}
} else {
$rt = $this->mail_passthru($to, $this->Subject, $body, $header, $params);
// implement call back function if it exists
$isSent = ($rt == 1) ? 1 : 0;
$this->doCallback($isSent, $to, $this->cc, $this->bcc, $this->Subject, $body);
}
if (isset($old_from)) {
ini_set('sendmail_from', $old_from);
}
if(!$rt) {
throw new phpmailerException($this->Lang('instantiate'), self::STOP_CRITICAL);
}
return true;
}
/** /**
* Sends mail via SMTP using PhpSMTP * Sends mail via SMTP using PhpSMTP

42
thirdparty/tcpdf/tcpdf.php vendored
View File

@@ -76,7 +76,7 @@
// dullus for text Justification. // dullus for text Justification.
// Bob Vincent (pillarsdotnet@users.sourceforge.net) for <li> value attribute. // Bob Vincent (pillarsdotnet@users.sourceforge.net) for <li> value attribute.
// Patrick Benny for text stretch suggestion on Cell(). // Patrick Benny for text stretch suggestion on Cell().
// Johannes Güntert for JavaScript support. // Johannes G<EFBFBD>ntert for JavaScript support.
// Denis Van Nuffelen for Dynamic Form. // Denis Van Nuffelen for Dynamic Form.
// Jacek Czekaj for multibyte justification // Jacek Czekaj for multibyte justification
// Anthony Ferrara for the reintroduction of legacy image methods. // Anthony Ferrara for the reintroduction of legacy image methods.
@@ -87,7 +87,7 @@
// Mohamad Ali Golkar, Saleh AlMatrafe, Charles Abbott for Arabic and Persian support. // Mohamad Ali Golkar, Saleh AlMatrafe, Charles Abbott for Arabic and Persian support.
// Moritz Wagner and Andreas Wurmser for graphic functions. // Moritz Wagner and Andreas Wurmser for graphic functions.
// Andrew Whitehead for core fonts support. // Andrew Whitehead for core fonts support.
// Esteban Joël Marín for OpenType font conversion. // Esteban Jo<EFBFBD>l Mar<EFBFBD>n for OpenType font conversion.
// Teus Hagen for several suggestions and fixes. // Teus Hagen for several suggestions and fixes.
// Yukihiro Nakadaira for CID-0 CJK fonts fixes. // Yukihiro Nakadaira for CID-0 CJK fonts fixes.
// Kosmas Papachristos for some CSS improvements. // Kosmas Papachristos for some CSS improvements.
@@ -7088,7 +7088,7 @@ class TCPDF {
* @param $cellpadding (float) Internal cell padding, if empty uses default cell padding. * @param $cellpadding (float) Internal cell padding, if empty uses default cell padding.
* @param $border (mixed) Indicates if borders must be drawn around the cell. The value can be a number:<ul><li>0: no border (default)</li><li>1: frame</li></ul> or a string containing some or all of the following characters (in any order):<ul><li>L: left</li><li>T: top</li><li>R: right</li><li>B: bottom</li></ul> or an array of line styles for each border group - for example: array('LTRB' => array('width' => 2, 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => array(0, 0, 0))) * @param $border (mixed) Indicates if borders must be drawn around the cell. The value can be a number:<ul><li>0: no border (default)</li><li>1: frame</li></ul> or a string containing some or all of the following characters (in any order):<ul><li>L: left</li><li>T: top</li><li>R: right</li><li>B: bottom</li></ul> or an array of line styles for each border group - for example: array('LTRB' => array('width' => 2, 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => array(0, 0, 0)))
* @return float Return the minimal height needed for multicell method for printing the $txt param. * @return float Return the minimal height needed for multicell method for printing the $txt param.
* @author Alexander Escalona Fernández, Nicola Asuni * @author Alexander Escalona Fern<EFBFBD>ndez, Nicola Asuni
* @public * @public
* @since 4.5.011 * @since 4.5.011
*/ */
@@ -7195,7 +7195,7 @@ class TCPDF {
* @param $cellpadding (float) Internal cell padding, if empty uses default cell padding. * @param $cellpadding (float) Internal cell padding, if empty uses default cell padding.
* @param $border (mixed) Indicates if borders must be drawn around the cell. The value can be a number:<ul><li>0: no border (default)</li><li>1: frame</li></ul> or a string containing some or all of the following characters (in any order):<ul><li>L: left</li><li>T: top</li><li>R: right</li><li>B: bottom</li></ul> or an array of line styles for each border group - for example: array('LTRB' => array('width' => 2, 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => array(0, 0, 0))) * @param $border (mixed) Indicates if borders must be drawn around the cell. The value can be a number:<ul><li>0: no border (default)</li><li>1: frame</li></ul> or a string containing some or all of the following characters (in any order):<ul><li>L: left</li><li>T: top</li><li>R: right</li><li>B: bottom</li></ul> or an array of line styles for each border group - for example: array('LTRB' => array('width' => 2, 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => array(0, 0, 0)))
* @return float Return the minimal height needed for multicell method for printing the $txt param. * @return float Return the minimal height needed for multicell method for printing the $txt param.
* @author Nicola Asuni, Alexander Escalona Fernández * @author Nicola Asuni, Alexander Escalona Fern<EFBFBD>ndez
* @public * @public
*/ */
public function getStringHeight($w, $txt, $reseth=false, $autopadding=true, $cellpadding='', $border=0) { public function getStringHeight($w, $txt, $reseth=false, $autopadding=true, $cellpadding='', $border=0) {
@@ -7927,7 +7927,7 @@ class TCPDF {
curl_setopt($cs, CURLOPT_BINARYTRANSFER, true); curl_setopt($cs, CURLOPT_BINARYTRANSFER, true);
curl_setopt($cs, CURLOPT_FAILONERROR, true); curl_setopt($cs, CURLOPT_FAILONERROR, true);
curl_setopt($cs, CURLOPT_RETURNTRANSFER, true); curl_setopt($cs, CURLOPT_RETURNTRANSFER, true);
if ((ini_get('open_basedir') == '') AND (!ini_get('safe_mode'))) { if (ini_get('open_basedir') == '') {
curl_setopt($cs, CURLOPT_FOLLOWLOCATION, true); curl_setopt($cs, CURLOPT_FOLLOWLOCATION, true);
} }
curl_setopt($cs, CURLOPT_CONNECTTIMEOUT, 5); curl_setopt($cs, CURLOPT_CONNECTTIMEOUT, 5);
@@ -15366,7 +15366,7 @@ class TCPDF {
} }
/** /**
* Append a cubic Bézier curve to the current path. The curve shall extend from the current point to the point (x3, y3), using (x1, y1) and (x2, y2) as the Bézier control points. * Append a cubic B<EFBFBD>zier curve to the current path. The curve shall extend from the current point to the point (x3, y3), using (x1, y1) and (x2, y2) as the B<EFBFBD>zier control points.
* The new current point shall be (x3, y3). * The new current point shall be (x3, y3).
* @param $x1 (float) Abscissa of control point 1. * @param $x1 (float) Abscissa of control point 1.
* @param $y1 (float) Ordinate of control point 1. * @param $y1 (float) Ordinate of control point 1.
@@ -15382,7 +15382,7 @@ class TCPDF {
} }
/** /**
* Append a cubic Bézier curve to the current path. The curve shall extend from the current point to the point (x3, y3), using the current point and (x2, y2) as the Bézier control points. * Append a cubic B<EFBFBD>zier curve to the current path. The curve shall extend from the current point to the point (x3, y3), using the current point and (x2, y2) as the B<EFBFBD>zier control points.
* The new current point shall be (x3, y3). * The new current point shall be (x3, y3).
* @param $x2 (float) Abscissa of control point 2. * @param $x2 (float) Abscissa of control point 2.
* @param $y2 (float) Ordinate of control point 2. * @param $y2 (float) Ordinate of control point 2.
@@ -15396,7 +15396,7 @@ class TCPDF {
} }
/** /**
* Append a cubic Bézier curve to the current path. The curve shall extend from the current point to the point (x3, y3), using (x1, y1) and (x3, y3) as the Bézier control points. * Append a cubic B<EFBFBD>zier curve to the current path. The curve shall extend from the current point to the point (x3, y3), using (x1, y1) and (x3, y3) as the B<EFBFBD>zier control points.
* The new current point shall be (x3, y3). * The new current point shall be (x3, y3).
* @param $x1 (float) Abscissa of control point 1. * @param $x1 (float) Abscissa of control point 1.
* @param $y1 (float) Ordinate of control point 1. * @param $y1 (float) Ordinate of control point 1.
@@ -16777,7 +16777,7 @@ class TCPDF {
/** /**
* Insert Named Destinations. * Insert Named Destinations.
* @protected * @protected
* @author Johannes Güntert, Nicola Asuni * @author Johannes G<EFBFBD>ntert, Nicola Asuni
* @since 5.9.098 (2011-06-23) * @since 5.9.098 (2011-06-23)
*/ */
protected function _putdests() { protected function _putdests() {
@@ -16976,7 +16976,7 @@ class TCPDF {
* Adds a javascript * Adds a javascript
* @param $script (string) Javascript code * @param $script (string) Javascript code
* @public * @public
* @author Johannes Güntert, Nicola Asuni * @author Johannes G<EFBFBD>ntert, Nicola Asuni
* @since 2.1.002 (2008-02-12) * @since 2.1.002 (2008-02-12)
*/ */
public function IncludeJS($script) { public function IncludeJS($script) {
@@ -17005,7 +17005,7 @@ class TCPDF {
/** /**
* Create a javascript PDF string. * Create a javascript PDF string.
* @protected * @protected
* @author Johannes Güntert, Nicola Asuni * @author Johannes G<EFBFBD>ntert, Nicola Asuni
* @since 2.1.002 (2008-02-12) * @since 2.1.002 (2008-02-12)
*/ */
protected function _putjavascript() { protected function _putjavascript() {
@@ -19055,7 +19055,7 @@ class TCPDF {
* @param $col1 (array) first color (Grayscale, RGB or CMYK components). * @param $col1 (array) first color (Grayscale, RGB or CMYK components).
* @param $col2 (array) second color (Grayscale, RGB or CMYK components). * @param $col2 (array) second color (Grayscale, RGB or CMYK components).
* @param $coords (array) array of the form (x1, y1, x2, y2) which defines the gradient vector (see linear_gradient_coords.jpg). The default value is from left to right (x1=0, y1=0, x2=1, y2=0). * @param $coords (array) array of the form (x1, y1, x2, y2) which defines the gradient vector (see linear_gradient_coords.jpg). The default value is from left to right (x1=0, y1=0, x2=1, y2=0).
* @author Andreas Würmser, Nicola Asuni * @author Andreas W<EFBFBD>rmser, Nicola Asuni
* @since 3.1.000 (2008-06-09) * @since 3.1.000 (2008-06-09)
* @public * @public
*/ */
@@ -19073,7 +19073,7 @@ class TCPDF {
* @param $col1 (array) first color (Grayscale, RGB or CMYK components). * @param $col1 (array) first color (Grayscale, RGB or CMYK components).
* @param $col2 (array) second color (Grayscale, RGB or CMYK components). * @param $col2 (array) second color (Grayscale, RGB or CMYK components).
* @param $coords (array) array of the form (fx, fy, cx, cy, r) where (fx, fy) is the starting point of the gradient with color1, (cx, cy) is the center of the circle with color2, and r is the radius of the circle (see radial_gradient_coords.jpg). (fx, fy) should be inside the circle, otherwise some areas will not be defined. * @param $coords (array) array of the form (fx, fy, cx, cy, r) where (fx, fy) is the starting point of the gradient with color1, (cx, cy) is the center of the circle with color2, and r is the radius of the circle (see radial_gradient_coords.jpg). (fx, fy) should be inside the circle, otherwise some areas will not be defined.
* @author Andreas Würmser, Nicola Asuni * @author Andreas W<EFBFBD>rmser, Nicola Asuni
* @since 3.1.000 (2008-06-09) * @since 3.1.000 (2008-06-09)
* @public * @public
*/ */
@@ -19096,7 +19096,7 @@ class TCPDF {
* @param $coords_min (array) minimum value used by the coordinates. If a coordinate's value is smaller than this it will be cut to coords_min. default: 0 * @param $coords_min (array) minimum value used by the coordinates. If a coordinate's value is smaller than this it will be cut to coords_min. default: 0
* @param $coords_max (array) maximum value used by the coordinates. If a coordinate's value is greater than this it will be cut to coords_max. default: 1 * @param $coords_max (array) maximum value used by the coordinates. If a coordinate's value is greater than this it will be cut to coords_max. default: 1
* @param $antialias (boolean) A flag indicating whether to filter the shading function to prevent aliasing artifacts. * @param $antialias (boolean) A flag indicating whether to filter the shading function to prevent aliasing artifacts.
* @author Andreas Würmser, Nicola Asuni * @author Andreas W<EFBFBD>rmser, Nicola Asuni
* @since 3.1.000 (2008-06-09) * @since 3.1.000 (2008-06-09)
* @public * @public
*/ */
@@ -19188,7 +19188,7 @@ class TCPDF {
* @param $y (float) ordinate of the top left corner of the rectangle. * @param $y (float) ordinate of the top left corner of the rectangle.
* @param $w (float) width of the rectangle. * @param $w (float) width of the rectangle.
* @param $h (float) height of the rectangle. * @param $h (float) height of the rectangle.
* @author Andreas Würmser, Nicola Asuni * @author Andreas W<EFBFBD>rmser, Nicola Asuni
* @since 3.1.000 (2008-06-09) * @since 3.1.000 (2008-06-09)
* @protected * @protected
*/ */
@@ -20697,19 +20697,19 @@ class TCPDF {
// remove empty blocks // remove empty blocks
$cssdata = preg_replace('/([^\}\{]+)\{\}/', '', $cssdata); $cssdata = preg_replace('/([^\}\{]+)\{\}/', '', $cssdata);
// replace media type parenthesis // replace media type parenthesis
$cssdata = preg_replace('/@media[\s]+([^\{]*)\{/i', '@media \\1§', $cssdata); $cssdata = preg_replace('/@media[\s]+([^\{]*)\{/i', '@media \\1<EFBFBD>', $cssdata);
$cssdata = preg_replace('/\}\}/si', '}§', $cssdata); $cssdata = preg_replace('/\}\}/si', '}<EFBFBD>', $cssdata);
// trim string // trim string
$cssdata = trim($cssdata); $cssdata = trim($cssdata);
// find media blocks (all, braille, embossed, handheld, print, projection, screen, speech, tty, tv) // find media blocks (all, braille, embossed, handheld, print, projection, screen, speech, tty, tv)
$cssblocks = array(); $cssblocks = array();
$matches = array(); $matches = array();
if (preg_match_all('/@media[\s]+([^\§]*)§([^§]*)§/i', $cssdata, $matches) > 0) { if (preg_match_all('/@media[\s]+([^\<EFBFBD>]*)<EFBFBD>([^<EFBFBD>]*)<EFBFBD>/i', $cssdata, $matches) > 0) {
foreach ($matches[1] as $key => $type) { foreach ($matches[1] as $key => $type) {
$cssblocks[$type] = $matches[2][$key]; $cssblocks[$type] = $matches[2][$key];
} }
// remove media blocks // remove media blocks
$cssdata = preg_replace('/@media[\s]+([^\§]*)§([^§]*)§/i', '', $cssdata); $cssdata = preg_replace('/@media[\s]+([^\<EFBFBD>]*)<EFBFBD>([^<EFBFBD>]*)<EFBFBD>/i', '', $cssdata);
} }
// keep 'all' and 'print' media, other media types are discarded // keep 'all' and 'print' media, other media types are discarded
if (isset($cssblocks['all']) AND !empty($cssblocks['all'])) { if (isset($cssblocks['all']) AND !empty($cssblocks['all'])) {
@@ -28911,7 +28911,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
} }
break; break;
} }
case 'Q': { // quadratic Bézier curveto case 'Q': { // quadratic B<EFBFBD>zier curveto
foreach ($params as $ck => $cp) { foreach ($params as $ck => $cp) {
$params[$ck] = $cp; $params[$ck] = $cp;
if ((($ck + 1) % 4) == 0) { if ((($ck + 1) % 4) == 0) {
@@ -28937,7 +28937,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
} }
break; break;
} }
case 'T': { // shorthand/smooth quadratic Bézier curveto case 'T': { // shorthand/smooth quadratic B<EFBFBD>zier curveto
foreach ($params as $ck => $cp) { foreach ($params as $ck => $cp) {
$params[$ck] = $cp; $params[$ck] = $cp;
if (($ck % 2) != 0) { if (($ck % 2) != 0) {