fisharebest / webtrees

app/Report/PdfRenderer.php

Indentation +31 added lines, -31 removed lines

@@ -67,11 +67,11 @@ 
     // The last pictures page number
     public int $lastpicpage = 0;
 
-	// The HEADER OR FOOTER to render
+    // The HEADER OR FOOTER to render
     public bool $isHeaderOrFooter = false;
 
-	//The breakpage header y
-	public float $breakPageHeaderHeight = 0.0;
+    //The breakpage header y
+    public float $breakPageHeaderHeight = 0.0;
 
     /**
      * PDF Header -PDF
@@ -81,7 +81,7 @@ 
     public function header(): void //sfqas
     {
         $isHeaderOrFooter = true;
-		foreach ($this->headerElements as $element) {
+        foreach ($this->headerElements as $element) {
             if ($element instanceof ReportBaseElement) {
                 $element->render($this,$isHeaderOrFooter);
             } elseif ($element === 'footnotetexts') {
@@ -90,8 +90,8 @@ 
                 $this->newPage();
             }
         }
-		$isHeaderOrFooter = false;
-		$this->breakPageHeaderHeight =$this->tcpdf->GetY();
+        $isHeaderOrFooter = false;
+        $this->breakPageHeaderHeight =$this->tcpdf->GetY();
     }
 
     /**
@@ -102,7 +102,7 @@ 
     public function body(): void  // //sfqas
     {
         // $this->tcpdf->AddPage();
-		$this->newPage();
+        $this->newPage();
         foreach ($this->bodyElements as $element) {
             if ($element instanceof ReportBaseElement) {
                 $element->render($this);
@@ -142,16 +142,16 @@ 
     public function footer(): void  //sfqas
     {
         $isHeaderOrFooter = true;
-		foreach ($this->footerElements as $element) {
+        foreach ($this->footerElements as $element) {
             if ($element instanceof ReportBaseElement) {
-				$element->render($this,$isHeaderOrFooter);
+                $element->render($this,$isHeaderOrFooter);
             } elseif ($element === 'footnotetexts') {
                 $this->footnotes();
             } elseif ($element === 'addpage') {
                 $this->newPage();
             }
         }
-		$isHeaderOrFooter = false;
+        $isHeaderOrFooter = false;
     }
 
     /**
@@ -335,11 +335,11 @@ 
         }
         $this->tcpdf->AddPage();
 
-		$this->header();
-		// $this->tcpdf->setY($this->tcpdf->getPageHeight() - 75);
-		$this->tcpdf->setY($this->tcpdf->getPageHeight()-$this->footer_margin-55);
-		$this->footer();
-		$this->tcpdf->setY($this->breakPageHeaderHeight);
+        $this->header();
+        // $this->tcpdf->setY($this->tcpdf->getPageHeight() - 75);
+        $this->tcpdf->setY($this->tcpdf->getPageHeight()-$this->footer_margin-55);
+        $this->footer();
+        $this->tcpdf->setY($this->breakPageHeaderHeight);
     }
 
     /**
@@ -352,19 +352,19 @@ 
     public function checkPageBreakPDF(float $height): bool   // // //sfqas
     {
         // return $this->tcpdf->checkPageBreak($height);
-		$isPageBreaked = false;
-		if(!$this->isHeaderOrFooter){
-			$isPageBreaked = $this->tcpdf->checkPageBreak($height);
-			$this->tcpdf->setY($this->header_margin);
-			$this->header();
-			// $this->tcpdf->setY($this->tcpdf->getPageHeight() - 75);
-			$this->tcpdf->setY($this->tcpdf->getPageHeight()-$this->footer_margin-55);
-			$this->footer();
-			$this->tcpdf->setY($this->breakPageHeaderHeight);
-			return $isPageBreaked ;
-		}else{
-			return false;
-		}
+        $isPageBreaked = false;
+        if(!$this->isHeaderOrFooter){
+            $isPageBreaked = $this->tcpdf->checkPageBreak($height);
+            $this->tcpdf->setY($this->header_margin);
+            $this->header();
+            // $this->tcpdf->setY($this->tcpdf->getPageHeight() - 75);
+            $this->tcpdf->setY($this->tcpdf->getPageHeight()-$this->footer_margin-55);
+            $this->footer();
+            $this->tcpdf->setY($this->breakPageHeaderHeight);
+            return $isPageBreaked ;
+        }else{
+            return false;
+        }
     }
 
     /**
@@ -408,9 +408,9 @@ 
         $this->tcpdf->setKeywords($this->rkeywords);
         $this->tcpdf->setHeaderData('', 0, $this->title);
         $this->tcpdf->setHeaderFont([$this->default_font, '', $this->default_font_size]);
-		// // remove default header/footer
-		$this->tcpdf->setPrintHeader(false);
-		$this->tcpdf->setPrintFooter(false);
+        // // remove default header/footer
+        $this->tcpdf->setPrintHeader(false);
+        $this->tcpdf->setPrintFooter(false);
 
         if ($this->show_generated_by) {
             // The default style name for Generated by.... is 'genby'

app/Report/ReportPdfCell.php

Indentation +5 added lines, -5 removed lines

@@ -126,11 +126,11 @@
             }
             // Add a new page if needed
             //sfqas
-			if ($renderer->tcpdf->checkPageBreak($cHT,null,false) and !$headerorfoot){
-				if ($renderer->checkPageBreakPDF($cHT)) {
-					$this->top = $renderer->tcpdf->GetY();
-				}
-			}
+            if ($renderer->tcpdf->checkPageBreak($cHT,null,false) and !$headerorfoot){
+                if ($renderer->checkPageBreakPDF($cHT)) {
+                    $this->top = $renderer->tcpdf->GetY();
+                }
+            }
             $temptext = RightToLeftSupport::spanLtrRtl($temptext);
         }
         // HTML ready - last value is true

app/Report/ReportPdfImage.php

Indentation +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
         // Check for a pagebreak first
         if ($renderer->tcpdf->checkPageBreak($this->height + 5,null,false) and !$headerorfoot){  //sfqas
             $renderer->checkPageBreakPDF($this->height + 5);
-			$this->y = $renderer->tcpdf->GetY();
+            $this->y = $renderer->tcpdf->GetY();
         }
 
         $curx = $renderer->tcpdf->GetX();

app/Report/ReportPdfTextBox.php

Indentation +5 added lines, -5 removed lines

@@ -225,12 +225,12 @@
         // Add a new page if needed
         if ($this->pagecheck) {
             if ($renderer->tcpdf->checkPageBreak($cH,null,false) and !$headerorfoot){
-				// Reset last cell height or Header/Footer will inherit it, in case of pagebreak
-				$renderer->lastCellHeight = 0;
-				if ($renderer->checkPageBreakPDF($cH)) {
-					$cY = $renderer->tcpdf->GetY();
+                // Reset last cell height or Header/Footer will inherit it, in case of pagebreak
+                $renderer->lastCellHeight = 0;
+                if ($renderer->checkPageBreakPDF($cH)) {
+                    $cY = $renderer->tcpdf->GetY();
+            }
             }
-			}
         }
 
         // Setup the border and background color