jon48 / webtrees-lib

src/Webtrees/Module/GeoDispersion/Views/AbstractGeoAnalysisTabGeneralView.php

Spacing +8 added lines, -8 removed lines

@@ -34,26 +34,26 @@
         $html = '<div id="geodispersion_summary">
         	<div class="maj-table center">
         		<div class="maj-row">
-        			<div class="label">' . I18N::translate('Places found'). '</div>
-        			<div class="value">' . I18N::translate('%1$d (%2$s)',$nb_found - $nb_other, I18N::percentage($perc_known)). '</div>
+        			<div class="label">' . I18N::translate('Places found').'</div>
+        			<div class="value">' . I18N::translate('%1$d (%2$s)', $nb_found - $nb_other, I18N::percentage($perc_known)).'</div>
         		</div>';
-        if($nb_other > 0){
+        if ($nb_other > 0) {
             $perc_other = Functions::safeDivision($nb_other, $nb_found + $nb_unknown);
             $html .=
         		'<div class="maj-row">
-        			<div class="label">' . I18N::translate('Other places'). '</div>
-        			<div class="value">' . I18N::translate('%1$d (%2$s)',$nb_other, I18N::percentage($perc_other)). '</div>
+        			<div class="label">' . I18N::translate('Other places').'</div>
+        			<div class="value">' . I18N::translate('%1$d (%2$s)', $nb_other, I18N::percentage($perc_other)).'</div>
         		</div>';
         }
         $html .= '<div class="maj-row">
-        			<div class="label">' . I18N::translate('Places not found'). '</div>
-        			<div class="value">' . I18N::translate('%1$d (%2$s)',$nb_unknown, I18N::percentage(1 - $perc_known)). '</div>
+        			<div class="label">' . I18N::translate('Places not found').'</div>
+        			<div class="value">' . I18N::translate('%1$d (%2$s)', $nb_unknown, I18N::percentage(1 - $perc_known)).'</div>
         		</div>
         	</div>
         </div>
         <br/>
 		<div id="geodispersion_data">
-		' . $this->htmlAnalysisData(). '
+		' . $this->htmlAnalysisData().'
 		</div>';
         
         return $html;

src/Webtrees/Module/GeoDispersion/Views/GeoAnalysisTabGeneralTableView.php

Spacing +16 added lines, -16 removed lines

@@ -29,34 +29,34 @@
         $nb_found = $this->data->get('stats_gen_nb_found');
         $nb_other = $this->data->get('stats_gen_nb_other');
         
-        $i=1;
-        $previous_nb=0;        
+        $i = 1;
+        $previous_nb = 0;        
         
-        $html='<div class="maj-table center">';        
-        foreach($results as $place => $nb){
+        $html = '<div class="maj-table center">';        
+        foreach ($results as $place => $nb) {
             $perc = Functions::safeDivision($nb, $nb_found - $nb_other);
-            if($nb!=$previous_nb){
-                $j= I18N::number($i);
+            if ($nb != $previous_nb) {
+                $j = I18N::number($i);
             }
-            else{
-                $j='&nbsp;';
+            else {
+                $j = '&nbsp;';
             }
             	
-            $levels = array_map('trim',explode(',', $place));
-            $placename = $levels[$analysis_level-1];
-            if($placename == '' && $analysis_level > 1) $placename = I18N::translate('Unknown (%s)', $levels[$analysis_level-2]);
-            $html.=
+            $levels = array_map('trim', explode(',', $place));
+            $placename = $levels[$analysis_level - 1];
+            if ($placename == '' && $analysis_level > 1) $placename = I18N::translate('Unknown (%s)', $levels[$analysis_level - 2]);
+            $html .=
             '<div class="maj-row">
                 <div class="label"><strong>'.$j.'</strong></div>
                 <div class="label">'.$placename.'</div>
-                <div class="value">'.I18N::translate('%d',$nb).'</div>
-                <div class="value">'.I18N::percentage($perc,1).'</div>
+                <div class="value">'.I18N::translate('%d', $nb).'</div>
+                <div class="value">'.I18N::percentage($perc, 1).'</div>
              </div>';
             $i++;
-            $previous_nb=$nb;
+            $previous_nb = $nb;
         }
         
-        $html.='</div>';
+        $html .= '</div>';
         
         return $html;
     }

src/Webtrees/Module/Certificates/Model/CertificateProviderInterface.php

Spacing +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
 /**
  * Interface for providers of certificates
  */
-interface CertificateProviderInterface  {
+interface CertificateProviderInterface {
     
     /**
      * Returns the certificates directory path as it is really (within the firewall directory).

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/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/Module/Certificates/Model/CertificateFileProvider.php

Spacing +23 added lines, -23 removed lines

@@ -52,24 +52,24 @@ 
      * {@inhericDoc}
      * @see \MyArtJaub\Webtrees\Module\Certificates\Model\CertificateProviderInterface::getRealCertificatesDirectory()
      */
-    public function getRealCertificatesDirectory(){
-        return WT_DATA_DIR . $this->root_path;
+    public function getRealCertificatesDirectory() {
+        return WT_DATA_DIR.$this->root_path;
     }
     
     /**
      * {@inhericDoc}
      * @see \MyArtJaub\Webtrees\Module\Certificates\Model\CertificateProviderInterface::getCitiesList()
      */
-    public function getCitiesList(){
-        if(!isset($this->cities_list) || is_null($this->cities_list)){
+    public function getCitiesList() {
+        if (!isset($this->cities_list) || is_null($this->cities_list)) {
             $certdir = $this->getRealCertificatesDirectory();
             $this->cities_list = array();
     
             $dir = opendir($certdir);
             
-            while($entry = readdir($dir)){
-                if($entry != '.' && $entry != '..' && is_dir($certdir.$entry)){
-                    $this->cities_list[]= Functions::encodeFileSystemToUtf8($entry);
+            while ($entry = readdir($dir)) {
+                if ($entry != '.' && $entry != '..' && is_dir($certdir.$entry)) {
+                    $this->cities_list[] = Functions::encodeFileSystemToUtf8($entry);
                 }
             }
             sort($this->cities_list);
@@ -81,21 +81,21 @@ 
      * {@inhericDoc}
      * @see \MyArtJaub\Webtrees\Module\Certificates\Model\CertificateProviderInterface::getCertificatesList()
      */
-    public function getCertificatesList($selCity){
+    public function getCertificatesList($selCity) {
     
         $selCity = Functions::encodeUtf8ToFileSystem($selCity);
     
         $certdir = $this->getRealCertificatesDirectory();
-        $tabCertif= array();
+        $tabCertif = array();
     
-        if(is_dir($certdir.$selCity)){
-            $dir=opendir($certdir.$selCity);
-            while($entry = readdir($dir)){
-                if($entry!='.' && $entry!='..' && !is_dir($certdir.$entry.'/')){
+        if (is_dir($certdir.$selCity)) {
+            $dir = opendir($certdir.$selCity);
+            while ($entry = readdir($dir)) {
+                if ($entry != '.' && $entry != '..' && !is_dir($certdir.$entry.'/')) {
                     $path = Functions::encodeFileSystemToUtf8($selCity.'/'.$entry);
                     $certificate = new Certificate($path, $this->tree, $this);
-                    if(Functions::isImageTypeSupported($certificate->extension())){
-                        $tabCertif[] = 	$certificate;
+                    if (Functions::isImageTypeSupported($certificate->extension())) {
+                        $tabCertif[] = $certificate;
                     }
                 }
             }
@@ -107,17 +107,17 @@ 
      * {@inhericDoc}
      * @see \MyArtJaub\Webtrees\Module\Certificates\Model\CertificateProviderInterface::getCertificatesListBeginWith()
      */
-    public function getCertificatesListBeginWith($city, $contains, $limit= 9999){
-        $tabFiles= array();
-        $dirPath= $this->getRealCertificatesDirectory() . Functions::encodeUtf8ToFileSystem($city).'/';
+    public function getCertificatesListBeginWith($city, $contains, $limit = 9999) {
+        $tabFiles = array();
+        $dirPath = $this->getRealCertificatesDirectory().Functions::encodeUtf8ToFileSystem($city).'/';
         $contains = utf8_decode($contains);
         $nbCert = 0;
     
-        if(is_dir($dirPath)){
-            $dir=opendir($dirPath);
-            while(($entry = readdir($dir)) && $nbCert < $limit){
-                if($entry!='.' && $entry!='..' && $entry!='Thumbs.db' &&!is_dir($dirPath.$entry.'/') && stripos($entry, $contains)!== false){
-                    $tabFiles[]= Functions::encodeFileSystemToUtf8($entry);
+        if (is_dir($dirPath)) {
+            $dir = opendir($dirPath);
+            while (($entry = readdir($dir)) && $nbCert < $limit) {
+                if ($entry != '.' && $entry != '..' && $entry != 'Thumbs.db' && !is_dir($dirPath.$entry.'/') && stripos($entry, $contains) !== false) {
+                    $tabFiles[] = Functions::encodeFileSystemToUtf8($entry);
                     $nbCert++;
                 }
             }

src/Webtrees/Place.php

Spacing +11 added lines, -11 removed lines

@@ -27,7 +27,7 @@ 
 	 *
 	 * @param \Fisharebest\Webtrees\Place $place_in The Place to extend
 	 */
-	public function __construct(\Fisharebest\Webtrees\Place $place){
+	public function __construct(\Fisharebest\Webtrees\Place $place) {
 		$this->place = $place;
 	}
 
@@ -39,9 +39,9 @@ 
 	 * @param \Fisharebest\Webtrees\Tree $tree
 	 * @return \MyArtJaub\Webtrees\Place|null Instance of \MyArtJaub\Webtrees\Place, if relevant
 	 */
-	public static function getIntance($place_str, Tree $tree){
+	public static function getIntance($place_str, Tree $tree) {
 		$dplace = null;
-		if(is_string($place_str) && strlen($place_str) > 0){
+		if (is_string($place_str) && strlen($place_str) > 0) {
 			$dplace = new Place(new \Fisharebest\Webtrees\Place($place_str, $tree));
 		}
 		return $dplace;
@@ -52,7 +52,7 @@ 
 	 *
 	 * @return \Fisharebest\Webtrees\Place Embedded place record
 	 */
-	public function getDerivedPlace(){
+	public function getDerivedPlace() {
 		return $this->place;
 	}
 	
@@ -65,8 +65,8 @@ 
 	 * @param bool $anchor Option to print a link to placelist
 	 * @return string HTML code for formatted place
 	 */
-	public function htmlFormattedName($format, $anchor = false){		
-		$html='';
+	public function htmlFormattedName($format, $anchor = false) {		
+		$html = '';
 		
 		$levels = array_map('trim', explode(',', $this->place->getGedcomName()));
 		$nbLevels = count($levels);
@@ -74,15 +74,15 @@ 
 		preg_match_all('/%[^%]/', $displayPlace, $matches);
 		foreach ($matches[0] as $match2) {
 			$index = str_replace('%', '', $match2);
-			if(is_numeric($index) && $index >0 && $index <= $nbLevels){
-				$displayPlace = str_replace($match2, $levels[$index-1] , $displayPlace);
+			if (is_numeric($index) && $index > 0 && $index <= $nbLevels) {
+				$displayPlace = str_replace($match2, $levels[$index - 1], $displayPlace);
 			}
-			else{
-				$displayPlace = str_replace($match2, '' , $displayPlace);
+			else {
+				$displayPlace = str_replace($match2, '', $displayPlace);
 			}
 		}
 		if ($anchor && !Auth::isSearchEngine()) {
-			$html .='<a href="' . $this->place->getURL() . '">' . $displayPlace . '</a>';
+			$html .= '<a href="'.$this->place->getURL().'">'.$displayPlace.'</a>';
 		} else {
 			$html .= $displayPlace;
 		}

src/Webtrees/Family.php

Spacing +4 added lines, -4 removed lines

@@ -30,10 +30,10 @@ 
 	 * @param string $gedcom
 	 * @return NULL|\MyArtJaub\Webtrees\Family
 	 */
-	public static function getIntance($xref, Tree $tree, $gedcom = null){
+	public static function getIntance($xref, Tree $tree, $gedcom = null) {
 		$dfam = null;
 		$fam = fw\Family::getInstance($xref, $tree, $gedcom);
-		if($fam){
+		if ($fam) {
 			$dfam = new Family($fam);
 		}
 		return $dfam;
@@ -44,8 +44,8 @@ 
 	*
 	* @return int Level of sources
 	* */
-	function isMarriageSourced(){
-		if($this->is_marriage_sourced !== null) return $this->is_marriage_sourced;
+	function isMarriageSourced() {
+		if ($this->is_marriage_sourced !== null) return $this->is_marriage_sourced;
 		$this->is_marriage_sourced = $this->isFactSourced(WT_EVENTS_MARR.'|MARC');
 		return $this->is_marriage_sourced;
 	}