From: Joe Hunt <joe.hunt.consulting@gmail.com>
Date: Thu, 25 Oct 2018 18:08:57 +0000 (+0200)
Subject: Merge branch 'master' of https://git.code.sf.net/p/frontaccounting/git
X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=commitdiff_plain;h=767cd3a2b9cc5f1e051f0f44a636d8514f5531ec;hp=8491b4b0a36d32d8ffe565ba45d8311c0b8610e4;p=fa-stable.git

Merge branch 'master' of https://git.code.sf.net/p/frontaccounting/git
---

diff --git a/reporting/includes/tcpdf.php b/reporting/includes/tcpdf.php
index c2140575..803416a8 100644
--- a/reporting/includes/tcpdf.php
+++ b/reporting/includes/tcpdf.php
@@ -4690,7 +4690,7 @@ if (!class_exists('TCPDF')) {
 		function _putimages() {
 			$filter = ($this->compress) ? '/Filter /FlateDecode ' : '';
 			reset($this->images);
-			while (list($file, $info) = each($this->images)) {
+			foreach ($this->images as $file => $info) {
 				$this->_newobj();
 				$this->images[$file]['n'] = $this->n;
 				$this->_out('<</Type /XObject');
@@ -7762,7 +7762,7 @@ if (!class_exists('TCPDF')) {
 			$k = $this->k;
 			$this->javascript .= sprintf("f".$name."=this.addField('%s','%s',%d,[%.2f,%.2f,%.2f,%.2f]);", $name, $type, $this->PageNo()-1, $x*$k, ($this->h-$y)*$k+1, ($x+$w)*$k, ($this->h-$y-$h)*$k+1)."\n";
 			$this->javascript .= "f".$name.".textSize=".$this->FontSizePt.";\n";
-			while (list($key, $val) = each($prop)) {
+			foreach ($prop as $key => $val) {
 				if (strcmp(substr($key,-5),"Color") == 0) {
 					$val = $this->_JScolor($val);
 				} else {
@@ -9236,7 +9236,7 @@ if (!class_exists('TCPDF')) {
 						// get attributes
 						preg_match_all('/([^=\s]*)=["\']?([^"\']*)["\']?/', $element, $attr_array, PREG_PATTERN_ORDER);
 						$dom[$key]['attribute'] = array(); // reset attribute array
-						while (list($id, $name) = each($attr_array[1])) {
+						foreach ($attr_array[1] as $id => $name) {
 							$dom[$key]['attribute'][strtolower($name)] = $attr_array[2][$id];
 						}
 						// split style attributes
@@ -9244,7 +9244,7 @@ if (!class_exists('TCPDF')) {
 							// get style attributes
 							preg_match_all('/([^:\s]*):([^;]*)/', $dom[$key]['attribute']['style'], $style_array, PREG_PATTERN_ORDER);
 							$dom[$key]['style'] = array(); // reset style attribute array
-							while (list($id, $name) = each($style_array[1])) {
+							foreach ($style_array[1] as $id => $name) {
 								$dom[$key]['style'][strtolower($name)] = trim($style_array[2][$id]);
 							}
 							// --- get some style attributes ---