jon48 / webtrees-lib

src/Webtrees/Module/Certificates/Views/CertificateView.php

Spacing +6 added lines, -6 removed lines

@@ -30,7 +30,7 @@ 
         <div id="maj-cert-page" class="center">
 			<h2><?php echo $this->data->get('title'); ?></h2>
 			
-    		<?php if($this->data->get('has_certif', false)) { 
+    		<?php if ($this->data->get('has_certif', false)) { 
     		    /** @var Certificate $certificate   */
     		  $certificate = $this->data->get('certificate');
     		  $has_linked_indis = $this->data->get('has_linked_indis', false);
@@ -49,16 +49,16 @@ 
     				<div id="certificate-edit">
     					<?php echo $certificate->displayImage(); ?>
     				</div>
-    				<?php if($has_linked_indis || $has_linked_fams) { ?>
+    				<?php if ($has_linked_indis || $has_linked_fams) { ?>
     				<ul>
-    					<?php if($has_linked_indis) { ?>
+    					<?php if ($has_linked_indis) { ?>
     					<li>
     						<a href="#indi-certificate">
     							<span id="indisource"><?php echo I18N::translate('Individuals'); ?></span>
     						</a>
     					</li>
     					<?php } ?>
-    					<?php if($has_linked_fams) { ?>
+    					<?php if ($has_linked_fams) { ?>
     					<li>
     						<a href="#fam-certificate">
     							<span id="famsource"><?php echo I18N::translate('Families'); ?></span>
@@ -67,13 +67,13 @@ 
     					<?php } ?>
     				</ul>
     				
-    				<?php if($has_linked_indis) { ?>
+    				<?php if ($has_linked_indis) { ?>
     				<div id="indi-certificate">
     					<?php echo FunctionsPrintLists::individualTable($this->data->get('linked_indis')); ?>
     				</div>
 					<?php } ?>
 					
-					<?php if($has_linked_fams) { ?>
+					<?php if ($has_linked_fams) { ?>
     				<div id="fam-certificate">
     					<?php echo FunctionsPrintLists::familyTable($this->data->get('linked_fams')); ?>
     				</div>

src/Webtrees/Module/PatronymicLineageModule.php

Spacing +1 added lines, -1 removed lines

@@ -48,7 +48,7 @@
      public function getMenu(fw\Tree $tree, $reference) {

          $tree_url = $tree ? $tree->getNameUrl() : '';

          $surname = $reference && is_string($reference) ? $reference : '';

-         return new fw\Menu($this->getTitle(), 'module.php?mod=' . $this->getName() . '&mod_action=Lineage&ged=' . $tree_url . '&surname=' . $surname , 'menu-maj-list-lineage', array('rel' => 'nofollow'));

+         return new fw\Menu($this->getTitle(), 'module.php?mod='.$this->getName().'&mod_action=Lineage&ged='.$tree_url.'&surname='.$surname, 'menu-maj-list-lineage', array('rel' => 'nofollow'));

      }

 
 }

src/Webtrees/Module/WelcomeBlock/Views/PiwikStatsView.php

Spacing +4 added lines, -4 removed lines

@@ -23,11 +23,11 @@
 	 * @see \MyArtJaub\Webtrees\Mvc\View\AbstractView::renderContent()
 	 */
     protected function renderContent() {    
-        if($this->data->get('has_stats', false)) {
-            $html = I18N::translate('%1$s visits since the beginning of %2$s<br>(%3$s today)' ,
-                '<span class="odometer">' . I18N::number($this->data->get('visits_year')) . '</span>',
+        if ($this->data->get('has_stats', false)) {
+            $html = I18N::translate('%1$s visits since the beginning of %2$s<br>(%3$s today)',
+                '<span class="odometer">'.I18N::number($this->data->get('visits_year')).'</span>',
                 date('Y'),
-                '<span class="odometer">' . I18N::number($this->data->get('visits_today')) . '</span>'
+                '<span class="odometer">'.I18N::number($this->data->get('visits_today')).'</span>'
                 );
         }
         else {

src/Webtrees/Module/WelcomeBlock/Views/WelcomeBlockConfigView.php

Spacing +8 added lines, -8 removed lines

@@ -28,42 +28,42 @@
         return '
             <tr>
                 <td class="descriptionbox wrap width33">' .
-                I18N::translate('Enable Piwik Statistics') .
+                I18N::translate('Enable Piwik Statistics').
                 // Ideally, would like to add helpLink, but this does not work for modules...
                 // FunctionsPrint::helpLink('piwik_enabled', $this->getName());
                 '</td>
                 <td class="optionbox">' .
-                FunctionsEdit::editFieldYesNo('piwik_enabled', $this->data->get('piwik_enabled', '0')) .
+                FunctionsEdit::editFieldYesNo('piwik_enabled', $this->data->get('piwik_enabled', '0')).
                 '</td>
             </tr>' .
             
             '<tr>
                 <td class="descriptionbox wrap width33">' .
-                I18N::translate('Piwik URL') .
+                I18N::translate('Piwik URL').
                 '</td>
                 <td class="optionbox">
                     <input type="text" name="piwik_url" size="45" value="' . 
-                    $this->data->get('piwik_url', '') . '" />
+                    $this->data->get('piwik_url', '').'" />
                 </td>
             </tr>' .
             
             '<tr>
                 <td class="descriptionbox wrap width33">' .
-                    I18N::translate('Piwik Token') .
+                    I18N::translate('Piwik Token').
                 '</td>
                 <td class="optionbox">
                     <input type="text" name="piwik_token" size="45" value="' . 
-                    $this->data->get('piwik_token', '') . '" />
+                    $this->data->get('piwik_token', '').'" />
                 </td>
             </tr>' .
             
             '<tr>
                 <td class="descriptionbox wrap width33">' .
-                    I18N::translate('Piwik Site ID') .
+                    I18N::translate('Piwik Site ID').
                 '</td>
                 <td class="optionbox">
                     <input type="text" name="piwik_siteid" size="4" value="' . 
-                    $this->data->get('piwik_siteid', '') . '" />
+                    $this->data->get('piwik_siteid', '').'" />
                 </td>
             </tr>' ;
         

src/Webtrees/Mvc/View/ViewFactory.php

Spacing +5 added lines, -5 removed lines

@@ -53,13 +53,13 @@
      */
     public function makeView($view_name, MvcController $mvc_ctrl, BaseController $ctrl, ViewBag $data) 
     {
-        if(!$mvc_ctrl) throw new \Exception('Mvc Controller not defined');
-        if(!$ctrl) throw new \Exception('Base Controller not defined');
-        if(!$view_name) throw new \Exception('View not defined');
+        if (!$mvc_ctrl) throw new \Exception('Mvc Controller not defined');
+        if (!$ctrl) throw new \Exception('Base Controller not defined');
+        if (!$view_name) throw new \Exception('View not defined');
         
         $mvc_ctrl_refl = new \ReflectionObject($mvc_ctrl);
-        $view_class = $mvc_ctrl_refl->getNamespaceName() . '\\Views\\' . $view_name . 'View';       
-        if(!class_exists($view_class)) throw new \Exception('View does not exist');
+        $view_class = $mvc_ctrl_refl->getNamespaceName().'\\Views\\'.$view_name.'View';       
+        if (!class_exists($view_class)) throw new \Exception('View does not exist');
         
         return new $view_class($ctrl, $data);
     }

src/Webtrees/Mvc/View/ViewBag.php

Spacing +3 added lines, -3 removed lines

@@ -73,8 +73,8 @@ 
      * @param bool $override
      */
     public function set($key, $value, $override = true) {
-        if(is_null($key)) return;
-        if(!$override && array_key_exists($key, $this->data)) return;
+        if (is_null($key)) return;
+        if (!$override && array_key_exists($key, $this->data)) return;
         $this->data[$key] = $value;        
     }
     
@@ -107,7 +107,7 @@ 
      * @param string $key
      */
     public function __unset($key) {
-        unset($this->data[$key]);;
+        unset($this->data[$key]); ;
     }
     
 }

src/Webtrees/ImageBuilder.php

Spacing +25 added lines, -25 removed lines

@@ -62,7 +62,7 @@ 
 	*
 	* @param Media|null $media Reference media object
 	*/
-	public function __construct(Media $media = null){
+	public function __construct(Media $media = null) {
 	    $this->media = $media;
 	    $this->use_ttf = function_exists('imagettftext');
 	    $this->expire_offset = 3600 * 24;
@@ -87,7 +87,7 @@ 
 	 * @return ImageBuilder
 	 */
 	public function setExpireOffset($expireOffset) {
-	    if($expireOffset) $this->expire_offset = $expireOffset;
+	    if ($expireOffset) $this->expire_offset = $expireOffset;
 	    return $this;
 	}
 	
@@ -107,7 +107,7 @@ 
 	 * @return ImageBuilder
 	 */
 	public function setShowWatermark($show_watermark) {
-	    if(!is_null($show_watermark)) $this->show_watermark = $show_watermark;
+	    if (!is_null($show_watermark)) $this->show_watermark = $show_watermark;
 	    return $this;
 	}
 	
@@ -118,7 +118,7 @@ 
 	 * @return ImageBuilder
 	 */
 	public function setFontMaxSize($font_max_size) {
-	    if($font_max_size) $this->font_max_size = $font_max_size;
+	    if ($font_max_size) $this->font_max_size = $font_max_size;
 	    return $this;
 	}
 	
@@ -129,32 +129,32 @@ 
 	 * @return ImageBuilder
 	 */
 	public function setFontColor($font_color) {
-	    if($font_color) $this->font_color = $font_color;
+	    if ($font_color) $this->font_color = $font_color;
 	    return $this;
 	}
 	
 	/**
 	 * Render the image to the output.
 	 */
-	public function render(){
+	public function render() {
 	    
 	    if (!$this->media || !$this->media->canShow()) {
-	        Log::addMediaLog('Image Builder error: >' . I18N::translate('Missing or private media object.'));
+	        Log::addMediaLog('Image Builder error: >'.I18N::translate('Missing or private media object.'));
 	        $this->renderError();
 	    }
 	    
 	    $serverFilename = $this->media->getServerFilename();
 	    
 	    if (!file_exists($serverFilename)) {
-	        Log::addMediaLog('Image Builder error: >'. I18N::translate('The media object does not exist.').'< for path >'.$serverFilename.'<');
+	        Log::addMediaLog('Image Builder error: >'.I18N::translate('The media object does not exist.').'< for path >'.$serverFilename.'<');
 	        $this->renderError();
 	    }
 	    
 	    $mimetype = $this->media->mimeType();
 	    $imgsize = $this->media->getImageAttributes();
 	    $filetime = $this->media->getFiletime();
-	    $filetimeHeader = gmdate('D, d M Y H:i:s', $filetime) . ' GMT';	    
-	    $expireHeader = gmdate('D, d M Y H:i:s', WT_TIMESTAMP + $this->getExpireOffset()) . ' GMT';
+	    $filetimeHeader = gmdate('D, d M Y H:i:s', $filetime).' GMT';	    
+	    $expireHeader = gmdate('D, d M Y H:i:s', WT_TIMESTAMP + $this->getExpireOffset()).' GMT';
 	    
 	    $type = Functions::isImageTypeSupported($imgsize['ext']);
 	    $usewatermark = false;
@@ -186,10 +186,10 @@ 
 	    }
 	    
 	    // add caching headers.  allow browser to cache file, but not proxy
-	    header('Last-Modified: ' . $filetimeHeader);
-	    header('ETag: "' . $etag . '"');
-	    header('Expires: ' . $expireHeader);
-	    header('Cache-Control: max-age=' . $this->getExpireOffset() . ', s-maxage=0, proxy-revalidate');
+	    header('Last-Modified: '.$filetimeHeader);
+	    header('ETag: "'.$etag.'"');
+	    header('Expires: '.$expireHeader);
+	    header('Cache-Control: max-age='.$this->getExpireOffset().', s-maxage=0, proxy-revalidate');
 	    
 	    // if this file is already in the user’s cache, don’t resend it
 	    // first check if the if_modified_since param matches
@@ -203,13 +203,13 @@ 
 	    }	    
 
 	    // send headers for the image
-	    header('Content-Type: ' . $mimetype);
-	    header('Content-Disposition: filename="' . addslashes(basename($this->media->getFilename())) . '"');
+	    header('Content-Type: '.$mimetype);
+	    header('Content-Disposition: filename="'.addslashes(basename($this->media->getFilename())).'"');
 	     
 	    if ($usewatermark) {
 	        // generate the watermarked image
-	        $imCreateFunc = 'imagecreatefrom' . $type;
-	        $imSendFunc   = 'image' . $type;
+	        $imCreateFunc = 'imagecreatefrom'.$type;
+	        $imSendFunc   = 'image'.$type;
 	    
 	        if (function_exists($imCreateFunc) && function_exists($imSendFunc)) {
 	            $im = $imCreateFunc($serverFilename);
@@ -222,7 +222,7 @@ 
 	            return;
 	        } else {
 	            // this image is defective.  log it
-	            Log::addMediaLog('Image Builder error: >' . I18N::translate('This media file is broken and cannot be watermarked.') . '< in file >' . $serverFilename . '< memory used: ' . memory_get_usage());
+	            Log::addMediaLog('Image Builder error: >'.I18N::translate('This media file is broken and cannot be watermarked.').'< in file >'.$serverFilename.'< memory used: '.memory_get_usage());
 	        }
 	    }
 	    
@@ -230,7 +230,7 @@ 
 	    $filesize = filesize($serverFilename);
 	    
 	    // set content-length header, send file
-	    header('Content-Length: ' . $filesize);
+	    header('Content-Length: '.$filesize);
 	    
 	    // Some servers disable fpassthru() and readfile()
 	    if (function_exists('readfile')) {
@@ -260,7 +260,7 @@ 
     	$bgc    = imagecolorallocate($im, 255, 255, 255); /* set background color */
     	imagefilledrectangle($im, 2, 2, $width - 4, $height - 4, $bgc); /* create a rectangle, leaving 2 px border */
     
-    	$this->embedText($im, $error, 100, '255, 0, 0', WT_ROOT . Config::FONT_DEJAVU_SANS_TTF, 'top', 'left');
+    	$this->embedText($im, $error, 100, '255, 0, 0', WT_ROOT.Config::FONT_DEJAVU_SANS_TTF, 'top', 'left');
     
     	http_response_code(404);
     	header('Content-Type: image/png');
@@ -278,7 +278,7 @@ 
 	protected function applyWatermark($im) {
 	    
 	    // text to watermark with	    
-	    if(method_exists($this->media, 'getWatermarkText')) {
+	    if (method_exists($this->media, 'getWatermarkText')) {
 	       $word1_text = $this->media->getWatermarkText();
 	    }
 	    else {
@@ -290,7 +290,7 @@ 
 	        $word1_text, 
 	        $this->font_max_size,
 	        $this->font_color,
-	        WT_ROOT . Config::FONT_DEJAVU_SANS_TTF,
+	        WT_ROOT.Config::FONT_DEJAVU_SANS_TTF,
 	        'top', 
 	        'left'
 	     );
@@ -409,7 +409,7 @@ 
 	 * @param string $hexstr
 	 * @return int[]
 	 */
-	protected function hexrgb ($hexstr)
+	protected function hexrgb($hexstr)
 	{
 	    $int = hexdec($hexstr);
 	
@@ -451,7 +451,7 @@ 
      */
     function imageTtfTextErrorHandler($errno, $errstr) {
         // log the error
-        Log::addErrorLog('Image Builder error: >' . $errno . '/' . $errstr . '< while processing file >' . $this->media->getServerFilename() . '<');
+        Log::addErrorLog('Image Builder error: >'.$errno.'/'.$errstr.'< while processing file >'.$this->media->getServerFilename().'<');
     
         // change value of useTTF to false so the fallback watermarking can be used.
         $this->use_ttf = false;

src/Webtrees/Module/PatronymicLineage/Model/LineageBuilder.php

Spacing +55 added lines, -55 removed lines

@@ -54,30 +54,30 @@ 
 	public function buildLineages() {				
 		$indis = \Fisharebest\Webtrees\Query\QueryName::individuals($this->tree, $this->surname, null, null, false, false);
 		
-		if(count($indis) == 0) return null;
+		if (count($indis) == 0) return null;
 		
 		$root_lineages = array();
 		
-		foreach($indis as $indi) {
+		foreach ($indis as $indi) {
 			$pid = $indi->getXref();
-			if(!isset($this->used_indis[$pid])){
+			if (!isset($this->used_indis[$pid])) {
 				//Find the root of the lineage
 				/** @var Fisharebest\Webtrees\Individual $indiFirst  */
-				$indiFirst= $this->getLineageRootIndividual($indi);
-				if($indiFirst){
+				$indiFirst = $this->getLineageRootIndividual($indi);
+				if ($indiFirst) {
 					$this->used_indis[$indiFirst->getXref()] = true;
-					if($indiFirst->canShow()){
+					if ($indiFirst->canShow()) {
 						//Check if the root individual has brothers and sisters, without parents
 						$indiChildFamily = $indiFirst->getPrimaryChildFamily();
-						if($indiChildFamily !== null){
+						if ($indiChildFamily !== null) {
 							$root_node = new LineageRootNode(null); 
 							$root_node->addFamily($indiChildFamily);
 						}
-						else{
+						else {
 							$root_node = new LineageRootNode($indiFirst);
 						}
 						$root_node = $this->buildLineage($root_node);		
-						if($root_node) $root_lineages[] = $root_node;
+						if ($root_node) $root_lineages[] = $root_node;
 					}
 				}
 			}
@@ -94,45 +94,45 @@ 
 	 * @return (Individual|null) Root individual
 	 */
 	protected function getLineageRootIndividual(Individual $indi) {
-		$is_first=false;
+		$is_first = false;
 		$dindi = new \MyArtJaub\Webtrees\Individual($indi);
-		$indi_surname=$dindi->getUnprotectedPrimarySurname();
+		$indi_surname = $dindi->getUnprotectedPrimarySurname();
 		$resIndi = $indi;
-		while(!$is_first){
+		while (!$is_first) {
 			//Get the individual parents family
-			$fam=$resIndi->getPrimaryChildFamily();
-			if($fam){
-				$husb=$fam->getHusband();
-				$wife=$fam->getWife();
+			$fam = $resIndi->getPrimaryChildFamily();
+			if ($fam) {
+				$husb = $fam->getHusband();
+				$wife = $fam->getWife();
 				//If the father exists, take him
-				if($husb){
+				if ($husb) {
 					$dhusb = new \MyArtJaub\Webtrees\Individual($husb);
-					$dhusb->isNewAddition() ? $is_first = true : $resIndi=$husb;
+					$dhusb->isNewAddition() ? $is_first = true : $resIndi = $husb;
 				}
 				//If only a mother exists
-				else if($wife){
+				else if ($wife) {
 					$dwife = new \MyArtJaub\Webtrees\Individual($wife);
-					$wife_surname=$dwife->getUnprotectedPrimarySurname();
+					$wife_surname = $dwife->getUnprotectedPrimarySurname();
 					//Check if the child is a natural child of the mother (based on the surname - Warning : surname must be identical)
-					if(!$dwife->isNewAddition() && I18N::strcasecmp($wife_surname, $indi_surname) == 0){
-						$resIndi=$wife;
+					if (!$dwife->isNewAddition() && I18N::strcasecmp($wife_surname, $indi_surname) == 0) {
+						$resIndi = $wife;
 					}
-					else{
-						$is_first=true;
+					else {
+						$is_first = true;
 					}
 				}
-				else{
-					$is_first=true;
+				else {
+					$is_first = true;
 				}
 			}
-			else{
-				$is_first=true;
+			else {
+				$is_first = true;
 			}
 		}
-		if(isset($this->used_indis[$resIndi->getXref()])){
+		if (isset($this->used_indis[$resIndi->getXref()])) {
 			return null;
 		}
-		else{
+		else {
 			return $resIndi;
 		}
 	}
@@ -145,15 +145,15 @@ 
 	 * @return LineageNode Computed lineage
 	 */
 	protected function buildLineage(LineageNode $node) {
-		if($node === null) return;
+		if ($node === null) return;
 		
 		$indi_surname = null;
 		
 		$indi_node = $node->getIndividual();			
-		if($indi_node) {
-			if(count($node->getFamiliesNodes()) == 0) {
+		if ($indi_node) {
+			if (count($node->getFamiliesNodes()) == 0) {
 				$indiSpouseFamilies = $indi_node->getSpouseFamilies();
-				foreach($indiSpouseFamilies as $indiSpouseFamily) {
+				foreach ($indiSpouseFamilies as $indiSpouseFamily) {
 					$node->addFamily($indiSpouseFamily);
 				}
 			}
@@ -162,62 +162,62 @@ 
 			$indi_surname = $dindi_node->getUnprotectedPrimarySurname();
 			
 			//Get the estimated birth place and put it in the place table
-			$place=$dindi_node->getEstimatedBirthPlace(false);
-			if($place && strlen($place) > 0){
-				$place=trim($place);
+			$place = $dindi_node->getEstimatedBirthPlace(false);
+			if ($place && strlen($place) > 0) {
+				$place = trim($place);
 				$node->getRootNode()->addPlace(new Place($place, $this->tree));
 			}
 				
 			//Tag the individual as used
-			$this->used_indis[$indi_node->getXref()]=true;
+			$this->used_indis[$indi_node->getXref()] = true;
 		}
 		
-		foreach($node->getFamiliesNodes() as $family) {
+		foreach ($node->getFamiliesNodes() as $family) {
 			$spouse_surname = null;
-			if($indi_node && $spouse = $family->getSpouse($indi_node)) {
+			if ($indi_node && $spouse = $family->getSpouse($indi_node)) {
 				$dspouse = new \MyArtJaub\Webtrees\Individual($spouse);
-				$spouse_surname=$dspouse->getUnprotectedPrimarySurname();
+				$spouse_surname = $dspouse->getUnprotectedPrimarySurname();
 			}
 			
 			$children = $family->getChildren();
 
-			$nbChildren=0;
-			$nbNatural=0;
+			$nbChildren = 0;
+			$nbNatural = 0;
 			
-			foreach($children as $child){
+			foreach ($children as $child) {
 				$dchild = new \MyArtJaub\Webtrees\Individual($child);
-				$child_surname=$dchild->getUnprotectedPrimarySurname();
+				$child_surname = $dchild->getUnprotectedPrimarySurname();
 				
-				if(!$dchild->isNewAddition()) {
+				if (!$dchild->isNewAddition()) {
 					$nbChildren++;
 					//If the root individual is the mother
-					if($indi_node && I18N::strcasecmp($indi_node->getSex(), 'F') == 0) {
+					if ($indi_node && I18N::strcasecmp($indi_node->getSex(), 'F') == 0) {
 						//Print only lineages of children with the same surname as their mother (supposing they are natural children)
-						if(!$spouse || ($spouse_surname && I18N::strcasecmp($child_surname, $spouse_surname) != 0)){
-							if(I18N::strcasecmp($child_surname, $indi_surname) == 0){
+						if (!$spouse || ($spouse_surname && I18N::strcasecmp($child_surname, $spouse_surname) != 0)) {
+							if (I18N::strcasecmp($child_surname, $indi_surname) == 0) {
 								$nbNatural++;
 								$node_child = new LineageNode($child, $node->getRootNode());							
 								$node_child = $this->buildLineage($node_child);
-								if($node_child) $node->addChild($family, $node_child);
+								if ($node_child) $node->addChild($family, $node_child);
 							}
 						}
 					}
 					//If the root individual is the father
 					else {
 						//Print if the children does not bear the same name as his mother (and different from his father)
-						if( strlen($child_surname) == 0 || strlen($indi_surname) == 0 || strlen($spouse_surname) == 0 ||
+						if (strlen($child_surname) == 0 || strlen($indi_surname) == 0 || strlen($spouse_surname) == 0 ||
 							I18N::strcasecmp($child_surname, $indi_surname) == 0 ||
-							I18N::strcasecmp($child_surname, $spouse_surname) != 0 )
+							I18N::strcasecmp($child_surname, $spouse_surname) != 0)
 						{
 							$nbNatural++;
 							$node_child = new LineageNode($child, $node->getRootNode());							
 							$node_child = $this->buildLineage($node_child);
-							if($node_child) $node->addChild($family, $node_child);
+							if ($node_child) $node->addChild($family, $node_child);
 						}
 						else {
 							$nbNatural++;
 							$node_child = new LineageNode($child, $node->getRootNode(), $child_surname);
-							if($node_child) $node->addChild($family, $node_child);
+							if ($node_child) $node->addChild($family, $node_child);
 						}
 					}
 				}
@@ -225,7 +225,7 @@ 
 
 
 			//Do not print other children
-			if(($nbChildren-$nbNatural)>0){
+			if (($nbChildren - $nbNatural) > 0) {
 				$node->addChild($family, null);
 			}
 		}

src/Webtrees/Module/PatronymicLineage/Views/LineageView.php

Spacing +30 added lines, -30 removed lines

@@ -36,12 +36,12 @@ 
         /** @var \Fisharebest\Webtrees\Tree $tree */
         $tree = $this->data->get('tree');
         
-        echo '<h2 class="center">', $this->data->get('title') , '</h2>';
+        echo '<h2 class="center">', $this->data->get('title'), '</h2>';
         echo '<p class="center alpha_index">', implode(' | ', $this->getInitialLettersList()), '</p>';
          
-        if($this->data->get('issurnames', false)) {
+        if ($this->data->get('issurnames', false)) {
             $surns = $this->data->get('surnameslist', array());
-            $extra_params = array ('mod' => Constants::MODULE_MAJ_PATROLIN_NAME, 'mod_action' => 'Lineage');
+            $extra_params = array('mod' => Constants::MODULE_MAJ_PATROLIN_NAME, 'mod_action' => 'Lineage');
             // Show the surname list
             switch ($tree->getPreference('SURNAME_LIST_STYLE')) {
                 case 'style1':
@@ -59,16 +59,16 @@ 
         else if ($this->data->get('islineages', false)) {
             //Link to indilist
             echo '<p class="center"><strong>'.
-                '<a href="indilist.php?ged=' . $tree->getNameUrl() . '&surname=' . rawurlencode($this->data->get('surname')) .'">'. 
+                '<a href="indilist.php?ged='.$tree->getNameUrl().'&surname='.rawurlencode($this->data->get('surname')).'">'. 
                 I18N::translate('Go to the list of individuals with surname %s', $this->data->get('legend')).
                 '</a></strong></p>';
             
             $lineages = $this->data->get('lineages', null);
             $nb_lineages = count($lineages);
-            if(is_null($lineages) || $nb_lineages == 0) {
+            if (is_null($lineages) || $nb_lineages == 0) {
             	echo '<p class="center"><span class="warning">',
             		I18N::translate('No individuals with surname %s has been found. Please try another name.',
-            			'<span dir="auto">' . $this->data->get('legend') . '</span>'),
+            			'<span dir="auto">'.$this->data->get('legend').'</span>'),
             			'</span></p>';
             } else { 
             	
@@ -79,9 +79,9 @@ 
             	
             	echo '<div class="list_value_wrap">';            	
             	
-            	foreach($lineages as $i => $lineage) {
+            	foreach ($lineages as $i => $lineage) {
             		$this->printRootLineage($lineage);
-            		if($i < $nb_lineages - 1) echo '<hr />';
+            		if ($i < $nb_lineages - 1) echo '<hr />';
             	}
             	
             	echo '</div>';
@@ -104,7 +104,7 @@ 
         $list = array();
         /** @var \Fisharebest\Webtrees\Tree $tree */
         $tree = $this->data->get('tree');
-		$script_base_url = WT_SCRIPT_NAME . '?mod=' . \MyArtJaub\Webtrees\Constants::MODULE_MAJ_PATROLIN_NAME . '&mod_action=Lineage';
+		$script_base_url = WT_SCRIPT_NAME.'?mod='.\MyArtJaub\Webtrees\Constants::MODULE_MAJ_PATROLIN_NAME.'&mod_action=Lineage';
 		
         foreach (QueryName::surnameAlpha($tree, false, false) as $letter => $count) {
             switch ($letter) {
@@ -120,9 +120,9 @@ 
             }
             if ($count) {
                 if ($letter == $this->data->get('alpha')) {
-                    $list[] = '<a href="' . $script_base_url . '&alpha=' . rawurlencode($letter) . '&amp;ged=' . $tree->getNameUrl() . '" class="warning" title="' . I18N::number($count) . '">' . $html . '</a>';
+                    $list[] = '<a href="'.$script_base_url.'&alpha='.rawurlencode($letter).'&amp;ged='.$tree->getNameUrl().'" class="warning" title="'.I18N::number($count).'">'.$html.'</a>';
                 } else {
-                    $list[] = '<a href="' . $script_base_url . '&alpha=' . rawurlencode($letter) . '&amp;ged=' . $tree->getNameUrl() . '" title="' . I18N::number($count) . '">' . $html . '</a>';
+                    $list[] = '<a href="'.$script_base_url.'&alpha='.rawurlencode($letter).'&amp;ged='.$tree->getNameUrl().'" title="'.I18N::number($count).'">'.$html.'</a>';
                 }
             } else {
                 $list[] = $html;
@@ -132,9 +132,9 @@ 
         // Search spiders don't get the "show all" option as the other links give them everything.
         if (!Auth::isSearchEngine()) {
             if ($this->data->get('show_all') === 'yes') {
-                $list[] = '<span class="warning">' . I18N::translate('All') . '</span>';
+                $list[] = '<span class="warning">'.I18N::translate('All').'</span>';
             } else {
-                $list[] = '<a href="' . $script_base_url . '&show_all=yes' . '&amp;ged=' . $tree->getNameUrl() . '">' . I18N::translate('All') . '</a>';
+                $list[] = '<a href="'.$script_base_url.'&show_all=yes'.'&amp;ged='.$tree->getNameUrl().'">'.I18N::translate('All').'</a>';
             }
         }
     
@@ -147,11 +147,11 @@ 
      */
     private function printRootLineage(LineageRootNode $node) {    	
     	print '<div class="patrolin_tree">';
-    	if($node->getIndividual() === null) {
+    	if ($node->getIndividual() === null) {
     		$fam_nodes = $node->getFamiliesNodes();
-    		foreach($fam_nodes as $fam){
-    			foreach($fam_nodes[$fam] as $child_node) {
-    				if($child_node) {
+    		foreach ($fam_nodes as $fam) {
+    			foreach ($fam_nodes[$fam] as $child_node) {
+    				if ($child_node) {
     					$this->printLineage($child_node);
     				}
     			}
@@ -163,7 +163,7 @@ 
     	echo '</div>';
     	
     	$places = $node->getPlaces();
-    	if($places && count($places)>0){
+    	if ($places && count($places) > 0) {
     		echo '<div class="patrolin_places">';
     		echo \MyArtJaub\Webtrees\Functions\FunctionsPrint::htmlPlacesCloud($places, false, $this->data->get('tree'));
     		echo '</div>';
@@ -178,34 +178,34 @@ 
     	
     	echo '<ul>';
     	$fam_nodes = $node->getFamiliesNodes();
-    	if(count($fam_nodes) > 0) {
+    	if (count($fam_nodes) > 0) {
     		$is_first_family = true;
-    		foreach($fam_nodes as $fam) {
+    		foreach ($fam_nodes as $fam) {
     			$node_indi = $node->getIndividual();
     			echo '<li>';
-    			if($is_first_family){
+    			if ($is_first_family) {
     				echo FunctionsPrint::htmlIndividualForList($node_indi);
     			}
-				else{
+				else {
 					echo FunctionsPrint::htmlIndividualForList($node_indi, false);
 				}
 				//Get individual's spouse
 				$dfam = new Family($fam);
-				$spouse=$dfam->getSpouseById($node_indi);
+				$spouse = $dfam->getSpouseById($node_indi);
 				//Print the spouse if relevant
-				if($spouse){
+				if ($spouse) {
 					$marrdate = I18N::translate('yes');
 					$marryear = '';
 					echo '&nbsp;<a href="'.$fam->getHtmlUrl().'">';
-					if ($fam->getMarriageYear()){
+					if ($fam->getMarriageYear()) {
 						$marrdate = strip_tags($fam->getMarriageDate()->Display());
 						$marryear = $fam->getMarriageYear();
 					}
 					echo '<span class="details1" title="'.$marrdate.'"><i class="icon-rings"></i>'.$marryear.'</span></a>&nbsp;';
 					echo FunctionsPrint::htmlIndividualForList($spouse);
 				}
-    			foreach($fam_nodes[$fam] as $child_node) {
-    				if($child_node) {
+    			foreach ($fam_nodes[$fam] as $child_node) {
+    				if ($child_node) {
     					$this->printLineage($child_node);
     				}
     				else {
@@ -218,10 +218,10 @@ 
     	else {
     		echo '<li>';
     		echo \MyArtJaub\Webtrees\Functions\FunctionsPrint::htmlIndividualForList($node->getIndividual());
-    		if($node->hasFollowUpSurname()) {
-    			$url_base = WT_SCRIPT_NAME . '?mod=' . \MyArtJaub\Webtrees\Constants::MODULE_MAJ_PATROLIN_NAME . '&mod_action=Lineage';
+    		if ($node->hasFollowUpSurname()) {
+    			$url_base = WT_SCRIPT_NAME.'?mod='.\MyArtJaub\Webtrees\Constants::MODULE_MAJ_PATROLIN_NAME.'&mod_action=Lineage';
     			echo '&nbsp;'.
-    				'<a href="' . $url_base . '&surname=' . rawurlencode($node->getFollowUpSurname()) . '&amp;ged=' . $this->data->get('tree')->getNameUrl() . '">'.
+    				'<a href="'.$url_base.'&surname='.rawurlencode($node->getFollowUpSurname()).'&amp;ged='.$this->data->get('tree')->getNameUrl().'">'.
     				'('.I18N::translate('Go to %s lineages', $node->getFollowUpSurname()).')'.
     				'</a>';
     		}