fisharebest / webtrees

app/Report/ReportBaseImage.php

Indentation +83 added lines, -83 removed lines

@@ -19,91 +19,91 @@
  * Class ReportBaseImage
  */
 class ReportBaseImage extends ReportBaseElement {
-	/**
-	 * Filename of the image
-	 *
-	 * @var string
-	 */
-	public $file;
-	/**
-	 * Height of the image
-	 *
-	 * @var float
-	 */
-	public $height;
-	/**
-	 * Width of the image
-	 *
-	 * @var float
-	 */
-	public $width;
-	/**
-	 * X-position (left) of the image
-	 *
-	 * @var float
-	 */
-	public $x;
-	/**
-	 * Y-position (top) of the image
-	 *
-	 * @var float
-	 */
-	public $y;
-	/**
-	 * Placement fo the image. L: left, C:center, R:right
-	 *
-	 * @var string
-	 */
-	public $align = "";
-	/**
-	 * T:same line, N:next line
-	 *
-	 * @var string
-	 */
-	public $line = "";
+    /**
+     * Filename of the image
+     *
+     * @var string
+     */
+    public $file;
+    /**
+     * Height of the image
+     *
+     * @var float
+     */
+    public $height;
+    /**
+     * Width of the image
+     *
+     * @var float
+     */
+    public $width;
+    /**
+     * X-position (left) of the image
+     *
+     * @var float
+     */
+    public $x;
+    /**
+     * Y-position (top) of the image
+     *
+     * @var float
+     */
+    public $y;
+    /**
+     * Placement fo the image. L: left, C:center, R:right
+     *
+     * @var string
+     */
+    public $align = "";
+    /**
+     * T:same line, N:next line
+     *
+     * @var string
+     */
+    public $line = "";
 
-	/**
-	 * Image class function - Base
-	 *
-	 * @param string $file  Filename of the image
-	 * @param float  $x     X-position (left) of the image
-	 * @param float  $y     Y-position (top) of the image
-	 * @param float  $w     Width of the image
-	 * @param float  $h     Height of the image
-	 * @param string $align Placement of the image. L: left, C:center, R:right
-	 * @param string $ln    T:same line, N:next line
-	 */
-	public function __construct($file, $x, $y, $w, $h, $align, $ln) {
-		$this->file   = $file;
-		$this->width  = $w;
-		$this->height = $h;
-		$this->x      = $x;
-		$this->y      = $y;
-		$this->align  = $align;
-		$this->line   = $ln;
+    /**
+     * Image class function - Base
+     *
+     * @param string $file  Filename of the image
+     * @param float  $x     X-position (left) of the image
+     * @param float  $y     Y-position (top) of the image
+     * @param float  $w     Width of the image
+     * @param float  $h     Height of the image
+     * @param string $align Placement of the image. L: left, C:center, R:right
+     * @param string $ln    T:same line, N:next line
+     */
+    public function __construct($file, $x, $y, $w, $h, $align, $ln) {
+        $this->file   = $file;
+        $this->width  = $w;
+        $this->height = $h;
+        $this->x      = $x;
+        $this->y      = $y;
+        $this->align  = $align;
+        $this->line   = $ln;
 
-		return 0;
-	}
+        return 0;
+    }
 
-	/**
-	 * Get the height.
-	 *
-	 * @param $renderer
-	 *
-	 * @return float
-	 */
-	public function getHeight($renderer) {
-		return $this->height;
-	}
+    /**
+     * Get the height.
+     *
+     * @param $renderer
+     *
+     * @return float
+     */
+    public function getHeight($renderer) {
+        return $this->height;
+    }
 
-	/**
-	 * Get the width.
-	 *
-	 * @param $renderer
-	 *
-	 * @return float
-	 */
-	public function getWidth($renderer) {
-		return $this->width;
-	}
+    /**
+     * Get the width.
+     *
+     * @param $renderer
+     *
+     * @return float
+     */
+    public function getWidth($renderer) {
+        return $this->width;
+    }
 }

Braces +8 added lines, -4 removed lines

@@ -18,7 +18,8 @@ 
 /**
  * Class ReportBaseImage
  */
-class ReportBaseImage extends ReportBaseElement {
+class ReportBaseImage extends ReportBaseElement
+{
 	/**
 	 * Filename of the image
 	 *
@@ -73,7 +74,8 @@ 
 	 * @param string $align Placement of the image. L: left, C:center, R:right
 	 * @param string $ln    T:same line, N:next line
 	 */
-	public function __construct($file, $x, $y, $w, $h, $align, $ln) {
+	public function __construct($file, $x, $y, $w, $h, $align, $ln)
+	{
 		$this->file   = $file;
 		$this->width  = $w;
 		$this->height = $h;
@@ -92,7 +94,8 @@ 
 	 *
 	 * @return float
 	 */
-	public function getHeight($renderer) {
+	public function getHeight($renderer)
+	{
 		return $this->height;
 	}
 
@@ -103,7 +106,8 @@ 
 	 *
 	 * @return float
 	 */
-	public function getWidth($renderer) {
+	public function getWidth($renderer)
+	{
 		return $this->width;
 	}
 }

app/Report/ReportPdfFootnote.php

Indentation +128 added lines, -128 removed lines

@@ -19,140 +19,140 @@
  * Class ReportPdfFootnote
  */
 class ReportPdfFootnote extends ReportBaseFootnote {
-	/**
-	 * PDF Footnotes number renderer
-	 *
-	 * @param ReportTcpdf $renderer
-	 */
-	public function render($renderer) {
-		$renderer->setCurrentStyle("footnotenum");
-		$renderer->Write($renderer->getCurrentStyleHeight(), $this->numText, $this->addlink); //source link numbers after name
-	}
+    /**
+     * PDF Footnotes number renderer
+     *
+     * @param ReportTcpdf $renderer
+     */
+    public function render($renderer) {
+        $renderer->setCurrentStyle("footnotenum");
+        $renderer->Write($renderer->getCurrentStyleHeight(), $this->numText, $this->addlink); //source link numbers after name
+    }
 
-	/**
-	 * Write the Footnote text
-	 * Uses style name "footnote" by default
-	 *
-	 * @param ReportTcpdf $pdf
-	 */
-	public function renderFootnote($pdf) {
-		if ($pdf->getCurrentStyle() != $this->styleName) {
-			$pdf->setCurrentStyle($this->styleName);
-		}
-		$temptext = str_replace("#PAGENUM#", $pdf->PageNo(), $this->text);
-		// Set the link to this y/page position
-		$pdf->SetLink($this->addlink, -1, -1);
-		// Print first the source number
-		// working
-		if ($pdf->getRTL()) {
-			$pdf->writeHTML("<span> ." . $this->num . "</span>", false, false, false, false, "");
-		} else {
-			$temptext = "<span>" . $this->num . ". </span>" . $temptext;
-		}
-		// underline «title» part of Source item
-		$temptext = str_replace(array('«', '»'), array('<u>', '</u>'), $temptext);
-		$pdf->writeHTML($temptext, true, false, true, false, '');
-	}
+    /**
+     * Write the Footnote text
+     * Uses style name "footnote" by default
+     *
+     * @param ReportTcpdf $pdf
+     */
+    public function renderFootnote($pdf) {
+        if ($pdf->getCurrentStyle() != $this->styleName) {
+            $pdf->setCurrentStyle($this->styleName);
+        }
+        $temptext = str_replace("#PAGENUM#", $pdf->PageNo(), $this->text);
+        // Set the link to this y/page position
+        $pdf->SetLink($this->addlink, -1, -1);
+        // Print first the source number
+        // working
+        if ($pdf->getRTL()) {
+            $pdf->writeHTML("<span> ." . $this->num . "</span>", false, false, false, false, "");
+        } else {
+            $temptext = "<span>" . $this->num . ". </span>" . $temptext;
+        }
+        // underline «title» part of Source item
+        $temptext = str_replace(array('«', '»'), array('<u>', '</u>'), $temptext);
+        $pdf->writeHTML($temptext, true, false, true, false, '');
+    }
 
-	/**
-	 * Returns the height in points of the Footnote element
-	 *
-	 * @param ReportTcpdf $renderer
-	 *
-	 * @return float $h
-	 */
-	public function getFootnoteHeight($renderer) {
-		return 0;
-	}
+    /**
+     * Returns the height in points of the Footnote element
+     *
+     * @param ReportTcpdf $renderer
+     *
+     * @return float $h
+     */
+    public function getFootnoteHeight($renderer) {
+        return 0;
+    }
 
-	/**
-	 * Splits the text into lines to fit into a giving cell
-	 * and returns the last lines width
-	 *
-	 * @param ReportTcpdf $pdf
-	 *
-	 * @return array
-	 */
-	public function getWidth($pdf) {
-		// Setup the style name, a font must be selected to calculate the width
-		$pdf->setCurrentStyle("footnotenum");
+    /**
+     * Splits the text into lines to fit into a giving cell
+     * and returns the last lines width
+     *
+     * @param ReportTcpdf $pdf
+     *
+     * @return array
+     */
+    public function getWidth($pdf) {
+        // Setup the style name, a font must be selected to calculate the width
+        $pdf->setCurrentStyle("footnotenum");
 
-		// Check for the largest font size in the box
-		$fsize = $pdf->getCurrentStyleHeight();
-		if ($fsize > $pdf->largestFontHeight) {
-			$pdf->largestFontHeight = $fsize;
-		}
+        // Check for the largest font size in the box
+        $fsize = $pdf->getCurrentStyleHeight();
+        if ($fsize > $pdf->largestFontHeight) {
+            $pdf->largestFontHeight = $fsize;
+        }
 
-		// Returns the Object if already numbered else false
-		if (empty($this->num)) {
-			$pdf->checkFootnote($this);
-		}
+        // Returns the Object if already numbered else false
+        if (empty($this->num)) {
+            $pdf->checkFootnote($this);
+        }
 
-		// Get the line width
-		$lw = ceil($pdf->GetStringWidth($this->numText));
-		// Line Feed counter - Number of lines in the text
-		$lfct = substr_count($this->numText, "\n") + 1;
-		// If there is still remaining wrap width...
-		if ($this->wrapWidthRemaining > 0) {
-			// Check with line counter too!
-			// but floor the $wrapWidthRemaining first to keep it bugfree!
-			$wrapWidthRemaining = (int) ($this->wrapWidthRemaining);
-			if ($lw >= $wrapWidthRemaining || $lfct > 1) {
-				$newtext = '';
-				$lines   = explode("\n", $this->numText);
-				// Go throught the text line by line
-				foreach ($lines as $line) {
-					// Line width in points
-					$lw = ceil($pdf->GetStringWidth($line));
-					// If the line has to be wraped
-					if ($lw >= $wrapWidthRemaining) {
-						$words    = explode(" ", $line);
-						$addspace = count($words);
-						$lw       = 0;
-						foreach ($words as $word) {
-							$addspace--;
-							$lw += ceil($pdf->GetStringWidth($word . " "));
-							if ($lw < $wrapWidthRemaining) {
-								$newtext .= $word;
-								if ($addspace != 0) {
-									$newtext .= " ";
-								}
-							} else {
-								$lw = $pdf->GetStringWidth($word . " ");
-								$newtext .= "\n$word";
-								if ($addspace != 0) {
-									$newtext .= " ";
-								}
-								// Reset the wrap width to the cell width
-								$wrapWidthRemaining = $this->wrapWidthCell;
-							}
-						}
-					} else {
-						$newtext .= $line;
-					}
-					// Check the Line Feed counter
-					if ($lfct > 1) {
-						// Add a new line feed as long as it’s not the last line
-						$newtext .= "\n";
-						// Reset the line width
-						$lw = 0;
-						// Reset the wrap width to the cell width
-						$wrapWidthRemaining = $this->wrapWidthCell;
-					}
-					$lfct--;
-				}
-				$this->numText = $newtext;
-				$lfct          = substr_count($this->numText, "\n");
+        // Get the line width
+        $lw = ceil($pdf->GetStringWidth($this->numText));
+        // Line Feed counter - Number of lines in the text
+        $lfct = substr_count($this->numText, "\n") + 1;
+        // If there is still remaining wrap width...
+        if ($this->wrapWidthRemaining > 0) {
+            // Check with line counter too!
+            // but floor the $wrapWidthRemaining first to keep it bugfree!
+            $wrapWidthRemaining = (int) ($this->wrapWidthRemaining);
+            if ($lw >= $wrapWidthRemaining || $lfct > 1) {
+                $newtext = '';
+                $lines   = explode("\n", $this->numText);
+                // Go throught the text line by line
+                foreach ($lines as $line) {
+                    // Line width in points
+                    $lw = ceil($pdf->GetStringWidth($line));
+                    // If the line has to be wraped
+                    if ($lw >= $wrapWidthRemaining) {
+                        $words    = explode(" ", $line);
+                        $addspace = count($words);
+                        $lw       = 0;
+                        foreach ($words as $word) {
+                            $addspace--;
+                            $lw += ceil($pdf->GetStringWidth($word . " "));
+                            if ($lw < $wrapWidthRemaining) {
+                                $newtext .= $word;
+                                if ($addspace != 0) {
+                                    $newtext .= " ";
+                                }
+                            } else {
+                                $lw = $pdf->GetStringWidth($word . " ");
+                                $newtext .= "\n$word";
+                                if ($addspace != 0) {
+                                    $newtext .= " ";
+                                }
+                                // Reset the wrap width to the cell width
+                                $wrapWidthRemaining = $this->wrapWidthCell;
+                            }
+                        }
+                    } else {
+                        $newtext .= $line;
+                    }
+                    // Check the Line Feed counter
+                    if ($lfct > 1) {
+                        // Add a new line feed as long as it’s not the last line
+                        $newtext .= "\n";
+                        // Reset the line width
+                        $lw = 0;
+                        // Reset the wrap width to the cell width
+                        $wrapWidthRemaining = $this->wrapWidthCell;
+                    }
+                    $lfct--;
+                }
+                $this->numText = $newtext;
+                $lfct          = substr_count($this->numText, "\n");
 
-				return array($lw, 1, $lfct);
-			}
-		}
-		$l    = 0;
-		$lfct = substr_count($this->numText, "\n");
-		if ($lfct > 0) {
-			$l = 2;
-		}
+                return array($lw, 1, $lfct);
+            }
+        }
+        $l    = 0;
+        $lfct = substr_count($this->numText, "\n");
+        if ($lfct > 0) {
+            $l = 2;
+        }
 
-		return array($lw, $l, $lfct);
-	}
+        return array($lw, $l, $lfct);
+    }
 }

Braces +10 added lines, -5 removed lines

@@ -18,13 +18,15 @@ 
 /**
  * Class ReportPdfFootnote
  */
-class ReportPdfFootnote extends ReportBaseFootnote {
+class ReportPdfFootnote extends ReportBaseFootnote
+{
 	/**
 	 * PDF Footnotes number renderer
 	 *
 	 * @param ReportTcpdf $renderer
 	 */
-	public function render($renderer) {
+	public function render($renderer)
+	{
 		$renderer->setCurrentStyle("footnotenum");
 		$renderer->Write($renderer->getCurrentStyleHeight(), $this->numText, $this->addlink); //source link numbers after name
 	}
@@ -35,7 +37,8 @@ 
 	 *
 	 * @param ReportTcpdf $pdf
 	 */
-	public function renderFootnote($pdf) {
+	public function renderFootnote($pdf)
+	{
 		if ($pdf->getCurrentStyle() != $this->styleName) {
 			$pdf->setCurrentStyle($this->styleName);
 		}
@@ -61,7 +64,8 @@ 
 	 *
 	 * @return float $h
 	 */
-	public function getFootnoteHeight($renderer) {
+	public function getFootnoteHeight($renderer)
+	{
 		return 0;
 	}
 
@@ -73,7 +77,8 @@ 
 	 *
 	 * @return array
 	 */
-	public function getWidth($pdf) {
+	public function getWidth($pdf)
+	{
 		// Setup the style name, a font must be selected to calculate the width
 		$pdf->setCurrentStyle("footnotenum");
 

app/Report/ReportPdfTextbox.php

Indentation +295 added lines, -295 removed lines

@@ -19,310 +19,310 @@
  * Class ReportPdfTextbox
  */
 class ReportPdfTextbox extends ReportBaseTextbox {
-	/**
-	 * PDF Text Box renderer
-	 *
-	 * @param ReportTcpdf $renderer
-	 *
-	 * @return bool|int
-	 */
-	public function render($renderer) {
+    /**
+     * PDF Text Box renderer
+     *
+     * @param ReportTcpdf $renderer
+     *
+     * @return bool|int
+     */
+    public function render($renderer) {
 
-		$newelements      = array();
-		$lastelement      = "";
-		$footnote_element = array();
-		// Element counter
-		$cE = count($this->elements);
-		//-- collapse duplicate elements
-		for ($i = 0; $i < $cE; $i++) {
-			$element = $this->elements[$i];
-			if (is_object($element)) {
-				if ($element instanceof ReportBaseText) {
-					if (!empty($footnote_element)) {
-						ksort($footnote_element);
-						foreach ($footnote_element as $links) {
-							$newelements[] = $links;
-						}
-						$footnote_element = array();
-					}
-					if (empty($lastelement)) {
-						$lastelement = $element;
-					} else {
-						// Checking if the Text has the same style
-						if ($element->getStyleName() == $lastelement->getStyleName()) {
-							$lastelement->addText(str_replace("\n", "<br>", $element->getValue()));
-						} elseif (!empty($lastelement)) {
-							$newelements[] = $lastelement;
-							$lastelement   = $element;
-						}
-					}
-				} // Collect the Footnote links
-				elseif ($element instanceof ReportBaseFootnote) {
-					// Check if the Footnote has been set with it’s link number
-					$renderer->checkFootnote($element);
-					// Save first the last element if any
-					if (!empty($lastelement)) {
-						$newelements[] = $lastelement;
-						$lastelement   = array();
-					}
-					// Save the Footnote with it’s link number as key for sorting later
-					$footnote_element[$element->num] = $element;
-				} //-- do not keep empty footnotes
-				elseif (!($element instanceof ReportBaseFootnote) || trim($element->getValue()) != "") {
-					if (!empty($footnote_element)) {
-						ksort($footnote_element);
-						foreach ($footnote_element as $links) {
-							$newelements[] = $links;
-						}
-						$footnote_element = array();
-					}
-					if (!empty($lastelement)) {
-						$newelements[] = $lastelement;
-						$lastelement   = array();
-					}
-					$newelements[] = $element;
-				}
-			} else {
-				if (!empty($lastelement)) {
-					$newelements[] = $lastelement;
-					$lastelement   = array();
-				}
-				if (!empty($footnote_element)) {
-					ksort($footnote_element);
-					foreach ($footnote_element as $links) {
-						$newelements[] = $links;
-					}
-					$footnote_element = array();
-				}
-				$newelements[] = $element;
-			}
-		}
-		if (!empty($lastelement)) {
-			$newelements[] = $lastelement;
-		}
-		if (!empty($footnote_element)) {
-			ksort($footnote_element);
-			foreach ($footnote_element as $links) {
-				$newelements[] = $links;
-			}
-		}
-		$this->elements = $newelements;
-		unset($footnote_element, $lastelement, $links, $newelements);
+        $newelements      = array();
+        $lastelement      = "";
+        $footnote_element = array();
+        // Element counter
+        $cE = count($this->elements);
+        //-- collapse duplicate elements
+        for ($i = 0; $i < $cE; $i++) {
+            $element = $this->elements[$i];
+            if (is_object($element)) {
+                if ($element instanceof ReportBaseText) {
+                    if (!empty($footnote_element)) {
+                        ksort($footnote_element);
+                        foreach ($footnote_element as $links) {
+                            $newelements[] = $links;
+                        }
+                        $footnote_element = array();
+                    }
+                    if (empty($lastelement)) {
+                        $lastelement = $element;
+                    } else {
+                        // Checking if the Text has the same style
+                        if ($element->getStyleName() == $lastelement->getStyleName()) {
+                            $lastelement->addText(str_replace("\n", "<br>", $element->getValue()));
+                        } elseif (!empty($lastelement)) {
+                            $newelements[] = $lastelement;
+                            $lastelement   = $element;
+                        }
+                    }
+                } // Collect the Footnote links
+                elseif ($element instanceof ReportBaseFootnote) {
+                    // Check if the Footnote has been set with it’s link number
+                    $renderer->checkFootnote($element);
+                    // Save first the last element if any
+                    if (!empty($lastelement)) {
+                        $newelements[] = $lastelement;
+                        $lastelement   = array();
+                    }
+                    // Save the Footnote with it’s link number as key for sorting later
+                    $footnote_element[$element->num] = $element;
+                } //-- do not keep empty footnotes
+                elseif (!($element instanceof ReportBaseFootnote) || trim($element->getValue()) != "") {
+                    if (!empty($footnote_element)) {
+                        ksort($footnote_element);
+                        foreach ($footnote_element as $links) {
+                            $newelements[] = $links;
+                        }
+                        $footnote_element = array();
+                    }
+                    if (!empty($lastelement)) {
+                        $newelements[] = $lastelement;
+                        $lastelement   = array();
+                    }
+                    $newelements[] = $element;
+                }
+            } else {
+                if (!empty($lastelement)) {
+                    $newelements[] = $lastelement;
+                    $lastelement   = array();
+                }
+                if (!empty($footnote_element)) {
+                    ksort($footnote_element);
+                    foreach ($footnote_element as $links) {
+                        $newelements[] = $links;
+                    }
+                    $footnote_element = array();
+                }
+                $newelements[] = $element;
+            }
+        }
+        if (!empty($lastelement)) {
+            $newelements[] = $lastelement;
+        }
+        if (!empty($footnote_element)) {
+            ksort($footnote_element);
+            foreach ($footnote_element as $links) {
+                $newelements[] = $links;
+            }
+        }
+        $this->elements = $newelements;
+        unset($footnote_element, $lastelement, $links, $newelements);
 
-		// Used with line breaks and cell height calculation within this box
-		$renderer->largestFontHeight = 0;
+        // Used with line breaks and cell height calculation within this box
+        $renderer->largestFontHeight = 0;
 
-		// If current position (left)
-		if ($this->left == ".") {
-			$cX = $renderer->GetX();
-		} else {
-			// For static position add margin (returns and updates X)
-			$cX = $renderer->addMarginX($this->left);
-		}
+        // If current position (left)
+        if ($this->left == ".") {
+            $cX = $renderer->GetX();
+        } else {
+            // For static position add margin (returns and updates X)
+            $cX = $renderer->addMarginX($this->left);
+        }
 
-		// If current position (top)
-		if ($this->top == ".") {
-			$cY = $renderer->GetY();
-		} else {
-			$cY = $this->top;
-			$renderer->SetY($cY);
-		}
+        // If current position (top)
+        if ($this->top == ".") {
+            $cY = $renderer->GetY();
+        } else {
+            $cY = $this->top;
+            $renderer->SetY($cY);
+        }
 
-		// Check the width if set to page wide OR set by xml to larger then page width (margin)
-		if ($this->width == 0 || $this->width > $renderer->getRemainingWidthPDF()) {
-			$cW = $renderer->getRemainingWidthPDF();
-		} else {
-			$cW = $this->width;
-		}
+        // Check the width if set to page wide OR set by xml to larger then page width (margin)
+        if ($this->width == 0 || $this->width > $renderer->getRemainingWidthPDF()) {
+            $cW = $renderer->getRemainingWidthPDF();
+        } else {
+            $cW = $this->width;
+        }
 
-		// Save the original margins
-		$cM = $renderer->getMargins();
-		// Use cell padding to wrap the width
-		// Temp Width with cell padding
-		if (is_array($cM['cell'])) {
-			$cWT = $cW - ($cM['padding_left'] + $cM['padding_right']);
-		} else {
-			$cWT = $cW - ($cM['cell'] * 2);
-		}
-		// Element height (exept text)
-		$eH = 0;
-		$w  = 0;
-		// Temp Height
-		$cHT = 0;
-		//-- $lw is an array
-		// 0 => last line width
-		// 1 => 1 if text was wrapped, 0 if text did not wrap
-		// 2 => number of LF
-		$lw = array();
-		// Element counter
-		$cE = count($this->elements);
-		//-- calculate the text box height + width
-		for ($i = 0; $i < $cE; $i++) {
-			if (is_object($this->elements[$i])) {
-				$ew = $this->elements[$i]->setWrapWidth($cWT - $w, $cWT);
-				if ($ew == $cWT) {
-					$w = 0;
-				}
-				$lw = $this->elements[$i]->getWidth($renderer);
-				// Text is already gets the # LF
-				$cHT += $lw[2];
-				if ($lw[1] == 1) {
-					$w = $lw[0];
-				} elseif ($lw[1] == 2) {
-					$w = 0;
-				} else {
-					$w += $lw[0];
-				}
-				if ($w > $cWT) {
-					$w = $lw[0];
-				}
-				// Footnote is at the bottom of the page. No need to calculate it’s height or wrap the text!
-				// We are changing the margins anyway!
-				// For anything else but text (images), get the height
-				$eH += $this->elements[$i]->getHeight($renderer);
-			}
-		}
+        // Save the original margins
+        $cM = $renderer->getMargins();
+        // Use cell padding to wrap the width
+        // Temp Width with cell padding
+        if (is_array($cM['cell'])) {
+            $cWT = $cW - ($cM['padding_left'] + $cM['padding_right']);
+        } else {
+            $cWT = $cW - ($cM['cell'] * 2);
+        }
+        // Element height (exept text)
+        $eH = 0;
+        $w  = 0;
+        // Temp Height
+        $cHT = 0;
+        //-- $lw is an array
+        // 0 => last line width
+        // 1 => 1 if text was wrapped, 0 if text did not wrap
+        // 2 => number of LF
+        $lw = array();
+        // Element counter
+        $cE = count($this->elements);
+        //-- calculate the text box height + width
+        for ($i = 0; $i < $cE; $i++) {
+            if (is_object($this->elements[$i])) {
+                $ew = $this->elements[$i]->setWrapWidth($cWT - $w, $cWT);
+                if ($ew == $cWT) {
+                    $w = 0;
+                }
+                $lw = $this->elements[$i]->getWidth($renderer);
+                // Text is already gets the # LF
+                $cHT += $lw[2];
+                if ($lw[1] == 1) {
+                    $w = $lw[0];
+                } elseif ($lw[1] == 2) {
+                    $w = 0;
+                } else {
+                    $w += $lw[0];
+                }
+                if ($w > $cWT) {
+                    $w = $lw[0];
+                }
+                // Footnote is at the bottom of the page. No need to calculate it’s height or wrap the text!
+                // We are changing the margins anyway!
+                // For anything else but text (images), get the height
+                $eH += $this->elements[$i]->getHeight($renderer);
+            }
+        }
 
-		// Add up what’s the final height
-		$cH = $this->height;
-		// If any element exist
-		if ($cE > 0) {
-			// Check if this is text or some other element, like images
-			if ($eH == 0) {
-				// This is text elements. Number of LF but at least one line
-				$cHT = ($cHT + 1) * $renderer->getCellHeightRatio();
-				// Calculate the cell hight with the largest font size used within this Box
-				$cHT = $cHT * $renderer->largestFontHeight;
-				// Add cell padding
-				if ($this->padding) {
-					if (is_array($cM['cell'])) {
-						$cHT += ($cM['padding_bottom'] + $cM['padding_top']);
-					} else {
-						$cHT += ($cM['cell'] * 2);
-					}
-				}
-				if ($cH < $cHT) {
-					$cH = $cHT;
-				}
-			} // This is any other element
-			elseif ($cH < $eH) {
-				$cH = $eH;
-			}
-		}
-		// Finaly, check the last cells height
-		if ($cH < $renderer->lastCellHeight) {
-			$cH = $renderer->lastCellHeight;
-		}
-		// Add a new page if needed
-		if ($this->pagecheck) {
-			// Reset last cell height or Header/Footer will inherit it, in case of pagebreak
-			$renderer->lastCellHeight = 0;
-			if ($renderer->checkPageBreakPDF($cH)) {
-				$cY = $renderer->GetY();
-			}
-		}
+        // Add up what’s the final height
+        $cH = $this->height;
+        // If any element exist
+        if ($cE > 0) {
+            // Check if this is text or some other element, like images
+            if ($eH == 0) {
+                // This is text elements. Number of LF but at least one line
+                $cHT = ($cHT + 1) * $renderer->getCellHeightRatio();
+                // Calculate the cell hight with the largest font size used within this Box
+                $cHT = $cHT * $renderer->largestFontHeight;
+                // Add cell padding
+                if ($this->padding) {
+                    if (is_array($cM['cell'])) {
+                        $cHT += ($cM['padding_bottom'] + $cM['padding_top']);
+                    } else {
+                        $cHT += ($cM['cell'] * 2);
+                    }
+                }
+                if ($cH < $cHT) {
+                    $cH = $cHT;
+                }
+            } // This is any other element
+            elseif ($cH < $eH) {
+                $cH = $eH;
+            }
+        }
+        // Finaly, check the last cells height
+        if ($cH < $renderer->lastCellHeight) {
+            $cH = $renderer->lastCellHeight;
+        }
+        // Add a new page if needed
+        if ($this->pagecheck) {
+            // Reset last cell height or Header/Footer will inherit it, in case of pagebreak
+            $renderer->lastCellHeight = 0;
+            if ($renderer->checkPageBreakPDF($cH)) {
+                $cY = $renderer->GetY();
+            }
+        }
 
-		// Setup the border and background color
-		$cS = ""; // Class Style
-		if ($this->border) {
-			$cS = "D";
-		} // D or empty string: Draw (default)
-		$match = array();
-		// Fill the background
-		if ($this->fill) {
-			if (!empty($this->bgcolor)) {
-				if (preg_match("/#?(..)(..)(..)/", $this->bgcolor, $match)) {
-					$cS .= "F"; // F: Fill the background
-					$r = hexdec($match[1]);
-					$g = hexdec($match[2]);
-					$b = hexdec($match[3]);
-					$renderer->SetFillColor($r, $g, $b);
-				}
-			}
-		}
-		// Clean up a bit
-		unset($lw, $w, $match, $cE, $eH);
-		// Draw the border
-		if (!empty($cS)) {
-			if (!$renderer->getRTL()) {
-				$cXM = $cX;
-			} else {
-				$cXM = ($renderer->getPageWidth()) - $cX - $cW;
-			}
-			$renderer->Rect($cXM, $cY, $cW, $cH, $cS);
-		}
-		// Add cell padding if set and if any text (element) exist
-		if ($this->padding) {
-			if ($cHT > 0) {
-				if (is_array($cM['cell'])) {
-					$renderer->SetY($cY + $cM['padding_top']);
-				} else {
-					$renderer->SetY($cY + $cM['cell']);
-				}
-			}
-		}
-		// Change the margins X, Width
-		if (!$renderer->getRTL()) {
-			if ($this->padding) {
-				if (is_array($cM['cell'])) {
-					$renderer->SetLeftMargin($cX + $cM['padding_left']);
-				} else {
-					$renderer->SetLeftMargin($cX + $cM['cell']);
-				}
-				$renderer->SetRightMargin($renderer->getRemainingWidthPDF() - $cW + $cM['right']);
-			} else {
-				$renderer->SetLeftMargin($cX);
-				$renderer->SetRightMargin($renderer->getRemainingWidthPDF() - $cW + $cM['right']);
-			}
-		} else {
-			if ($this->padding) {
-				if (is_array($cM['cell'])) {
-					$renderer->SetRightMargin($cX + $cM['padding_right']);
-				} else {
-					$renderer->SetRightMargin($cX + $cM['cell']);
-				}
-				$renderer->SetLeftMargin($renderer->getRemainingWidthPDF() - $cW + $cM['left']);
-			} else {
-				$renderer->SetRightMargin($cX);
-				$renderer->SetLeftMargin($renderer->getRemainingWidthPDF() - $cW + $cM['left']);
-			}
-		}
-		// Save the current page number
-		$cPN = $renderer->getPage();
+        // Setup the border and background color
+        $cS = ""; // Class Style
+        if ($this->border) {
+            $cS = "D";
+        } // D or empty string: Draw (default)
+        $match = array();
+        // Fill the background
+        if ($this->fill) {
+            if (!empty($this->bgcolor)) {
+                if (preg_match("/#?(..)(..)(..)/", $this->bgcolor, $match)) {
+                    $cS .= "F"; // F: Fill the background
+                    $r = hexdec($match[1]);
+                    $g = hexdec($match[2]);
+                    $b = hexdec($match[3]);
+                    $renderer->SetFillColor($r, $g, $b);
+                }
+            }
+        }
+        // Clean up a bit
+        unset($lw, $w, $match, $cE, $eH);
+        // Draw the border
+        if (!empty($cS)) {
+            if (!$renderer->getRTL()) {
+                $cXM = $cX;
+            } else {
+                $cXM = ($renderer->getPageWidth()) - $cX - $cW;
+            }
+            $renderer->Rect($cXM, $cY, $cW, $cH, $cS);
+        }
+        // Add cell padding if set and if any text (element) exist
+        if ($this->padding) {
+            if ($cHT > 0) {
+                if (is_array($cM['cell'])) {
+                    $renderer->SetY($cY + $cM['padding_top']);
+                } else {
+                    $renderer->SetY($cY + $cM['cell']);
+                }
+            }
+        }
+        // Change the margins X, Width
+        if (!$renderer->getRTL()) {
+            if ($this->padding) {
+                if (is_array($cM['cell'])) {
+                    $renderer->SetLeftMargin($cX + $cM['padding_left']);
+                } else {
+                    $renderer->SetLeftMargin($cX + $cM['cell']);
+                }
+                $renderer->SetRightMargin($renderer->getRemainingWidthPDF() - $cW + $cM['right']);
+            } else {
+                $renderer->SetLeftMargin($cX);
+                $renderer->SetRightMargin($renderer->getRemainingWidthPDF() - $cW + $cM['right']);
+            }
+        } else {
+            if ($this->padding) {
+                if (is_array($cM['cell'])) {
+                    $renderer->SetRightMargin($cX + $cM['padding_right']);
+                } else {
+                    $renderer->SetRightMargin($cX + $cM['cell']);
+                }
+                $renderer->SetLeftMargin($renderer->getRemainingWidthPDF() - $cW + $cM['left']);
+            } else {
+                $renderer->SetRightMargin($cX);
+                $renderer->SetLeftMargin($renderer->getRemainingWidthPDF() - $cW + $cM['left']);
+            }
+        }
+        // Save the current page number
+        $cPN = $renderer->getPage();
 
-		// Render the elements (write text, print picture...)
-		foreach ($this->elements as $element) {
-			if (is_object($element)) {
-				$element->render($renderer);
-			} elseif (is_string($element) && $element == 'footnotetexts') {
-				$renderer->footnotes();
-			} elseif (is_string($element) && $element == 'addpage') {
-				$renderer->newPage();
-			}
-		}
-		// Restore the margins
-		$renderer->SetLeftMargin($cM['left']);
-		$renderer->SetRightMargin($cM['right']);
+        // Render the elements (write text, print picture...)
+        foreach ($this->elements as $element) {
+            if (is_object($element)) {
+                $element->render($renderer);
+            } elseif (is_string($element) && $element == 'footnotetexts') {
+                $renderer->footnotes();
+            } elseif (is_string($element) && $element == 'addpage') {
+                $renderer->newPage();
+            }
+        }
+        // Restore the margins
+        $renderer->SetLeftMargin($cM['left']);
+        $renderer->SetRightMargin($cM['right']);
 
-		// This will be mostly used to trick the multiple images last height
-		if ($this->reseth) {
-			$cH = 0;
-			// This can only happen with multiple images and with pagebreak
-			if ($cPN != $renderer->getPage()) {
-				$renderer->setPage($cPN);
-			}
-		}
-		// New line and some clean up
-		if (!$this->newline) {
-			$renderer->SetXY(($cX + $cW), $cY);
-			$renderer->lastCellHeight = $cH;
-		} else {
-			// addMarginX() also updates X
-			$renderer->addMarginX(0);
-			$renderer->SetY($cY + $cH);
-			$renderer->lastCellHeight = 0;
-		}
+        // This will be mostly used to trick the multiple images last height
+        if ($this->reseth) {
+            $cH = 0;
+            // This can only happen with multiple images and with pagebreak
+            if ($cPN != $renderer->getPage()) {
+                $renderer->setPage($cPN);
+            }
+        }
+        // New line and some clean up
+        if (!$this->newline) {
+            $renderer->SetXY(($cX + $cW), $cY);
+            $renderer->lastCellHeight = $cH;
+        } else {
+            // addMarginX() also updates X
+            $renderer->addMarginX(0);
+            $renderer->SetY($cY + $cH);
+            $renderer->lastCellHeight = 0;
+        }
 
-		return true;
-	}
+        return true;
+    }
 }

Braces +4 added lines, -2 removed lines

@@ -18,7 +18,8 @@ 
 /**
  * Class ReportPdfTextbox
  */
-class ReportPdfTextbox extends ReportBaseTextbox {
+class ReportPdfTextbox extends ReportBaseTextbox
+{
 	/**
 	 * PDF Text Box renderer
 	 *
@@ -26,7 +27,8 @@ 
 	 *
 	 * @return bool|int
 	 */
-	public function render($renderer) {
+	public function render($renderer)
+	{
 
 		$newelements      = array();
 		$lastelement      = "";

app/Report/ReportHtmlPageheader.php

Indentation +11 added lines, -11 removed lines

@@ -19,15 +19,15 @@
  * Class ReportHtmlPageheader
  */
 class ReportHtmlPageheader extends ReportBasePageheader {
-	/**
-	 * Render elements.
-	 *
-	 * @param ReportHtml $renderer
-	 */
-	public function render($renderer) {
-		$renderer->clearPageHeader();
-		foreach ($this->elements as $element) {
-			$renderer->addPageHeader($element);
-		}
-	}
+    /**
+     * Render elements.
+     *
+     * @param ReportHtml $renderer
+     */
+    public function render($renderer) {
+        $renderer->clearPageHeader();
+        foreach ($this->elements as $element) {
+            $renderer->addPageHeader($element);
+        }
+    }
 }

Braces +4 added lines, -2 removed lines

@@ -18,13 +18,15 @@
 /**
  * Class ReportHtmlPageheader
  */
-class ReportHtmlPageheader extends ReportBasePageheader {
+class ReportHtmlPageheader extends ReportBasePageheader
+{
 	/**
 	 * Render elements.
 	 *
 	 * @param ReportHtml $renderer
 	 */
-	public function render($renderer) {
+	public function render($renderer)
+	{
 		$renderer->clearPageHeader();
 		foreach ($this->elements as $element) {
 			$renderer->addPageHeader($element);

app/Report/ReportHtmlImage.php

Indentation +60 added lines, -60 removed lines

@@ -19,69 +19,69 @@
  * Class ReportHtmlImage
  */
 class ReportHtmlImage extends ReportBaseImage {
-	/**
-	 * Image renderer
-	 *
-	 * @param ReportHtml $renderer
-	 */
-	public function render($renderer) {
-		global $lastpicbottom, $lastpicpage, $lastpicleft, $lastpicright;
+    /**
+     * Image renderer
+     *
+     * @param ReportHtml $renderer
+     */
+    public function render($renderer) {
+        global $lastpicbottom, $lastpicpage, $lastpicleft, $lastpicright;
 
-		// Get the current positions
-		if ($this->x == ".") {
-			$this->x = $renderer->getX();
-		}
-		if ($this->y == ".") {
-			//-- first check for a collision with the last picture
-			if (isset($lastpicbottom)) {
-				if (($renderer->pageNo() == $lastpicpage) && ($lastpicbottom >= $renderer->getY()) && ($this->x >= $lastpicleft) && ($this->x <= $lastpicright)) {
-					$renderer->setY($lastpicbottom + ($renderer->cPadding * 2));
-				}
-			}
-			$this->y = $renderer->getY();
-		}
+        // Get the current positions
+        if ($this->x == ".") {
+            $this->x = $renderer->getX();
+        }
+        if ($this->y == ".") {
+            //-- first check for a collision with the last picture
+            if (isset($lastpicbottom)) {
+                if (($renderer->pageNo() == $lastpicpage) && ($lastpicbottom >= $renderer->getY()) && ($this->x >= $lastpicleft) && ($this->x <= $lastpicright)) {
+                    $renderer->setY($lastpicbottom + ($renderer->cPadding * 2));
+                }
+            }
+            $this->y = $renderer->getY();
+        }
 
-		// Image alignment
-		switch ($this->align) {
-		case "L":
-			echo "<div style=\"position:absolute;top:", $this->y, "pt;left:0pt;width:", $renderer->getRemainingWidth(), "pt;text-align:left;\">\n";
-			echo "<img src=\"", $this->file, "\" style=\"width:", $this->width, "pt;height:", $this->height, "pt;\" alt=\"\">\n</div>\n";
-			break;
-		case "C":
-			echo "<div style=\"position:absolute;top:", $this->y, "pt;left:0pt;width:", $renderer->getRemainingWidth(), "pt;text-align:center;\">\n";
-			echo "<img src=\"", $this->file, "\" style=\"width:", $this->width, "pt;height:", $this->height, "pt;\" alt=\"\">\n</div>\n";
-			break;
-		case "R":
-			echo "<div style=\"position:absolute;top:", $this->y, "pt;left:0pt;width:", $renderer->getRemainingWidth(), "pt;text-align:right;\">\n";
-			echo "<img src=\"", $this->file, "\" style=\"width:", $this->width, "pt;height:", $this->height, "pt;\" alt=\"\">\n</div>\n";
-			break;
-		default:
-			echo "<img src=\"", $this->file, "\" style=\"position:absolute;", $renderer->alignRTL, ":", $this->x, "pt;top:", $this->y, "pt;width:", $this->width, "pt;height:", $this->height, "pt;\" alt=\"\">\n";
-		}
+        // Image alignment
+        switch ($this->align) {
+        case "L":
+            echo "<div style=\"position:absolute;top:", $this->y, "pt;left:0pt;width:", $renderer->getRemainingWidth(), "pt;text-align:left;\">\n";
+            echo "<img src=\"", $this->file, "\" style=\"width:", $this->width, "pt;height:", $this->height, "pt;\" alt=\"\">\n</div>\n";
+            break;
+        case "C":
+            echo "<div style=\"position:absolute;top:", $this->y, "pt;left:0pt;width:", $renderer->getRemainingWidth(), "pt;text-align:center;\">\n";
+            echo "<img src=\"", $this->file, "\" style=\"width:", $this->width, "pt;height:", $this->height, "pt;\" alt=\"\">\n</div>\n";
+            break;
+        case "R":
+            echo "<div style=\"position:absolute;top:", $this->y, "pt;left:0pt;width:", $renderer->getRemainingWidth(), "pt;text-align:right;\">\n";
+            echo "<img src=\"", $this->file, "\" style=\"width:", $this->width, "pt;height:", $this->height, "pt;\" alt=\"\">\n</div>\n";
+            break;
+        default:
+            echo "<img src=\"", $this->file, "\" style=\"position:absolute;", $renderer->alignRTL, ":", $this->x, "pt;top:", $this->y, "pt;width:", $this->width, "pt;height:", $this->height, "pt;\" alt=\"\">\n";
+        }
 
-		$lastpicpage   = $renderer->pageNo();
-		$lastpicleft   = $this->x;
-		$lastpicright  = $this->x + $this->width;
-		$lastpicbottom = $this->y + $this->height;
-		// Setup for the next line
-		if ($this->line == "N") {
-			$renderer->setY($lastpicbottom);
-		}
-		// Keep max Y updated
-		$renderer->addMaxY($lastpicbottom);
-	}
+        $lastpicpage   = $renderer->pageNo();
+        $lastpicleft   = $this->x;
+        $lastpicright  = $this->x + $this->width;
+        $lastpicbottom = $this->y + $this->height;
+        // Setup for the next line
+        if ($this->line == "N") {
+            $renderer->setY($lastpicbottom);
+        }
+        // Keep max Y updated
+        $renderer->addMaxY($lastpicbottom);
+    }
 
-	/**
-	 * Get the image height
-	 * This would be called from the TextBox only for multiple images
-	 * so we add a bit bottom space between the images
-	 *
-	 * @param ReportHtml $html
-	 *
-	 * @return float
-	 */
-	public function getHeight($html) {
-		return $this->height + ($html->cPadding * 2);
-	}
+    /**
+     * Get the image height
+     * This would be called from the TextBox only for multiple images
+     * so we add a bit bottom space between the images
+     *
+     * @param ReportHtml $html
+     *
+     * @return float
+     */
+    public function getHeight($html) {
+        return $this->height + ($html->cPadding * 2);
+    }
 
 }

Switch Indentation +14 added lines, -14 removed lines

@@ -43,20 +43,20 @@
 
 		// Image alignment
 		switch ($this->align) {
-		case "L":
-			echo "<div style=\"position:absolute;top:", $this->y, "pt;left:0pt;width:", $renderer->getRemainingWidth(), "pt;text-align:left;\">\n";
-			echo "<img src=\"", $this->file, "\" style=\"width:", $this->width, "pt;height:", $this->height, "pt;\" alt=\"\">\n</div>\n";
-			break;
-		case "C":
-			echo "<div style=\"position:absolute;top:", $this->y, "pt;left:0pt;width:", $renderer->getRemainingWidth(), "pt;text-align:center;\">\n";
-			echo "<img src=\"", $this->file, "\" style=\"width:", $this->width, "pt;height:", $this->height, "pt;\" alt=\"\">\n</div>\n";
-			break;
-		case "R":
-			echo "<div style=\"position:absolute;top:", $this->y, "pt;left:0pt;width:", $renderer->getRemainingWidth(), "pt;text-align:right;\">\n";
-			echo "<img src=\"", $this->file, "\" style=\"width:", $this->width, "pt;height:", $this->height, "pt;\" alt=\"\">\n</div>\n";
-			break;
-		default:
-			echo "<img src=\"", $this->file, "\" style=\"position:absolute;", $renderer->alignRTL, ":", $this->x, "pt;top:", $this->y, "pt;width:", $this->width, "pt;height:", $this->height, "pt;\" alt=\"\">\n";
+		    case "L":
+			    echo "<div style=\"position:absolute;top:", $this->y, "pt;left:0pt;width:", $renderer->getRemainingWidth(), "pt;text-align:left;\">\n";
+			    echo "<img src=\"", $this->file, "\" style=\"width:", $this->width, "pt;height:", $this->height, "pt;\" alt=\"\">\n</div>\n";
+			    break;
+		    case "C":
+			    echo "<div style=\"position:absolute;top:", $this->y, "pt;left:0pt;width:", $renderer->getRemainingWidth(), "pt;text-align:center;\">\n";
+			    echo "<img src=\"", $this->file, "\" style=\"width:", $this->width, "pt;height:", $this->height, "pt;\" alt=\"\">\n</div>\n";
+			    break;
+		    case "R":
+			    echo "<div style=\"position:absolute;top:", $this->y, "pt;left:0pt;width:", $renderer->getRemainingWidth(), "pt;text-align:right;\">\n";
+			    echo "<img src=\"", $this->file, "\" style=\"width:", $this->width, "pt;height:", $this->height, "pt;\" alt=\"\">\n</div>\n";
+			    break;
+		    default:
+			    echo "<img src=\"", $this->file, "\" style=\"position:absolute;", $renderer->alignRTL, ":", $this->x, "pt;top:", $this->y, "pt;width:", $this->width, "pt;height:", $this->height, "pt;\" alt=\"\">\n";
 		}
 
 		$lastpicpage   = $renderer->pageNo();

Braces +6 added lines, -3 removed lines

@@ -18,13 +18,15 @@ 
 /**
  * Class ReportHtmlImage
  */
-class ReportHtmlImage extends ReportBaseImage {
+class ReportHtmlImage extends ReportBaseImage
+{
 	/**
 	 * Image renderer
 	 *
 	 * @param ReportHtml $renderer
 	 */
-	public function render($renderer) {
+	public function render($renderer)
+	{
 		global $lastpicbottom, $lastpicpage, $lastpicleft, $lastpicright;
 
 		// Get the current positions
@@ -80,7 +82,8 @@ 
 	 *
 	 * @return float
 	 */
-	public function getHeight($html) {
+	public function getHeight($html)
+	{
 		return $this->height + ($html->cPadding * 2);
 	}
 

app/Report/ReportParserBase.php

Indentation +62 added lines, -62 removed lines

@@ -19,73 +19,73 @@
  * Class ReportParserBase
  */
 class ReportParserBase {
-	/** @var resource The XML parser */
-	protected $xml_parser;
+    /** @var resource The XML parser */
+    protected $xml_parser;
 
-	/** @var string Text contents of tags */
-	protected $text = '';
+    /** @var string Text contents of tags */
+    protected $text = '';
 
-	/**
-	 * Create a parser for a report
-	 *
-	 * @param string     $report     The XML filename
-	 * @param ReportBase $report_root
-	 * @param string[][] $vars
-	 */
-	public function __construct($report, ReportBase $report_root = null, $vars = array()) {
-		$this->xml_parser = xml_parser_create();
-		xml_parser_set_option($this->xml_parser, XML_OPTION_CASE_FOLDING, false);
-		xml_set_element_handler($this->xml_parser, array($this, 'startElement'), array($this, 'endElement'));
-		xml_set_character_data_handler($this->xml_parser, array($this, 'characterData'));
+    /**
+     * Create a parser for a report
+     *
+     * @param string     $report     The XML filename
+     * @param ReportBase $report_root
+     * @param string[][] $vars
+     */
+    public function __construct($report, ReportBase $report_root = null, $vars = array()) {
+        $this->xml_parser = xml_parser_create();
+        xml_parser_set_option($this->xml_parser, XML_OPTION_CASE_FOLDING, false);
+        xml_set_element_handler($this->xml_parser, array($this, 'startElement'), array($this, 'endElement'));
+        xml_set_character_data_handler($this->xml_parser, array($this, 'characterData'));
 
-		$fp = fopen($report, 'r');
-		while (($data = fread($fp, 4096))) {
-			if (!xml_parse($this->xml_parser, $data, feof($fp))) {
-				throw new \DomainException(sprintf(
-					'XML error: %s at line %d',
-					xml_error_string(xml_get_error_code($this->xml_parser)),
-					xml_get_current_line_number($this->xml_parser)
-				));
-			}
-		}
+        $fp = fopen($report, 'r');
+        while (($data = fread($fp, 4096))) {
+            if (!xml_parse($this->xml_parser, $data, feof($fp))) {
+                throw new \DomainException(sprintf(
+                    'XML error: %s at line %d',
+                    xml_error_string(xml_get_error_code($this->xml_parser)),
+                    xml_get_current_line_number($this->xml_parser)
+                ));
+            }
+        }
 
-		xml_parser_free($this->xml_parser);
-	}
+        xml_parser_free($this->xml_parser);
+    }
 
-	/**
-	 * XML handler for an opening (or self-closing) tag.
-	 *
-	 * @param resource $parser The resource handler for the xml parser
-	 * @param string   $name   The name of the xml element parsed
-	 * @param string[] $attrs  An array of key value pairs for the attributes
-	 */
-	protected function startElement($parser, $name, $attrs) {
-		$method = $name . 'StartHandler';
-		if (method_exists($this, $method)) {
-			$this->$method($attrs);
-		}
-	}
+    /**
+     * XML handler for an opening (or self-closing) tag.
+     *
+     * @param resource $parser The resource handler for the xml parser
+     * @param string   $name   The name of the xml element parsed
+     * @param string[] $attrs  An array of key value pairs for the attributes
+     */
+    protected function startElement($parser, $name, $attrs) {
+        $method = $name . 'StartHandler';
+        if (method_exists($this, $method)) {
+            $this->$method($attrs);
+        }
+    }
 
-	/**
-	 * XML handler for a closing tag.
-	 *
-	 * @param resource $parser the resource handler for the xml parser
-	 * @param string $name the name of the xml element parsed
-	 */
-	protected function endElement($parser, $name) {
-		$method = $name . 'EndHandler';
-		if (method_exists($this, $method)) {
-			$this->$method();
-		}
-	}
+    /**
+     * XML handler for a closing tag.
+     *
+     * @param resource $parser the resource handler for the xml parser
+     * @param string $name the name of the xml element parsed
+     */
+    protected function endElement($parser, $name) {
+        $method = $name . 'EndHandler';
+        if (method_exists($this, $method)) {
+            $this->$method();
+        }
+    }
 
-	/**
-	 * XML handler for character data.
-	 *
-	 * @param resource $parser The resource handler for the xml parser
-	 * @param string   $data   The name of the xml element parsed
-	 */
-	protected function characterData($parser, $data) {
-		$this->text .= $data;
-	}
+    /**
+     * XML handler for character data.
+     *
+     * @param resource $parser The resource handler for the xml parser
+     * @param string   $data   The name of the xml element parsed
+     */
+    protected function characterData($parser, $data) {
+        $this->text .= $data;
+    }
 }

Braces +10 added lines, -5 removed lines

@@ -18,7 +18,8 @@ 
 /**
  * Class ReportParserBase
  */
-class ReportParserBase {
+class ReportParserBase
+{
 	/** @var resource The XML parser */
 	protected $xml_parser;
 
@@ -32,7 +33,8 @@ 
 	 * @param ReportBase $report_root
 	 * @param string[][] $vars
 	 */
-	public function __construct($report, ReportBase $report_root = null, $vars = array()) {
+	public function __construct($report, ReportBase $report_root = null, $vars = array())
+	{
 		$this->xml_parser = xml_parser_create();
 		xml_parser_set_option($this->xml_parser, XML_OPTION_CASE_FOLDING, false);
 		xml_set_element_handler($this->xml_parser, array($this, 'startElement'), array($this, 'endElement'));
@@ -59,7 +61,8 @@ 
 	 * @param string   $name   The name of the xml element parsed
 	 * @param string[] $attrs  An array of key value pairs for the attributes
 	 */
-	protected function startElement($parser, $name, $attrs) {
+	protected function startElement($parser, $name, $attrs)
+	{
 		$method = $name . 'StartHandler';
 		if (method_exists($this, $method)) {
 			$this->$method($attrs);
@@ -72,7 +75,8 @@ 
 	 * @param resource $parser the resource handler for the xml parser
 	 * @param string $name the name of the xml element parsed
 	 */
-	protected function endElement($parser, $name) {
+	protected function endElement($parser, $name)
+	{
 		$method = $name . 'EndHandler';
 		if (method_exists($this, $method)) {
 			$this->$method();
@@ -85,7 +89,8 @@ 
 	 * @param resource $parser The resource handler for the xml parser
 	 * @param string   $data   The name of the xml element parsed
 	 */
-	protected function characterData($parser, $data) {
+	protected function characterData($parser, $data)
+	{
 		$this->text .= $data;
 	}
 }

app/Report/ReportHtml.php

Indentation +712 added lines, -712 removed lines

@@ -24,717 +24,717 @@
  * Class ReportHtml
  */
 class ReportHtml extends ReportBase {
-	/**
-	 * Cell padding
-	 *
-	 * @var int
-	 */
-	public $cPadding = 2;
-
-	/**
-	 * Cell height ratio
-	 *
-	 * @var float
-	 */
-	public $cellHeightRatio = 1.8;
-
-	/**
-	 * Current horizontal position
-	 *
-	 * @var float
-	 */
-	public $X = 0.0;
-
-	/**
-	 * Current vertical position
-	 *
-	 * @var float
-	 */
-	public $Y = 0.0;
-
-	/**
-	 * Currently used style name
-	 *
-	 * @var string
-	 */
-	public $currentStyle = '';
-
-	/**
-	 * Page number counter
-	 *
-	 * @var int
-	 */
-	public $pageN = 1;
-
-	/**
-	 * Store the page width without left and right margins
-	 *
-	 * In HTML, we don't need this
-	 *
-	 * @var float
-	 */
-	public $noMarginWidth = 0.0;
-
-	/**
-	 * Last cell height
-	 *
-	 * @var float
-	 */
-	public $lastCellHeight = 0.0;
-
-	/**
-	 * LTR or RTL alignement; "left" on LTR, "right" on RTL
-	 * Used in <div>
-	 *
-	 * @var string
-	 */
-	public $alignRTL = 'left';
-
-	/**
-	 * LTR or RTL entity
-	 *
-	 * @var string
-	 */
-	public $entityRTL = '&lrm;';
-
-	/**
-	 * Largest Font Height is used by TextBox etc.
-	 *
-	 * Use this to calculate a the text height.
-	 * This makes sure that the text fits into the cell/box when different font sizes are used
-	 *
-	 * @var int
-	 */
-	public $largestFontHeight = 0;
-
-	/**
-	 * Keep track of the highest Y position
-	 *
-	 * Used with Header div / Body div / Footer div / "addpage" / The bottom of the last image etc.
-	 *
-	 * @var float
-	 */
-	public $maxY = 0;
-
-	/** @var ReportBaseElement[] Array of elements in the header */
-	public $headerElements = array();
-
-	/** @var ReportBaseElement[] Array of elements in the page header */
-	public $pageHeaderElements = array();
-
-	/** @var ReportBaseElement[] Array of elements in the footer */
-	public $footerElements = array();
-
-	/** @var ReportBaseElement[] Array of elements in the body */
-	public $bodyElements = array();
-
-	/** @var ReportBaseFootnote[] Array of elements in the footer notes */
-	public $printedfootnotes = array();
-
-	/**
-	 * HTML Setup - ReportHtml
-	 */
-	public function setup() {
-		parent::setup();
-
-		// Setting up the correct dimensions if Portrait (default) or Landscape
-		if ($this->orientation == "landscape") {
-			$tmpw        = $this->pagew;
-			$this->pagew = $this->pageh;
-			$this->pageh = $tmpw;
-		}
-		// Store the pagewidth without margins
-		$this->noMarginWidth = (int) ($this->pagew - $this->leftmargin - $this->rightmargin);
-		// If RTL
-		if ($this->rtl) {
-			$this->alignRTL  = "right";
-			$this->entityRTL = "&rlm;";
-		}
-		// Change the default HTML font name
-		$this->defaultFont = "Arial";
-
-		if ($this->showGenText) {
-			// The default style name for Generated by.... is 'genby'
-			$element = new ReportHtmlCell(0, 10, 0, 'C', '', 'genby', 1, '.', '.', 0, 0, '', '', true);
-			$element->addText($this->generatedby);
-			$element->setUrl(parent::WT_URL);
-			$this->footerElements[] = $element;
-		}
-	}
-
-	/**
-	 * Add an element.
-	 *
-	 * @param $element
-	 */
-	public function addElement($element) {
-		if ($this->processing == "B") {
-			$this->bodyElements[] = $element;
-		} elseif ($this->processing == "H") {
-			$this->headerElements[] = $element;
-		} elseif ($this->processing == "F") {
-			$this->footerElements[] = $element;
-		}
-	}
-
-	/**
-	 * Generate the page header
-	 */
-	public function runPageHeader() {
-		foreach ($this->pageHeaderElements as $element) {
-			if (is_object($element)) {
-				$element->render($this);
-			} elseif (is_string($element) && $element == "footnotetexts") {
-				$this->footnotes();
-			} elseif (is_string($element) && $element == "addpage") {
-				$this->addPage();
-			}
-		}
-	}
-
-	/**
-	 * Generate footnotes
-	 */
-	public function footnotes() {
-		$this->currentStyle = "";
-		if (!empty($this->printedfootnotes)) {
-			foreach ($this->printedfootnotes as $element) {
-				$element->renderFootnote($this);
-			}
-		}
-	}
-
-	/**
-	 * Run the report.
-	 */
-	public function run() {
-		$controller = new SimpleController;
-		$controller
-			->setPageTitle($this->title)
-			->pageHeader();
-
-		// Setting up the styles
-		echo '<style type="text/css">';
-		echo 'body { font: 10px sans-serif;}';
-		foreach ($this->Styles as $class => $style) {
-			echo '.', $class, ' { ';
-			if ($style["font"] == "dejavusans") {
-				$style["font"] = $this->defaultFont;
-			}
-			echo 'font-family: ', $style['font'], '; ';
-			echo 'font-size: ', $style['size'], 'pt; ';
-			// Case-insensitive
-			if (stripos($style['style'], 'B') !== false) {
-				echo 'font-weight: bold; ';
-			}
-			if (stripos($style['style'], 'I') !== false) {
-				echo 'font-style: italic; ';
-			}
-			if (stripos($style['style'], 'U') !== false) {
-				echo 'text-decoration: underline; ';
-			}
-			if (stripos($style['style'], 'D') !== false) {
-				echo 'text-decoration: line-through; ';
-			}
-			echo '}', PHP_EOL;
-		}
-		unset($class, $style);
-		//-- header divider
-		echo '</style>', PHP_EOL;
-		echo '<div id="headermargin" style="position: relative; top: auto; height: ', $this->headermargin, 'pt; width: ', $this->noMarginWidth, 'pt;"></div>';
-		echo '<div id="headerdiv" style="position: relative; top: auto; width: ', $this->noMarginWidth, 'pt;">';
-		foreach ($this->headerElements as $element) {
-			if (is_object($element)) {
-				$element->render($this);
-			} elseif (is_string($element) && $element == "footnotetexts") {
-				$this->footnotes();
-			} elseif (is_string($element) && $element == "addpage") {
-				$this->addPage();
-			}
-		}
-		//-- body
-		echo '</div>';
-		echo '<script>document.getElementById("headerdiv").style.height="', $this->topmargin - $this->headermargin - 6, 'pt";</script>';
-		echo '<div id="bodydiv" style="position: relative; top: auto; width: ', $this->noMarginWidth, 'pt; height: 100%;">';
-		$this->Y    = 0;
-		$this->maxY = 0;
-		$this->runPageHeader();
-		foreach ($this->bodyElements as $element) {
-			if (is_object($element)) {
-				$element->render($this);
-			} elseif (is_string($element) && $element == "footnotetexts") {
-				$this->footnotes();
-			} elseif (is_string($element) && $element == "addpage") {
-				$this->addPage();
-			}
-		}
-		//-- footer
-		echo '</div>';
-		echo '<script>document.getElementById("bodydiv").style.height="', $this->maxY, 'pt";</script>';
-		echo '<div id="bottommargin" style="position: relative; top: auto; height: ', $this->bottommargin - $this->footermargin, 'pt;width:', $this->noMarginWidth, 'pt;"></div>';
-		echo '<div id="footerdiv" style="position: relative; top: auto; width: ', $this->noMarginWidth, 'pt;height:auto;">';
-		$this->Y    = 0;
-		$this->X    = 0;
-		$this->maxY = 0;
-		foreach ($this->footerElements as $element) {
-			if (is_object($element)) {
-				$element->render($this);
-			} elseif (is_string($element) && $element == "footnotetexts") {
-				$this->footnotes();
-			} elseif (is_string($element) && $element == "addpage") {
-				$this->addPage();
-			}
-		}
-		echo '</div>';
-		echo '<script>document.getElementById("footerdiv").style.height="', $this->maxY, 'pt";</script>';
-		echo '<div id="footermargin" style="position: relative; top: auto; height: ', $this->footermargin, 'pt;width:', $this->noMarginWidth, 'pt;"></div>';
-	}
-
-	/**
-	 * Create a new Cell object - ReportHtml
-	 *
-	 * @param int    $width   cell width (expressed in points)
-	 * @param int    $height  cell height (expressed in points)
-	 * @param mixed  $border  Border style
-	 * @param string $align   Text alignement
-	 * @param string $bgcolor Background color code
-	 * @param string $style   The name of the text style
-	 * @param int    $ln      Indicates where the current position should go after the call
-	 * @param mixed  $top     Y-position
-	 * @param mixed  $left    X-position
-	 * @param int    $fill    Indicates if the cell background must be painted (1) or transparent (0). Default value: 0.
-	 * @param int    $stretch Stretch carachter mode
-	 * @param string $bocolor Border color
-	 * @param string $tcolor  Text color
-	 * @param bool    $reseth
-	 *
-	 * @return object ReportHtmlCell
-	 */
-	public function createCell($width, $height, $border, $align, $bgcolor, $style, $ln, $top, $left, $fill, $stretch, $bocolor, $tcolor, $reseth) {
-		return new ReportHtmlCell($width, $height, $border, $align, $bgcolor, $style, $ln, $top, $left, $fill, $stretch, $bocolor, $tcolor, $reseth);
-	}
-
-	/**
-	 * Create a text box.
-	 *
-	 * @param $width
-	 * @param $height
-	 * @param $border
-	 * @param $bgcolor
-	 * @param $newline
-	 * @param $left
-	 * @param $top
-	 * @param $pagecheck
-	 * @param $style
-	 * @param $fill
-	 * @param $padding
-	 * @param $reseth
-	 *
-	 * @return ReportHtmlTextbox
-	 */
-	public function createTextBox($width, $height, $border, $bgcolor, $newline, $left, $top, $pagecheck, $style, $fill, $padding, $reseth) {
-		return new ReportHtmlTextbox($width, $height, $border, $bgcolor, $newline, $left, $top, $pagecheck, $style, $fill, $padding, $reseth);
-	}
-
-	/**
-	 * Create a text element.
-	 *
-	 * @param $style
-	 * @param $color
-	 *
-	 * @return ReportHtmlText
-	 */
-	public function createText($style, $color) {
-		return new ReportHtmlText($style, $color);
-	}
-
-	/**
-	 * Create a footnote.
-	 *
-	 * @param string $style
-	 *
-	 * @return ReportHtmlFootnote
-	 */
-	public function createFootnote($style = "") {
-		return new ReportHtmlFootnote($style);
-	}
-
-	/**
-	 * Create a page header.
-	 *
-	 * @return ReportHtmlPageheader
-	 */
-	public function createPageHeader() {
-		return new ReportHtmlPageheader;
-	}
-
-	/**
-	 * Create an image.
-	 *
-	 * @param $file
-	 * @param $x
-	 * @param $y
-	 * @param $w
-	 * @param $h
-	 * @param $align
-	 * @param $ln
-	 *
-	 * @return ReportHtmlImage
-	 */
-	public function createImage($file, $x, $y, $w, $h, $align, $ln) {
-		return new ReportHtmlImage($file, $x, $y, $w, $h, $align, $ln);
-	}
-
-	/**
-	 * Create an image.
-	 *
-	 * @param Media $mediaobject
-	 * @param $x
-	 * @param $y
-	 * @param $w
-	 * @param $h
-	 * @param $align
-	 * @param $ln
-	 *
-	 * @return ReportHtmlImage
-	 */
-	public function createImageFromObject(Media $mediaobject, $x, $y, $w, $h, $align, $ln) {
-		return new ReportHtmlImage($mediaobject->getHtmlUrlDirect('thumb'), $x, $y, $w, $h, $align, $ln);
-	}
-
-	/**
-	 * Create a line.
-	 *
-	 * @param $x1
-	 * @param $y1
-	 * @param $x2
-	 * @param $y2
-	 *
-	 * @return ReportHtmlLine
-	 */
-	public function createLine($x1, $y1, $x2, $y2) {
-		return new ReportHtmlLine($x1, $y1, $x2, $y2);
-	}
-
-	/**
-	 * Create an HTML element.
-	 *
-	 * @param $tag
-	 * @param $attrs
-	 *
-	 * @return ReportHtmlHtml
-	 */
-	public function createHTML($tag, $attrs) {
-		return new ReportHtmlHtml($tag, $attrs);
-	}
-
-	/**
-	 * Clear the Header - ReportHtml
-	 */
-	public function clearHeader() {
-		$this->headerElements = array();
-	}
-
-	/**
-	 * Update the Page Number and set a new Y if max Y is larger - ReportHtml
-	 */
-	public function addPage() {
-		$this->pageN++;
-		// Add a little margin to max Y "between pages"
-		$this->maxY += 10;
-		// If Y is still heigher by any reason...
-		if ($this->maxY < $this->Y) {
-			// ... update max Y
-			$this->maxY = $this->Y;
-		} // else update Y so that nothing will be overwritten, like images or cells...
-		else {
-			$this->Y = $this->maxY;
-		}
-	}
-
-	/**
-	 * Uppdate max Y to keep track it incase of a pagebreak - ReportHtml
-	 *
-	 * @param float $y
-	 */
-	public function addMaxY($y) {
-		if ($this->maxY < $y) {
-			$this->maxY = $y;
-		}
-	}
-
-	/**
-	 * Add a page header.
-	 *
-	 * @param $element
-	 *
-	 * @return int
-	 */
-	public function addPageHeader($element) {
-		$this->pageHeaderElements[] = $element;
-
-		return count($this->headerElements) - 1;
-	}
-
-	/**
-	 * Checks the Footnote and numbers them - ReportHtml
-	 *
-	 * @param object $footnote
-	 *
-	 * @return bool false if not numbered before | object if already numbered
-	 */
-	public function checkFootnote($footnote) {
-		$ct  = count($this->printedfootnotes);
-		$i   = 0;
-		$val = $footnote->getValue();
-		while ($i < $ct) {
-			if ($this->printedfootnotes[$i]->getValue() == $val) {
-				// If this footnote already exist then set up the numbers for this object
-				$footnote->setNum($i + 1);
-				$footnote->setAddlink($i + 1);
-
-				return $this->printedfootnotes[$i];
-			}
-			$i++;
-		}
-		// If this Footnote has not been set up yet
-		$footnote->setNum($ct + 1);
-		$footnote->setAddlink($ct + 1);
-		$this->printedfootnotes[] = $footnote;
-
-		return false;
-	}
-
-	/**
-	 * Clear the Page Header - ReportHtml
-	 */
-	public function clearPageHeader() {
-		$this->pageHeaderElements = array();
-	}
-
-	/**
-	 * Count the number of lines - ReportHtml
-	 *
-	 * @param string $str
-	 *
-	 * @return int Number of lines. 0 if empty line
-	 */
-	public function countLines($str) {
-		if ($str == "") {
-			return 0;
-		}
-
-		return (substr_count($str, "\n") + 1);
-	}
-
-	/**
-	 * Get the current style.
-	 *
-	 * @return string
-	 */
-	public function getCurrentStyle() {
-		return $this->currentStyle;
-	}
-
-	/**
-	 * Get the current style height.
-	 *
-	 * @return int
-	 */
-	public function getCurrentStyleHeight() {
-		if (empty($this->currentStyle)) {
-			return $this->defaultFontSize;
-		}
-		$style = $this->getStyle($this->currentStyle);
-
-		return $style["size"];
-	}
-
-	/**
-	 * Get the current footnotes height.
-	 *
-	 * @param $cellWidth
-	 *
-	 * @return int
-	 */
-	public function getFootnotesHeight($cellWidth) {
-		$h = 0;
-		foreach ($this->printedfootnotes as $element) {
-			$h += $element->getFootnoteHeight($this, $cellWidth);
-		}
-
-		return $h;
-	}
-
-	/**
-	 * Get the maximum width from current position to the margin - ReportHtml
-	 *
-	 * @return float
-	 */
-	public function getRemainingWidth() {
-		return $this->noMarginWidth - $this->X;
-	}
-
-	/**
-	 * Get the page height.
-	 *
-	 * @return float
-	 */
-	public function getPageHeight() {
-		return $this->pageh - $this->topmargin;
-	}
-
-	/**
-	 * Get the width of a string.
-	 *
-	 * @param $text
-	 *
-	 * @return int
-	 */
-	public function getStringWidth($text) {
-		$style = $this->getStyle($this->currentStyle);
-
-		return mb_strlen($text) * ($style['size'] / 2);
-	}
-
-	/**
-	 * Get a text height in points - ReportHtml
-	 *
-	 * @param $str
-	 *
-	 * @return int
-	 */
-	public function getTextCellHeight($str) {
-		// Count the number of lines to calculate the height
-		$nl = $this->countLines($str);
-		// Calculate the cell height
-		return ceil(($this->getCurrentStyleHeight() * $this->cellHeightRatio) * $nl);
-	}
-
-	/**
-	 * Get the current X position - ReportHtml
-	 *
-	 * @return float
-	 */
-	public function getX() {
-		return $this->X;
-	}
-
-	/**
-	 * Get the current Y position - ReportHtml
-	 *
-	 * @return float
-	 */
-	public function getY() {
-		return $this->Y;
-	}
-
-	/**
-	 * Get the current page number - ReportHtml
-	 *
-	 * @return int
-	 */
-	public function pageNo() {
-		return $this->pageN;
-	}
-
-	/**
-	 * Set the current style.
-	 *
-	 * @param $s
-	 */
-	public function setCurrentStyle($s) {
-		$this->currentStyle = $s;
-	}
-
-	/**
-	 * Set the X position - ReportHtml
-	 *
-	 * @param float $x
-	 */
-	public function setX($x) {
-		$this->X = $x;
-	}
-
-	/**
-	 * Set the Y position - ReportHtml
-	 *
-	 * Also updates Max Y position
-	 *
-	 * @param float $y
-	 */
-	public function setY($y) {
-		$this->Y = $y;
-		if ($this->maxY < $y) {
-			$this->maxY = $y;
-		}
-	}
-
-	/**
-	 * Set the X and Y position - ReportHtml
-	 *
-	 * Also updates Max Y position
-	 *
-	 * @param float $x
-	 * @param float $y
-	 */
-	public function setXy($x, $y) {
-		$this->setX($x);
-		$this->setY($y);
-	}
-
-	/**
-	 * Wrap text - ReportHtml
-	 *
-	 * @param string $str   Text to wrap
-	 * @param int    $width Width in points the text has to fit into
-	 *
-	 * @return string
-	 */
-	public function textWrap($str, $width) {
-		// Calculate the line width
-		$lw = (int) ($width / ($this->getCurrentStyleHeight() / 2));
-		// Wordwrap each line
-		$lines = explode("\n", $str);
-		// Line Feed counter
-		$lfct     = count($lines);
-		$wraptext = '';
-		foreach ($lines as $line) {
-			$wtext = FunctionsRtl::utf8WordWrap($line, $lw, "\n", true);
-			$wraptext .= $wtext;
-			// Add a new line as long as it’s not the last line
-			if ($lfct > 1) {
-				$wraptext .= "\n";
-			}
-			$lfct--;
-		}
-
-		return $wraptext;
-	}
-
-	/**
-	 * Write text - ReportHtml
-	 *
-	 * @param string $text  Text to print
-	 * @param string $color HTML RGB color code (Ex: #001122)
-	 * @param bool   $useclass
-	 */
-	public function write($text, $color = '', $useclass = true) {
-		$style    = $this->getStyle($this->getCurrentStyle());
-		$htmlcode = '<span dir="' . I18N::direction() . '"';
-		if ($useclass) {
-			$htmlcode .= ' class="' . $style['name'] . '"';
-		}
-		if (!empty($color)) {
-			// Check if Text Color is set and if it’s valid HTML color
-			if (preg_match('/#?(..)(..)(..)/', $color)) {
-				$htmlcode .= ' style="color:' . $color . ';"';
-			}
-		}
-
-		$htmlcode .= '>' . $text . '</span>';
-		$htmlcode = str_replace(array("\n", '> ', ' <'), array('<br>', '>&nbsp;', '&nbsp;<'), $htmlcode);
-		echo $htmlcode;
-	}
+    /**
+     * Cell padding
+     *
+     * @var int
+     */
+    public $cPadding = 2;
+
+    /**
+     * Cell height ratio
+     *
+     * @var float
+     */
+    public $cellHeightRatio = 1.8;
+
+    /**
+     * Current horizontal position
+     *
+     * @var float
+     */
+    public $X = 0.0;
+
+    /**
+     * Current vertical position
+     *
+     * @var float
+     */
+    public $Y = 0.0;
+
+    /**
+     * Currently used style name
+     *
+     * @var string
+     */
+    public $currentStyle = '';
+
+    /**
+     * Page number counter
+     *
+     * @var int
+     */
+    public $pageN = 1;
+
+    /**
+     * Store the page width without left and right margins
+     *
+     * In HTML, we don't need this
+     *
+     * @var float
+     */
+    public $noMarginWidth = 0.0;
+
+    /**
+     * Last cell height
+     *
+     * @var float
+     */
+    public $lastCellHeight = 0.0;
+
+    /**
+     * LTR or RTL alignement; "left" on LTR, "right" on RTL
+     * Used in <div>
+     *
+     * @var string
+     */
+    public $alignRTL = 'left';
+
+    /**
+     * LTR or RTL entity
+     *
+     * @var string
+     */
+    public $entityRTL = '&lrm;';
+
+    /**
+     * Largest Font Height is used by TextBox etc.
+     *
+     * Use this to calculate a the text height.
+     * This makes sure that the text fits into the cell/box when different font sizes are used
+     *
+     * @var int
+     */
+    public $largestFontHeight = 0;
+
+    /**
+     * Keep track of the highest Y position
+     *
+     * Used with Header div / Body div / Footer div / "addpage" / The bottom of the last image etc.
+     *
+     * @var float
+     */
+    public $maxY = 0;
+
+    /** @var ReportBaseElement[] Array of elements in the header */
+    public $headerElements = array();
+
+    /** @var ReportBaseElement[] Array of elements in the page header */
+    public $pageHeaderElements = array();
+
+    /** @var ReportBaseElement[] Array of elements in the footer */
+    public $footerElements = array();
+
+    /** @var ReportBaseElement[] Array of elements in the body */
+    public $bodyElements = array();
+
+    /** @var ReportBaseFootnote[] Array of elements in the footer notes */
+    public $printedfootnotes = array();
+
+    /**
+     * HTML Setup - ReportHtml
+     */
+    public function setup() {
+        parent::setup();
+
+        // Setting up the correct dimensions if Portrait (default) or Landscape
+        if ($this->orientation == "landscape") {
+            $tmpw        = $this->pagew;
+            $this->pagew = $this->pageh;
+            $this->pageh = $tmpw;
+        }
+        // Store the pagewidth without margins
+        $this->noMarginWidth = (int) ($this->pagew - $this->leftmargin - $this->rightmargin);
+        // If RTL
+        if ($this->rtl) {
+            $this->alignRTL  = "right";
+            $this->entityRTL = "&rlm;";
+        }
+        // Change the default HTML font name
+        $this->defaultFont = "Arial";
+
+        if ($this->showGenText) {
+            // The default style name for Generated by.... is 'genby'
+            $element = new ReportHtmlCell(0, 10, 0, 'C', '', 'genby', 1, '.', '.', 0, 0, '', '', true);
+            $element->addText($this->generatedby);
+            $element->setUrl(parent::WT_URL);
+            $this->footerElements[] = $element;
+        }
+    }
+
+    /**
+     * Add an element.
+     *
+     * @param $element
+     */
+    public function addElement($element) {
+        if ($this->processing == "B") {
+            $this->bodyElements[] = $element;
+        } elseif ($this->processing == "H") {
+            $this->headerElements[] = $element;
+        } elseif ($this->processing == "F") {
+            $this->footerElements[] = $element;
+        }
+    }
+
+    /**
+     * Generate the page header
+     */
+    public function runPageHeader() {
+        foreach ($this->pageHeaderElements as $element) {
+            if (is_object($element)) {
+                $element->render($this);
+            } elseif (is_string($element) && $element == "footnotetexts") {
+                $this->footnotes();
+            } elseif (is_string($element) && $element == "addpage") {
+                $this->addPage();
+            }
+        }
+    }
+
+    /**
+     * Generate footnotes
+     */
+    public function footnotes() {
+        $this->currentStyle = "";
+        if (!empty($this->printedfootnotes)) {
+            foreach ($this->printedfootnotes as $element) {
+                $element->renderFootnote($this);
+            }
+        }
+    }
+
+    /**
+     * Run the report.
+     */
+    public function run() {
+        $controller = new SimpleController;
+        $controller
+            ->setPageTitle($this->title)
+            ->pageHeader();
+
+        // Setting up the styles
+        echo '<style type="text/css">';
+        echo 'body { font: 10px sans-serif;}';
+        foreach ($this->Styles as $class => $style) {
+            echo '.', $class, ' { ';
+            if ($style["font"] == "dejavusans") {
+                $style["font"] = $this->defaultFont;
+            }
+            echo 'font-family: ', $style['font'], '; ';
+            echo 'font-size: ', $style['size'], 'pt; ';
+            // Case-insensitive
+            if (stripos($style['style'], 'B') !== false) {
+                echo 'font-weight: bold; ';
+            }
+            if (stripos($style['style'], 'I') !== false) {
+                echo 'font-style: italic; ';
+            }
+            if (stripos($style['style'], 'U') !== false) {
+                echo 'text-decoration: underline; ';
+            }
+            if (stripos($style['style'], 'D') !== false) {
+                echo 'text-decoration: line-through; ';
+            }
+            echo '}', PHP_EOL;
+        }
+        unset($class, $style);
+        //-- header divider
+        echo '</style>', PHP_EOL;
+        echo '<div id="headermargin" style="position: relative; top: auto; height: ', $this->headermargin, 'pt; width: ', $this->noMarginWidth, 'pt;"></div>';
+        echo '<div id="headerdiv" style="position: relative; top: auto; width: ', $this->noMarginWidth, 'pt;">';
+        foreach ($this->headerElements as $element) {
+            if (is_object($element)) {
+                $element->render($this);
+            } elseif (is_string($element) && $element == "footnotetexts") {
+                $this->footnotes();
+            } elseif (is_string($element) && $element == "addpage") {
+                $this->addPage();
+            }
+        }
+        //-- body
+        echo '</div>';
+        echo '<script>document.getElementById("headerdiv").style.height="', $this->topmargin - $this->headermargin - 6, 'pt";</script>';
+        echo '<div id="bodydiv" style="position: relative; top: auto; width: ', $this->noMarginWidth, 'pt; height: 100%;">';
+        $this->Y    = 0;
+        $this->maxY = 0;
+        $this->runPageHeader();
+        foreach ($this->bodyElements as $element) {
+            if (is_object($element)) {
+                $element->render($this);
+            } elseif (is_string($element) && $element == "footnotetexts") {
+                $this->footnotes();
+            } elseif (is_string($element) && $element == "addpage") {
+                $this->addPage();
+            }
+        }
+        //-- footer
+        echo '</div>';
+        echo '<script>document.getElementById("bodydiv").style.height="', $this->maxY, 'pt";</script>';
+        echo '<div id="bottommargin" style="position: relative; top: auto; height: ', $this->bottommargin - $this->footermargin, 'pt;width:', $this->noMarginWidth, 'pt;"></div>';
+        echo '<div id="footerdiv" style="position: relative; top: auto; width: ', $this->noMarginWidth, 'pt;height:auto;">';
+        $this->Y    = 0;
+        $this->X    = 0;
+        $this->maxY = 0;
+        foreach ($this->footerElements as $element) {
+            if (is_object($element)) {
+                $element->render($this);
+            } elseif (is_string($element) && $element == "footnotetexts") {
+                $this->footnotes();
+            } elseif (is_string($element) && $element == "addpage") {
+                $this->addPage();
+            }
+        }
+        echo '</div>';
+        echo '<script>document.getElementById("footerdiv").style.height="', $this->maxY, 'pt";</script>';
+        echo '<div id="footermargin" style="position: relative; top: auto; height: ', $this->footermargin, 'pt;width:', $this->noMarginWidth, 'pt;"></div>';
+    }
+
+    /**
+     * Create a new Cell object - ReportHtml
+     *
+     * @param int    $width   cell width (expressed in points)
+     * @param int    $height  cell height (expressed in points)
+     * @param mixed  $border  Border style
+     * @param string $align   Text alignement
+     * @param string $bgcolor Background color code
+     * @param string $style   The name of the text style
+     * @param int    $ln      Indicates where the current position should go after the call
+     * @param mixed  $top     Y-position
+     * @param mixed  $left    X-position
+     * @param int    $fill    Indicates if the cell background must be painted (1) or transparent (0). Default value: 0.
+     * @param int    $stretch Stretch carachter mode
+     * @param string $bocolor Border color
+     * @param string $tcolor  Text color
+     * @param bool    $reseth
+     *
+     * @return object ReportHtmlCell
+     */
+    public function createCell($width, $height, $border, $align, $bgcolor, $style, $ln, $top, $left, $fill, $stretch, $bocolor, $tcolor, $reseth) {
+        return new ReportHtmlCell($width, $height, $border, $align, $bgcolor, $style, $ln, $top, $left, $fill, $stretch, $bocolor, $tcolor, $reseth);
+    }
+
+    /**
+     * Create a text box.
+     *
+     * @param $width
+     * @param $height
+     * @param $border
+     * @param $bgcolor
+     * @param $newline
+     * @param $left
+     * @param $top
+     * @param $pagecheck
+     * @param $style
+     * @param $fill
+     * @param $padding
+     * @param $reseth
+     *
+     * @return ReportHtmlTextbox
+     */
+    public function createTextBox($width, $height, $border, $bgcolor, $newline, $left, $top, $pagecheck, $style, $fill, $padding, $reseth) {
+        return new ReportHtmlTextbox($width, $height, $border, $bgcolor, $newline, $left, $top, $pagecheck, $style, $fill, $padding, $reseth);
+    }
+
+    /**
+     * Create a text element.
+     *
+     * @param $style
+     * @param $color
+     *
+     * @return ReportHtmlText
+     */
+    public function createText($style, $color) {
+        return new ReportHtmlText($style, $color);
+    }
+
+    /**
+     * Create a footnote.
+     *
+     * @param string $style
+     *
+     * @return ReportHtmlFootnote
+     */
+    public function createFootnote($style = "") {
+        return new ReportHtmlFootnote($style);
+    }
+
+    /**
+     * Create a page header.
+     *
+     * @return ReportHtmlPageheader
+     */
+    public function createPageHeader() {
+        return new ReportHtmlPageheader;
+    }
+
+    /**
+     * Create an image.
+     *
+     * @param $file
+     * @param $x
+     * @param $y
+     * @param $w
+     * @param $h
+     * @param $align
+     * @param $ln
+     *
+     * @return ReportHtmlImage
+     */
+    public function createImage($file, $x, $y, $w, $h, $align, $ln) {
+        return new ReportHtmlImage($file, $x, $y, $w, $h, $align, $ln);
+    }
+
+    /**
+     * Create an image.
+     *
+     * @param Media $mediaobject
+     * @param $x
+     * @param $y
+     * @param $w
+     * @param $h
+     * @param $align
+     * @param $ln
+     *
+     * @return ReportHtmlImage
+     */
+    public function createImageFromObject(Media $mediaobject, $x, $y, $w, $h, $align, $ln) {
+        return new ReportHtmlImage($mediaobject->getHtmlUrlDirect('thumb'), $x, $y, $w, $h, $align, $ln);
+    }
+
+    /**
+     * Create a line.
+     *
+     * @param $x1
+     * @param $y1
+     * @param $x2
+     * @param $y2
+     *
+     * @return ReportHtmlLine
+     */
+    public function createLine($x1, $y1, $x2, $y2) {
+        return new ReportHtmlLine($x1, $y1, $x2, $y2);
+    }
+
+    /**
+     * Create an HTML element.
+     *
+     * @param $tag
+     * @param $attrs
+     *
+     * @return ReportHtmlHtml
+     */
+    public function createHTML($tag, $attrs) {
+        return new ReportHtmlHtml($tag, $attrs);
+    }
+
+    /**
+     * Clear the Header - ReportHtml
+     */
+    public function clearHeader() {
+        $this->headerElements = array();
+    }
+
+    /**
+     * Update the Page Number and set a new Y if max Y is larger - ReportHtml
+     */
+    public function addPage() {
+        $this->pageN++;
+        // Add a little margin to max Y "between pages"
+        $this->maxY += 10;
+        // If Y is still heigher by any reason...
+        if ($this->maxY < $this->Y) {
+            // ... update max Y
+            $this->maxY = $this->Y;
+        } // else update Y so that nothing will be overwritten, like images or cells...
+        else {
+            $this->Y = $this->maxY;
+        }
+    }
+
+    /**
+     * Uppdate max Y to keep track it incase of a pagebreak - ReportHtml
+     *
+     * @param float $y
+     */
+    public function addMaxY($y) {
+        if ($this->maxY < $y) {
+            $this->maxY = $y;
+        }
+    }
+
+    /**
+     * Add a page header.
+     *
+     * @param $element
+     *
+     * @return int
+     */
+    public function addPageHeader($element) {
+        $this->pageHeaderElements[] = $element;
+
+        return count($this->headerElements) - 1;
+    }
+
+    /**
+     * Checks the Footnote and numbers them - ReportHtml
+     *
+     * @param object $footnote
+     *
+     * @return bool false if not numbered before | object if already numbered
+     */
+    public function checkFootnote($footnote) {
+        $ct  = count($this->printedfootnotes);
+        $i   = 0;
+        $val = $footnote->getValue();
+        while ($i < $ct) {
+            if ($this->printedfootnotes[$i]->getValue() == $val) {
+                // If this footnote already exist then set up the numbers for this object
+                $footnote->setNum($i + 1);
+                $footnote->setAddlink($i + 1);
+
+                return $this->printedfootnotes[$i];
+            }
+            $i++;
+        }
+        // If this Footnote has not been set up yet
+        $footnote->setNum($ct + 1);
+        $footnote->setAddlink($ct + 1);
+        $this->printedfootnotes[] = $footnote;
+
+        return false;
+    }
+
+    /**
+     * Clear the Page Header - ReportHtml
+     */
+    public function clearPageHeader() {
+        $this->pageHeaderElements = array();
+    }
+
+    /**
+     * Count the number of lines - ReportHtml
+     *
+     * @param string $str
+     *
+     * @return int Number of lines. 0 if empty line
+     */
+    public function countLines($str) {
+        if ($str == "") {
+            return 0;
+        }
+
+        return (substr_count($str, "\n") + 1);
+    }
+
+    /**
+     * Get the current style.
+     *
+     * @return string
+     */
+    public function getCurrentStyle() {
+        return $this->currentStyle;
+    }
+
+    /**
+     * Get the current style height.
+     *
+     * @return int
+     */
+    public function getCurrentStyleHeight() {
+        if (empty($this->currentStyle)) {
+            return $this->defaultFontSize;
+        }
+        $style = $this->getStyle($this->currentStyle);
+
+        return $style["size"];
+    }
+
+    /**
+     * Get the current footnotes height.
+     *
+     * @param $cellWidth
+     *
+     * @return int
+     */
+    public function getFootnotesHeight($cellWidth) {
+        $h = 0;
+        foreach ($this->printedfootnotes as $element) {
+            $h += $element->getFootnoteHeight($this, $cellWidth);
+        }
+
+        return $h;
+    }
+
+    /**
+     * Get the maximum width from current position to the margin - ReportHtml
+     *
+     * @return float
+     */
+    public function getRemainingWidth() {
+        return $this->noMarginWidth - $this->X;
+    }
+
+    /**
+     * Get the page height.
+     *
+     * @return float
+     */
+    public function getPageHeight() {
+        return $this->pageh - $this->topmargin;
+    }
+
+    /**
+     * Get the width of a string.
+     *
+     * @param $text
+     *
+     * @return int
+     */
+    public function getStringWidth($text) {
+        $style = $this->getStyle($this->currentStyle);
+
+        return mb_strlen($text) * ($style['size'] / 2);
+    }
+
+    /**
+     * Get a text height in points - ReportHtml
+     *
+     * @param $str
+     *
+     * @return int
+     */
+    public function getTextCellHeight($str) {
+        // Count the number of lines to calculate the height
+        $nl = $this->countLines($str);
+        // Calculate the cell height
+        return ceil(($this->getCurrentStyleHeight() * $this->cellHeightRatio) * $nl);
+    }
+
+    /**
+     * Get the current X position - ReportHtml
+     *
+     * @return float
+     */
+    public function getX() {
+        return $this->X;
+    }
+
+    /**
+     * Get the current Y position - ReportHtml
+     *
+     * @return float
+     */
+    public function getY() {
+        return $this->Y;
+    }
+
+    /**
+     * Get the current page number - ReportHtml
+     *
+     * @return int
+     */
+    public function pageNo() {
+        return $this->pageN;
+    }
+
+    /**
+     * Set the current style.
+     *
+     * @param $s
+     */
+    public function setCurrentStyle($s) {
+        $this->currentStyle = $s;
+    }
+
+    /**
+     * Set the X position - ReportHtml
+     *
+     * @param float $x
+     */
+    public function setX($x) {
+        $this->X = $x;
+    }
+
+    /**
+     * Set the Y position - ReportHtml
+     *
+     * Also updates Max Y position
+     *
+     * @param float $y
+     */
+    public function setY($y) {
+        $this->Y = $y;
+        if ($this->maxY < $y) {
+            $this->maxY = $y;
+        }
+    }
+
+    /**
+     * Set the X and Y position - ReportHtml
+     *
+     * Also updates Max Y position
+     *
+     * @param float $x
+     * @param float $y
+     */
+    public function setXy($x, $y) {
+        $this->setX($x);
+        $this->setY($y);
+    }
+
+    /**
+     * Wrap text - ReportHtml
+     *
+     * @param string $str   Text to wrap
+     * @param int    $width Width in points the text has to fit into
+     *
+     * @return string
+     */
+    public function textWrap($str, $width) {
+        // Calculate the line width
+        $lw = (int) ($width / ($this->getCurrentStyleHeight() / 2));
+        // Wordwrap each line
+        $lines = explode("\n", $str);
+        // Line Feed counter
+        $lfct     = count($lines);
+        $wraptext = '';
+        foreach ($lines as $line) {
+            $wtext = FunctionsRtl::utf8WordWrap($line, $lw, "\n", true);
+            $wraptext .= $wtext;
+            // Add a new line as long as it’s not the last line
+            if ($lfct > 1) {
+                $wraptext .= "\n";
+            }
+            $lfct--;
+        }
+
+        return $wraptext;
+    }
+
+    /**
+     * Write text - ReportHtml
+     *
+     * @param string $text  Text to print
+     * @param string $color HTML RGB color code (Ex: #001122)
+     * @param bool   $useclass
+     */
+    public function write($text, $color = '', $useclass = true) {
+        $style    = $this->getStyle($this->getCurrentStyle());
+        $htmlcode = '<span dir="' . I18N::direction() . '"';
+        if ($useclass) {
+            $htmlcode .= ' class="' . $style['name'] . '"';
+        }
+        if (!empty($color)) {
+            // Check if Text Color is set and if it’s valid HTML color
+            if (preg_match('/#?(..)(..)(..)/', $color)) {
+                $htmlcode .= ' style="color:' . $color . ';"';
+            }
+        }
+
+        $htmlcode .= '>' . $text . '</span>';
+        $htmlcode = str_replace(array("\n", '> ', ' <'), array('<br>', '>&nbsp;', '&nbsp;<'), $htmlcode);
+        echo $htmlcode;
+    }
 
 }

Braces +76 added lines, -38 removed lines

@@ -23,7 +23,8 @@ 
 /**
  * Class ReportHtml
  */
-class ReportHtml extends ReportBase {
+class ReportHtml extends ReportBase
+{
 	/**
 	 * Cell padding
 	 *
@@ -134,7 +135,8 @@ 
 	/**
 	 * HTML Setup - ReportHtml
 	 */
-	public function setup() {
+	public function setup()
+	{
 		parent::setup();
 
 		// Setting up the correct dimensions if Portrait (default) or Landscape
@@ -167,7 +169,8 @@ 
 	 *
 	 * @param $element
 	 */
-	public function addElement($element) {
+	public function addElement($element)
+	{
 		if ($this->processing == "B") {
 			$this->bodyElements[] = $element;
 		} elseif ($this->processing == "H") {
@@ -180,7 +183,8 @@ 
 	/**
 	 * Generate the page header
 	 */
-	public function runPageHeader() {
+	public function runPageHeader()
+	{
 		foreach ($this->pageHeaderElements as $element) {
 			if (is_object($element)) {
 				$element->render($this);
@@ -195,7 +199,8 @@ 
 	/**
 	 * Generate footnotes
 	 */
-	public function footnotes() {
+	public function footnotes()
+	{
 		$this->currentStyle = "";
 		if (!empty($this->printedfootnotes)) {
 			foreach ($this->printedfootnotes as $element) {
@@ -207,7 +212,8 @@ 
 	/**
 	 * Run the report.
 	 */
-	public function run() {
+	public function run()
+	{
 		$controller = new SimpleController;
 		$controller
 			->setPageTitle($this->title)
@@ -310,7 +316,8 @@ 
 	 *
 	 * @return object ReportHtmlCell
 	 */
-	public function createCell($width, $height, $border, $align, $bgcolor, $style, $ln, $top, $left, $fill, $stretch, $bocolor, $tcolor, $reseth) {
+	public function createCell($width, $height, $border, $align, $bgcolor, $style, $ln, $top, $left, $fill, $stretch, $bocolor, $tcolor, $reseth)
+	{
 		return new ReportHtmlCell($width, $height, $border, $align, $bgcolor, $style, $ln, $top, $left, $fill, $stretch, $bocolor, $tcolor, $reseth);
 	}
 
@@ -332,7 +339,8 @@ 
 	 *
 	 * @return ReportHtmlTextbox
 	 */
-	public function createTextBox($width, $height, $border, $bgcolor, $newline, $left, $top, $pagecheck, $style, $fill, $padding, $reseth) {
+	public function createTextBox($width, $height, $border, $bgcolor, $newline, $left, $top, $pagecheck, $style, $fill, $padding, $reseth)
+	{
 		return new ReportHtmlTextbox($width, $height, $border, $bgcolor, $newline, $left, $top, $pagecheck, $style, $fill, $padding, $reseth);
 	}
 
@@ -344,7 +352,8 @@ 
 	 *
 	 * @return ReportHtmlText
 	 */
-	public function createText($style, $color) {
+	public function createText($style, $color)
+	{
 		return new ReportHtmlText($style, $color);
 	}
 
@@ -355,7 +364,8 @@ 
 	 *
 	 * @return ReportHtmlFootnote
 	 */
-	public function createFootnote($style = "") {
+	public function createFootnote($style = "")
+	{
 		return new ReportHtmlFootnote($style);
 	}
 
@@ -364,7 +374,8 @@ 
 	 *
 	 * @return ReportHtmlPageheader
 	 */
-	public function createPageHeader() {
+	public function createPageHeader()
+	{
 		return new ReportHtmlPageheader;
 	}
 
@@ -381,7 +392,8 @@ 
 	 *
 	 * @return ReportHtmlImage
 	 */
-	public function createImage($file, $x, $y, $w, $h, $align, $ln) {
+	public function createImage($file, $x, $y, $w, $h, $align, $ln)
+	{
 		return new ReportHtmlImage($file, $x, $y, $w, $h, $align, $ln);
 	}
 
@@ -398,7 +410,8 @@ 
 	 *
 	 * @return ReportHtmlImage
 	 */
-	public function createImageFromObject(Media $mediaobject, $x, $y, $w, $h, $align, $ln) {
+	public function createImageFromObject(Media $mediaobject, $x, $y, $w, $h, $align, $ln)
+	{
 		return new ReportHtmlImage($mediaobject->getHtmlUrlDirect('thumb'), $x, $y, $w, $h, $align, $ln);
 	}
 
@@ -412,7 +425,8 @@ 
 	 *
 	 * @return ReportHtmlLine
 	 */
-	public function createLine($x1, $y1, $x2, $y2) {
+	public function createLine($x1, $y1, $x2, $y2)
+	{
 		return new ReportHtmlLine($x1, $y1, $x2, $y2);
 	}
 
@@ -424,21 +438,24 @@ 
 	 *
 	 * @return ReportHtmlHtml
 	 */
-	public function createHTML($tag, $attrs) {
+	public function createHTML($tag, $attrs)
+	{
 		return new ReportHtmlHtml($tag, $attrs);
 	}
 
 	/**
 	 * Clear the Header - ReportHtml
 	 */
-	public function clearHeader() {
+	public function clearHeader()
+	{
 		$this->headerElements = array();
 	}
 
 	/**
 	 * Update the Page Number and set a new Y if max Y is larger - ReportHtml
 	 */
-	public function addPage() {
+	public function addPage()
+	{
 		$this->pageN++;
 		// Add a little margin to max Y "between pages"
 		$this->maxY += 10;
@@ -457,7 +474,8 @@ 
 	 *
 	 * @param float $y
 	 */
-	public function addMaxY($y) {
+	public function addMaxY($y)
+	{
 		if ($this->maxY < $y) {
 			$this->maxY = $y;
 		}
@@ -470,7 +488,8 @@ 
 	 *
 	 * @return int
 	 */
-	public function addPageHeader($element) {
+	public function addPageHeader($element)
+	{
 		$this->pageHeaderElements[] = $element;
 
 		return count($this->headerElements) - 1;
@@ -483,7 +502,8 @@ 
 	 *
 	 * @return bool false if not numbered before | object if already numbered
 	 */
-	public function checkFootnote($footnote) {
+	public function checkFootnote($footnote)
+	{
 		$ct  = count($this->printedfootnotes);
 		$i   = 0;
 		$val = $footnote->getValue();
@@ -508,7 +528,8 @@ 
 	/**
 	 * Clear the Page Header - ReportHtml
 	 */
-	public function clearPageHeader() {
+	public function clearPageHeader()
+	{
 		$this->pageHeaderElements = array();
 	}
 
@@ -519,7 +540,8 @@ 
 	 *
 	 * @return int Number of lines. 0 if empty line
 	 */
-	public function countLines($str) {
+	public function countLines($str)
+	{
 		if ($str == "") {
 			return 0;
 		}
@@ -532,7 +554,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getCurrentStyle() {
+	public function getCurrentStyle()
+	{
 		return $this->currentStyle;
 	}
 
@@ -541,7 +564,8 @@ 
 	 *
 	 * @return int
 	 */
-	public function getCurrentStyleHeight() {
+	public function getCurrentStyleHeight()
+	{
 		if (empty($this->currentStyle)) {
 			return $this->defaultFontSize;
 		}
@@ -557,7 +581,8 @@ 
 	 *
 	 * @return int
 	 */
-	public function getFootnotesHeight($cellWidth) {
+	public function getFootnotesHeight($cellWidth)
+	{
 		$h = 0;
 		foreach ($this->printedfootnotes as $element) {
 			$h += $element->getFootnoteHeight($this, $cellWidth);
@@ -571,7 +596,8 @@ 
 	 *
 	 * @return float
 	 */
-	public function getRemainingWidth() {
+	public function getRemainingWidth()
+	{
 		return $this->noMarginWidth - $this->X;
 	}
 
@@ -580,7 +606,8 @@ 
 	 *
 	 * @return float
 	 */
-	public function getPageHeight() {
+	public function getPageHeight()
+	{
 		return $this->pageh - $this->topmargin;
 	}
 
@@ -591,7 +618,8 @@ 
 	 *
 	 * @return int
 	 */
-	public function getStringWidth($text) {
+	public function getStringWidth($text)
+	{
 		$style = $this->getStyle($this->currentStyle);
 
 		return mb_strlen($text) * ($style['size'] / 2);
@@ -604,7 +632,8 @@ 
 	 *
 	 * @return int
 	 */
-	public function getTextCellHeight($str) {
+	public function getTextCellHeight($str)
+	{
 		// Count the number of lines to calculate the height
 		$nl = $this->countLines($str);
 		// Calculate the cell height
@@ -616,7 +645,8 @@ 
 	 *
 	 * @return float
 	 */
-	public function getX() {
+	public function getX()
+	{
 		return $this->X;
 	}
 
@@ -625,7 +655,8 @@ 
 	 *
 	 * @return float
 	 */
-	public function getY() {
+	public function getY()
+	{
 		return $this->Y;
 	}
 
@@ -634,7 +665,8 @@ 
 	 *
 	 * @return int
 	 */
-	public function pageNo() {
+	public function pageNo()
+	{
 		return $this->pageN;
 	}
 
@@ -643,7 +675,8 @@ 
 	 *
 	 * @param $s
 	 */
-	public function setCurrentStyle($s) {
+	public function setCurrentStyle($s)
+	{
 		$this->currentStyle = $s;
 	}
 
@@ -652,7 +685,8 @@ 
 	 *
 	 * @param float $x
 	 */
-	public function setX($x) {
+	public function setX($x)
+	{
 		$this->X = $x;
 	}
 
@@ -663,7 +697,8 @@ 
 	 *
 	 * @param float $y
 	 */
-	public function setY($y) {
+	public function setY($y)
+	{
 		$this->Y = $y;
 		if ($this->maxY < $y) {
 			$this->maxY = $y;
@@ -678,7 +713,8 @@ 
 	 * @param float $x
 	 * @param float $y
 	 */
-	public function setXy($x, $y) {
+	public function setXy($x, $y)
+	{
 		$this->setX($x);
 		$this->setY($y);
 	}
@@ -691,7 +727,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function textWrap($str, $width) {
+	public function textWrap($str, $width)
+	{
 		// Calculate the line width
 		$lw = (int) ($width / ($this->getCurrentStyleHeight() / 2));
 		// Wordwrap each line
@@ -719,7 +756,8 @@ 
 	 * @param string $color HTML RGB color code (Ex: #001122)
 	 * @param bool   $useclass
 	 */
-	public function write($text, $color = '', $useclass = true) {
+	public function write($text, $color = '', $useclass = true)
+	{
 		$style    = $this->getStyle($this->getCurrentStyle());
 		$htmlcode = '<span dir="' . I18N::direction() . '"';
 		if ($useclass) {

app/Report/ReportPdfImage.php

Indentation +91 added lines, -91 removed lines

@@ -19,99 +19,99 @@
  * Class ReportPdfImage
  */
 class ReportPdfImage extends ReportBaseImage {
-	/**
-	 * PDF image renderer
-	 *
-	 * @param ReportTcpdf $renderer
-	 */
-	public function render($renderer) {
-		global $lastpicbottom, $lastpicpage, $lastpicleft, $lastpicright;
+    /**
+     * PDF image renderer
+     *
+     * @param ReportTcpdf $renderer
+     */
+    public function render($renderer) {
+        global $lastpicbottom, $lastpicpage, $lastpicleft, $lastpicright;
 
-		// Check for a pagebreak first
-		if ($renderer->checkPageBreakPDF($this->height + 5)) {
-			$this->y = $renderer->GetY();
-		}
+        // Check for a pagebreak first
+        if ($renderer->checkPageBreakPDF($this->height + 5)) {
+            $this->y = $renderer->GetY();
+        }
 
-		$curx = $renderer->GetX();
-		// If current position (left)set "."
-		if ($this->x == ".") {
-			$this->x = $renderer->GetX();
-		} // For static position add margin
-		else {
-			$this->x = $renderer->addMarginX($this->x);
-			$renderer->SetX($curx);
-		}
-		if ($this->y == ".") {
-			//-- first check for a collision with the last picture
-			if (isset($lastpicbottom)) {
-				if (($renderer->PageNo() == $lastpicpage) && ($lastpicbottom >= $renderer->GetY()) && ($this->x >= $lastpicleft) && ($this->x <= $lastpicright)
-				) {
-					$renderer->SetY($lastpicbottom + 5);
-				}
-			}
-			$this->y = $renderer->GetY();
-		} else {
-			$renderer->SetY($this->y);
-		}
-		if ($renderer->getRTL()) {
-			$renderer->Image(
-				$this->file,
-				$renderer->getPageWidth() - $this->x,
-				$this->y,
-				$this->width,
-				$this->height,
-				"",
-				"",
-				$this->line,
-				false,
-				72,
-				$this->align
-			);
-		} else {
-			$renderer->Image(
-				$this->file,
-				$this->x,
-				$this->y,
-				$this->width,
-				$this->height,
-				"",
-				"",
-				$this->line,
-				false,
-				72,
-				$this->align
-			);
-		}
-		$lastpicpage           = $renderer->PageNo();
-		$renderer->lastpicpage = $renderer->getPage();
-		$lastpicleft           = $this->x;
-		$lastpicright          = $this->x + $this->width;
-		$lastpicbottom         = $this->y + $this->height;
-		// Setup for the next line
-		if ($this->line == "N") {
-			$renderer->SetY($lastpicbottom);
-		}
-	}
+        $curx = $renderer->GetX();
+        // If current position (left)set "."
+        if ($this->x == ".") {
+            $this->x = $renderer->GetX();
+        } // For static position add margin
+        else {
+            $this->x = $renderer->addMarginX($this->x);
+            $renderer->SetX($curx);
+        }
+        if ($this->y == ".") {
+            //-- first check for a collision with the last picture
+            if (isset($lastpicbottom)) {
+                if (($renderer->PageNo() == $lastpicpage) && ($lastpicbottom >= $renderer->GetY()) && ($this->x >= $lastpicleft) && ($this->x <= $lastpicright)
+                ) {
+                    $renderer->SetY($lastpicbottom + 5);
+                }
+            }
+            $this->y = $renderer->GetY();
+        } else {
+            $renderer->SetY($this->y);
+        }
+        if ($renderer->getRTL()) {
+            $renderer->Image(
+                $this->file,
+                $renderer->getPageWidth() - $this->x,
+                $this->y,
+                $this->width,
+                $this->height,
+                "",
+                "",
+                $this->line,
+                false,
+                72,
+                $this->align
+            );
+        } else {
+            $renderer->Image(
+                $this->file,
+                $this->x,
+                $this->y,
+                $this->width,
+                $this->height,
+                "",
+                "",
+                $this->line,
+                false,
+                72,
+                $this->align
+            );
+        }
+        $lastpicpage           = $renderer->PageNo();
+        $renderer->lastpicpage = $renderer->getPage();
+        $lastpicleft           = $this->x;
+        $lastpicright          = $this->x + $this->width;
+        $lastpicbottom         = $this->y + $this->height;
+        // Setup for the next line
+        if ($this->line == "N") {
+            $renderer->SetY($lastpicbottom);
+        }
+    }
 
-	/**
-	 * Get the image height
-	 *
-	 * @param ReportTcpdf $pdf
-	 *
-	 * @return float
-	 */
-	public function getHeight($pdf) {
-		return $this->height;
-	}
+    /**
+     * Get the image height
+     *
+     * @param ReportTcpdf $pdf
+     *
+     * @return float
+     */
+    public function getHeight($pdf) {
+        return $this->height;
+    }
 
-	/**
-	 * Get the image width.
-	 *
-	 * @param $pdf
-	 *
-	 * @return float
-	 */
-	public function getWidth($pdf) {
-		return $this->width;
-	}
+    /**
+     * Get the image width.
+     *
+     * @param $pdf
+     *
+     * @return float
+     */
+    public function getWidth($pdf) {
+        return $this->width;
+    }
 }

Braces +8 added lines, -4 removed lines

@@ -18,13 +18,15 @@ 
 /**
  * Class ReportPdfImage
  */
-class ReportPdfImage extends ReportBaseImage {
+class ReportPdfImage extends ReportBaseImage
+{
 	/**
 	 * PDF image renderer
 	 *
 	 * @param ReportTcpdf $renderer
 	 */
-	public function render($renderer) {
+	public function render($renderer)
+	{
 		global $lastpicbottom, $lastpicpage, $lastpicleft, $lastpicright;
 
 		// Check for a pagebreak first
@@ -100,7 +102,8 @@ 
 	 *
 	 * @return float
 	 */
-	public function getHeight($pdf) {
+	public function getHeight($pdf)
+	{
 		return $this->height;
 	}
 
@@ -111,7 +114,8 @@ 
 	 *
 	 * @return float
 	 */
-	public function getWidth($pdf) {
+	public function getWidth($pdf)
+	{
 		return $this->width;
 	}
 }

app/Report/ReportHtmlHtml.php

Indentation +43 added lines, -43 removed lines

@@ -19,51 +19,51 @@
  * Class ReportHtmlHtml
  */
 class ReportHtmlHtml extends ReportBaseHtml {
-	/**
-	 * Render the elements.
-	 *
-	 * @param ReportHtml $renderer
-	 * @param bool       $sub
-	 * @param bool       $inat
-	 *
-	 * @return string
-	 */
-	public function render($renderer, $sub = false, $inat = true) {
-		if (!empty($this->attrs["wt_style"])) {
-			$renderer->setCurrentStyle($this->attrs["wt_style"]);
-		}
+    /**
+     * Render the elements.
+     *
+     * @param ReportHtml $renderer
+     * @param bool       $sub
+     * @param bool       $inat
+     *
+     * @return string
+     */
+    public function render($renderer, $sub = false, $inat = true) {
+        if (!empty($this->attrs["wt_style"])) {
+            $renderer->setCurrentStyle($this->attrs["wt_style"]);
+        }
 
-		$this->text = $this->getStart() . $this->text;
-		foreach ($this->elements as $element) {
-			if (is_string($element) && $element == "footnotetexts") {
-				$renderer->footnotes();
-			} elseif (is_string($element) && $element == "addpage") {
-				$renderer->addPage();
-			} elseif ($element instanceof ReportBaseHtml) {
-				$element->render($renderer, true, false);
-			} else {
-				$element->render($renderer);
-			}
-		}
-		$this->text .= $this->getEnd();
-		if ($sub) {
-			return $this->text;
-		}
+        $this->text = $this->getStart() . $this->text;
+        foreach ($this->elements as $element) {
+            if (is_string($element) && $element == "footnotetexts") {
+                $renderer->footnotes();
+            } elseif (is_string($element) && $element == "addpage") {
+                $renderer->addPage();
+            } elseif ($element instanceof ReportBaseHtml) {
+                $element->render($renderer, true, false);
+            } else {
+                $element->render($renderer);
+            }
+        }
+        $this->text .= $this->getEnd();
+        if ($sub) {
+            return $this->text;
+        }
 
-		// If not called by an other attribute
-		if ($inat) {
-			$startX = $renderer->getX();
-			$startY = $renderer->getY();
-			$width  = $renderer->getRemainingWidth();
-			echo "<div style=\"position: absolute;top: ", $startY, "pt;", $renderer->alignRTL, ": ", $startX, "pt;width: ", $width, "pt;\">";
-			$startY += $renderer->getCurrentStyleHeight() + 2;
-			$renderer->setY($startY);
-		}
+        // If not called by an other attribute
+        if ($inat) {
+            $startX = $renderer->getX();
+            $startY = $renderer->getY();
+            $width  = $renderer->getRemainingWidth();
+            echo "<div style=\"position: absolute;top: ", $startY, "pt;", $renderer->alignRTL, ": ", $startX, "pt;width: ", $width, "pt;\">";
+            $startY += $renderer->getCurrentStyleHeight() + 2;
+            $renderer->setY($startY);
+        }
 
-		echo $this->text;
+        echo $this->text;
 
-		if ($inat) {
-			echo "</div>\n";
-		}
-	}
+        if ($inat) {
+            echo "</div>\n";
+        }
+    }
 }

Braces +4 added lines, -2 removed lines

@@ -18,7 +18,8 @@ 
 /**
  * Class ReportHtmlHtml
  */
-class ReportHtmlHtml extends ReportBaseHtml {
+class ReportHtmlHtml extends ReportBaseHtml
+{
 	/**
 	 * Render the elements.
 	 *
@@ -28,7 +29,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function render($renderer, $sub = false, $inat = true) {
+	public function render($renderer, $sub = false, $inat = true)
+	{
 		if (!empty($this->attrs["wt_style"])) {
 			$renderer->setCurrentStyle($this->attrs["wt_style"]);
 		}