fisharebest / webtrees

app/Report/ReportPdfLine.php

Indentation +24 added lines, -24 removed lines

@@ -19,28 +19,28 @@
  * Class ReportPdfLine
  */
 class ReportPdfLine extends ReportBaseLine {
-	/**
-	 * PDF line renderer
-	 *
-	 * @param ReportTcpdf $renderer
-	 */
-	public function render($renderer) {
-		if ($this->x1 == ".") {
-			$this->x1 = $renderer->GetX();
-		}
-		if ($this->y1 == ".") {
-			$this->y1 = $renderer->GetY();
-		}
-		if ($this->x2 == ".") {
-			$this->x2 = $renderer->getMaxLineWidth();
-		}
-		if ($this->y2 == ".") {
-			$this->y2 = $renderer->GetY();
-		}
-		if ($renderer->getRTL()) {
-			$renderer->Line($renderer->getPageWidth() - $this->x1, $this->y1, $renderer->getPageWidth() - $this->x2, $this->y2);
-		} else {
-			$renderer->Line($this->x1, $this->y1, $this->x2, $this->y2);
-		}
-	}
+    /**
+     * PDF line renderer
+     *
+     * @param ReportTcpdf $renderer
+     */
+    public function render($renderer) {
+        if ($this->x1 == ".") {
+            $this->x1 = $renderer->GetX();
+        }
+        if ($this->y1 == ".") {
+            $this->y1 = $renderer->GetY();
+        }
+        if ($this->x2 == ".") {
+            $this->x2 = $renderer->getMaxLineWidth();
+        }
+        if ($this->y2 == ".") {
+            $this->y2 = $renderer->GetY();
+        }
+        if ($renderer->getRTL()) {
+            $renderer->Line($renderer->getPageWidth() - $this->x1, $this->y1, $renderer->getPageWidth() - $this->x2, $this->y2);
+        } else {
+            $renderer->Line($this->x1, $this->y1, $this->x2, $this->y2);
+        }
+    }
 }

Braces +4 added lines, -2 removed lines

@@ -18,13 +18,15 @@
 /**
  * Class ReportPdfLine
  */
-class ReportPdfLine extends ReportBaseLine {
+class ReportPdfLine extends ReportBaseLine
+{
 	/**
 	 * PDF line renderer
 	 *
 	 * @param ReportTcpdf $renderer
 	 */
-	public function render($renderer) {
+	public function render($renderer)
+	{
 		if ($this->x1 == ".") {
 			$this->x1 = $renderer->GetX();
 		}

app/Report/ReportBase.php

Indentation +451 added lines, -451 removed lines

@@ -21,455 +21,455 @@
  * Class ReportBase
  */
 class ReportBase {
-	/** User measure unit. */
-	const UNITS = 'pt';
-
-	/** webtrees URL */
-	const WT_URL = WT_WEBTREES_URL;
-
-	/** @var float Left Margin (expressed in points) Default: 17.99 mm, 0.7083 inch */
-	public $leftmargin = 51.0;
-
-	/** @var float Right Margin (expressed in points) Default: 9.87 mm, 0.389 inch */
-	public $rightmargin = 28.0;
-
-	/** @var float Top Margin (expressed in points) Default: 26.81 mm */
-	public $topmargin = 76.0;
-
-	/** @var float Bottom Margin (expressed in points) Default: 21.6 mm */
-	public $bottommargin = 60.0;
-
-	/** @var float Header Margin (expressed in points) Default: 4.93 mm */
-	public $headermargin = 14.0;
-
-	/** @var float Footer Margin (expressed in points) Default: 9.88 mm, 0.389 inch */
-	public $footermargin = 28.0;
-
-	/** @var string Page orientation (portrait, landscape) */
-	public $orientation = 'portrait';
-
-	/** @var string Page format name */
-	public $pageFormat = 'A4';
-
-	/** @var float Height of page format in points */
-	public $pageh = 0.0;
-
-	/** @var float Width of page format in points */
-	public $pagew = 0.0;
-
-	/** @var string[][] An array of the Styles elements found in the document */
-	public $Styles = array();
-
-	/** @var string The default Report font name */
-	public $defaultFont = 'dejavusans';
-
-	/** @var int The default Report font size */
-	public $defaultFontSize = 12;
-
-	/** @var string Header (H), Page header (PH), Body (B) or Footer (F) */
-	public $processing = 'H';
-
-	/** @var bool RTL Language (false=LTR, true=RTL) */
-	public $rtl = false;
-
-	/** @var bool Show the Generated by... (true=show the text) */
-	public $showGenText = true;
-
-	/** @var string Generated By... text */
-	public $generatedby = '';
-
-	/** @var string The report title */
-	public $title = '';
-
-	/** @var string Author of the report, the users full name */
-	public $rauthor = WT_BASE_URL;
-
-	/** @var string Keywords */
-	public $rkeywords = '';
-
-	/** @var string Report Description / Subject */
-	public $rsubject = '';
-
-	/**
-	 * Initial Setup - ReportBase
-	 *
-	 * Setting up document wide defaults that will be inherited of the report modules
-	 * As DEFAULT A4 and Portrait will be used if not set
-	 */
-	public function setup() {
-		// Set RTL direction
-		if (I18N::direction() === 'rtl') {
-			$this->rtl = true;
-		}
-		// Set the Keywords
-		$this->rkeywords = '';
-		// Generated By...text
-		// I18N: This is a report footer. %s is the name of the application.
-		$this->generatedby = I18N::translate('Generated by %s', WT_WEBTREES . ' ' . WT_VERSION);
-
-		// For known size pages
-		if ($this->pagew == 0 && $this->pageh == 0) {
-			/**
-			 * The current ISO 216 standard was introduced in 1975 and is a direct follow up to the german DIN 476 standard from 1922. ISO 216 is also called EN 20216 in Europe.
-			 * The ISO paper sizes are based on the metric system so everything else is aproxiamte
-			 *
-			 * The Series A is used for Standard Printing and Stationary.
-			 * The Series B is used for Posters, Wall-Charts etc.
-			 * The C series is used for folders, post cards and envelopes. C series envelope is suitable to insert A series sizes.
-			 * ISO also define format series RA and SRA for untrimmed raw paper, where SRA stands for 'supplementary raw format A'.
-			 * Japan has adopted the ISO series A sizes, but its series B sizes are slightly different. These sizes are sometimes called JIS B or JB sizes.
-			 *  sun was a unit of length used in Japan and is equal to about 3.03 cm or 1.193 inches
-			 * The United States, Canada, and in part Mexico, are today the only industrialized nations in which the ISO standard paper sizes are not yet widely used.
-			 *
-			 * A0 & A1        Technical drawings, posters
-			 * A1 & A2        Flip charts
-			 * A2 & A3        Drawings, diagrams, large tables
-			 * A4             Letters, magazines, forms, catalogs, laser printer and copying machine output
-			 * A5             Note pads
-			 * A6             Postcards
-			 * B5, A5, B6  A6 Books
-			 * C4, C5, C6     Envelopes for A4 letters: unfolded (C4), folded once (C5), folded twice (C6)
-			 * B4 & A3        Newspapers, supported by most copying machines in addition to A4
-			 * B8 & A8        Playing cards
-			 *
-			 * 1 inch = 72 points
-			 * 1 mm = 2.8346457 points
-			 * 1 inch = 25.4 mm
-			 * 1 point = 0,35278 mm
-			 */
-			switch ($this->pageFormat) {
-				// ISO A series
-			case '4A0': // ISO 216, 1682 mm x 2378 mm
-				$sizes = array(4767.86, 6740.79);
-				break;
-			case '2A0': // ISO 216, 1189 mm x 1682 mm
-				$sizes = array(3370.39, 4767.86);
-				break;
-			case 'A0': // ISO 216, 841 mm x 1189mm
-				$sizes = array(2383.94, 3370.39);
-				break;
-			case 'A1': // ISO 216, 594 mm x 841 mm
-				$sizes = array(1683.78, 2383.94);
-				break;
-			case 'A2': // ISO 216, 420 mm x 594 mm
-				$sizes = array(1190.55, 1683.78);
-				break;
-			case 'A3': // ISO 216, 297 mm x 420 mm
-				$sizes = array(841.89, 1190.55);
-				break;
-			case 'A4': // ISO 216, 210 mm 297 mm
-				$sizes = array(595.28, 841.89);
-				break;
-			case 'A5': // ISO 216, 148 mm x 210 mm
-				$sizes = array(419.53, 595.28);
-				break;
-			case 'A6': // ISO 216, 105 mm x 148 mm
-				$sizes = array(297.64, 419.53);
-				break;
-			case 'A7': // ISO 216, 74 mm x 105 mm
-				$sizes = array(209.76, 297.64);
-				break;
-			case 'A8': // ISO 216, 52 mm x 74 mm
-				$sizes = array(147.40, 209.76);
-				break;
-			case 'A9': // ISO 216, 37 mm x 52 mm
-				$sizes = array(104.88, 147.40);
-				break;
-			case 'A10': // ISO 216, 26 mm x 37 mm
-				$sizes = array(73.70, 104.88);
-				break;
-
-			// ISO B series
-			case 'B0': // ISO 216, 1000 mm x 1414 mm
-				$sizes = array(2834.65, 4008.19);
-				break;
-			case 'B1': // ISO 216, 707 mm x 1000 mm
-				$sizes = array(2004.09, 2834.65);
-				break;
-			case 'B2': // ISO 216, 500 mm x 707 mm
-				$sizes = array(1417.32, 2004.09);
-				break;
-			case 'B3': // ISO 216, 353 mm x 500 mm
-				$sizes = array(1000.63, 1417.32);
-				break;
-			case 'B4': // ISO 216, 250 mm x 353 mm
-				$sizes = array(708.66, 1000.63);
-				break;
-			case 'B5': // ISO 216, 176 mm x 250 mm
-				$sizes = array(498.90, 708.66);
-				break;
-			case 'B6': // ISO 216, 125 mm x 176 mm
-				$sizes = array(354.33, 498.90);
-				break;
-			case 'B7': // ISO 216, 88 mm x 125 mm
-				$sizes = array(249.45, 354.33);
-				break;
-			case 'B8': // ISO 216, 62 mm x 88 mm
-				$sizes = array(175.75, 249.45);
-				break;
-			case 'B9': // ISO 216, 44 mm x 62 mm
-				$sizes = array(124.72, 175.75);
-				break;
-			case 'B10': // ISO 216, 31 mm x 44 mm
-				$sizes = array(87.87, 124.72);
-				break;
-
-			// ISO C series, Envelope
-			case 'C0': // ISO 269, 917 mm x 1297 mm, For flat A0 sheet
-				$sizes = array(2599.37, 3676.54);
-				break;
-			case 'C1': // ISO 269, 648 mm x 917 mm, For flat A1 sheet
-				$sizes = array(1836.85, 2599.37);
-				break;
-			case 'C2': // ISO 269, 458 mm x 648 mm, For flat A2 sheet, A1 folded in half
-				$sizes = array(1298.27, 1836.85);
-				break;
-			case 'C3': // ISO 269, 324 mm x 458 mm, For flat A3 sheet, A2 folded in half
-				$sizes = array(918.43, 1298.27);
-				break;
-			case 'C4': // ISO 269, 229 mm x 324 mm, For flat A4 sheet, A3 folded in half
-				$sizes = array(649.13, 918.43);
-				break;
-			case 'C5': // ISO 269, 162 mm x 229 mm, For flat A5 sheet, A4 folded in half
-				$sizes = array(459.21, 649.13);
-				break;
-			case 'C6/5': // ISO 269, 114 mm x 229 mm. A5 folded twice = 1/3 A4. Alternative for the DL envelope
-				$sizes = array(323.15, 649.13);
-				break;
-			case 'C6': // ISO 269, 114 mm x 162 mm, For A5 folded in half
-				$sizes = array(323.15, 459.21);
-				break;
-			case 'C7/6': // ISO 269, 81 mm x 162 mm, For A5 sheet folded in thirds
-				$sizes = array(229.61, 459.21);
-				break;
-			case 'C7': // ISO 269, 81 mm x 114 mm, For A5 folded in quarters
-				$sizes = array(229.61, 323.15);
-				break;
-			case 'C8': // ISO 269, 57 mm x 81 mm
-				$sizes = array(161.57, 229.61);
-				break;
-			case 'C9': // ISO 269, 40 mm x 57 mm
-				$sizes = array(113.39, 161.57);
-				break;
-			case 'C10': // ISO 269, 28 mm x 40 mm
-				$sizes = array(79.37, 113.39);
-				break;
-			case 'DL': // Original DIN 678 but ISO 269 now has this C6/5 , 110 mm x 220 mm, For A4 sheet folded in thirds, A5 in half
-				$sizes = array(311.81, 623.62);
-				break;
-
-			// Untrimmed stock sizes for the ISO-A Series - ISO primary range
-			case 'RA0': // ISO 478, 860 mm x 1220 mm
-				$sizes = array(2437.80, 3458.27);
-				break;
-			case 'RA1': // ISO 478, 610 mm x 860 mm
-				$sizes = array(1729.13, 2437.80);
-				break;
-			case 'RA2': // ISO 478, 430 mm x 610 mm
-				$sizes = array(1218.90, 1729.13);
-				break;
-			case 'RA3': // ISO 478, 305 mm x 430 mm
-				$sizes = array(864.57, 1218.90);
-				break;
-			case 'RA4': // ISO 478, 215 mm x 305 mm
-				$sizes = array(609.45, 864.57);
-				break;
-
-			// Untrimmed stock sizes for the ISO-A Series - ISO supplementary range
-			case 'SRA0': // ISO 593, 900 mm x 1280 mm
-				$sizes = array(2551.18, 3628.35);
-				break;
-			case 'SRA1': // ISO 593, 640 mm x 900 mm
-				$sizes = array(1814.17, 2551.18);
-				break;
-			case 'SRA2': // ISO 593, 450 mm x 640 mm
-				$sizes = array(1275.59, 1814.17);
-				break;
-			case 'SRA3': // ISO 593, 320 mm x 450 mm
-				$sizes = array(907.09, 1275.59);
-				break;
-			case 'SRA4': // ISO 593, 225 mm x 320 mm
-				$sizes = array(637.80, 907.09);
-				break;
-
-			// ISO size variations
-			case 'A2EXTRA': // ISO 216, 445 mm x 619 mm
-				$sizes = array(1261.42, 1754.65);
-				break;
-			case 'A2SUPER': // ISO 216, 305 mm x 508 mm
-				$sizes = array(864.57, 1440.00);
-				break;
-			case 'A3EXTRA': // ISO 216, 322 mm x 445 mm
-				$sizes = array(912.76, 1261.42);
-				break;
-			case 'SUPERA3': // ISO 216, 305 mm x 487 mm
-				$sizes = array(864.57, 1380.47);
-				break;
-			case 'A4EXTRA': // ISO 216, 235 mm x 322 mm
-				$sizes = array(666.14, 912.76);
-				break;
-			case 'A4LONG': // ISO 216, 210 mm x 348 mm
-				$sizes = array(595.28, 986.46);
-				break;
-			case 'A4SUPER': // ISO 216, 229 mm x 322 mm
-				$sizes = array(649.13, 912.76);
-				break;
-			case 'SUPERA4': // ISO 216, 227 mm x 356 mm
-				$sizes = array(643.46, 1009.13);
-				break;
-			case 'A5EXTRA': // ISO 216, 173 mm x 235 mm
-				$sizes = array(490.39, 666.14);
-				break;
-			case 'SOB5EXTRA': // ISO 216, 202 mm x 276 mm
-				$sizes = array(572.60, 782.36);
-				break;
-
-			// Japanese version of the ISO 216 B series
-			case 'JB0': // JIS P 0138-61, 1030 mm x 1456 mm
-				$sizes = array(2919.69, 4127.24);
-				break;
-			case 'JB1': // JIS P 0138-61, 728 mm x 1030 mm
-				$sizes = array(2063.62, 2919.69);
-				break;
-			case 'JB2': // JIS P 0138-61, 515 mm x 728 mm
-				$sizes = array(1459.84, 2063.62);
-				break;
-			case 'JB3': // JIS P 0138-61, 364 mm x 515 mm
-				$sizes = array(1031.81, 1459.84);
-				break;
-			case 'JB4': // JIS P 0138-61, 257 mm x 364 mm
-				$sizes = array(728.50, 1031.81);
-				break;
-			case 'JB5': // JIS P 0138-61, 182 mm x 257 mm
-				$sizes = array(515.91, 728.50);
-				break;
-			case 'JB6': // JIS P 0138-61, 128 mm x 182 mm
-				$sizes = array(362.83, 515.91);
-				break;
-			case 'JB7': // JIS P 0138-61, 91 mm x 128 mm
-				$sizes = array(257.95, 362.83);
-				break;
-			case 'JB8': // JIS P 0138-61, 64 mm x 91 mm
-				$sizes = array(181.42, 257.95);
-				break;
-			case 'JB9': // JIS P 0138-61, 45 mm x 64 mm
-				$sizes = array(127.56, 181.42);
-				break;
-			case 'JB10': // JIS P 0138-61, 32 mm x 45 mm
-				$sizes = array(90.71, 127.56);
-				break;
-
-			// US pages
-			case 'EXECUTIVE': // 7.25 in x 10.5 in
-				$sizes = array(522.00, 756.00);
-				break;
-			case 'FOLIO': // 8.5 in x 13 in
-				$sizes = array(612.00, 936.00);
-				break;
-			case 'FOOLSCAP': // 13.5 in x 17 in
-				$sizes = array(972.00, 1224.00);
-				break;
-			case 'LEDGER': // 11 in x 17 in
-				$sizes = array(792.00, 1224.00);
-				break;
-			case 'LEGAL': // 8.5 in x 14 in
-				$sizes = array(612.00, 1008.00);
-				break;
-			case 'LETTER': // 8.5 in x 11 in
-				$sizes = array(612.00, 792.00);
-				break;
-			case 'QUARTO': // 8.46 in x 10.8 in
-				$sizes = array(609.12, 777.50);
-				break;
-			case 'STATEMENT': // 5.5 in x 8.5 in
-				$sizes = array(396.00, 612.00);
-				break;
-			case 'USGOVT': // 8 in x 11 in
-				$sizes = array(576.00, 792.00);
-				break;
-			default:
-				$this->pageFormat = 'A4';
-				$sizes            = array(595.28, 841.89);
-				break;
-			}
-			$this->pagew = $sizes[0];
-			$this->pageh = $sizes[1];
-		} else {
-			if ($this->pagew < 10) {
-				throw new \DomainException('REPORT ERROR ReportBase::setup(): For custom size pages you must set "customwidth" larger then this in the XML file');
-			}
-			if ($this->pageh < 10) {
-				throw new \DomainException('REPORT ERROR ReportBase::setup(): For custom size pages you must set "customheight" larger then this in the XML file');
-			}
-		}
-
-		return 0;
-	}
-
-	/**
-	 * Process the Header , Page header, Body or Footer - ReportBase
-	 *
-	 * @param string $p Header (H), Page header (PH), Body (B) or Footer (F)
-	 *
-	 * @return int
-	 */
-	public function setProcessing($p) {
-		$this->processing = $p;
-
-		return 0;
-	}
-
-	/**
-	 * Add the Title when raw character data is used in Title - ReportBase
-	 *
-	 * @param string $data
-	 *
-	 * @return int
-	 */
-	public function addTitle($data) {
-		$this->title .= $data;
-
-		return 0;
-	}
-
-	/**
-	 * Add the Description when raw character data is used in Description - ReportBase
-	 *
-	 * @param string $data
-	 *
-	 * @return int
-	 */
-	public function addDescription($data) {
-		$this->rsubject .= $data;
-
-		return 0;
-	}
-
-	/**
-	 * Add Style to Styles array - ReportBase
-	 *
-	 * @param array $style
-	 *
-	 * @return int
-	 */
-	public function addStyle($style) {
-		$this->Styles[$style['name']] = $style;
-
-		return 0;
-	}
-
-	/**
-	 * Get a style from the Styles array - ReportBase
-	 *
-	 * @param string $s Style name
-	 *
-	 * @return array
-	 */
-	public function getStyle($s) {
-		if (!isset($this->Styles[$s])) {
-			return current($this->Styles);
-		}
-
-		return $this->Styles[$s];
-	}
+    /** User measure unit. */
+    const UNITS = 'pt';
+
+    /** webtrees URL */
+    const WT_URL = WT_WEBTREES_URL;
+
+    /** @var float Left Margin (expressed in points) Default: 17.99 mm, 0.7083 inch */
+    public $leftmargin = 51.0;
+
+    /** @var float Right Margin (expressed in points) Default: 9.87 mm, 0.389 inch */
+    public $rightmargin = 28.0;
+
+    /** @var float Top Margin (expressed in points) Default: 26.81 mm */
+    public $topmargin = 76.0;
+
+    /** @var float Bottom Margin (expressed in points) Default: 21.6 mm */
+    public $bottommargin = 60.0;
+
+    /** @var float Header Margin (expressed in points) Default: 4.93 mm */
+    public $headermargin = 14.0;
+
+    /** @var float Footer Margin (expressed in points) Default: 9.88 mm, 0.389 inch */
+    public $footermargin = 28.0;
+
+    /** @var string Page orientation (portrait, landscape) */
+    public $orientation = 'portrait';
+
+    /** @var string Page format name */
+    public $pageFormat = 'A4';
+
+    /** @var float Height of page format in points */
+    public $pageh = 0.0;
+
+    /** @var float Width of page format in points */
+    public $pagew = 0.0;
+
+    /** @var string[][] An array of the Styles elements found in the document */
+    public $Styles = array();
+
+    /** @var string The default Report font name */
+    public $defaultFont = 'dejavusans';
+
+    /** @var int The default Report font size */
+    public $defaultFontSize = 12;
+
+    /** @var string Header (H), Page header (PH), Body (B) or Footer (F) */
+    public $processing = 'H';
+
+    /** @var bool RTL Language (false=LTR, true=RTL) */
+    public $rtl = false;
+
+    /** @var bool Show the Generated by... (true=show the text) */
+    public $showGenText = true;
+
+    /** @var string Generated By... text */
+    public $generatedby = '';
+
+    /** @var string The report title */
+    public $title = '';
+
+    /** @var string Author of the report, the users full name */
+    public $rauthor = WT_BASE_URL;
+
+    /** @var string Keywords */
+    public $rkeywords = '';
+
+    /** @var string Report Description / Subject */
+    public $rsubject = '';
+
+    /**
+     * Initial Setup - ReportBase
+     *
+     * Setting up document wide defaults that will be inherited of the report modules
+     * As DEFAULT A4 and Portrait will be used if not set
+     */
+    public function setup() {
+        // Set RTL direction
+        if (I18N::direction() === 'rtl') {
+            $this->rtl = true;
+        }
+        // Set the Keywords
+        $this->rkeywords = '';
+        // Generated By...text
+        // I18N: This is a report footer. %s is the name of the application.
+        $this->generatedby = I18N::translate('Generated by %s', WT_WEBTREES . ' ' . WT_VERSION);
+
+        // For known size pages
+        if ($this->pagew == 0 && $this->pageh == 0) {
+            /**
+             * The current ISO 216 standard was introduced in 1975 and is a direct follow up to the german DIN 476 standard from 1922. ISO 216 is also called EN 20216 in Europe.
+             * The ISO paper sizes are based on the metric system so everything else is aproxiamte
+             *
+             * The Series A is used for Standard Printing and Stationary.
+             * The Series B is used for Posters, Wall-Charts etc.
+             * The C series is used for folders, post cards and envelopes. C series envelope is suitable to insert A series sizes.
+             * ISO also define format series RA and SRA for untrimmed raw paper, where SRA stands for 'supplementary raw format A'.
+             * Japan has adopted the ISO series A sizes, but its series B sizes are slightly different. These sizes are sometimes called JIS B or JB sizes.
+             *  sun was a unit of length used in Japan and is equal to about 3.03 cm or 1.193 inches
+             * The United States, Canada, and in part Mexico, are today the only industrialized nations in which the ISO standard paper sizes are not yet widely used.
+             *
+             * A0 & A1        Technical drawings, posters
+             * A1 & A2        Flip charts
+             * A2 & A3        Drawings, diagrams, large tables
+             * A4             Letters, magazines, forms, catalogs, laser printer and copying machine output
+             * A5             Note pads
+             * A6             Postcards
+             * B5, A5, B6  A6 Books
+             * C4, C5, C6     Envelopes for A4 letters: unfolded (C4), folded once (C5), folded twice (C6)
+             * B4 & A3        Newspapers, supported by most copying machines in addition to A4
+             * B8 & A8        Playing cards
+             *
+             * 1 inch = 72 points
+             * 1 mm = 2.8346457 points
+             * 1 inch = 25.4 mm
+             * 1 point = 0,35278 mm
+             */
+            switch ($this->pageFormat) {
+                // ISO A series
+            case '4A0': // ISO 216, 1682 mm x 2378 mm
+                $sizes = array(4767.86, 6740.79);
+                break;
+            case '2A0': // ISO 216, 1189 mm x 1682 mm
+                $sizes = array(3370.39, 4767.86);
+                break;
+            case 'A0': // ISO 216, 841 mm x 1189mm
+                $sizes = array(2383.94, 3370.39);
+                break;
+            case 'A1': // ISO 216, 594 mm x 841 mm
+                $sizes = array(1683.78, 2383.94);
+                break;
+            case 'A2': // ISO 216, 420 mm x 594 mm
+                $sizes = array(1190.55, 1683.78);
+                break;
+            case 'A3': // ISO 216, 297 mm x 420 mm
+                $sizes = array(841.89, 1190.55);
+                break;
+            case 'A4': // ISO 216, 210 mm 297 mm
+                $sizes = array(595.28, 841.89);
+                break;
+            case 'A5': // ISO 216, 148 mm x 210 mm
+                $sizes = array(419.53, 595.28);
+                break;
+            case 'A6': // ISO 216, 105 mm x 148 mm
+                $sizes = array(297.64, 419.53);
+                break;
+            case 'A7': // ISO 216, 74 mm x 105 mm
+                $sizes = array(209.76, 297.64);
+                break;
+            case 'A8': // ISO 216, 52 mm x 74 mm
+                $sizes = array(147.40, 209.76);
+                break;
+            case 'A9': // ISO 216, 37 mm x 52 mm
+                $sizes = array(104.88, 147.40);
+                break;
+            case 'A10': // ISO 216, 26 mm x 37 mm
+                $sizes = array(73.70, 104.88);
+                break;
+
+            // ISO B series
+            case 'B0': // ISO 216, 1000 mm x 1414 mm
+                $sizes = array(2834.65, 4008.19);
+                break;
+            case 'B1': // ISO 216, 707 mm x 1000 mm
+                $sizes = array(2004.09, 2834.65);
+                break;
+            case 'B2': // ISO 216, 500 mm x 707 mm
+                $sizes = array(1417.32, 2004.09);
+                break;
+            case 'B3': // ISO 216, 353 mm x 500 mm
+                $sizes = array(1000.63, 1417.32);
+                break;
+            case 'B4': // ISO 216, 250 mm x 353 mm
+                $sizes = array(708.66, 1000.63);
+                break;
+            case 'B5': // ISO 216, 176 mm x 250 mm
+                $sizes = array(498.90, 708.66);
+                break;
+            case 'B6': // ISO 216, 125 mm x 176 mm
+                $sizes = array(354.33, 498.90);
+                break;
+            case 'B7': // ISO 216, 88 mm x 125 mm
+                $sizes = array(249.45, 354.33);
+                break;
+            case 'B8': // ISO 216, 62 mm x 88 mm
+                $sizes = array(175.75, 249.45);
+                break;
+            case 'B9': // ISO 216, 44 mm x 62 mm
+                $sizes = array(124.72, 175.75);
+                break;
+            case 'B10': // ISO 216, 31 mm x 44 mm
+                $sizes = array(87.87, 124.72);
+                break;
+
+            // ISO C series, Envelope
+            case 'C0': // ISO 269, 917 mm x 1297 mm, For flat A0 sheet
+                $sizes = array(2599.37, 3676.54);
+                break;
+            case 'C1': // ISO 269, 648 mm x 917 mm, For flat A1 sheet
+                $sizes = array(1836.85, 2599.37);
+                break;
+            case 'C2': // ISO 269, 458 mm x 648 mm, For flat A2 sheet, A1 folded in half
+                $sizes = array(1298.27, 1836.85);
+                break;
+            case 'C3': // ISO 269, 324 mm x 458 mm, For flat A3 sheet, A2 folded in half
+                $sizes = array(918.43, 1298.27);
+                break;
+            case 'C4': // ISO 269, 229 mm x 324 mm, For flat A4 sheet, A3 folded in half
+                $sizes = array(649.13, 918.43);
+                break;
+            case 'C5': // ISO 269, 162 mm x 229 mm, For flat A5 sheet, A4 folded in half
+                $sizes = array(459.21, 649.13);
+                break;
+            case 'C6/5': // ISO 269, 114 mm x 229 mm. A5 folded twice = 1/3 A4. Alternative for the DL envelope
+                $sizes = array(323.15, 649.13);
+                break;
+            case 'C6': // ISO 269, 114 mm x 162 mm, For A5 folded in half
+                $sizes = array(323.15, 459.21);
+                break;
+            case 'C7/6': // ISO 269, 81 mm x 162 mm, For A5 sheet folded in thirds
+                $sizes = array(229.61, 459.21);
+                break;
+            case 'C7': // ISO 269, 81 mm x 114 mm, For A5 folded in quarters
+                $sizes = array(229.61, 323.15);
+                break;
+            case 'C8': // ISO 269, 57 mm x 81 mm
+                $sizes = array(161.57, 229.61);
+                break;
+            case 'C9': // ISO 269, 40 mm x 57 mm
+                $sizes = array(113.39, 161.57);
+                break;
+            case 'C10': // ISO 269, 28 mm x 40 mm
+                $sizes = array(79.37, 113.39);
+                break;
+            case 'DL': // Original DIN 678 but ISO 269 now has this C6/5 , 110 mm x 220 mm, For A4 sheet folded in thirds, A5 in half
+                $sizes = array(311.81, 623.62);
+                break;
+
+            // Untrimmed stock sizes for the ISO-A Series - ISO primary range
+            case 'RA0': // ISO 478, 860 mm x 1220 mm
+                $sizes = array(2437.80, 3458.27);
+                break;
+            case 'RA1': // ISO 478, 610 mm x 860 mm
+                $sizes = array(1729.13, 2437.80);
+                break;
+            case 'RA2': // ISO 478, 430 mm x 610 mm
+                $sizes = array(1218.90, 1729.13);
+                break;
+            case 'RA3': // ISO 478, 305 mm x 430 mm
+                $sizes = array(864.57, 1218.90);
+                break;
+            case 'RA4': // ISO 478, 215 mm x 305 mm
+                $sizes = array(609.45, 864.57);
+                break;
+
+            // Untrimmed stock sizes for the ISO-A Series - ISO supplementary range
+            case 'SRA0': // ISO 593, 900 mm x 1280 mm
+                $sizes = array(2551.18, 3628.35);
+                break;
+            case 'SRA1': // ISO 593, 640 mm x 900 mm
+                $sizes = array(1814.17, 2551.18);
+                break;
+            case 'SRA2': // ISO 593, 450 mm x 640 mm
+                $sizes = array(1275.59, 1814.17);
+                break;
+            case 'SRA3': // ISO 593, 320 mm x 450 mm
+                $sizes = array(907.09, 1275.59);
+                break;
+            case 'SRA4': // ISO 593, 225 mm x 320 mm
+                $sizes = array(637.80, 907.09);
+                break;
+
+            // ISO size variations
+            case 'A2EXTRA': // ISO 216, 445 mm x 619 mm
+                $sizes = array(1261.42, 1754.65);
+                break;
+            case 'A2SUPER': // ISO 216, 305 mm x 508 mm
+                $sizes = array(864.57, 1440.00);
+                break;
+            case 'A3EXTRA': // ISO 216, 322 mm x 445 mm
+                $sizes = array(912.76, 1261.42);
+                break;
+            case 'SUPERA3': // ISO 216, 305 mm x 487 mm
+                $sizes = array(864.57, 1380.47);
+                break;
+            case 'A4EXTRA': // ISO 216, 235 mm x 322 mm
+                $sizes = array(666.14, 912.76);
+                break;
+            case 'A4LONG': // ISO 216, 210 mm x 348 mm
+                $sizes = array(595.28, 986.46);
+                break;
+            case 'A4SUPER': // ISO 216, 229 mm x 322 mm
+                $sizes = array(649.13, 912.76);
+                break;
+            case 'SUPERA4': // ISO 216, 227 mm x 356 mm
+                $sizes = array(643.46, 1009.13);
+                break;
+            case 'A5EXTRA': // ISO 216, 173 mm x 235 mm
+                $sizes = array(490.39, 666.14);
+                break;
+            case 'SOB5EXTRA': // ISO 216, 202 mm x 276 mm
+                $sizes = array(572.60, 782.36);
+                break;
+
+            // Japanese version of the ISO 216 B series
+            case 'JB0': // JIS P 0138-61, 1030 mm x 1456 mm
+                $sizes = array(2919.69, 4127.24);
+                break;
+            case 'JB1': // JIS P 0138-61, 728 mm x 1030 mm
+                $sizes = array(2063.62, 2919.69);
+                break;
+            case 'JB2': // JIS P 0138-61, 515 mm x 728 mm
+                $sizes = array(1459.84, 2063.62);
+                break;
+            case 'JB3': // JIS P 0138-61, 364 mm x 515 mm
+                $sizes = array(1031.81, 1459.84);
+                break;
+            case 'JB4': // JIS P 0138-61, 257 mm x 364 mm
+                $sizes = array(728.50, 1031.81);
+                break;
+            case 'JB5': // JIS P 0138-61, 182 mm x 257 mm
+                $sizes = array(515.91, 728.50);
+                break;
+            case 'JB6': // JIS P 0138-61, 128 mm x 182 mm
+                $sizes = array(362.83, 515.91);
+                break;
+            case 'JB7': // JIS P 0138-61, 91 mm x 128 mm
+                $sizes = array(257.95, 362.83);
+                break;
+            case 'JB8': // JIS P 0138-61, 64 mm x 91 mm
+                $sizes = array(181.42, 257.95);
+                break;
+            case 'JB9': // JIS P 0138-61, 45 mm x 64 mm
+                $sizes = array(127.56, 181.42);
+                break;
+            case 'JB10': // JIS P 0138-61, 32 mm x 45 mm
+                $sizes = array(90.71, 127.56);
+                break;
+
+            // US pages
+            case 'EXECUTIVE': // 7.25 in x 10.5 in
+                $sizes = array(522.00, 756.00);
+                break;
+            case 'FOLIO': // 8.5 in x 13 in
+                $sizes = array(612.00, 936.00);
+                break;
+            case 'FOOLSCAP': // 13.5 in x 17 in
+                $sizes = array(972.00, 1224.00);
+                break;
+            case 'LEDGER': // 11 in x 17 in
+                $sizes = array(792.00, 1224.00);
+                break;
+            case 'LEGAL': // 8.5 in x 14 in
+                $sizes = array(612.00, 1008.00);
+                break;
+            case 'LETTER': // 8.5 in x 11 in
+                $sizes = array(612.00, 792.00);
+                break;
+            case 'QUARTO': // 8.46 in x 10.8 in
+                $sizes = array(609.12, 777.50);
+                break;
+            case 'STATEMENT': // 5.5 in x 8.5 in
+                $sizes = array(396.00, 612.00);
+                break;
+            case 'USGOVT': // 8 in x 11 in
+                $sizes = array(576.00, 792.00);
+                break;
+            default:
+                $this->pageFormat = 'A4';
+                $sizes            = array(595.28, 841.89);
+                break;
+            }
+            $this->pagew = $sizes[0];
+            $this->pageh = $sizes[1];
+        } else {
+            if ($this->pagew < 10) {
+                throw new \DomainException('REPORT ERROR ReportBase::setup(): For custom size pages you must set "customwidth" larger then this in the XML file');
+            }
+            if ($this->pageh < 10) {
+                throw new \DomainException('REPORT ERROR ReportBase::setup(): For custom size pages you must set "customheight" larger then this in the XML file');
+            }
+        }
+
+        return 0;
+    }
+
+    /**
+     * Process the Header , Page header, Body or Footer - ReportBase
+     *
+     * @param string $p Header (H), Page header (PH), Body (B) or Footer (F)
+     *
+     * @return int
+     */
+    public function setProcessing($p) {
+        $this->processing = $p;
+
+        return 0;
+    }
+
+    /**
+     * Add the Title when raw character data is used in Title - ReportBase
+     *
+     * @param string $data
+     *
+     * @return int
+     */
+    public function addTitle($data) {
+        $this->title .= $data;
+
+        return 0;
+    }
+
+    /**
+     * Add the Description when raw character data is used in Description - ReportBase
+     *
+     * @param string $data
+     *
+     * @return int
+     */
+    public function addDescription($data) {
+        $this->rsubject .= $data;
+
+        return 0;
+    }
+
+    /**
+     * Add Style to Styles array - ReportBase
+     *
+     * @param array $style
+     *
+     * @return int
+     */
+    public function addStyle($style) {
+        $this->Styles[$style['name']] = $style;
+
+        return 0;
+    }
+
+    /**
+     * Get a style from the Styles array - ReportBase
+     *
+     * @param string $s Style name
+     *
+     * @return array
+     */
+    public function getStyle($s) {
+        if (!isset($this->Styles[$s])) {
+            return current($this->Styles);
+        }
+
+        return $this->Styles[$s];
+    }
 }

Switch Indentation +252 added lines, -252 removed lines

@@ -139,258 +139,258 @@
 			 */
 			switch ($this->pageFormat) {
 				// ISO A series
-			case '4A0': // ISO 216, 1682 mm x 2378 mm
-				$sizes = array(4767.86, 6740.79);
-				break;
-			case '2A0': // ISO 216, 1189 mm x 1682 mm
-				$sizes = array(3370.39, 4767.86);
-				break;
-			case 'A0': // ISO 216, 841 mm x 1189mm
-				$sizes = array(2383.94, 3370.39);
-				break;
-			case 'A1': // ISO 216, 594 mm x 841 mm
-				$sizes = array(1683.78, 2383.94);
-				break;
-			case 'A2': // ISO 216, 420 mm x 594 mm
-				$sizes = array(1190.55, 1683.78);
-				break;
-			case 'A3': // ISO 216, 297 mm x 420 mm
-				$sizes = array(841.89, 1190.55);
-				break;
-			case 'A4': // ISO 216, 210 mm 297 mm
-				$sizes = array(595.28, 841.89);
-				break;
-			case 'A5': // ISO 216, 148 mm x 210 mm
-				$sizes = array(419.53, 595.28);
-				break;
-			case 'A6': // ISO 216, 105 mm x 148 mm
-				$sizes = array(297.64, 419.53);
-				break;
-			case 'A7': // ISO 216, 74 mm x 105 mm
-				$sizes = array(209.76, 297.64);
-				break;
-			case 'A8': // ISO 216, 52 mm x 74 mm
-				$sizes = array(147.40, 209.76);
-				break;
-			case 'A9': // ISO 216, 37 mm x 52 mm
-				$sizes = array(104.88, 147.40);
-				break;
-			case 'A10': // ISO 216, 26 mm x 37 mm
-				$sizes = array(73.70, 104.88);
-				break;
-
-			// ISO B series
-			case 'B0': // ISO 216, 1000 mm x 1414 mm
-				$sizes = array(2834.65, 4008.19);
-				break;
-			case 'B1': // ISO 216, 707 mm x 1000 mm
-				$sizes = array(2004.09, 2834.65);
-				break;
-			case 'B2': // ISO 216, 500 mm x 707 mm
-				$sizes = array(1417.32, 2004.09);
-				break;
-			case 'B3': // ISO 216, 353 mm x 500 mm
-				$sizes = array(1000.63, 1417.32);
-				break;
-			case 'B4': // ISO 216, 250 mm x 353 mm
-				$sizes = array(708.66, 1000.63);
-				break;
-			case 'B5': // ISO 216, 176 mm x 250 mm
-				$sizes = array(498.90, 708.66);
-				break;
-			case 'B6': // ISO 216, 125 mm x 176 mm
-				$sizes = array(354.33, 498.90);
-				break;
-			case 'B7': // ISO 216, 88 mm x 125 mm
-				$sizes = array(249.45, 354.33);
-				break;
-			case 'B8': // ISO 216, 62 mm x 88 mm
-				$sizes = array(175.75, 249.45);
-				break;
-			case 'B9': // ISO 216, 44 mm x 62 mm
-				$sizes = array(124.72, 175.75);
-				break;
-			case 'B10': // ISO 216, 31 mm x 44 mm
-				$sizes = array(87.87, 124.72);
-				break;
-
-			// ISO C series, Envelope
-			case 'C0': // ISO 269, 917 mm x 1297 mm, For flat A0 sheet
-				$sizes = array(2599.37, 3676.54);
-				break;
-			case 'C1': // ISO 269, 648 mm x 917 mm, For flat A1 sheet
-				$sizes = array(1836.85, 2599.37);
-				break;
-			case 'C2': // ISO 269, 458 mm x 648 mm, For flat A2 sheet, A1 folded in half
-				$sizes = array(1298.27, 1836.85);
-				break;
-			case 'C3': // ISO 269, 324 mm x 458 mm, For flat A3 sheet, A2 folded in half
-				$sizes = array(918.43, 1298.27);
-				break;
-			case 'C4': // ISO 269, 229 mm x 324 mm, For flat A4 sheet, A3 folded in half
-				$sizes = array(649.13, 918.43);
-				break;
-			case 'C5': // ISO 269, 162 mm x 229 mm, For flat A5 sheet, A4 folded in half
-				$sizes = array(459.21, 649.13);
-				break;
-			case 'C6/5': // ISO 269, 114 mm x 229 mm. A5 folded twice = 1/3 A4. Alternative for the DL envelope
-				$sizes = array(323.15, 649.13);
-				break;
-			case 'C6': // ISO 269, 114 mm x 162 mm, For A5 folded in half
-				$sizes = array(323.15, 459.21);
-				break;
-			case 'C7/6': // ISO 269, 81 mm x 162 mm, For A5 sheet folded in thirds
-				$sizes = array(229.61, 459.21);
-				break;
-			case 'C7': // ISO 269, 81 mm x 114 mm, For A5 folded in quarters
-				$sizes = array(229.61, 323.15);
-				break;
-			case 'C8': // ISO 269, 57 mm x 81 mm
-				$sizes = array(161.57, 229.61);
-				break;
-			case 'C9': // ISO 269, 40 mm x 57 mm
-				$sizes = array(113.39, 161.57);
-				break;
-			case 'C10': // ISO 269, 28 mm x 40 mm
-				$sizes = array(79.37, 113.39);
-				break;
-			case 'DL': // Original DIN 678 but ISO 269 now has this C6/5 , 110 mm x 220 mm, For A4 sheet folded in thirds, A5 in half
-				$sizes = array(311.81, 623.62);
-				break;
-
-			// Untrimmed stock sizes for the ISO-A Series - ISO primary range
-			case 'RA0': // ISO 478, 860 mm x 1220 mm
-				$sizes = array(2437.80, 3458.27);
-				break;
-			case 'RA1': // ISO 478, 610 mm x 860 mm
-				$sizes = array(1729.13, 2437.80);
-				break;
-			case 'RA2': // ISO 478, 430 mm x 610 mm
-				$sizes = array(1218.90, 1729.13);
-				break;
-			case 'RA3': // ISO 478, 305 mm x 430 mm
-				$sizes = array(864.57, 1218.90);
-				break;
-			case 'RA4': // ISO 478, 215 mm x 305 mm
-				$sizes = array(609.45, 864.57);
-				break;
-
-			// Untrimmed stock sizes for the ISO-A Series - ISO supplementary range
-			case 'SRA0': // ISO 593, 900 mm x 1280 mm
-				$sizes = array(2551.18, 3628.35);
-				break;
-			case 'SRA1': // ISO 593, 640 mm x 900 mm
-				$sizes = array(1814.17, 2551.18);
-				break;
-			case 'SRA2': // ISO 593, 450 mm x 640 mm
-				$sizes = array(1275.59, 1814.17);
-				break;
-			case 'SRA3': // ISO 593, 320 mm x 450 mm
-				$sizes = array(907.09, 1275.59);
-				break;
-			case 'SRA4': // ISO 593, 225 mm x 320 mm
-				$sizes = array(637.80, 907.09);
-				break;
-
-			// ISO size variations
-			case 'A2EXTRA': // ISO 216, 445 mm x 619 mm
-				$sizes = array(1261.42, 1754.65);
-				break;
-			case 'A2SUPER': // ISO 216, 305 mm x 508 mm
-				$sizes = array(864.57, 1440.00);
-				break;
-			case 'A3EXTRA': // ISO 216, 322 mm x 445 mm
-				$sizes = array(912.76, 1261.42);
-				break;
-			case 'SUPERA3': // ISO 216, 305 mm x 487 mm
-				$sizes = array(864.57, 1380.47);
-				break;
-			case 'A4EXTRA': // ISO 216, 235 mm x 322 mm
-				$sizes = array(666.14, 912.76);
-				break;
-			case 'A4LONG': // ISO 216, 210 mm x 348 mm
-				$sizes = array(595.28, 986.46);
-				break;
-			case 'A4SUPER': // ISO 216, 229 mm x 322 mm
-				$sizes = array(649.13, 912.76);
-				break;
-			case 'SUPERA4': // ISO 216, 227 mm x 356 mm
-				$sizes = array(643.46, 1009.13);
-				break;
-			case 'A5EXTRA': // ISO 216, 173 mm x 235 mm
-				$sizes = array(490.39, 666.14);
-				break;
-			case 'SOB5EXTRA': // ISO 216, 202 mm x 276 mm
-				$sizes = array(572.60, 782.36);
-				break;
-
-			// Japanese version of the ISO 216 B series
-			case 'JB0': // JIS P 0138-61, 1030 mm x 1456 mm
-				$sizes = array(2919.69, 4127.24);
-				break;
-			case 'JB1': // JIS P 0138-61, 728 mm x 1030 mm
-				$sizes = array(2063.62, 2919.69);
-				break;
-			case 'JB2': // JIS P 0138-61, 515 mm x 728 mm
-				$sizes = array(1459.84, 2063.62);
-				break;
-			case 'JB3': // JIS P 0138-61, 364 mm x 515 mm
-				$sizes = array(1031.81, 1459.84);
-				break;
-			case 'JB4': // JIS P 0138-61, 257 mm x 364 mm
-				$sizes = array(728.50, 1031.81);
-				break;
-			case 'JB5': // JIS P 0138-61, 182 mm x 257 mm
-				$sizes = array(515.91, 728.50);
-				break;
-			case 'JB6': // JIS P 0138-61, 128 mm x 182 mm
-				$sizes = array(362.83, 515.91);
-				break;
-			case 'JB7': // JIS P 0138-61, 91 mm x 128 mm
-				$sizes = array(257.95, 362.83);
-				break;
-			case 'JB8': // JIS P 0138-61, 64 mm x 91 mm
-				$sizes = array(181.42, 257.95);
-				break;
-			case 'JB9': // JIS P 0138-61, 45 mm x 64 mm
-				$sizes = array(127.56, 181.42);
-				break;
-			case 'JB10': // JIS P 0138-61, 32 mm x 45 mm
-				$sizes = array(90.71, 127.56);
-				break;
-
-			// US pages
-			case 'EXECUTIVE': // 7.25 in x 10.5 in
-				$sizes = array(522.00, 756.00);
-				break;
-			case 'FOLIO': // 8.5 in x 13 in
-				$sizes = array(612.00, 936.00);
-				break;
-			case 'FOOLSCAP': // 13.5 in x 17 in
-				$sizes = array(972.00, 1224.00);
-				break;
-			case 'LEDGER': // 11 in x 17 in
-				$sizes = array(792.00, 1224.00);
-				break;
-			case 'LEGAL': // 8.5 in x 14 in
-				$sizes = array(612.00, 1008.00);
-				break;
-			case 'LETTER': // 8.5 in x 11 in
-				$sizes = array(612.00, 792.00);
-				break;
-			case 'QUARTO': // 8.46 in x 10.8 in
-				$sizes = array(609.12, 777.50);
-				break;
-			case 'STATEMENT': // 5.5 in x 8.5 in
-				$sizes = array(396.00, 612.00);
-				break;
-			case 'USGOVT': // 8 in x 11 in
-				$sizes = array(576.00, 792.00);
-				break;
-			default:
-				$this->pageFormat = 'A4';
-				$sizes            = array(595.28, 841.89);
-				break;
+			    case '4A0': // ISO 216, 1682 mm x 2378 mm
+				    $sizes = array(4767.86, 6740.79);
+				    break;
+			    case '2A0': // ISO 216, 1189 mm x 1682 mm
+				    $sizes = array(3370.39, 4767.86);
+				    break;
+			    case 'A0': // ISO 216, 841 mm x 1189mm
+				    $sizes = array(2383.94, 3370.39);
+				    break;
+			    case 'A1': // ISO 216, 594 mm x 841 mm
+				    $sizes = array(1683.78, 2383.94);
+				    break;
+			    case 'A2': // ISO 216, 420 mm x 594 mm
+				    $sizes = array(1190.55, 1683.78);
+				    break;
+			    case 'A3': // ISO 216, 297 mm x 420 mm
+				    $sizes = array(841.89, 1190.55);
+				    break;
+			    case 'A4': // ISO 216, 210 mm 297 mm
+				    $sizes = array(595.28, 841.89);
+				    break;
+			    case 'A5': // ISO 216, 148 mm x 210 mm
+				    $sizes = array(419.53, 595.28);
+				    break;
+			    case 'A6': // ISO 216, 105 mm x 148 mm
+				    $sizes = array(297.64, 419.53);
+				    break;
+			    case 'A7': // ISO 216, 74 mm x 105 mm
+				    $sizes = array(209.76, 297.64);
+				    break;
+			    case 'A8': // ISO 216, 52 mm x 74 mm
+				    $sizes = array(147.40, 209.76);
+				    break;
+			    case 'A9': // ISO 216, 37 mm x 52 mm
+				    $sizes = array(104.88, 147.40);
+				    break;
+			    case 'A10': // ISO 216, 26 mm x 37 mm
+				    $sizes = array(73.70, 104.88);
+				    break;
+
+			    // ISO B series
+			    case 'B0': // ISO 216, 1000 mm x 1414 mm
+				    $sizes = array(2834.65, 4008.19);
+				    break;
+			    case 'B1': // ISO 216, 707 mm x 1000 mm
+				    $sizes = array(2004.09, 2834.65);
+				    break;
+			    case 'B2': // ISO 216, 500 mm x 707 mm
+				    $sizes = array(1417.32, 2004.09);
+				    break;
+			    case 'B3': // ISO 216, 353 mm x 500 mm
+				    $sizes = array(1000.63, 1417.32);
+				    break;
+			    case 'B4': // ISO 216, 250 mm x 353 mm
+				    $sizes = array(708.66, 1000.63);
+				    break;
+			    case 'B5': // ISO 216, 176 mm x 250 mm
+				    $sizes = array(498.90, 708.66);
+				    break;
+			    case 'B6': // ISO 216, 125 mm x 176 mm
+				    $sizes = array(354.33, 498.90);
+				    break;
+			    case 'B7': // ISO 216, 88 mm x 125 mm
+				    $sizes = array(249.45, 354.33);
+				    break;
+			    case 'B8': // ISO 216, 62 mm x 88 mm
+				    $sizes = array(175.75, 249.45);
+				    break;
+			    case 'B9': // ISO 216, 44 mm x 62 mm
+				    $sizes = array(124.72, 175.75);
+				    break;
+			    case 'B10': // ISO 216, 31 mm x 44 mm
+				    $sizes = array(87.87, 124.72);
+				    break;
+
+			    // ISO C series, Envelope
+			    case 'C0': // ISO 269, 917 mm x 1297 mm, For flat A0 sheet
+				    $sizes = array(2599.37, 3676.54);
+				    break;
+			    case 'C1': // ISO 269, 648 mm x 917 mm, For flat A1 sheet
+				    $sizes = array(1836.85, 2599.37);
+				    break;
+			    case 'C2': // ISO 269, 458 mm x 648 mm, For flat A2 sheet, A1 folded in half
+				    $sizes = array(1298.27, 1836.85);
+				    break;
+			    case 'C3': // ISO 269, 324 mm x 458 mm, For flat A3 sheet, A2 folded in half
+				    $sizes = array(918.43, 1298.27);
+				    break;
+			    case 'C4': // ISO 269, 229 mm x 324 mm, For flat A4 sheet, A3 folded in half
+				    $sizes = array(649.13, 918.43);
+				    break;
+			    case 'C5': // ISO 269, 162 mm x 229 mm, For flat A5 sheet, A4 folded in half
+				    $sizes = array(459.21, 649.13);
+				    break;
+			    case 'C6/5': // ISO 269, 114 mm x 229 mm. A5 folded twice = 1/3 A4. Alternative for the DL envelope
+				    $sizes = array(323.15, 649.13);
+				    break;
+			    case 'C6': // ISO 269, 114 mm x 162 mm, For A5 folded in half
+				    $sizes = array(323.15, 459.21);
+				    break;
+			    case 'C7/6': // ISO 269, 81 mm x 162 mm, For A5 sheet folded in thirds
+				    $sizes = array(229.61, 459.21);
+				    break;
+			    case 'C7': // ISO 269, 81 mm x 114 mm, For A5 folded in quarters
+				    $sizes = array(229.61, 323.15);
+				    break;
+			    case 'C8': // ISO 269, 57 mm x 81 mm
+				    $sizes = array(161.57, 229.61);
+				    break;
+			    case 'C9': // ISO 269, 40 mm x 57 mm
+				    $sizes = array(113.39, 161.57);
+				    break;
+			    case 'C10': // ISO 269, 28 mm x 40 mm
+				    $sizes = array(79.37, 113.39);
+				    break;
+			    case 'DL': // Original DIN 678 but ISO 269 now has this C6/5 , 110 mm x 220 mm, For A4 sheet folded in thirds, A5 in half
+				    $sizes = array(311.81, 623.62);
+				    break;
+
+			    // Untrimmed stock sizes for the ISO-A Series - ISO primary range
+			    case 'RA0': // ISO 478, 860 mm x 1220 mm
+				    $sizes = array(2437.80, 3458.27);
+				    break;
+			    case 'RA1': // ISO 478, 610 mm x 860 mm
+				    $sizes = array(1729.13, 2437.80);
+				    break;
+			    case 'RA2': // ISO 478, 430 mm x 610 mm
+				    $sizes = array(1218.90, 1729.13);
+				    break;
+			    case 'RA3': // ISO 478, 305 mm x 430 mm
+				    $sizes = array(864.57, 1218.90);
+				    break;
+			    case 'RA4': // ISO 478, 215 mm x 305 mm
+				    $sizes = array(609.45, 864.57);
+				    break;
+
+			    // Untrimmed stock sizes for the ISO-A Series - ISO supplementary range
+			    case 'SRA0': // ISO 593, 900 mm x 1280 mm
+				    $sizes = array(2551.18, 3628.35);
+				    break;
+			    case 'SRA1': // ISO 593, 640 mm x 900 mm
+				    $sizes = array(1814.17, 2551.18);
+				    break;
+			    case 'SRA2': // ISO 593, 450 mm x 640 mm
+				    $sizes = array(1275.59, 1814.17);
+				    break;
+			    case 'SRA3': // ISO 593, 320 mm x 450 mm
+				    $sizes = array(907.09, 1275.59);
+				    break;
+			    case 'SRA4': // ISO 593, 225 mm x 320 mm
+				    $sizes = array(637.80, 907.09);
+				    break;
+
+			    // ISO size variations
+			    case 'A2EXTRA': // ISO 216, 445 mm x 619 mm
+				    $sizes = array(1261.42, 1754.65);
+				    break;
+			    case 'A2SUPER': // ISO 216, 305 mm x 508 mm
+				    $sizes = array(864.57, 1440.00);
+				    break;
+			    case 'A3EXTRA': // ISO 216, 322 mm x 445 mm
+				    $sizes = array(912.76, 1261.42);
+				    break;
+			    case 'SUPERA3': // ISO 216, 305 mm x 487 mm
+				    $sizes = array(864.57, 1380.47);
+				    break;
+			    case 'A4EXTRA': // ISO 216, 235 mm x 322 mm
+				    $sizes = array(666.14, 912.76);
+				    break;
+			    case 'A4LONG': // ISO 216, 210 mm x 348 mm
+				    $sizes = array(595.28, 986.46);
+				    break;
+			    case 'A4SUPER': // ISO 216, 229 mm x 322 mm
+				    $sizes = array(649.13, 912.76);
+				    break;
+			    case 'SUPERA4': // ISO 216, 227 mm x 356 mm
+				    $sizes = array(643.46, 1009.13);
+				    break;
+			    case 'A5EXTRA': // ISO 216, 173 mm x 235 mm
+				    $sizes = array(490.39, 666.14);
+				    break;
+			    case 'SOB5EXTRA': // ISO 216, 202 mm x 276 mm
+				    $sizes = array(572.60, 782.36);
+				    break;
+
+			    // Japanese version of the ISO 216 B series
+			    case 'JB0': // JIS P 0138-61, 1030 mm x 1456 mm
+				    $sizes = array(2919.69, 4127.24);
+				    break;
+			    case 'JB1': // JIS P 0138-61, 728 mm x 1030 mm
+				    $sizes = array(2063.62, 2919.69);
+				    break;
+			    case 'JB2': // JIS P 0138-61, 515 mm x 728 mm
+				    $sizes = array(1459.84, 2063.62);
+				    break;
+			    case 'JB3': // JIS P 0138-61, 364 mm x 515 mm
+				    $sizes = array(1031.81, 1459.84);
+				    break;
+			    case 'JB4': // JIS P 0138-61, 257 mm x 364 mm
+				    $sizes = array(728.50, 1031.81);
+				    break;
+			    case 'JB5': // JIS P 0138-61, 182 mm x 257 mm
+				    $sizes = array(515.91, 728.50);
+				    break;
+			    case 'JB6': // JIS P 0138-61, 128 mm x 182 mm
+				    $sizes = array(362.83, 515.91);
+				    break;
+			    case 'JB7': // JIS P 0138-61, 91 mm x 128 mm
+				    $sizes = array(257.95, 362.83);
+				    break;
+			    case 'JB8': // JIS P 0138-61, 64 mm x 91 mm
+				    $sizes = array(181.42, 257.95);
+				    break;
+			    case 'JB9': // JIS P 0138-61, 45 mm x 64 mm
+				    $sizes = array(127.56, 181.42);
+				    break;
+			    case 'JB10': // JIS P 0138-61, 32 mm x 45 mm
+				    $sizes = array(90.71, 127.56);
+				    break;
+
+			    // US pages
+			    case 'EXECUTIVE': // 7.25 in x 10.5 in
+				    $sizes = array(522.00, 756.00);
+				    break;
+			    case 'FOLIO': // 8.5 in x 13 in
+				    $sizes = array(612.00, 936.00);
+				    break;
+			    case 'FOOLSCAP': // 13.5 in x 17 in
+				    $sizes = array(972.00, 1224.00);
+				    break;
+			    case 'LEDGER': // 11 in x 17 in
+				    $sizes = array(792.00, 1224.00);
+				    break;
+			    case 'LEGAL': // 8.5 in x 14 in
+				    $sizes = array(612.00, 1008.00);
+				    break;
+			    case 'LETTER': // 8.5 in x 11 in
+				    $sizes = array(612.00, 792.00);
+				    break;
+			    case 'QUARTO': // 8.46 in x 10.8 in
+				    $sizes = array(609.12, 777.50);
+				    break;
+			    case 'STATEMENT': // 5.5 in x 8.5 in
+				    $sizes = array(396.00, 612.00);
+				    break;
+			    case 'USGOVT': // 8 in x 11 in
+				    $sizes = array(576.00, 792.00);
+				    break;
+			    default:
+				    $this->pageFormat = 'A4';
+				    $sizes            = array(595.28, 841.89);
+				    break;
 			}
 			$this->pagew = $sizes[0];
 			$this->pageh = $sizes[1];

Braces +14 added lines, -7 removed lines

@@ -20,7 +20,8 @@ 
 /**
  * Class ReportBase
  */
-class ReportBase {
+class ReportBase
+{
 	/** User measure unit. */
 	const UNITS = 'pt';
 
@@ -96,7 +97,8 @@ 
 	 * Setting up document wide defaults that will be inherited of the report modules
 	 * As DEFAULT A4 and Portrait will be used if not set
 	 */
-	public function setup() {
+	public function setup()
+	{
 		// Set RTL direction
 		if (I18N::direction() === 'rtl') {
 			$this->rtl = true;
@@ -413,7 +415,8 @@ 
 	 *
 	 * @return int
 	 */
-	public function setProcessing($p) {
+	public function setProcessing($p)
+	{
 		$this->processing = $p;
 
 		return 0;
@@ -426,7 +429,8 @@ 
 	 *
 	 * @return int
 	 */
-	public function addTitle($data) {
+	public function addTitle($data)
+	{
 		$this->title .= $data;
 
 		return 0;
@@ -439,7 +443,8 @@ 
 	 *
 	 * @return int
 	 */
-	public function addDescription($data) {
+	public function addDescription($data)
+	{
 		$this->rsubject .= $data;
 
 		return 0;
@@ -452,7 +457,8 @@ 
 	 *
 	 * @return int
 	 */
-	public function addStyle($style) {
+	public function addStyle($style)
+	{
 		$this->Styles[$style['name']] = $style;
 
 		return 0;
@@ -465,7 +471,8 @@ 
 	 *
 	 * @return array
 	 */
-	public function getStyle($s) {
+	public function getStyle($s)
+	{
 		if (!isset($this->Styles[$s])) {
 			return current($this->Styles);
 		}

app/Report/ReportBaseFootnote.php

Indentation +100 added lines, -100 removed lines

@@ -19,118 +19,118 @@
  * Class ReportBaseFootnote
  */
 class ReportBaseFootnote extends ReportBaseElement {
-	/**
-	 * The name of the style for this element
-	 *
-	 * @var string
-	 */
-	public $styleName = "";
+    /**
+     * The name of the style for this element
+     *
+     * @var string
+     */
+    public $styleName = "";
 
-	/**
-	 * Numbers for the links
-	 *
-	 * @var int
-	 */
-	public $num;
+    /**
+     * Numbers for the links
+     *
+     * @var int
+     */
+    public $num;
 
-	/**
-	 * The text that will be printed with the number
-	 *
-	 * @var string
-	 */
-	public $numText = "";
+    /**
+     * The text that will be printed with the number
+     *
+     * @var string
+     */
+    public $numText = "";
 
-	/**
-	 * Remaining width of a cell
-	 *
-	 * @var float User unit (points)
-	 */
-	public $wrapWidthRemaining;
+    /**
+     * Remaining width of a cell
+     *
+     * @var float User unit (points)
+     */
+    public $wrapWidthRemaining;
 
-	/**
-	 * Original width of a cell
-	 *
-	 * @var float User unit (points)
-	 */
-	public $wrapWidthCell;
+    /**
+     * Original width of a cell
+     *
+     * @var float User unit (points)
+     */
+    public $wrapWidthCell;
 
-	/** @var string A link */
-	public $addlink;
+    /** @var string A link */
+    public $addlink;
 
-	/**
-	 * Createa an element.
-	 *
-	 * @param string $style
-	 */
-	public function __construct($style = "") {
-		$this->text = "";
-		if (!empty($style)) {
-			$this->styleName = $style;
-		} else {
-			$this->styleName = "footnote";
-		}
-	}
+    /**
+     * Createa an element.
+     *
+     * @param string $style
+     */
+    public function __construct($style = "") {
+        $this->text = "";
+        if (!empty($style)) {
+            $this->styleName = $style;
+        } else {
+            $this->styleName = "footnote";
+        }
+    }
 
-	/**
-	 * Add text.
-	 *
-	 * @param $t
-	 *
-	 * @return int
-	 */
-	public function addText($t) {
-		$t = trim($t, "\r\n\t");
-		$t = str_replace(array("<br>", "&nbsp;"), array("\n", " "), $t);
-		$t = strip_tags($t);
-		$t = htmlspecialchars_decode($t);
-		$this->text .= $t;
+    /**
+     * Add text.
+     *
+     * @param $t
+     *
+     * @return int
+     */
+    public function addText($t) {
+        $t = trim($t, "\r\n\t");
+        $t = str_replace(array("<br>", "&nbsp;"), array("\n", " "), $t);
+        $t = strip_tags($t);
+        $t = htmlspecialchars_decode($t);
+        $this->text .= $t;
 
-		return 0;
-	}
+        return 0;
+    }
 
-	/**
-	 * Set the width to wrap text.
-	 *
-	 * @param $wrapwidth
-	 * @param $cellwidth
-	 *
-	 * @return mixed
-	 */
-	public function setWrapWidth($wrapwidth, $cellwidth) {
-		$this->wrapWidthCell = $cellwidth;
-		if (strpos($this->numText, "\n") !== false) {
-			$this->wrapWidthRemaining = $cellwidth;
-		} else {
-			$this->wrapWidthRemaining = $wrapwidth;
-		}
+    /**
+     * Set the width to wrap text.
+     *
+     * @param $wrapwidth
+     * @param $cellwidth
+     *
+     * @return mixed
+     */
+    public function setWrapWidth($wrapwidth, $cellwidth) {
+        $this->wrapWidthCell = $cellwidth;
+        if (strpos($this->numText, "\n") !== false) {
+            $this->wrapWidthRemaining = $cellwidth;
+        } else {
+            $this->wrapWidthRemaining = $wrapwidth;
+        }
 
-		return $this->wrapWidthRemaining;
-	}
+        return $this->wrapWidthRemaining;
+    }
 
-	/**
-	 * Set the number.
-	 *
-	 * @param $n
-	 *
-	 * @return int
-	 */
-	public function setNum($n) {
-		$this->num     = $n;
-		$this->numText = "$n ";
+    /**
+     * Set the number.
+     *
+     * @param $n
+     *
+     * @return int
+     */
+    public function setNum($n) {
+        $this->num     = $n;
+        $this->numText = "$n ";
 
-		return 0;
-	}
+        return 0;
+    }
 
-	/**
-	 * Add a link.
-	 *
-	 * @param $a
-	 *
-	 * @return int
-	 */
-	public function setAddlink($a) {
-		$this->addlink = $a;
+    /**
+     * Add a link.
+     *
+     * @param $a
+     *
+     * @return int
+     */
+    public function setAddlink($a) {
+        $this->addlink = $a;
 
-		return 0;
-	}
+        return 0;
+    }
 }

Braces +12 added lines, -6 removed lines

@@ -18,7 +18,8 @@ 
 /**
  * Class ReportBaseFootnote
  */
-class ReportBaseFootnote extends ReportBaseElement {
+class ReportBaseFootnote extends ReportBaseElement
+{
 	/**
 	 * The name of the style for this element
 	 *
@@ -62,7 +63,8 @@ 
 	 *
 	 * @param string $style
 	 */
-	public function __construct($style = "") {
+	public function __construct($style = "")
+	{
 		$this->text = "";
 		if (!empty($style)) {
 			$this->styleName = $style;
@@ -78,7 +80,8 @@ 
 	 *
 	 * @return int
 	 */
-	public function addText($t) {
+	public function addText($t)
+	{
 		$t = trim($t, "\r\n\t");
 		$t = str_replace(array("<br>", "&nbsp;"), array("\n", " "), $t);
 		$t = strip_tags($t);
@@ -96,7 +99,8 @@ 
 	 *
 	 * @return mixed
 	 */
-	public function setWrapWidth($wrapwidth, $cellwidth) {
+	public function setWrapWidth($wrapwidth, $cellwidth)
+	{
 		$this->wrapWidthCell = $cellwidth;
 		if (strpos($this->numText, "\n") !== false) {
 			$this->wrapWidthRemaining = $cellwidth;
@@ -114,7 +118,8 @@ 
 	 *
 	 * @return int
 	 */
-	public function setNum($n) {
+	public function setNum($n)
+	{
 		$this->num     = $n;
 		$this->numText = "$n ";
 
@@ -128,7 +133,8 @@ 
 	 *
 	 * @return int
 	 */
-	public function setAddlink($a) {
+	public function setAddlink($a)
+	{
 		$this->addlink = $a;
 
 		return 0;

app/Report/ReportPdfPageheader.php

Indentation +11 added lines, -11 removed lines

@@ -19,15 +19,15 @@
  * class ReportPdfPageheader
  */
 class ReportPdfPageheader extends ReportBasePageheader {
-	/**
-	 * PageHeader element renderer
-	 *
-	 * @param ReportTcpdf $renderer
-	 */
-	public function render($renderer) {
-		$renderer->clearPageHeader();
-		foreach ($this->elements as $element) {
-			$renderer->addPageHeader($element);
-		}
-	}
+    /**
+     * PageHeader element renderer
+     *
+     * @param ReportTcpdf $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 ReportPdfPageheader
  */
-class ReportPdfPageheader extends ReportBasePageheader {
+class ReportPdfPageheader extends ReportBasePageheader
+{
 	/**
 	 * PageHeader element renderer
 	 *
 	 * @param ReportTcpdf $renderer
 	 */
-	public function render($renderer) {
+	public function render($renderer)
+	{
 		$renderer->clearPageHeader();
 		foreach ($this->elements as $element) {
 			$renderer->addPageHeader($element);

app/Report/ReportHtmlText.php

Indentation +145 added lines, -145 removed lines

@@ -19,158 +19,158 @@
  * Class ReportHtmlText
  */
 class ReportHtmlText extends ReportBaseText {
-	/**
-	 * Render the elements.
-	 *
-	 * @param ReportHtml $renderer
-	 * @param int        $curx
-	 * @param bool       $attrib Is is called from a different element?
-	 */
-	public function render($renderer, $curx = 0, $attrib = true) {
+    /**
+     * Render the elements.
+     *
+     * @param ReportHtml $renderer
+     * @param int        $curx
+     * @param bool       $attrib Is is called from a different element?
+     */
+    public function render($renderer, $curx = 0, $attrib = true) {
 
-		// Setup the style name
-		if ($renderer->getCurrentStyle() != $this->styleName) {
-			$renderer->setCurrentStyle($this->styleName);
-		}
-		$temptext = str_replace("#PAGENUM#", $renderer->pageNo(), $this->text);
-		// underline «title» part of Source item
-		$temptext = str_replace(array('«', '»'), array('<u>', '</u>'), $temptext);
+        // Setup the style name
+        if ($renderer->getCurrentStyle() != $this->styleName) {
+            $renderer->setCurrentStyle($this->styleName);
+        }
+        $temptext = str_replace("#PAGENUM#", $renderer->pageNo(), $this->text);
+        // underline «title» part of Source item
+        $temptext = str_replace(array('«', '»'), array('<u>', '</u>'), $temptext);
 
-		// If any text at all
-		if (!empty($temptext)) {
-			// If called by an other element
-			if (!$attrib) {
-				$renderer->write($temptext, $this->color);
-			} else {
-				// Save the start positions
-				$startX = $renderer->getX();
-				$startY = $renderer->getY();
-				$width  = $renderer->getRemainingWidth();
-				// If text is wider then page width then wrap it
-				if ($renderer->getStringWidth($temptext) > $width) {
-					$lines = explode("\n", $temptext);
-					foreach ($lines as $line) {
-						echo "<div style=\"position:absolute;top:", $startY, "pt;", $renderer->alignRTL, ":", $startX, "pt;width:", $width, "pt;\">";
-						$line = $renderer->textWrap($line, $width);
-						$startY += $renderer->getTextCellHeight($line);
-						$renderer->setY($startY);
-						$renderer->write($line, $this->color);
-						echo "</div>\n";
-					}
-				} else {
-					echo "<div style=\"position:absolute;top:", $startY, "pt;", $renderer->alignRTL, ":", $startX, "pt;width:", $width, "pt;\">";
-					$renderer->write($temptext, $this->color);
-					echo "</div>\n";
-					$renderer->setX($startX + $renderer->getStringWidth($temptext));
-					if ($renderer->countLines($temptext) != 1) {
-						$renderer->setXy(0, ($startY + $renderer->getTextCellHeight($temptext)));
-					}
-				}
-			}
-		}
-	}
+        // If any text at all
+        if (!empty($temptext)) {
+            // If called by an other element
+            if (!$attrib) {
+                $renderer->write($temptext, $this->color);
+            } else {
+                // Save the start positions
+                $startX = $renderer->getX();
+                $startY = $renderer->getY();
+                $width  = $renderer->getRemainingWidth();
+                // If text is wider then page width then wrap it
+                if ($renderer->getStringWidth($temptext) > $width) {
+                    $lines = explode("\n", $temptext);
+                    foreach ($lines as $line) {
+                        echo "<div style=\"position:absolute;top:", $startY, "pt;", $renderer->alignRTL, ":", $startX, "pt;width:", $width, "pt;\">";
+                        $line = $renderer->textWrap($line, $width);
+                        $startY += $renderer->getTextCellHeight($line);
+                        $renderer->setY($startY);
+                        $renderer->write($line, $this->color);
+                        echo "</div>\n";
+                    }
+                } else {
+                    echo "<div style=\"position:absolute;top:", $startY, "pt;", $renderer->alignRTL, ":", $startX, "pt;width:", $width, "pt;\">";
+                    $renderer->write($temptext, $this->color);
+                    echo "</div>\n";
+                    $renderer->setX($startX + $renderer->getStringWidth($temptext));
+                    if ($renderer->countLines($temptext) != 1) {
+                        $renderer->setXy(0, ($startY + $renderer->getTextCellHeight($temptext)));
+                    }
+                }
+            }
+        }
+    }
 
-	/**
-	 * Returns the height in points of the text element
-	 * The height is already calculated in getWidth()
-	 *
-	 * @param ReportHtml $html
-	 *
-	 * @return float
-	 */
-	public function getHeight($html) {
-		$ct = substr_count($this->text, "\n");
-		if ($ct > 0) {
-			$ct += 1;
-		}
-		$style = $html->getStyle($this->styleName);
+    /**
+     * Returns the height in points of the text element
+     * The height is already calculated in getWidth()
+     *
+     * @param ReportHtml $html
+     *
+     * @return float
+     */
+    public function getHeight($html) {
+        $ct = substr_count($this->text, "\n");
+        if ($ct > 0) {
+            $ct += 1;
+        }
+        $style = $html->getStyle($this->styleName);
 
-		return ($style["size"] * $ct) * $html->cellHeightRatio;
-	}
+        return ($style["size"] * $ct) * $html->cellHeightRatio;
+    }
 
-	/**
-	 * Get the width of text and wrap it too
-	 *
-	 * @param ReportHtml $html
-	 *
-	 * @return array
-	 */
-	public function getWidth($html) {
-		// Setup the style name
-		if ($html->getCurrentStyle() != $this->styleName) {
-			$html->setCurrentStyle($this->styleName);
-		}
+    /**
+     * Get the width of text and wrap it too
+     *
+     * @param ReportHtml $html
+     *
+     * @return array
+     */
+    public function getWidth($html) {
+        // Setup the style name
+        if ($html->getCurrentStyle() != $this->styleName) {
+            $html->setCurrentStyle($this->styleName);
+        }
 
-		// Check for the largest font size in the box
-		$fsize = $html->getCurrentStyleHeight();
-		if ($fsize > $html->largestFontHeight) {
-			$html->largestFontHeight = $fsize;
-		}
+        // Check for the largest font size in the box
+        $fsize = $html->getCurrentStyleHeight();
+        if ($fsize > $html->largestFontHeight) {
+            $html->largestFontHeight = $fsize;
+        }
 
-		// Get the line width for the text in points
-		$lw = $html->getStringWidth($this->text);
-		// Line Feed counter - Number of lines in the text
-		$lfct = $html->countLines($this->text);
-		// If there is still remaining wrap width...
-		if ($this->wrapWidthRemaining > 0) {
-			// Check with line counter too!
-			if ($lw >= $this->wrapWidthRemaining || $lfct > 1) {
-				$newtext            = "";
-				$wrapWidthRemaining = $this->wrapWidthRemaining;
-				$lines              = explode("\n", $this->text);
-				// Go throught the text line by line
-				foreach ($lines as $line) {
-					// Line width in points + a little margin
-					$lw = $html->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 += $html->getStringWidth($word . " ");
-							if ($lw <= $wrapWidthRemaining) {
-								$newtext .= $word;
-								if ($addspace != 0) {
-									$newtext .= " ";
-								}
-							} else {
-								$lw = $html->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->text = $newtext;
-				$lfct       = substr_count($this->text, "\n");
+        // Get the line width for the text in points
+        $lw = $html->getStringWidth($this->text);
+        // Line Feed counter - Number of lines in the text
+        $lfct = $html->countLines($this->text);
+        // If there is still remaining wrap width...
+        if ($this->wrapWidthRemaining > 0) {
+            // Check with line counter too!
+            if ($lw >= $this->wrapWidthRemaining || $lfct > 1) {
+                $newtext            = "";
+                $wrapWidthRemaining = $this->wrapWidthRemaining;
+                $lines              = explode("\n", $this->text);
+                // Go throught the text line by line
+                foreach ($lines as $line) {
+                    // Line width in points + a little margin
+                    $lw = $html->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 += $html->getStringWidth($word . " ");
+                            if ($lw <= $wrapWidthRemaining) {
+                                $newtext .= $word;
+                                if ($addspace != 0) {
+                                    $newtext .= " ";
+                                }
+                            } else {
+                                $lw = $html->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->text = $newtext;
+                $lfct       = substr_count($this->text, "\n");
 
-				return array($lw, 1, $lfct);
-			}
-		}
-		$l    = 0;
-		$lfct = substr_count($this->text, "\n");
-		if ($lfct > 0) {
-			$l = 2;
-		}
+                return array($lw, 1, $lfct);
+            }
+        }
+        $l    = 0;
+        $lfct = substr_count($this->text, "\n");
+        if ($lfct > 0) {
+            $l = 2;
+        }
 
-		return array($lw, $l, $lfct);
-	}
+        return array($lw, $l, $lfct);
+    }
 }

Braces +8 added lines, -4 removed lines

@@ -18,7 +18,8 @@ 
 /**
  * Class ReportHtmlText
  */
-class ReportHtmlText extends ReportBaseText {
+class ReportHtmlText extends ReportBaseText
+{
 	/**
 	 * Render the elements.
 	 *
@@ -26,7 +27,8 @@ 
 	 * @param int        $curx
 	 * @param bool       $attrib Is is called from a different element?
 	 */
-	public function render($renderer, $curx = 0, $attrib = true) {
+	public function render($renderer, $curx = 0, $attrib = true)
+	{
 
 		// Setup the style name
 		if ($renderer->getCurrentStyle() != $this->styleName) {
@@ -78,7 +80,8 @@ 
 	 *
 	 * @return float
 	 */
-	public function getHeight($html) {
+	public function getHeight($html)
+	{
 		$ct = substr_count($this->text, "\n");
 		if ($ct > 0) {
 			$ct += 1;
@@ -95,7 +98,8 @@ 
 	 *
 	 * @return array
 	 */
-	public function getWidth($html) {
+	public function getWidth($html)
+	{
 		// Setup the style name
 		if ($html->getCurrentStyle() != $this->styleName) {
 			$html->setCurrentStyle($this->styleName);

app/Report/ReportPdfCell.php

Indentation +116 added lines, -116 removed lines

@@ -21,125 +21,125 @@
  * Class ReportPdfCell
  */
 class ReportPdfCell extends ReportBaseCell {
-	/**
-	 * PDF Cell renderer
-	 *
-	 * @param ReportTcpdf $renderer
-	 */
-	public function render($renderer) {
+    /**
+     * PDF Cell renderer
+     *
+     * @param ReportTcpdf $renderer
+     */
+    public function render($renderer) {
 
-		// Set up the text style
-		if (($renderer->getCurrentStyle()) != ($this->styleName)) {
-			$renderer->setCurrentStyle($this->styleName);
-		}
-		$temptext = str_replace("#PAGENUM#", $renderer->PageNo(), $this->text);
-		// underline «title» part of Source item
-		$temptext = str_replace(array('«', '»'), array('<u>', '</u>'), $temptext);
-		$match    = array();
-		// Indicates if the cell background must be painted (1) or transparent (0)
-		if ($this->fill == 1) {
-			if (!empty($this->bgcolor)) {
-				// HTML color to RGB
-				if (preg_match("/#?(..)(..)(..)/", $this->bgcolor, $match)) {
-					$r = hexdec($match[1]);
-					$g = hexdec($match[2]);
-					$b = hexdec($match[3]);
-					$renderer->SetFillColor($r, $g, $b);
-				}
-			} // If no color set then don't fill
-			else {
-				$this->fill = 0;
-			}
-		}
-		// Paint the Border color if set
-		if (!empty($this->bocolor)) {
-			// HTML color to RGB
-			if (preg_match("/#?(..)(..)(..)/", $this->bocolor, $match)) {
-				$r = hexdec($match[1]);
-				$g = hexdec($match[2]);
-				$b = hexdec($match[3]);
-				$renderer->SetDrawColor($r, $g, $b);
-			}
-		}
-		// Paint the text color or they might use inherited colors by the previous function
-		if (preg_match("/#?(..)(..)(..)/", $this->tcolor, $match)) {
-			$r = hexdec($match[1]);
-			$g = hexdec($match[2]);
-			$b = hexdec($match[3]);
-			$renderer->SetTextColor($r, $g, $b);
-		} else {
-			$renderer->SetTextColor(0, 0, 0);
-		}
+        // Set up the text style
+        if (($renderer->getCurrentStyle()) != ($this->styleName)) {
+            $renderer->setCurrentStyle($this->styleName);
+        }
+        $temptext = str_replace("#PAGENUM#", $renderer->PageNo(), $this->text);
+        // underline «title» part of Source item
+        $temptext = str_replace(array('«', '»'), array('<u>', '</u>'), $temptext);
+        $match    = array();
+        // Indicates if the cell background must be painted (1) or transparent (0)
+        if ($this->fill == 1) {
+            if (!empty($this->bgcolor)) {
+                // HTML color to RGB
+                if (preg_match("/#?(..)(..)(..)/", $this->bgcolor, $match)) {
+                    $r = hexdec($match[1]);
+                    $g = hexdec($match[2]);
+                    $b = hexdec($match[3]);
+                    $renderer->SetFillColor($r, $g, $b);
+                }
+            } // If no color set then don't fill
+            else {
+                $this->fill = 0;
+            }
+        }
+        // Paint the Border color if set
+        if (!empty($this->bocolor)) {
+            // HTML color to RGB
+            if (preg_match("/#?(..)(..)(..)/", $this->bocolor, $match)) {
+                $r = hexdec($match[1]);
+                $g = hexdec($match[2]);
+                $b = hexdec($match[3]);
+                $renderer->SetDrawColor($r, $g, $b);
+            }
+        }
+        // Paint the text color or they might use inherited colors by the previous function
+        if (preg_match("/#?(..)(..)(..)/", $this->tcolor, $match)) {
+            $r = hexdec($match[1]);
+            $g = hexdec($match[2]);
+            $b = hexdec($match[3]);
+            $renderer->SetTextColor($r, $g, $b);
+        } else {
+            $renderer->SetTextColor(0, 0, 0);
+        }
 
-		// If current position (left)
-		if ($this->left == ".") {
-			$cX = $renderer->GetX();
-		} // For static position add margin (also updates X)
-		else {
-			$cX = $renderer->addMarginX($this->left);
-		}
+        // If current position (left)
+        if ($this->left == ".") {
+            $cX = $renderer->GetX();
+        } // For static position add margin (also updates X)
+        else {
+            $cX = $renderer->addMarginX($this->left);
+        }
 
-		// Check the width if set to page wide OR set by xml to larger then page wide
-		if ($this->width == 0 || $this->width > $renderer->getRemainingWidthPDF()) {
-			$this->width = $renderer->getRemainingWidthPDF();
-		}
-		// For current position
-		if ($this->top == ".") {
-			$this->top = $renderer->GetY();
-		} else {
-			$renderer->SetY($this->top);
-		}
+        // Check the width if set to page wide OR set by xml to larger then page wide
+        if ($this->width == 0 || $this->width > $renderer->getRemainingWidthPDF()) {
+            $this->width = $renderer->getRemainingWidthPDF();
+        }
+        // For current position
+        if ($this->top == ".") {
+            $this->top = $renderer->GetY();
+        } else {
+            $renderer->SetY($this->top);
+        }
 
-		// Check the last cell height and adjust the current cell height if needed
-		if ($renderer->lastCellHeight > $this->height) {
-			$this->height = $renderer->lastCellHeight;
-		}
-		// Check for pagebreak
-		if (!empty($temptext)) {
-			$cHT = $renderer->getNumLines($temptext, $this->width);
-			$cHT = $cHT * $renderer->getCellHeightRatio() * $renderer->getCurrentStyleHeight();
-			$cM  = $renderer->getMargins();
-			// Add padding
-			if (is_array($cM['cell'])) {
-				$cHT += ($cM['padding_bottom'] + $cM['padding_top']);
-			} else {
-				$cHT += ($cM['cell'] * 2);
-			}
-			// Add a new page if needed
-			if ($renderer->checkPageBreakPDF($cHT)) {
-				$this->top = $renderer->GetY();
-			}
-			$temptext = FunctionsRtl::spanLtrRtl($temptext, "BOTH");
-		}
-		// HTML ready - last value is true
-		$renderer->MultiCell(
-			$this->width,
-			$this->height,
-			$temptext,
-			$this->border,
-			$this->align,
-			$this->fill,
-			$this->newline,
-			$cX,
-			$this->top,
-			$this->reseth,
-			$this->stretch,
-			true
-		);
-		// Reset the last cell height for the next line
-		if ($this->newline >= 1) {
-			$renderer->lastCellHeight = 0;
-		} // OR save the last height if heigher then before
-		elseif ($renderer->lastCellHeight < $renderer->getLastH()) {
-			$renderer->lastCellHeight = $renderer->getLastH();
-		}
+        // Check the last cell height and adjust the current cell height if needed
+        if ($renderer->lastCellHeight > $this->height) {
+            $this->height = $renderer->lastCellHeight;
+        }
+        // Check for pagebreak
+        if (!empty($temptext)) {
+            $cHT = $renderer->getNumLines($temptext, $this->width);
+            $cHT = $cHT * $renderer->getCellHeightRatio() * $renderer->getCurrentStyleHeight();
+            $cM  = $renderer->getMargins();
+            // Add padding
+            if (is_array($cM['cell'])) {
+                $cHT += ($cM['padding_bottom'] + $cM['padding_top']);
+            } else {
+                $cHT += ($cM['cell'] * 2);
+            }
+            // Add a new page if needed
+            if ($renderer->checkPageBreakPDF($cHT)) {
+                $this->top = $renderer->GetY();
+            }
+            $temptext = FunctionsRtl::spanLtrRtl($temptext, "BOTH");
+        }
+        // HTML ready - last value is true
+        $renderer->MultiCell(
+            $this->width,
+            $this->height,
+            $temptext,
+            $this->border,
+            $this->align,
+            $this->fill,
+            $this->newline,
+            $cX,
+            $this->top,
+            $this->reseth,
+            $this->stretch,
+            true
+        );
+        // Reset the last cell height for the next line
+        if ($this->newline >= 1) {
+            $renderer->lastCellHeight = 0;
+        } // OR save the last height if heigher then before
+        elseif ($renderer->lastCellHeight < $renderer->getLastH()) {
+            $renderer->lastCellHeight = $renderer->getLastH();
+        }
 
-		// Set up the url link if exists ontop of the cell
-		if (!empty($this->url)) {
-			$renderer->Link($cX, $this->top, $this->width, $this->height, $this->url);
-		}
-		// Reset the border and the text color to black or they will be inherited
-		$renderer->SetDrawColor(0, 0, 0);
-		$renderer->SetTextColor(0, 0, 0);
-	}
+        // Set up the url link if exists ontop of the cell
+        if (!empty($this->url)) {
+            $renderer->Link($cX, $this->top, $this->width, $this->height, $this->url);
+        }
+        // Reset the border and the text color to black or they will be inherited
+        $renderer->SetDrawColor(0, 0, 0);
+        $renderer->SetTextColor(0, 0, 0);
+    }
 }

Braces +4 added lines, -2 removed lines

@@ -20,13 +20,15 @@
 /**
  * Class ReportPdfCell
  */
-class ReportPdfCell extends ReportBaseCell {
+class ReportPdfCell extends ReportBaseCell
+{
 	/**
 	 * PDF Cell renderer
 	 *
 	 * @param ReportTcpdf $renderer
 	 */
-	public function render($renderer) {
+	public function render($renderer)
+	{
 
 		// Set up the text style
 		if (($renderer->getCurrentStyle()) != ($this->styleName)) {

app/Report/ReportPdf.php

Indentation +246 added lines, -246 removed lines

@@ -22,269 +22,269 @@
  * Class ReportPdf
  */
 class ReportPdf extends ReportBase {
-	/**
-	 * PDF compression - Zlib extension is required
-	 *
-	 * @var bool const
-	 */
-	const COMPRESSION = true;
-	/**
-	 * If true reduce the RAM memory usage by caching temporary data on filesystem (slower).
-	 *
-	 * @var bool const
-	 */
-	const DISK_CACHE = false;
-	/**
-	 * true means that the input text is unicode (PDF)
-	 *
-	 * @var bool const
-	 */
-	const UNICODE = true;
-	/**
-	 * false means that the full font is embedded, true means only the used chars
-	 * in TCPDF v5.9 font subsetting is a very slow process, this leads to larger files
-	 *
-	 * @var bool const
-	 */
-	const SUBSETTING = false;
-	/**
-	 * A new object of the PDF class
-	 *
-	 * @var ReportTcpdf
-	 */
-	public $pdf;
+    /**
+     * PDF compression - Zlib extension is required
+     *
+     * @var bool const
+     */
+    const COMPRESSION = true;
+    /**
+     * If true reduce the RAM memory usage by caching temporary data on filesystem (slower).
+     *
+     * @var bool const
+     */
+    const DISK_CACHE = false;
+    /**
+     * true means that the input text is unicode (PDF)
+     *
+     * @var bool const
+     */
+    const UNICODE = true;
+    /**
+     * false means that the full font is embedded, true means only the used chars
+     * in TCPDF v5.9 font subsetting is a very slow process, this leads to larger files
+     *
+     * @var bool const
+     */
+    const SUBSETTING = false;
+    /**
+     * A new object of the PDF class
+     *
+     * @var ReportTcpdf
+     */
+    public $pdf;
 
-	/**
-	 * PDF Setup - ReportPdf
-	 */
-	public function setup() {
-		parent::setup();
+    /**
+     * PDF Setup - ReportPdf
+     */
+    public function setup() {
+        parent::setup();
 
-		// Setup the PDF class with custom size pages because WT supports more page sizes. If WT sends an unknown size name then the default would be A4
-		$this->pdf = new ReportTcpdf($this->orientation, parent::UNITS, array(
-			$this->pagew,
-			$this->pageh,
-		), self::UNICODE, "UTF-8", self::DISK_CACHE);
+        // Setup the PDF class with custom size pages because WT supports more page sizes. If WT sends an unknown size name then the default would be A4
+        $this->pdf = new ReportTcpdf($this->orientation, parent::UNITS, array(
+            $this->pagew,
+            $this->pageh,
+        ), self::UNICODE, "UTF-8", self::DISK_CACHE);
 
-		// Setup the PDF margins
-		$this->pdf->SetMargins($this->leftmargin, $this->topmargin, $this->rightmargin);
-		$this->pdf->setHeaderMargin($this->headermargin);
-		$this->pdf->setFooterMargin($this->footermargin);
-		//Set auto page breaks
-		$this->pdf->SetAutoPageBreak(true, $this->bottommargin);
-		// Set font subsetting
-		$this->pdf->setFontSubsetting(self::SUBSETTING);
-		// Setup PDF compression
-		$this->pdf->SetCompression(self::COMPRESSION);
-		// Setup RTL support
-		$this->pdf->setRTL($this->rtl);
-		// Set the document information
-		// Only admin should see the version number
-		$appversion = WT_WEBTREES;
-		if (Auth::isAdmin()) {
-			$appversion .= " " . WT_VERSION;
-		}
-		$this->pdf->SetCreator($appversion . " (" . parent::WT_URL . ")");
-		// Not implemented yet - ReportBase::setup()
-		$this->pdf->SetAuthor($this->rauthor);
-		$this->pdf->SetTitle($this->title);
-		$this->pdf->SetSubject($this->rsubject);
-		$this->pdf->SetKeywords($this->rkeywords);
+        // Setup the PDF margins
+        $this->pdf->SetMargins($this->leftmargin, $this->topmargin, $this->rightmargin);
+        $this->pdf->setHeaderMargin($this->headermargin);
+        $this->pdf->setFooterMargin($this->footermargin);
+        //Set auto page breaks
+        $this->pdf->SetAutoPageBreak(true, $this->bottommargin);
+        // Set font subsetting
+        $this->pdf->setFontSubsetting(self::SUBSETTING);
+        // Setup PDF compression
+        $this->pdf->SetCompression(self::COMPRESSION);
+        // Setup RTL support
+        $this->pdf->setRTL($this->rtl);
+        // Set the document information
+        // Only admin should see the version number
+        $appversion = WT_WEBTREES;
+        if (Auth::isAdmin()) {
+            $appversion .= " " . WT_VERSION;
+        }
+        $this->pdf->SetCreator($appversion . " (" . parent::WT_URL . ")");
+        // Not implemented yet - ReportBase::setup()
+        $this->pdf->SetAuthor($this->rauthor);
+        $this->pdf->SetTitle($this->title);
+        $this->pdf->SetSubject($this->rsubject);
+        $this->pdf->SetKeywords($this->rkeywords);
 
-		$this->pdf->setReport($this);
+        $this->pdf->setReport($this);
 
-		if ($this->showGenText) {
-			// The default style name for Generated by.... is 'genby'
-			$element = new ReportPdfCell(0, 10, 0, "C", "", "genby", 1, ".", ".", 0, 0, "", "", true);
-			$element->addText($this->generatedby);
-			$element->setUrl(parent::WT_URL);
-			$this->pdf->addFooter($element);
-		}
-	}
+        if ($this->showGenText) {
+            // The default style name for Generated by.... is 'genby'
+            $element = new ReportPdfCell(0, 10, 0, "C", "", "genby", 1, ".", ".", 0, 0, "", "", true);
+            $element->addText($this->generatedby);
+            $element->setUrl(parent::WT_URL);
+            $this->pdf->addFooter($element);
+        }
+    }
 
-	/**
-	 * Add an element - ReportPdf
-	 *
-	 * @param object|string $element Object or string
-	 *
-	 * @return int
-	 */
-	public function addElement($element) {
-		if ($this->processing == "B") {
-			return $this->pdf->addBody($element);
-		} elseif ($this->processing == "H") {
-			return $this->pdf->addHeader($element);
-		} elseif ($this->processing == "F") {
-			return $this->pdf->addFooter($element);
-		}
+    /**
+     * Add an element - ReportPdf
+     *
+     * @param object|string $element Object or string
+     *
+     * @return int
+     */
+    public function addElement($element) {
+        if ($this->processing == "B") {
+            return $this->pdf->addBody($element);
+        } elseif ($this->processing == "H") {
+            return $this->pdf->addHeader($element);
+        } elseif ($this->processing == "F") {
+            return $this->pdf->addFooter($element);
+        }
 
-		return 0;
-	}
+        return 0;
+    }
 
-	/**
-	 * Run the report.
-	 */
-	public function run() {
-		$this->pdf->body();
-		header('Expires:');
-		header('Pragma:');
-		header('Cache-control:');
-		$this->pdf->Output('webtrees-' . uniqid() . '.pdf', 'I');
-	}
+    /**
+     * Run the report.
+     */
+    public function run() {
+        $this->pdf->body();
+        header('Expires:');
+        header('Pragma:');
+        header('Cache-control:');
+        $this->pdf->Output('webtrees-' . uniqid() . '.pdf', 'I');
+    }
 
-	/**
-	 * Clear the Header - ReportPdf
-	 */
-	public function clearHeader() {
-		$this->pdf->clearHeader();
-	}
+    /**
+     * Clear the Header - ReportPdf
+     */
+    public function clearHeader() {
+        $this->pdf->clearHeader();
+    }
 
-	/**
-	 * Clear the Page Header - ReportPdf
-	 */
-	public function clearPageHeader() {
-		$this->pdf->clearPageHeader();
-	}
+    /**
+     * Clear the Page Header - ReportPdf
+     */
+    public function clearPageHeader() {
+        $this->pdf->clearPageHeader();
+    }
 
-	/**
-	 * Create a new Cell object - ReportPdf
-	 *
-	 * @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: 1
-	 * @param int    $stretch Stretch carachter mode
-	 * @param string $bocolor Border color
-	 * @param string $tcolor  Text color
-	 * @param bool   $reseth
-	 *
-	 * @return ReportPdfCell
-	 */
-	public function createCell(
-		$width, $height, $border, $align, $bgcolor, $style, $ln, $top, $left, $fill, $stretch, $bocolor, $tcolor, $reseth
-	) {
-		return new ReportPdfCell($width, $height, $border, $align, $bgcolor, $style, $ln, $top, $left, $fill, $stretch, $bocolor, $tcolor, $reseth);
-	}
+    /**
+     * Create a new Cell object - ReportPdf
+     *
+     * @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: 1
+     * @param int    $stretch Stretch carachter mode
+     * @param string $bocolor Border color
+     * @param string $tcolor  Text color
+     * @param bool   $reseth
+     *
+     * @return ReportPdfCell
+     */
+    public function createCell(
+        $width, $height, $border, $align, $bgcolor, $style, $ln, $top, $left, $fill, $stretch, $bocolor, $tcolor, $reseth
+    ) {
+        return new ReportPdfCell($width, $height, $border, $align, $bgcolor, $style, $ln, $top, $left, $fill, $stretch, $bocolor, $tcolor, $reseth);
+    }
 
-	/**
-	 * Create a new TextBox object - ReportPdf
-	 *
-	 * @param float  $width   Text box width
-	 * @param float  $height  Text box height
-	 * @param bool   $border
-	 * @param string $bgcolor Background color code in HTML
-	 * @param bool   $newline
-	 * @param mixed  $left
-	 * @param mixed  $top
-	 * @param bool   $pagecheck
-	 * @param string $style
-	 * @param bool   $fill
-	 * @param bool   $padding
-	 * @param bool   $reseth
-	 *
-	 * @return ReportPdfTextbox
-	 */
-	public function createTextBox(
-		$width, $height, $border, $bgcolor, $newline, $left, $top, $pagecheck, $style, $fill, $padding, $reseth
-	) {
-		return new ReportPdfTextbox($width, $height, $border, $bgcolor, $newline, $left, $top, $pagecheck, $style, $fill, $padding, $reseth);
-	}
+    /**
+     * Create a new TextBox object - ReportPdf
+     *
+     * @param float  $width   Text box width
+     * @param float  $height  Text box height
+     * @param bool   $border
+     * @param string $bgcolor Background color code in HTML
+     * @param bool   $newline
+     * @param mixed  $left
+     * @param mixed  $top
+     * @param bool   $pagecheck
+     * @param string $style
+     * @param bool   $fill
+     * @param bool   $padding
+     * @param bool   $reseth
+     *
+     * @return ReportPdfTextbox
+     */
+    public function createTextBox(
+        $width, $height, $border, $bgcolor, $newline, $left, $top, $pagecheck, $style, $fill, $padding, $reseth
+    ) {
+        return new ReportPdfTextbox($width, $height, $border, $bgcolor, $newline, $left, $top, $pagecheck, $style, $fill, $padding, $reseth);
+    }
 
-	/**
-	 * Create a new Text object- ReportPdf
-	 *
-	 * @param string $style The name of the text style
-	 * @param string $color HTML color code
-	 *
-	 * @return ReportPdfText
-	 */
-	public function createText($style, $color) {
-		return new ReportPdfText($style, $color);
-	}
+    /**
+     * Create a new Text object- ReportPdf
+     *
+     * @param string $style The name of the text style
+     * @param string $color HTML color code
+     *
+     * @return ReportPdfText
+     */
+    public function createText($style, $color) {
+        return new ReportPdfText($style, $color);
+    }
 
-	/**
-	 * Create a new Footnote object - ReportPdf
-	 *
-	 * @param string $style Style name
-	 *
-	 * @return ReportPdfFootnote
-	 */
-	public function createFootnote($style) {
-		return new ReportPdfFootnote($style);
-	}
+    /**
+     * Create a new Footnote object - ReportPdf
+     *
+     * @param string $style Style name
+     *
+     * @return ReportPdfFootnote
+     */
+    public function createFootnote($style) {
+        return new ReportPdfFootnote($style);
+    }
 
-	/**
-	 * Create a new Page Header object - ReportPdf
-	 *
-	 * @return ReportPdfPageheader
-	 */
-	public function createPageHeader() {
-		return new ReportPdfPageheader;
-	}
+    /**
+     * Create a new Page Header object - ReportPdf
+     *
+     * @return ReportPdfPageheader
+     */
+    public function createPageHeader() {
+        return new ReportPdfPageheader;
+    }
 
-	/**
-	 * Create a new image object - ReportPdf
-	 *
-	 * @param string  $file  Filename
-	 * @param mixed   $x
-	 * @param mixed   $y
-	 * @param int $w     Image width
-	 * @param int $h     Image height
-	 * @param string  $align L:left, C:center, R:right or empty to use x/y
-	 * @param string  $ln    T:same line, N:next line
-	 *
-	 * @return ReportPdfImage
-	 */
-	public function createImage($file, $x, $y, $w, $h, $align, $ln) {
-		return new ReportPdfImage($file, $x, $y, $w, $h, $align, $ln);
-	}
+    /**
+     * Create a new image object - ReportPdf
+     *
+     * @param string  $file  Filename
+     * @param mixed   $x
+     * @param mixed   $y
+     * @param int $w     Image width
+     * @param int $h     Image height
+     * @param string  $align L:left, C:center, R:right or empty to use x/y
+     * @param string  $ln    T:same line, N:next line
+     *
+     * @return ReportPdfImage
+     */
+    public function createImage($file, $x, $y, $w, $h, $align, $ln) {
+        return new ReportPdfImage($file, $x, $y, $w, $h, $align, $ln);
+    }
 
-	/**
-	 * Create a new image object from Media Object - ReportPdf
-	 *
-	 * @param Media  $mediaobject
-	 * @param mixed  $x
-	 * @param mixed  $y
-	 * @param int    $w           Image width
-	 * @param int    $h           Image height
-	 * @param string $align       L:left, C:center, R:right or empty to use x/y
-	 * @param string $ln          T:same line, N:next line
-	 *
-	 * @return ReportPdfImage
-	 */
-	public function createImageFromObject($mediaobject, $x, $y, $w, $h, $align, $ln) {
-		return new ReportPdfImage($mediaobject->getServerFilename('thumb'), $x, $y, $w, $h, $align, $ln);
-	}
+    /**
+     * Create a new image object from Media Object - ReportPdf
+     *
+     * @param Media  $mediaobject
+     * @param mixed  $x
+     * @param mixed  $y
+     * @param int    $w           Image width
+     * @param int    $h           Image height
+     * @param string $align       L:left, C:center, R:right or empty to use x/y
+     * @param string $ln          T:same line, N:next line
+     *
+     * @return ReportPdfImage
+     */
+    public function createImageFromObject($mediaobject, $x, $y, $w, $h, $align, $ln) {
+        return new ReportPdfImage($mediaobject->getServerFilename('thumb'), $x, $y, $w, $h, $align, $ln);
+    }
 
-	/**
-	 * Create a new line object - ReportPdf
-	 *
-	 * @param mixed $x1
-	 * @param mixed $y1
-	 * @param mixed $x2
-	 * @param mixed $y2
-	 *
-	 * @return ReportPdfLine
-	 */
-	public function createLine($x1, $y1, $x2, $y2) {
-		return new ReportPdfLine($x1, $y1, $x2, $y2);
-	}
+    /**
+     * Create a new line object - ReportPdf
+     *
+     * @param mixed $x1
+     * @param mixed $y1
+     * @param mixed $x2
+     * @param mixed $y2
+     *
+     * @return ReportPdfLine
+     */
+    public function createLine($x1, $y1, $x2, $y2) {
+        return new ReportPdfLine($x1, $y1, $x2, $y2);
+    }
 
-	/**
-	 * Create an HTML element.
-	 *
-	 * @param $tag
-	 * @param $attrs
-	 *
-	 * @return ReportPdfHtml
-	 */
-	public function createHTML($tag, $attrs) {
-		return new ReportPdfHtml($tag, $attrs);
-	}
+    /**
+     * Create an HTML element.
+     *
+     * @param $tag
+     * @param $attrs
+     *
+     * @return ReportPdfHtml
+     */
+    public function createHTML($tag, $attrs) {
+        return new ReportPdfHtml($tag, $attrs);
+    }
 }

Braces +26 added lines, -13 removed lines

@@ -21,7 +21,8 @@ 
 /**
  * Class ReportPdf
  */
-class ReportPdf extends ReportBase {
+class ReportPdf extends ReportBase
+{
 	/**
 	 * PDF compression - Zlib extension is required
 	 *
@@ -57,7 +58,8 @@ 
 	/**
 	 * PDF Setup - ReportPdf
 	 */
-	public function setup() {
+	public function setup()
+	{
 		parent::setup();
 
 		// Setup the PDF class with custom size pages because WT supports more page sizes. If WT sends an unknown size name then the default would be A4
@@ -109,7 +111,8 @@ 
 	 *
 	 * @return int
 	 */
-	public function addElement($element) {
+	public function addElement($element)
+	{
 		if ($this->processing == "B") {
 			return $this->pdf->addBody($element);
 		} elseif ($this->processing == "H") {
@@ -124,7 +127,8 @@ 
 	/**
 	 * Run the report.
 	 */
-	public function run() {
+	public function run()
+	{
 		$this->pdf->body();
 		header('Expires:');
 		header('Pragma:');
@@ -135,14 +139,16 @@ 
 	/**
 	 * Clear the Header - ReportPdf
 	 */
-	public function clearHeader() {
+	public function clearHeader()
+	{
 		$this->pdf->clearHeader();
 	}
 
 	/**
 	 * Clear the Page Header - ReportPdf
 	 */
-	public function clearPageHeader() {
+	public function clearPageHeader()
+	{
 		$this->pdf->clearPageHeader();
 	}
 
@@ -204,7 +210,8 @@ 
 	 *
 	 * @return ReportPdfText
 	 */
-	public function createText($style, $color) {
+	public function createText($style, $color)
+	{
 		return new ReportPdfText($style, $color);
 	}
 
@@ -215,7 +222,8 @@ 
 	 *
 	 * @return ReportPdfFootnote
 	 */
-	public function createFootnote($style) {
+	public function createFootnote($style)
+	{
 		return new ReportPdfFootnote($style);
 	}
 
@@ -224,7 +232,8 @@ 
 	 *
 	 * @return ReportPdfPageheader
 	 */
-	public function createPageHeader() {
+	public function createPageHeader()
+	{
 		return new ReportPdfPageheader;
 	}
 
@@ -241,7 +250,8 @@ 
 	 *
 	 * @return ReportPdfImage
 	 */
-	public function createImage($file, $x, $y, $w, $h, $align, $ln) {
+	public function createImage($file, $x, $y, $w, $h, $align, $ln)
+	{
 		return new ReportPdfImage($file, $x, $y, $w, $h, $align, $ln);
 	}
 
@@ -258,7 +268,8 @@ 
 	 *
 	 * @return ReportPdfImage
 	 */
-	public function createImageFromObject($mediaobject, $x, $y, $w, $h, $align, $ln) {
+	public function createImageFromObject($mediaobject, $x, $y, $w, $h, $align, $ln)
+	{
 		return new ReportPdfImage($mediaobject->getServerFilename('thumb'), $x, $y, $w, $h, $align, $ln);
 	}
 
@@ -272,7 +283,8 @@ 
 	 *
 	 * @return ReportPdfLine
 	 */
-	public function createLine($x1, $y1, $x2, $y2) {
+	public function createLine($x1, $y1, $x2, $y2)
+	{
 		return new ReportPdfLine($x1, $y1, $x2, $y2);
 	}
 
@@ -284,7 +296,8 @@ 
 	 *
 	 * @return ReportPdfHtml
 	 */
-	public function createHTML($tag, $attrs) {
+	public function createHTML($tag, $attrs)
+	{
 		return new ReportPdfHtml($tag, $attrs);
 	}
 }

app/Report/ReportBaseElement.php

Indentation +88 added lines, -88 removed lines

@@ -19,103 +19,103 @@
  * Class ReportBaseElement
  */
 class ReportBaseElement {
-	/** @var string Text*/
-	public $text = '';
+    /** @var string Text*/
+    public $text = '';
 
-	/**
-	 * Element renderer
-	 *
-	 * @param ReportHtml|ReportTcpdf $renderer
-	 */
-	public function render($renderer) {
-		//-- to be implemented in inherited classes
-	}
+    /**
+     * Element renderer
+     *
+     * @param ReportHtml|ReportTcpdf $renderer
+     */
+    public function render($renderer) {
+        //-- to be implemented in inherited classes
+    }
 
-	/**
-	 * Get the height.
-	 *
-	 * @param ReportHtml|ReportTcpdf $renderer
-	 *
-	 * @return float
-	 */
-	public function getHeight($renderer) {
-		return 0.0;
-	}
+    /**
+     * Get the height.
+     *
+     * @param ReportHtml|ReportTcpdf $renderer
+     *
+     * @return float
+     */
+    public function getHeight($renderer) {
+        return 0.0;
+    }
 
-	/**
-	 * Get the width.
-	 *
-	 * @param ReportHtml|ReportTcpdf $renderer
-	 *
-	 * @return float
-	 */
-	public function getWidth($renderer) {
-		return 0.0;
-	}
+    /**
+     * Get the width.
+     *
+     * @param ReportHtml|ReportTcpdf $renderer
+     *
+     * @return float
+     */
+    public function getWidth($renderer) {
+        return 0.0;
+    }
 
-	/**
-	 * Add text.
-	 *
-	 * @param string $t
-	 *
-	 * @return int
-	 */
-	public function addText($t) {
-		$t = trim($t, "\r\n\t");
-		$t = str_replace(array("<br>", "&nbsp;"), array("\n", " "), $t);
-		$t = strip_tags($t);
-		$t = htmlspecialchars_decode($t);
-		$this->text .= $t;
+    /**
+     * Add text.
+     *
+     * @param string $t
+     *
+     * @return int
+     */
+    public function addText($t) {
+        $t = trim($t, "\r\n\t");
+        $t = str_replace(array("<br>", "&nbsp;"), array("\n", " "), $t);
+        $t = strip_tags($t);
+        $t = htmlspecialchars_decode($t);
+        $this->text .= $t;
 
-		return 0;
-	}
+        return 0;
+    }
 
-	/**
-	 * Add an end-of-line.
-	 *
-	 * @return int
-	 */
-	public function addNewline() {
-		$this->text .= "\n";
+    /**
+     * Add an end-of-line.
+     *
+     * @return int
+     */
+    public function addNewline() {
+        $this->text .= "\n";
 
-		return 0;
-	}
+        return 0;
+    }
 
-	/**
-	 * Get the current text.
-	 *
-	 * @return string
-	 */
-	public function getValue() {
-		return $this->text;
-	}
+    /**
+     * Get the current text.
+     *
+     * @return string
+     */
+    public function getValue() {
+        return $this->text;
+    }
 
-	/**
-	 * Set the width to wrap text.
-	 *
-	 * @param $wrapwidth
-	 * @param $cellwidth
-	 *
-	 * @return int
-	 */
-	public function setWrapWidth($wrapwidth, $cellwidth) {
-		return 0;
-	}
+    /**
+     * Set the width to wrap text.
+     *
+     * @param $wrapwidth
+     * @param $cellwidth
+     *
+     * @return int
+     */
+    public function setWrapWidth($wrapwidth, $cellwidth) {
+        return 0;
+    }
 
-	/**
-	 * Render the footnotes.
-	 *
-	 * @param $renderer
-	 */
-	public function renderFootnote($renderer) {
-	}
+    /**
+     * Render the footnotes.
+     *
+     * @param $renderer
+     */
+    public function renderFootnote($renderer) {
+    }
 
-	/**
-	 * Set the text.
-	 *
-	 * @param $text
-	 */
-	public function setText($text) {
-		$this->text = $text;
-	}
+    /**
+     * Set the text.
+     *
+     * @param $text
+     */
+    public function setText($text) {
+        $this->text = $text;
+    }
 }

Braces +20 added lines, -10 removed lines

@@ -18,7 +18,8 @@ 
 /**
  * Class ReportBaseElement
  */
-class ReportBaseElement {
+class ReportBaseElement
+{
 	/** @var string Text*/
 	public $text = '';
 
@@ -27,7 +28,8 @@ 
 	 *
 	 * @param ReportHtml|ReportTcpdf $renderer
 	 */
-	public function render($renderer) {
+	public function render($renderer)
+	{
 		//-- to be implemented in inherited classes
 	}
 
@@ -38,7 +40,8 @@ 
 	 *
 	 * @return float
 	 */
-	public function getHeight($renderer) {
+	public function getHeight($renderer)
+	{
 		return 0.0;
 	}
 
@@ -49,7 +52,8 @@ 
 	 *
 	 * @return float
 	 */
-	public function getWidth($renderer) {
+	public function getWidth($renderer)
+	{
 		return 0.0;
 	}
 
@@ -60,7 +64,8 @@ 
 	 *
 	 * @return int
 	 */
-	public function addText($t) {
+	public function addText($t)
+	{
 		$t = trim($t, "\r\n\t");
 		$t = str_replace(array("<br>", "&nbsp;"), array("\n", " "), $t);
 		$t = strip_tags($t);
@@ -75,7 +80,8 @@ 
 	 *
 	 * @return int
 	 */
-	public function addNewline() {
+	public function addNewline()
+	{
 		$this->text .= "\n";
 
 		return 0;
@@ -86,7 +92,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getValue() {
+	public function getValue()
+	{
 		return $this->text;
 	}
 
@@ -98,7 +105,8 @@ 
 	 *
 	 * @return int
 	 */
-	public function setWrapWidth($wrapwidth, $cellwidth) {
+	public function setWrapWidth($wrapwidth, $cellwidth)
+	{
 		return 0;
 	}
 
@@ -107,7 +115,8 @@ 
 	 *
 	 * @param $renderer
 	 */
-	public function renderFootnote($renderer) {
+	public function renderFootnote($renderer)
+	{
 	}
 
 	/**
@@ -115,7 +124,8 @@ 
 	 *
 	 * @param $text
 	 */
-	public function setText($text) {
+	public function setText($text)
+	{
 		$this->text = $text;
 	}
 }

app/Report/ReportPdfText.php

Indentation +134 added lines, -134 removed lines

@@ -21,144 +21,144 @@
  * Class ReportPdfText
  */
 class ReportPdfText extends ReportBaseText {
-	/**
-	 * PDF Text renderer
-	 *
-	 * @param ReportTcpdf $renderer
-	 */
-	public function render($renderer) {
-		// Set up the style
-		if ($renderer->getCurrentStyle() != $this->styleName) {
-			$renderer->setCurrentStyle($this->styleName);
-		}
-		$temptext = str_replace("#PAGENUM#", $renderer->PageNo(), $this->text);
-		// underline «title» part of Source item
-		$temptext = str_replace(array('«', '»'), array('<u>', '</u>'), $temptext);
+    /**
+     * PDF Text renderer
+     *
+     * @param ReportTcpdf $renderer
+     */
+    public function render($renderer) {
+        // Set up the style
+        if ($renderer->getCurrentStyle() != $this->styleName) {
+            $renderer->setCurrentStyle($this->styleName);
+        }
+        $temptext = str_replace("#PAGENUM#", $renderer->PageNo(), $this->text);
+        // underline «title» part of Source item
+        $temptext = str_replace(array('«', '»'), array('<u>', '</u>'), $temptext);
 
-		// Paint the text color or they might use inherited colors by the previous function
-		$match = array();
-		if (preg_match("/#?(..)(..)(..)/", $this->color, $match)) {
-			$r = hexdec($match[1]);
-			$g = hexdec($match[2]);
-			$b = hexdec($match[3]);
-			$renderer->SetTextColor($r, $g, $b);
-		} else {
-			$renderer->SetTextColor(0, 0, 0);
-		}
-		$temptext = FunctionsRtl::spanLtrRtl($temptext, "BOTH");
-		$temptext = str_replace(
-			array('<br><span dir="rtl" >', '<br><span dir="ltr" >', '> ', ' <'),
-			array('<span dir="rtl" ><br>', '<span dir="ltr" ><br>', '>&nbsp;', '&nbsp;<'),
-			$temptext
-		);
-		$renderer->writeHTML(
-			$temptext,
-			false,
-			false,
-			true,
-			false,
-			""
-		); //change height - line break etc. - the form is mirror on rtl pages
-		// Reset the text color to black or it will be inherited
-		$renderer->SetTextColor(0, 0, 0);
-	}
+        // Paint the text color or they might use inherited colors by the previous function
+        $match = array();
+        if (preg_match("/#?(..)(..)(..)/", $this->color, $match)) {
+            $r = hexdec($match[1]);
+            $g = hexdec($match[2]);
+            $b = hexdec($match[3]);
+            $renderer->SetTextColor($r, $g, $b);
+        } else {
+            $renderer->SetTextColor(0, 0, 0);
+        }
+        $temptext = FunctionsRtl::spanLtrRtl($temptext, "BOTH");
+        $temptext = str_replace(
+            array('<br><span dir="rtl" >', '<br><span dir="ltr" >', '> ', ' <'),
+            array('<span dir="rtl" ><br>', '<span dir="ltr" ><br>', '>&nbsp;', '&nbsp;<'),
+            $temptext
+        );
+        $renderer->writeHTML(
+            $temptext,
+            false,
+            false,
+            true,
+            false,
+            ""
+        ); //change height - line break etc. - the form is mirror on rtl pages
+        // Reset the text color to black or it will be inherited
+        $renderer->SetTextColor(0, 0, 0);
+    }
 
-	/**
-	 * Returns the height in points of the text element
-	 *
-	 * The height is already calculated in getWidth()
-	 *
-	 * @param ReportTcpdf $pdf
-	 *
-	 * @return float 0
-	 */
-	public function getHeight($pdf) {
-		return 0;
-	}
+    /**
+     * Returns the height in points of the text element
+     *
+     * The height is already calculated in getWidth()
+     *
+     * @param ReportTcpdf $pdf
+     *
+     * @return float 0
+     */
+    public function getHeight($pdf) {
+        return 0;
+    }
 
-	/**
-	 * Splits the text into lines if necessary to fit into a giving cell
-	 *
-	 * @param ReportTcpdf $pdf
-	 *
-	 * @return array
-	 */
-	public function getWidth($pdf) {
-		// Setup the style name, a font must be selected to calculate the width
-		if ($pdf->getCurrentStyle() != $this->styleName) {
-			$pdf->setCurrentStyle($this->styleName);
-		}
-		// Check for the largest font size in the box
-		$fsize = $pdf->getCurrentStyleHeight();
-		if ($fsize > $pdf->largestFontHeight) {
-			$pdf->largestFontHeight = $fsize;
-		}
+    /**
+     * Splits the text into lines if necessary to fit into a giving cell
+     *
+     * @param ReportTcpdf $pdf
+     *
+     * @return array
+     */
+    public function getWidth($pdf) {
+        // Setup the style name, a font must be selected to calculate the width
+        if ($pdf->getCurrentStyle() != $this->styleName) {
+            $pdf->setCurrentStyle($this->styleName);
+        }
+        // Check for the largest font size in the box
+        $fsize = $pdf->getCurrentStyleHeight();
+        if ($fsize > $pdf->largestFontHeight) {
+            $pdf->largestFontHeight = $fsize;
+        }
 
-		// Get the line width
-		$lw = $pdf->GetStringWidth($this->text);
-		// Line Feed counter - Number of lines in the text
-		$lfct = substr_count($this->text, "\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->text);
-				// Go throught the text line by line
-				foreach ($lines as $line) {
-					// Line width in points + a little margin
-					$lw = $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 += $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 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->text = $newtext;
-				$lfct       = substr_count($this->text, "\n");
+        // Get the line width
+        $lw = $pdf->GetStringWidth($this->text);
+        // Line Feed counter - Number of lines in the text
+        $lfct = substr_count($this->text, "\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->text);
+                // Go throught the text line by line
+                foreach ($lines as $line) {
+                    // Line width in points + a little margin
+                    $lw = $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 += $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 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->text = $newtext;
+                $lfct       = substr_count($this->text, "\n");
 
-				return array($lw, 1, $lfct);
-			}
-		}
-		$l    = 0;
-		$lfct = substr_count($this->text, "\n");
-		if ($lfct > 0) {
-			$l = 2;
-		}
+                return array($lw, 1, $lfct);
+            }
+        }
+        $l    = 0;
+        $lfct = substr_count($this->text, "\n");
+        if ($lfct > 0) {
+            $l = 2;
+        }
 
-		return array($lw, $l, $lfct);
-	}
+        return array($lw, $l, $lfct);
+    }
 }

Braces +8 added lines, -4 removed lines

@@ -20,13 +20,15 @@ 
 /**
  * Class ReportPdfText
  */
-class ReportPdfText extends ReportBaseText {
+class ReportPdfText extends ReportBaseText
+{
 	/**
 	 * PDF Text renderer
 	 *
 	 * @param ReportTcpdf $renderer
 	 */
-	public function render($renderer) {
+	public function render($renderer)
+	{
 		// Set up the style
 		if ($renderer->getCurrentStyle() != $this->styleName) {
 			$renderer->setCurrentStyle($this->styleName);
@@ -72,7 +74,8 @@ 
 	 *
 	 * @return float 0
 	 */
-	public function getHeight($pdf) {
+	public function getHeight($pdf)
+	{
 		return 0;
 	}
 
@@ -83,7 +86,8 @@ 
 	 *
 	 * @return array
 	 */
-	public function getWidth($pdf) {
+	public function getWidth($pdf)
+	{
 		// Setup the style name, a font must be selected to calculate the width
 		if ($pdf->getCurrentStyle() != $this->styleName) {
 			$pdf->setCurrentStyle($this->styleName);