jon48 / webtrees-lib

src/Webtrees/Fact.php

Indentation +15 added lines, -15 removed lines

@@ -34,26 +34,26 @@
 	protected $fact; 
 	
 	/**
-	* Contructor for the decorator
-	*
-	* @param \Fisharebest\Webtrees\Fact $fact_in The Fact to extend
-	*/
+	 * Contructor for the decorator
+	 *
+	 * @param \Fisharebest\Webtrees\Fact $fact_in The Fact to extend
+	 */
 	public function __construct(\Fisharebest\Webtrees\Fact $fact_in){
 		$this->fact = $fact_in;
 	}
 	
 	/**
-	* Check if a fact has a date and is sourced
-	* Values:
-	* 		- 0, if no date is found for the fact
-	* 		- -1, if the date is not precise
-	* 		- -2, if the date is precise, but no source is found
-	* 		- 1, if the date is precise, and a source is found
-	* 		- 2, if the date is precise, a source exists, and is supported by a certificate (requires _ACT usage)
-	* 		- 3, if the date is precise, a source exists, and the certificate supporting the fact is within an acceptable range of date
-	*
-	* @return int Level of sources
-	*/
+	 * Check if a fact has a date and is sourced
+	 * Values:
+	 * 		- 0, if no date is found for the fact
+	 * 		- -1, if the date is not precise
+	 * 		- -2, if the date is precise, but no source is found
+	 * 		- 1, if the date is precise, and a source is found
+	 * 		- 2, if the date is precise, a source exists, and is supported by a certificate (requires _ACT usage)
+	 * 		- 3, if the date is precise, a source exists, and the certificate supporting the fact is within an acceptable range of date
+	 *
+	 * @return int Level of sources
+	 */
 	public function isSourced(){
 		$isSourced=0;
 		$date = $this->fact->getDate();

Spacing +13 added lines, -13 removed lines

@@ -38,7 +38,7 @@ 
 	*
 	* @param \Fisharebest\Webtrees\Fact $fact_in The Fact to extend
 	*/
-	public function __construct(\Fisharebest\Webtrees\Fact $fact_in){
+	public function __construct(\Fisharebest\Webtrees\Fact $fact_in) {
 		$this->fact = $fact_in;
 	}
 	
@@ -54,22 +54,22 @@ 
 	*
 	* @return int Level of sources
 	*/
-	public function isSourced(){
-		$isSourced=0;
+	public function isSourced() {
+		$isSourced = 0;
 		$date = $this->fact->getDate();
-		if($date->isOK()) {
-			$isSourced=-1;
-			if($date->qual1=='' && $date->minimumJulianDay() == $date->maximumJulianDay()){
-				$isSourced=-2;
+		if ($date->isOK()) {
+			$isSourced = -1;
+			if ($date->qual1 == '' && $date->minimumJulianDay() == $date->maximumJulianDay()) {
+				$isSourced = -2;
 				$citations = $this->fact->getCitations();
-				foreach($citations as $citation){
-					$isSourced=max($isSourced, 1);
-					if(preg_match('/3 _ACT (.*)/', $citation) ){
- 						$isSourced=max($isSourced, 2);
+				foreach ($citations as $citation) {
+					$isSourced = max($isSourced, 1);
+					if (preg_match('/3 _ACT (.*)/', $citation)) {
+ 						$isSourced = max($isSourced, 2);
  						preg_match_all("/4 DATE (.*)/", $citation, $datessource, PREG_SET_ORDER);
- 						foreach($datessource as $daterec){
+ 						foreach ($datessource as $daterec) {
  							$datesource = new Date($daterec[1]);
- 							if(abs($datesource->julianDay() - $date->julianDay()) < self::DATE_PRECISION_MARGIN){
+ 							if (abs($datesource->julianDay() - $date->julianDay()) < self::DATE_PRECISION_MARGIN) {
  								$isSourced = max($isSourced, 3); //If this level increases, do not forget to change the constant MAX_IS_SOURCED_LEVEL
  							}
  						}

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

Indentation +34 added lines, -34 removed lines

@@ -24,16 +24,16 @@ 
 	 * {@inhericDoc}
 	 * @see \MyArtJaub\Webtrees\Mvc\View\AbstractView::renderContent()
 	 */
-    protected function renderContent() {        
-        /** @var \Fisharebest\Webtrees\Individual $indi */
-        $indi = $this->data->get('indi');
+	protected function renderContent() {        
+		/** @var \Fisharebest\Webtrees\Individual $indi */
+		$indi = $this->data->get('indi');
         
-        /** @var \Fisharebest\Webtrees\Tree $tree */
-        $tree = $this->data->get('tree');
+		/** @var \Fisharebest\Webtrees\Tree $tree */
+		$tree = $this->data->get('tree');
                 
-        //Welcome section - gedcom title, date, statistics - based on gedcom_block        
-        $content = 
-            '<table>
+		//Welcome section - gedcom title, date, statistics - based on gedcom_block        
+		$content = 
+			'<table>
                 <tr>
                     <td>
                         <a href="pedigree.php?rootid=' . $indi->getXref() . '&amp;ged=' . $tree->getNameUrl() . '">
@@ -46,50 +46,50 @@ 
                         </a>
                     </td>';
         
-        if (Site::getPreference('USE_REGISTRATION_MODULE') && !Auth::check()) {
-            $content .= '
+		if (Site::getPreference('USE_REGISTRATION_MODULE') && !Auth::check()) {
+			$content .= '
                     <td>
                         <a href="' . WT_LOGIN_URL . '?action=register">
                             <i class="icon-user_add"></i><br>'.I18N::translate('Request a new user account').'
                         </a>
                     </td>';
-        }
-        $content .= '
+		}
+		$content .= '
                 </tr>
             </table>';
         
-        // Piwik Statistics        
-        if ($this->data->get('piwik_enabled', false)){
-            $content .= '
+		// Piwik Statistics        
+		if ($this->data->get('piwik_enabled', false)){
+			$content .= '
                 <div class="center">
                     <div id="piwik_stats">
                         <i class="icon-loading-small"></i>&nbsp;' . I18N::translate('Retrieving Piwik statistics...') . '
                     </div>
                 </div>';
-        }
+		}
         
-        $content .=  '<hr />';
+		$content .=  '<hr />';
         
-        // Login section - based on login_block
-        if (Auth::check()) {
-            $content .= '
+		// Login section - based on login_block
+		if (Auth::check()) {
+			$content .= '
             <div class="center">
                 <form method="post" action="logout.php" name="logoutform" onsubmit="return true;">
                     <br>' . 
-                    I18N::translate('You are signed in as %s.', '<a href="edituser.php" class="name2">' . Auth::user()->getRealNameHtml() . '</a>') .
-                    '<br><br>
+					I18N::translate('You are signed in as %s.', '<a href="edituser.php" class="name2">' . Auth::user()->getRealNameHtml() . '</a>') .
+					'<br><br>
                     <input type="submit" value="'.I18N::translate('sign out').'">
                     <br><br>
                 </form>
             </div>';
-        } else {
-            $content .= '
+		} else {
+			$content .= '
             <div id="maj-login-box">
                 <form id="maj-login-form" name="maj-login-form" method="post" action="'.WT_LOGIN_URL.'">
 					<input type="hidden" name="action" value="login">
 				    <div>
 					    <label for="maj-username">'. I18N::translate('Username').
-							    '<input type="text" id="maj-username" name="username" class="formField">
+								'<input type="text" id="maj-username" name="username" class="formField">
 						</label>
 					</div>
 					<div>
@@ -103,17 +103,17 @@ 
 					<div>
 						<a href="#" id="maj-passwd_click">'. I18N::translate('Request a new password').'</a>
 					</div>';
-            if (Site::getPreference('USE_REGISTRATION_MODULE')) {
-                $content.= '
+			if (Site::getPreference('USE_REGISTRATION_MODULE')) {
+				$content.= '
                     <div>
                         <a href="'.WT_LOGIN_URL.'?action=register">'. I18N::translate('Request a new user account').'</a>
                     </div>';
-            }
-            $content.= '
+			}
+			$content.= '
                 </form>'; // close "login-form"
              
-            // hidden New Password block
-            $content.= '
+			// hidden New Password block
+			$content.= '
                 <div id="maj-new_passwd">
                     <form id="maj-new_passwd_form" name="new_passwd_form" action="'.WT_LOGIN_URL.'" method="post">
                         <input type="hidden" name="time" value="">
@@ -130,10 +130,10 @@ 
                     </form>
                 </div>
             </div>';//"login-box"
-        }
+		}
         
-        return $content;
-    }
+		return $content;
+	}
     
 
 }

Spacing +16 added lines, -16 removed lines

@@ -36,20 +36,20 @@ 
             '<table>
                 <tr>
                     <td>
-                        <a href="pedigree.php?rootid=' . $indi->getXref() . '&amp;ged=' . $tree->getNameUrl() . '">
-                            <i class="icon-pedigree"></i><br>' . I18N::translate('Default chart') . '
+                        <a href="pedigree.php?rootid=' . $indi->getXref().'&amp;ged='.$tree->getNameUrl().'">
+                            <i class="icon-pedigree"></i><br>' . I18N::translate('Default chart').'
                         </a>
                     </td>
                     <td>
-                        <a href="individual.php?pid=' . $indi->getXref() . '&amp;ged=' . $tree->getNameUrl() . '">
-                            <i class="icon-indis"></i><br>' . I18N::translate('Default individual') . '
+                        <a href="individual.php?pid=' . $indi->getXref().'&amp;ged='.$tree->getNameUrl().'">
+                            <i class="icon-indis"></i><br>' . I18N::translate('Default individual').'
                         </a>
                     </td>';
         
         if (Site::getPreference('USE_REGISTRATION_MODULE') && !Auth::check()) {
             $content .= '
                     <td>
-                        <a href="' . WT_LOGIN_URL . '?action=register">
+                        <a href="' . WT_LOGIN_URL.'?action=register">
                             <i class="icon-user_add"></i><br>'.I18N::translate('Request a new user account').'
                         </a>
                     </td>';
@@ -59,16 +59,16 @@ 
             </table>';
         
         // Piwik Statistics        
-        if ($this->data->get('piwik_enabled', false)){
+        if ($this->data->get('piwik_enabled', false)) {
             $content .= '
                 <div class="center">
                     <div id="piwik_stats">
-                        <i class="icon-loading-small"></i>&nbsp;' . I18N::translate('Retrieving Piwik statistics...') . '
+                        <i class="icon-loading-small"></i>&nbsp;' . I18N::translate('Retrieving Piwik statistics...').'
                     </div>
                 </div>';
         }
         
-        $content .=  '<hr />';
+        $content .= '<hr />';
         
         // Login section - based on login_block
         if (Auth::check()) {
@@ -76,7 +76,7 @@ 
             <div class="center">
                 <form method="post" action="logout.php" name="logoutform" onsubmit="return true;">
                     <br>' . 
-                    I18N::translate('You are signed in as %s.', '<a href="edituser.php" class="name2">' . Auth::user()->getRealNameHtml() . '</a>') .
+                    I18N::translate('You are signed in as %s.', '<a href="edituser.php" class="name2">'.Auth::user()->getRealNameHtml().'</a>').
                     '<br><br>
                     <input type="submit" value="'.I18N::translate('sign out').'">
                     <br><br>
@@ -98,34 +98,34 @@ 
 						</label>
 					</div>
 					<div>
-						<input type="submit" value="'. I18N::translate('sign in'). '">
+						<input type="submit" value="'. I18N::translate('sign in').'">
 					</div>
 					<div>
 						<a href="#" id="maj-passwd_click">'. I18N::translate('Request a new password').'</a>
 					</div>';
             if (Site::getPreference('USE_REGISTRATION_MODULE')) {
-                $content.= '
+                $content .= '
                     <div>
-                        <a href="'.WT_LOGIN_URL.'?action=register">'. I18N::translate('Request a new user account').'</a>
+                        <a href="'.WT_LOGIN_URL.'?action=register">'.I18N::translate('Request a new user account').'</a>
                     </div>';
             }
-            $content.= '
+            $content .= '
                 </form>'; // close "login-form"
              
             // hidden New Password block
-            $content.= '
+            $content .= '
                 <div id="maj-new_passwd">
                     <form id="maj-new_passwd_form" name="new_passwd_form" action="'.WT_LOGIN_URL.'" method="post">
                         <input type="hidden" name="time" value="">
                         <input type="hidden" name="action" value="requestpw">
                         <h4>'. I18N::translate('Lost password request').'</h4>
                         <div>
-                            <label for="maj-new_passwd_username">'. I18N::translate('Username or email address') . '
+                            <label for="maj-new_passwd_username">'. I18N::translate('Username or email address').'
                                 <input type="text" id="maj-new_passwd_username" name="new_passwd_username" value="">
                             </label>
         				</div>
         				<div>
-                            <input type="submit" value="'. I18N::translate('Continue'). '">
+                            <input type="submit" value="'. I18N::translate('Continue').'">
                         </div>
                     </form>
                 </div>

src/Webtrees/Module/IsSourcedModule.php

Spacing +15 added lines, -15 removed lines

@@ -63,7 +63,7 @@ 
 	 * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\IndividualHeaderExtenderInterface::hExtendIndiHeaderIcons()
 	 */
 	public function hExtendIndiHeaderIcons(IndividualController $ctrlIndi) {
-	    if($ctrlIndi){
+	    if ($ctrlIndi) {
 	        $dindi = new Individual($ctrlIndi->getSignificantIndividual());
 	        if ($dindi->canDisplayIsSourced()) 
 	            return FunctionsPrint::formatIsSourcedIcon('R', $dindi->isSourced(), 'INDI', 1, 'large');
@@ -87,19 +87,19 @@ 
 	 * {@inheritDoc}
 	 * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\RecordNameTextExtenderInterface::hRecordNamePrepend()
 	 */
-	public function hRecordNamePrepend(GedcomRecord $grec, $size){ }
+	public function hRecordNamePrepend(GedcomRecord $grec, $size) { }
 	
 	/**
 	 * {@inheritDoc}
 	 * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\RecordNameTextExtenderInterface::hRecordNameAppend()
 	 */
-	public function hRecordNameAppend(GedcomRecord $grec, $size = 'small'){
+	public function hRecordNameAppend(GedcomRecord $grec, $size = 'small') {
 	    $html = '';
-	    if($grec instanceof \Fisharebest\Webtrees\Individual){
+	    if ($grec instanceof \Fisharebest\Webtrees\Individual) {
 	        $dindi = new Individual($grec);
 	        $html .= FunctionsPrint::formatIsSourcedIcon('R', $dindi->isSourced(), 'INDI', 1, $size);
 	        $html .= FunctionsPrint::formatIsSourcedIcon('E', $dindi->isBirthSourced(), 'BIRT', 1, $size);
-	        if($grec->isDead())
+	        if ($grec->isDead())
 	            $html .= FunctionsPrint::formatIsSourcedIcon('E', $dindi->isDeathSourced(), 'DEAT', 1, $size);
 	    }
 	    return $html;
@@ -117,7 +117,7 @@ 
 	 * {@inheritDoc}
 	 * @see \Fisharebest\Webtrees\Module\ModuleSidebarInterface::hasSidebarContent()
 	 */
-	public function hasSidebarContent(){ 
+	public function hasSidebarContent() { 
 	    return true;
 	}
 	
@@ -147,24 +147,24 @@ 
 	            echo '
 	                <table class="issourcedtable">
 	                   <tr>
-	                       <td class="slabel"> ' . GedcomTag::getLabel('INDI') . '</td>
+	                       <td class="slabel"> ' . GedcomTag::getLabel('INDI').'</td>
 	                       <td class="svalue">' . FunctionsPrint::formatIsSourcedIcon('R', $dindi->isSourced(), 'INDI', 1).'</td>
 	                   </tr>
 	                   <tr>
-	                       <td class="slabel">' . GedcomTag::getLabel('BIRT') . '</td>
+	                       <td class="slabel">' . GedcomTag::getLabel('BIRT').'</td>
 	                       <td class="svalue">' . FunctionsPrint::formatIsSourcedIcon('E', $dindi->isBirthSourced(), 'BIRT', 1).'</td>
 	                   </tr>';
 	            
 	            $fams = $root->getSpouseFamilies();
-	            ($ct = count($fams)) > 1 ? $nb=1 : $nb=' ';	            
-	            foreach($fams as $fam){
+	            ($ct = count($fams)) > 1 ? $nb = 1 : $nb = ' ';	            
+	            foreach ($fams as $fam) {
 	                $dfam = new Family($fam);
 	                echo '
 	                    <tr>
 	                       <td class="slabel right">
-	                           <a href="' . $fam->getHtmlUrl() . '"> '. GedcomTag::getLabel('MARR');
-	                if($ct > 1){
-	                    echo ' ',$nb;
+	                           <a href="' . $fam->getHtmlUrl().'"> '.GedcomTag::getLabel('MARR');
+	                if ($ct > 1) {
+	                    echo ' ', $nb;
 	                    $nb++;
 	                }
 	                echo '     </a>
@@ -173,10 +173,10 @@ 
 	                   </tr>';
 	            }
 	            
-	            if( $root->isDead() )
+	            if ($root->isDead())
 	                echo '
 	                    <tr>
-	                       <td class="slabel">' . GedcomTag::getLabel('DEAT') . '</td>
+	                       <td class="slabel">' . GedcomTag::getLabel('DEAT').'</td>
 	                       <td class="svalue">' . FunctionsPrint::formatIsSourcedIcon('E', $dindi->isDeathSourced(), 'DEAT', 1).'</td>
 	                   </tr>';
 	            

Braces +9 added lines, -6 removed lines

@@ -65,8 +65,9 @@ 
 	public function hExtendIndiHeaderIcons(IndividualController $ctrlIndi) {
 	    if($ctrlIndi){
 	        $dindi = new Individual($ctrlIndi->getSignificantIndividual());
-	        if ($dindi->canDisplayIsSourced()) 
-	            return FunctionsPrint::formatIsSourcedIcon('R', $dindi->isSourced(), 'INDI', 1, 'large');
+	        if ($dindi->canDisplayIsSourced()) {
+	        	            return FunctionsPrint::formatIsSourcedIcon('R', $dindi->isSourced(), 'INDI', 1, 'large');
+	        }
 	    }
 	    return '';
 	}
@@ -99,8 +100,9 @@ 
 	        $dindi = new Individual($grec);
 	        $html .= FunctionsPrint::formatIsSourcedIcon('R', $dindi->isSourced(), 'INDI', 1, $size);
 	        $html .= FunctionsPrint::formatIsSourcedIcon('E', $dindi->isBirthSourced(), 'BIRT', 1, $size);
-	        if($grec->isDead())
-	            $html .= FunctionsPrint::formatIsSourcedIcon('E', $dindi->isDeathSourced(), 'DEAT', 1, $size);
+	        if($grec->isDead()) {
+	        	            $html .= FunctionsPrint::formatIsSourcedIcon('E', $dindi->isDeathSourced(), 'DEAT', 1, $size);
+	        }
 	    }
 	    return $html;
 	}
@@ -173,12 +175,13 @@ 
 	                   </tr>';
 	            }
 	            
-	            if( $root->isDead() )
-	                echo '
+	            if( $root->isDead() ) {
+	            	                echo '
 	                    <tr>
 	                       <td class="slabel">' . GedcomTag::getLabel('DEAT') . '</td>
 	                       <td class="svalue">' . FunctionsPrint::formatIsSourcedIcon('E', $dindi->isDeathSourced(), 'DEAT', 1).'</td>
 	                   </tr>';
+	            }
 	            
 	            echo '</table>';
 	        }

Indentation +59 added lines, -59 removed lines

@@ -30,29 +30,29 @@ 
 class IsSourcedModule extends AbstractModule 
 implements ModuleSidebarInterface, HookSubscriberInterface, IndividualHeaderExtenderInterface, RecordNameTextExtenderInterface
 {
-    /** @var string For custom modules - link for support, upgrades, etc. */
-    const CUSTOM_WEBSITE = 'https://github.com/jon48/webtrees-lib';
+	/** @var string For custom modules - link for support, upgrades, etc. */
+	const CUSTOM_WEBSITE = 'https://github.com/jon48/webtrees-lib';
     
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\AbstractModule::getTitle()
-     */
-    public function getTitle() {
-        return I18N::translate('Sourced events');
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\AbstractModule::getTitle()
+	 */
+	public function getTitle() {
+		return I18N::translate('Sourced events');
+	}
     
    /**
     * {@inheritDoc}
     * @see \Fisharebest\Webtrees\Module\AbstractModule::getDescription()
     */
-    public function getDescription() {
-        return I18N::translate('Indicate if events related to an record are sourced.');
-    }
+	public function getDescription() {
+		return I18N::translate('Indicate if events related to an record are sourced.');
+	}
     
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Hook\HookSubscriberInterface::getSubscribedHooks()
-     */
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Hook\HookSubscriberInterface::getSubscribedHooks()
+	 */
 	public function getSubscribedHooks() {
 		return array(
  			'hExtendIndiHeaderIcons' => 10,
@@ -65,12 +65,12 @@ 
 	 * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\IndividualHeaderExtenderInterface::hExtendIndiHeaderIcons()
 	 */
 	public function hExtendIndiHeaderIcons(IndividualController $ctrlIndi) {
-	    if($ctrlIndi){
-	        $dindi = new Individual($ctrlIndi->getSignificantIndividual());
-	        if ($dindi->canDisplayIsSourced()) 
-	            return FunctionsPrint::formatIsSourcedIcon('R', $dindi->isSourced(), 'INDI', 1, 'large');
-	    }
-	    return '';
+		if($ctrlIndi){
+			$dindi = new Individual($ctrlIndi->getSignificantIndividual());
+			if ($dindi->canDisplayIsSourced()) 
+				return FunctionsPrint::formatIsSourcedIcon('R', $dindi->isSourced(), 'INDI', 1, 'large');
+		}
+		return '';
 	}
 	
 	/**
@@ -96,15 +96,15 @@ 
 	 * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\RecordNameTextExtenderInterface::hRecordNameAppend()
 	 */
 	public function hRecordNameAppend(GedcomRecord $grec, $size = 'small'){
-	    $html = '';
-	    if($grec instanceof \Fisharebest\Webtrees\Individual){
-	        $dindi = new Individual($grec);
-	        $html .= FunctionsPrint::formatIsSourcedIcon('R', $dindi->isSourced(), 'INDI', 1, $size);
-	        $html .= FunctionsPrint::formatIsSourcedIcon('E', $dindi->isBirthSourced(), 'BIRT', 1, $size);
-	        if($grec->isDead())
-	            $html .= FunctionsPrint::formatIsSourcedIcon('E', $dindi->isDeathSourced(), 'DEAT', 1, $size);
-	    }
-	    return $html;
+		$html = '';
+		if($grec instanceof \Fisharebest\Webtrees\Individual){
+			$dindi = new Individual($grec);
+			$html .= FunctionsPrint::formatIsSourcedIcon('R', $dindi->isSourced(), 'INDI', 1, $size);
+			$html .= FunctionsPrint::formatIsSourcedIcon('E', $dindi->isBirthSourced(), 'BIRT', 1, $size);
+			if($grec->isDead())
+				$html .= FunctionsPrint::formatIsSourcedIcon('E', $dindi->isDeathSourced(), 'DEAT', 1, $size);
+		}
+		return $html;
 	}
 	
 	/**
@@ -112,7 +112,7 @@ 
 	 * @see \Fisharebest\Webtrees\Module\ModuleSidebarInterface::defaultSidebarOrder()
 	 */
 	public function defaultSidebarOrder() {
-	    return 15;
+		return 15;
 	}
 	
 	/**
@@ -120,7 +120,7 @@ 
 	 * @see \Fisharebest\Webtrees\Module\ModuleSidebarInterface::hasSidebarContent()
 	 */
 	public function hasSidebarContent(){ 
-	    return true;
+		return true;
 	}
 	
 	/**
@@ -128,7 +128,7 @@ 
 	 * @see \Fisharebest\Webtrees\Module\ModuleSidebarInterface::getSidebarAjaxContent()
 	 */
 	public function getSidebarAjaxContent() {
-	    return '';
+		return '';
 	}
 	
 	/**
@@ -136,15 +136,15 @@ 
 	 * @see \Fisharebest\Webtrees\Module\ModuleSidebarInterface::getSidebarContent()
 	 */
 	public function getSidebarContent() {
-	    ob_start();
-	    $root = Globals::getController()->getSignificantIndividual();
-	    if ($root) {
-	        $dindi = new Individual($root);
+		ob_start();
+		$root = Globals::getController()->getSignificantIndividual();
+		if ($root) {
+			$dindi = new Individual($root);
 	        	
-	        if (!$dindi->canDisplayIsSourced()) {
-	            echo '<div class="error">', I18N::translate('This information is private and cannot be shown.'), '</div>';
-	        } else {
-	            echo '
+			if (!$dindi->canDisplayIsSourced()) {
+				echo '<div class="error">', I18N::translate('This information is private and cannot be shown.'), '</div>';
+			} else {
+				echo '
 	                <table class="issourcedtable">
 	                   <tr>
 	                       <td class="slabel"> ' . GedcomTag::getLabel('INDI') . '</td>
@@ -155,35 +155,35 @@ 
 	                       <td class="svalue">' . FunctionsPrint::formatIsSourcedIcon('E', $dindi->isBirthSourced(), 'BIRT', 1).'</td>
 	                   </tr>';
 	            
-	            $fams = $root->getSpouseFamilies();
-	            ($ct = count($fams)) > 1 ? $nb=1 : $nb=' ';	            
-	            foreach($fams as $fam){
-	                $dfam = new Family($fam);
-	                echo '
+				$fams = $root->getSpouseFamilies();
+				($ct = count($fams)) > 1 ? $nb=1 : $nb=' ';	            
+				foreach($fams as $fam){
+					$dfam = new Family($fam);
+					echo '
 	                    <tr>
 	                       <td class="slabel right">
 	                           <a href="' . $fam->getHtmlUrl() . '"> '. GedcomTag::getLabel('MARR');
-	                if($ct > 1){
-	                    echo ' ',$nb;
-	                    $nb++;
-	                }
-	                echo '     </a>
+					if($ct > 1){
+						echo ' ',$nb;
+						$nb++;
+					}
+					echo '     </a>
 	                       </td>
 	                       <td class="svalue">' . FunctionsPrint::formatIsSourcedIcon('E', $dfam->isMarriageSourced(), 'MARR', 1).'</td>
 	                   </tr>';
-	            }
+				}
 	            
-	            if( $root->isDead() )
-	                echo '
+				if( $root->isDead() )
+					echo '
 	                    <tr>
 	                       <td class="slabel">' . GedcomTag::getLabel('DEAT') . '</td>
 	                       <td class="svalue">' . FunctionsPrint::formatIsSourcedIcon('E', $dindi->isDeathSourced(), 'DEAT', 1).'</td>
 	                   </tr>';
 	            
-	            echo '</table>';
-	        }
-	    }
-	    return ob_get_clean();	    
+				echo '</table>';
+			}
+		}
+		return ob_get_clean();	    
 	}
 	
 	

src/Webtrees/Module/Sosa/Views/SosaListIndiView.php

Indentation +71 added lines, -71 removed lines

@@ -31,11 +31,11 @@ 
 	 * {@inhericDoc}
 	 * @see \MyArtJaub\Webtrees\Mvc\View\AbstractView::renderContent()
 	 */
-    protected function renderContent() { 
+	protected function renderContent() { 
         
-        if($this->data->get('has_sosa', false)) {
-            $table_id = $this->data->get('table_id');            
-        ?>   
+		if($this->data->get('has_sosa', false)) {
+			$table_id = $this->data->get('table_id');            
+		?>   
         
         <div id="sosa-indi-list" class="sosa-list">
         	<table id="<?= $table_id ?>">
@@ -177,67 +177,67 @@ 
 			<tbody>
 			
 			<?php foreach($this->data->get('sosa_list') as $sosa => $person) {
-			    /** @var \Fisharebest\Webtrees\Individual $person */
-			    if ($person->isPendingAddtion()) {
-			        $class = ' class="new"';
-			    } elseif ($person->isPendingDeletion()) {
-			        $class = ' class="old"';
-			    } else {
-			        $class = '';
-			    }
-			    $dperson = new \MyArtJaub\Webtrees\Individual($person);
-			    ?>			
+				/** @var \Fisharebest\Webtrees\Individual $person */
+				if ($person->isPendingAddtion()) {
+					$class = ' class="new"';
+				} elseif ($person->isPendingDeletion()) {
+					$class = ' class="old"';
+				} else {
+					$class = '';
+				}
+				$dperson = new \MyArtJaub\Webtrees\Individual($person);
+				?>			
         		<tr <?= $class ?>>
         			<td class="transparent"><?= $sosa ?></td>
         			<td hidden><?= $person->getXref() ?></td>
         			<?php list($surn_givn, $givn_surn) = FunctionsPrintLists::sortableNames($person); ?>
         			<td colspan="2" data-sort="<?= Filter::escapeHtml($givn_surn) ?>">
         			<?php foreach ($person->getAllNames() as $num=>$name) {
-        				if ($name['type']=='NAME') {
-        					$title='';
-        				} else {
-        					$title='title="'.strip_tags(GedcomTag::getLabel($name['type'], $person)).'"';
-        				}
-        				if ($num==$person->getPrimaryName()) {
-        					$class=' class="name2"';
-        					$sex_image=$person->getSexImage();
-        				} else {
-        					$class='';
-        					$sex_image='';
-        				} ?>
+						if ($name['type']=='NAME') {
+							$title='';
+						} else {
+							$title='title="'.strip_tags(GedcomTag::getLabel($name['type'], $person)).'"';
+						}
+						if ($num==$person->getPrimaryName()) {
+							$class=' class="name2"';
+							$sex_image=$person->getSexImage();
+						} else {
+							$class='';
+							$sex_image='';
+						} ?>
         				<a <?= $title.' '.$class; ?> href="<?= $person->getHtmlUrl() ?>">
         					<?= \Fisharebest\Webtrees\Functions\FunctionsPrint::highlightSearchHits($name['full']) ?>
         				</a>
         				<?= $sex_image;
-        				echo implode('&nbsp;',
-        				    \MyArtJaub\Webtrees\Hook\HookProvider::getInstance()
-        				    ->get('hRecordNameAppend')
-        				    ->executeOnlyFor(array(Constants::MODULE_MAJ_SOSA_NAME),  $person, 'smaller')); 
-        				?>
+						echo implode('&nbsp;',
+							\MyArtJaub\Webtrees\Hook\HookProvider::getInstance()
+							->get('hRecordNameAppend')
+							->executeOnlyFor(array(Constants::MODULE_MAJ_SOSA_NAME),  $person, 'smaller')); 
+						?>
         				<br/>
             		<?php }
-            		echo $person->getPrimaryParentsNames('parents details1', 'none');
-            		?>
+					echo $person->getPrimaryParentsNames('parents details1', 'none');
+					?>
             		</td>
             		<td hidden data-sort="<?= Filter::escapeHtml($surn_givn) ?>"></td>
             		<?php $birth_dates = $person->getAllBirthDates(); ?>
             		<td data-sort="<?= $person->getEstimatedBirthDate()->julianDay() ?>">
             		<?php foreach ($birth_dates as $n => $birth_date) {
-    					   if ($n > 0) { ?><br/><?php } ?>
+						   if ($n > 0) { ?><br/><?php } ?>
     						<?php  echo $birth_date->display(true);
-			        } ?>
+					} ?>
             		</td>
         			<td>
         			<?php foreach ($person->getAllBirthPlaces() as $n => $birth_place) {
-				        $tmp = new \Fisharebest\Webtrees\Place($birth_place, $person->getTree());
-        				if ($n > 0) { ?><br><?php } ?>
+						$tmp = new \Fisharebest\Webtrees\Place($birth_place, $person->getTree());
+						if ($n > 0) { ?><br><?php } ?>
         				<a href="'<?= $tmp->getURL() ?>" title="<?= strip_tags($tmp->getFullName()) ?>">
         					<?= \Fisharebest\Webtrees\Functions\FunctionsPrint::highlightSearchHits($tmp->getShortName()) ?>
         				</a>
         			<?php } ?>
         			</td>
         			<?php if (ModuleManager::getInstance()->isOperational(Constants::MODULE_MAJ_ISSOURCED_NAME)) {
-				        $isBSourced = $dperson->isBirthSourced(); ?>
+						$isBSourced = $dperson->isBirthSourced(); ?>
 				   	<td data-sort="<?= $isBSourced ?>"><?= FunctionsPrint::formatIsSourcedIcon('E', $isBSourced, 'BIRT', 1, 'medium') ?></td>
 					<?php } else { ?>
 					<td>&nbsp;</td>
@@ -245,63 +245,63 @@ 
 					<?php $death_dates = $person->getAllDeathDates(); ?>
 					<td data-sort="<?= $person->getEstimatedDeathDate()->julianDay() ?>">
 					<?php foreach ($death_dates as $num => $death_date) {
-					       if ($num) { ?><br/><?php } ?>
+						   if ($num) { ?><br/><?php } ?>
 					 		<?php echo $death_date->display(true); 
-				     } ?>
+					 } ?>
 			         </td>
 			         <?php if (isset($birth_dates[0]) && isset($death_dates[0])) {
-			             $age_at_death = Date::getAge($birth_dates[0], $death_dates[0], 0);
-			             $age_at_death_sort = Date::getAge($birth_dates[0], $death_dates[0], 2);
-			         } else {
-			             $age_at_death      = '';
-			             $age_at_death_sort = PHP_INT_MAX;
-			         } ?>
+						 $age_at_death = Date::getAge($birth_dates[0], $death_dates[0], 0);
+						 $age_at_death_sort = Date::getAge($birth_dates[0], $death_dates[0], 2);
+					 } else {
+						 $age_at_death      = '';
+						 $age_at_death_sort = PHP_INT_MAX;
+					 } ?>
 			         <td class="center" data-sort="<?= $age_at_death_sort ?>"><?= $age_at_death ?></td>
 			         <td>
         			 <?php foreach ($person->getAllDeathPlaces() as $n => $death_place) {
-        				$tmp = new Place($death_place, $person->getTree());
-        				if ($n) { ?><br><?php } ?>
+						$tmp = new Place($death_place, $person->getTree());
+						if ($n) { ?><br><?php } ?>
         				<a href="'<?= $tmp->getURL() ?>" title="<?= strip_tags($tmp->getFullName()) ?>">
         					<?= \Fisharebest\Webtrees\Functions\FunctionsPrint::highlightSearchHits($tmp->getShortName()) ?>
         				</a>
         			<?php } ?>
         			</td>
         			<?php if (ModuleManager::getInstance()->isOperational(Constants::MODULE_MAJ_ISSOURCED_NAME)) {
-        			    if($person->isDead()) {
-        			        $isDSourced = $dperson->isDeathSourced(); ?>
+						if($person->isDead()) {
+							$isDSourced = $dperson->isDeathSourced(); ?>
 				   	<td data-sort=<?= $isDSourced ?>><?= FunctionsPrint::formatIsSourcedIcon('E', $isDSourced, 'DEAT', 1, 'medium') ?></td>
 					<?php } else { ?>
 					<td data-sort="-99">&nbsp;</td>
 					<?php } 
-        			} else { ?>
+					} else { ?>
 					<td>&nbsp;</td>
 					<?php } ?>
 					<td hidden><?= $person->getSex() ?></td>
 					<td hidden>
 					<?php if (!$person->canShow() || Date::compare($person->getEstimatedBirthDate(), new Date(date('Y') - 100)) > 0) {
-					    echo 'Y100';
-        			} else {
-        				echo 'YES';
-        			} ?>
+						echo 'Y100';
+					} else {
+						echo 'YES';
+					} ?>
         			</td>
         			<td hidden>
         			<?php if (isset($death_dates[0]) && Date::compare($death_dates[0], new Date(date('Y') - 100)) > 0) {
-				        echo 'Y100';
-        			} elseif ($person->isDead()) {
-				        echo 'YES';
-        			} else {
-				        echo 'N';
-			         } ?>
+						echo 'Y100';
+					} elseif ($person->isDead()) {
+						echo 'YES';
+					} else {
+						echo 'N';
+					 } ?>
 			         </td>
 			         <td hidden>
 					<?php if (!$person->getChildFamilies()) {
-					    echo 'R';
+						echo 'R';
 					}  // roots
 					elseif (!$person->isDead() && $person->getNumberOfChildren() < 1) {
-            			echo 'L';
+						echo 'L';
 					} // leaves
 					else {
-					    echo '&nbsp;';
+						echo '&nbsp;';
 					} ?>
 					</td>
 				</tr>
@@ -312,12 +312,12 @@ 
 					<th class="ui-state-default" colspan="15">
 						<div class="center">
 							<?= I18N::translate('Number of Sosa ancestors: %1$s known / %2$s theoretical (%3$s)',
-							    I18N::number($this->data->get('sosa_count')),
-							    I18N::number($this->data->get('sosa_theo')), 
-							    I18N::percentage($this->data->get('sosa_ratio'),2)
-							    ) ?>
+								I18N::number($this->data->get('sosa_count')),
+								I18N::number($this->data->get('sosa_theo')), 
+								I18N::percentage($this->data->get('sosa_ratio'),2)
+								) ?>
 							<?php if($this->data->get('sosa_hidden') > 0) {
-							    echo '['. I18N::translate('%s hidden', I18N::number($this->data->get('sosa_hidden'))).']';
+								echo '['. I18N::translate('%s hidden', I18N::number($this->data->get('sosa_hidden'))).']';
 							} ?>
 						</div>
 					</th>
@@ -351,8 +351,8 @@ 
 				</div>
 			</div>
 		<?php 
-        }
-    }
+		}
+	}
     
 }
  
\ No newline at end of file

Spacing +16 added lines, -16 removed lines

@@ -33,7 +33,7 @@ 
 	 */
     protected function renderContent() { 
         
-        if($this->data->get('has_sosa', false)) {
+        if ($this->data->get('has_sosa', false)) {
             $table_id = $this->data->get('table_id');            
         ?>   
         
@@ -176,7 +176,7 @@ 
 				</thead>
 			<tbody>
 			
-			<?php foreach($this->data->get('sosa_list') as $sosa => $person) {
+			<?php foreach ($this->data->get('sosa_list') as $sosa => $person) {
 			    /** @var \Fisharebest\Webtrees\Individual $person */
 			    if ($person->isPendingAddtion()) {
 			        $class = ' class="new"';
@@ -193,17 +193,17 @@ 
         			<?php list($surn_givn, $givn_surn) = FunctionsPrintLists::sortableNames($person); ?>
         			<td colspan="2" data-sort="<?= Filter::escapeHtml($givn_surn) ?>">
         			<?php foreach ($person->getAllNames() as $num=>$name) {
-        				if ($name['type']=='NAME') {
-        					$title='';
+        				if ($name['type'] == 'NAME') {
+        					$title = '';
         				} else {
-        					$title='title="'.strip_tags(GedcomTag::getLabel($name['type'], $person)).'"';
+        					$title = 'title="'.strip_tags(GedcomTag::getLabel($name['type'], $person)).'"';
         				}
-        				if ($num==$person->getPrimaryName()) {
-        					$class=' class="name2"';
-        					$sex_image=$person->getSexImage();
+        				if ($num == $person->getPrimaryName()) {
+        					$class = ' class="name2"';
+        					$sex_image = $person->getSexImage();
         				} else {
-        					$class='';
-        					$sex_image='';
+        					$class = '';
+        					$sex_image = '';
         				} ?>
         				<a <?= $title.' '.$class; ?> href="<?= $person->getHtmlUrl() ?>">
         					<?= \Fisharebest\Webtrees\Functions\FunctionsPrint::highlightSearchHits($name['full']) ?>
@@ -212,7 +212,7 @@ 
         				echo implode('&nbsp;',
         				    \MyArtJaub\Webtrees\Hook\HookProvider::getInstance()
         				    ->get('hRecordNameAppend')
-        				    ->executeOnlyFor(array(Constants::MODULE_MAJ_SOSA_NAME),  $person, 'smaller')); 
+        				    ->executeOnlyFor(array(Constants::MODULE_MAJ_SOSA_NAME), $person, 'smaller')); 
         				?>
         				<br/>
             		<?php }
@@ -267,7 +267,7 @@ 
         			<?php } ?>
         			</td>
         			<?php if (ModuleManager::getInstance()->isOperational(Constants::MODULE_MAJ_ISSOURCED_NAME)) {
-        			    if($person->isDead()) {
+        			    if ($person->isDead()) {
         			        $isDSourced = $dperson->isDeathSourced(); ?>
 				   	<td data-sort=<?= $isDSourced ?>><?= FunctionsPrint::formatIsSourcedIcon('E', $isDSourced, 'DEAT', 1, 'medium') ?></td>
 					<?php } else { ?>
@@ -314,10 +314,10 @@ 
 							<?= I18N::translate('Number of Sosa ancestors: %1$s known / %2$s theoretical (%3$s)',
 							    I18N::number($this->data->get('sosa_count')),
 							    I18N::number($this->data->get('sosa_theo')), 
-							    I18N::percentage($this->data->get('sosa_ratio'),2)
+							    I18N::percentage($this->data->get('sosa_ratio'), 2)
 							    ) ?>
-							<?php if($this->data->get('sosa_hidden') > 0) {
-							    echo '['. I18N::translate('%s hidden', I18N::number($this->data->get('sosa_hidden'))).']';
+							<?php if ($this->data->get('sosa_hidden') > 0) {
+							    echo '['.I18N::translate('%s hidden', I18N::number($this->data->get('sosa_hidden'))).']';
 							} ?>
 						</div>
 					</th>
@@ -329,7 +329,7 @@ 
 								<button type="button" class="ui-state-default btn-toggle-parents">
 									<?= I18N::translate('Show parents') ?>
 								</button>
-								<button id="btn-toggle-statistics-<?= $table_id ;?>" type="button" class="ui-state-default btn-toggle-statistics">
+								<button id="btn-toggle-statistics-<?= $table_id; ?>" type="button" class="ui-state-default btn-toggle-statistics">
 									<?= I18N::translate('Show statistics charts') ?>
 								</button>
 							</div>

src/Webtrees/Hook/Hook.php

Indentation +19 added lines, -19 removed lines

@@ -1,13 +1,13 @@ 
 <?php
  /**
- * webtrees-lib: MyArtJaub library for webtrees
- *
- * @package MyArtJaub\Webtrees
- * @subpackage Hook
- * @author Jonathan Jaubart <dev@jaubart.com>
- * @copyright Copyright (c) 2011-2016, Jonathan Jaubart
- * @license http://www.gnu.org/licenses/gpl.html GNU General Public License, version 3
- */
+  * webtrees-lib: MyArtJaub library for webtrees
+  *
+  * @package MyArtJaub\Webtrees
+  * @subpackage Hook
+  * @author Jonathan Jaubart <dev@jaubart.com>
+  * @copyright Copyright (c) 2011-2016, Jonathan Jaubart
+  * @license http://www.gnu.org/licenses/gpl.html GNU General Public License, version 3
+  */
 namespace MyArtJaub\Webtrees\Hook;
 
 use Fisharebest\Webtrees\Database;
@@ -137,17 +137,17 @@ 
 	 * @return array Results of the hook executions
 	 */
 	public function executeOnlyFor(array $module_names) {
-	    $result = array();
-	    if(HookProvider::getInstance()->isModuleOperational()){
-	       $params = func_get_args();
-	       array_shift($params);
-    	    foreach ($module_names as $module_name) {
-    	        if($module = Module::getModuleByName($module_name)) {
-    	            $result[] = call_user_func_array(array($module, $this->hook_function), $params);
-    	        }
-    	    }
-	    }
-	    return $result;
+		$result = array();
+		if(HookProvider::getInstance()->isModuleOperational()){
+		   $params = func_get_args();
+		   array_shift($params);
+			foreach ($module_names as $module_name) {
+				if($module = Module::getModuleByName($module_name)) {
+					$result[] = call_user_func_array(array($module, $this->hook_function), $params);
+				}
+			}
+		}
+		return $result;
 	}
 
 	/**

Spacing +23 added lines, -23 removed lines

@@ -31,7 +31,7 @@ 
 	 * @param string $hook_function_in Hook function to be subscribed or executed
 	 * @param string $hook_context_in Hook context to be subscribed or executed
 	 */
-	public function __construct($hook_function_in, $hook_context_in = 'all'){
+	public function __construct($hook_function_in, $hook_context_in = 'all') {
 		$this->hook_function = $hook_function_in;
 		$this->hook_context = $hook_context_in;
 	}
@@ -47,8 +47,8 @@ 
 	 *
 	 * @param string $hsubscriber Name of the subscriber module
 	 */
-	public function subscribe($hsubscriber){
-		if(HookProvider::getInstance()->isModuleOperational()){
+	public function subscribe($hsubscriber) {
+		if (HookProvider::getInstance()->isModuleOperational()) {
 			Database::prepare(
 					"INSERT IGNORE INTO `##maj_hooks` (majh_hook_function, majh_hook_context, majh_module_name)".
 					" VALUES (?, ?, ?)"
@@ -62,8 +62,8 @@ 
 	 * @param string $hsubscriber Name of the subscriber module
 	 * @param int $priority Priority of execution
 	 */
-	public function setPriority($hsubscriber, $priority){
-		if(HookProvider::getInstance()->isModuleOperational()){
+	public function setPriority($hsubscriber, $priority) {
+		if (HookProvider::getInstance()->isModuleOperational()) {
 			Database::prepare(
 			"UPDATE `##maj_hooks`".
 			" SET majh_module_priority=?".
@@ -79,8 +79,8 @@ 
 	 *
 	 * @param string $hsubscriber Name of the subscriber module
 	 */
-	public function enable($hsubscriber){
-		if(HookProvider::getInstance()->isModuleOperational()){
+	public function enable($hsubscriber) {
+		if (HookProvider::getInstance()->isModuleOperational()) {
 		Database::prepare(
 			"UPDATE `##maj_hooks`".
 			" SET majh_status='enabled'".
@@ -96,8 +96,8 @@ 
 	 *
 	 * @param string $hsubscriber Name of the subscriber module
 	 */
-	public function disable($hsubscriber){
-		if(HookProvider::getInstance()->isModuleOperational()){
+	public function disable($hsubscriber) {
+		if (HookProvider::getInstance()->isModuleOperational()) {
 		Database::prepare(
 			"UPDATE `##maj_hooks`".
 			" SET majh_status='disabled'".
@@ -113,8 +113,8 @@ 
 	 *
 	 * @param string $hsubscriber Name of the subscriber module
 	 */
-	public function remove($hsubscriber){
-		if(HookProvider::getInstance()->isModuleOperational()){
+	public function remove($hsubscriber) {
+		if (HookProvider::getInstance()->isModuleOperational()) {
 		Database::prepare(
 			"DELETE FROM `##maj_hooks`".
 			" WHERE majh_hook_function=?".
@@ -138,11 +138,11 @@ 
 	 */
 	public function executeOnlyFor(array $module_names) {
 	    $result = array();
-	    if(HookProvider::getInstance()->isModuleOperational()){
+	    if (HookProvider::getInstance()->isModuleOperational()) {
 	       $params = func_get_args();
 	       array_shift($params);
     	    foreach ($module_names as $module_name) {
-    	        if($module = Module::getModuleByName($module_name)) {
+    	        if ($module = Module::getModuleByName($module_name)) {
     	            $result[] = call_user_func_array(array($module, $this->hook_function), $params);
     	        }
     	    }
@@ -156,17 +156,17 @@ 
 	 *
 	 * @return array Results of the hook executions
 	 */
-	public function execute(){
+	public function execute() {
 		$result = array();
-		if(HookProvider::getInstance()->isModuleOperational()){
+		if (HookProvider::getInstance()->isModuleOperational()) {
 			$params = func_get_args();
 			$sqlquery = '';
 			$sqlparams = array($this->hook_function);
-			if($this->hook_context != 'all') {
+			if ($this->hook_context != 'all') {
 				$sqlparams = array($this->hook_function, $this->hook_context);
 				$sqlquery = " OR majh_hook_context=?";
 			}
-			$module_names=Database::prepare(
+			$module_names = Database::prepare(
 					"SELECT majh_module_name AS module, majh_module_priority AS priority FROM `##maj_hooks`".
 					" WHERE majh_hook_function = ? AND (majh_hook_context='all'".$sqlquery.") AND majh_status='enabled'".
 					" ORDER BY majh_module_priority ASC, module ASC"
@@ -183,15 +183,15 @@ 
 	 *
 	 * @return int Number of active modules
 	 */
-	public function getNumberActiveModules(){
-		if(HookProvider::getInstance()->isModuleOperational()){
+	public function getNumberActiveModules() {
+		if (HookProvider::getInstance()->isModuleOperational()) {
 			$sqlquery = '';
 			$sqlparams = array($this->hook_function);
-			if($this->hook_context != 'all') {
+			if ($this->hook_context != 'all') {
 				$sqlparams = array($this->hook_function, $this->hook_context);
 				$sqlquery = " OR majh_hook_context=?";
 			}
-			$module_names=Database::prepare(
+			$module_names = Database::prepare(
 					"SELECT majh_module_name AS modules FROM `##maj_hooks`".
 					" WHERE majh_hook_function = ? AND (majh_hook_context='all'".$sqlquery.") AND majh_status='enabled'"
 			)->execute($sqlparams)->fetchOneColumn();
@@ -205,8 +205,8 @@ 
 	 *
 	 * @return bool True is active modules exist, false otherwise
 	 */
-	public function hasAnyActiveModule(){
-		return ($this->getNumberActiveModules()>0);
+	public function hasAnyActiveModule() {
+		return ($this->getNumberActiveModules() > 0);
 	}
 
 }

src/Webtrees/Mvc/View/AbstractView.php

Indentation +49 added lines, -49 removed lines

@@ -15,66 +15,66 @@
  */
 abstract class AbstractView {
     
-    /**
-     * Reference controller
-     * @var \Fisharebest\Webtrees\Controller\BaseController $ctrl
-     */
-    protected $ctrl;
+	/**
+	 * Reference controller
+	 * @var \Fisharebest\Webtrees\Controller\BaseController $ctrl
+	 */
+	protected $ctrl;
     
-    /**
-     * Structure containing the data of the view
-     * @var ViewBag $data
-     */
-    protected $data;
+	/**
+	 * Structure containing the data of the view
+	 * @var ViewBag $data
+	 */
+	protected $data;
     
-    /**
-     * Constructor 
-     * @param \Fisharebest\Webtrees\Controller\BaseController $ctrl Controller
-     * @param ViewBag $data ViewBag holding view data
-     */
-    public function __construct(\Fisharebest\Webtrees\Controller\BaseController $ctrl, ViewBag $data) {
-        $this->ctrl = $ctrl;
-        $this->data = $data;
-    }
+	/**
+	 * Constructor 
+	 * @param \Fisharebest\Webtrees\Controller\BaseController $ctrl Controller
+	 * @param ViewBag $data ViewBag holding view data
+	 */
+	public function __construct(\Fisharebest\Webtrees\Controller\BaseController $ctrl, ViewBag $data) {
+		$this->ctrl = $ctrl;
+		$this->data = $data;
+	}
     
-    /**
-     * Render the view to the page, including header.
-     * 
-     * @throws \Exception
-     */
-    public function render() {
-        global $controller;        
+	/**
+	 * Render the view to the page, including header.
+	 * 
+	 * @throws \Exception
+	 */
+	public function render() {
+		global $controller;        
         
-        if(!$this->ctrl) throw new \Exception('Controller not initialised');
+		if(!$this->ctrl) throw new \Exception('Controller not initialised');
         
 		$controller = $this->ctrl;
-        $this->ctrl->pageHeader();
+		$this->ctrl->pageHeader();
         
-        echo $this->renderContent();
-    }
+		echo $this->renderContent();
+	}
     
-    /**
-     * Render the view to the page, without any header
-     */
-    public function renderPartial() {
-        echo $this->getHtmlPartial();
-    }
+	/**
+	 * Render the view to the page, without any header
+	 */
+	public function renderPartial() {
+		echo $this->getHtmlPartial();
+	}
     
-    /**
-     * Return the HTML code generated by the view, without any header
-     */
-    public function getHtmlPartial() {
-        ob_start();
-        $html_render = $this->renderContent();
-        $html_buffer = ob_get_clean();        
+	/**
+	 * Return the HTML code generated by the view, without any header
+	 */
+	public function getHtmlPartial() {
+		ob_start();
+		$html_render = $this->renderContent();
+		$html_buffer = ob_get_clean();        
         
-        return empty($html_render) ? $html_buffer : $html_render;
-    }
+		return empty($html_render) ? $html_buffer : $html_render;
+	}
     
-    /**
-     * Abstract method containing the details of the view.
-     */
-    abstract protected function renderContent();
+	/**
+	 * Abstract method containing the details of the view.
+	 */
+	abstract protected function renderContent();
     
 }
  
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
     public function render() {
         global $controller;        
         
-        if(!$this->ctrl) throw new \Exception('Controller not initialised');
+        if (!$this->ctrl) throw new \Exception('Controller not initialised');
         
 		$controller = $this->ctrl;
         $this->ctrl->pageHeader();

Braces +3 added lines, -1 removed lines

@@ -45,7 +45,9 @@
     public function render() {
         global $controller;        
         
-        if(!$this->ctrl) throw new \Exception('Controller not initialised');
+        if(!$this->ctrl) {
+        	throw new \Exception('Controller not initialised');
+        }
         
 		$controller = $this->ctrl;
         $this->ctrl->pageHeader();

src/Webtrees/GedcomRecord.php

Braces +13 added lines, -7 removed lines

@@ -86,9 +86,12 @@ 
 	 * @return boolean
 	 */
 	public function canDisplayIsSourced($access_level = null){
-		if(!$this->gedcomrecord->canShow($access_level)) return false;
-		if($access_level === null )
-		    $access_level = \Fisharebest\Webtrees\Auth::accessLevel($this->gedcomrecord->getTree());
+		if(!$this->gedcomrecord->canShow($access_level)) {
+			return false;
+		}
+		if($access_level === null ) {
+				    $access_level = \Fisharebest\Webtrees\Auth::accessLevel($this->gedcomrecord->getTree());
+		}
 
 		$global_facts = Globals::getGlobalFacts();
 		if (isset($global_facts['SOUR'])) {
@@ -108,7 +111,9 @@ 
 	 * @return int Level of sources
 	 */
 	public function isSourced(){
-		if($this->_issourced !== null) return $this->_issourced;
+		if($this->_issourced !== null) {
+			return $this->_issourced;
+		}
 		$this->_issourced=-1;
 		$sourcesfacts = $this->gedcomrecord->getFacts('SOUR');
 		foreach($sourcesfacts as $sourcefact){
@@ -127,7 +132,9 @@ 
 	 * @return int Level of sources
 	 */
 	public function isFactSourced($eventslist){
-	    if(empty($eventslist)) return 0;
+	    if(empty($eventslist)) {
+	    	return 0;
+	    }
 		$isSourced=0;
 		$facts = $this->gedcomrecord->getFacts($eventslist);
 		foreach($facts as $fact){
@@ -137,8 +144,7 @@ 
 				if($tmpIsSourced != 0) {
 					if($isSourced==0) {
 						$isSourced =  $tmpIsSourced;
-					}
-					else{
+					} else{
 						$isSourced = max($isSourced, $tmpIsSourced);
 					}
 				}

Indentation +3 added lines, -3 removed lines

@@ -70,7 +70,7 @@ 
 			if (($fact->getDate() || $fact->getPlace()) && $fact->canShow()) {
 				switch ($style) {
 					case 10:
-					    return '<i>'.$fact->getLabel().' '. \MyArtJaub\Webtrees\Functions\FunctionsPrint::formatFactDateShort($fact) .'&nbsp;'. MyArtJaub\Webtrees\Functions\FunctionsPrint::formatFactPlaceShort($fact, '%1') .'</i>';
+						return '<i>'.$fact->getLabel().' '. \MyArtJaub\Webtrees\Functions\FunctionsPrint::formatFactDateShort($fact) .'&nbsp;'. MyArtJaub\Webtrees\Functions\FunctionsPrint::formatFactPlaceShort($fact, '%1') .'</i>';
 					default:
 						return $this->gedcomrecord->formatFirstMajorFact($facts, $style);
 				}
@@ -88,7 +88,7 @@ 
 	public function canDisplayIsSourced($access_level = null){
 		if(!$this->gedcomrecord->canShow($access_level)) return false;
 		if($access_level === null )
-		    $access_level = \Fisharebest\Webtrees\Auth::accessLevel($this->gedcomrecord->getTree());
+			$access_level = \Fisharebest\Webtrees\Auth::accessLevel($this->gedcomrecord->getTree());
 
 		$global_facts = Globals::getGlobalFacts();
 		if (isset($global_facts['SOUR'])) {
@@ -127,7 +127,7 @@ 
 	 * @return int Level of sources
 	 */
 	public function isFactSourced($eventslist){
-	    if(empty($eventslist)) return 0;
+		if(empty($eventslist)) return 0;
 		$isSourced=0;
 		$facts = $this->gedcomrecord->getFacts($eventslist);
 		foreach($facts as $fact){

Spacing +23 added lines, -23 removed lines

@@ -23,14 +23,14 @@ 
 	protected $gedcomrecord;
 
 	/** @var bool Is the GedcomRecord sourced (cache) */ 
-	protected $_issourced=null;
+	protected $_issourced = null;
 
 	/**
 	 * Contructor for the decorator
 	 *
 	 * @param \Fisharebest\Webtrees\GedcomRecord $gedcomrecord_in The GedcomRecord to extend
 	 */
-	public function __construct(\Fisharebest\Webtrees\GedcomRecord $gedcomrecord_in){
+	public function __construct(\Fisharebest\Webtrees\GedcomRecord $gedcomrecord_in) {
 		$this->gedcomrecord = $gedcomrecord_in;
 	}
 
@@ -39,7 +39,7 @@ 
 	 *
 	 * @return \Fisharebest\Webtrees\GedcomRecord Embedded gedcom record
 	 */
-	public function getDerivedRecord(){
+	public function getDerivedRecord() {
 		return $this->gedcomrecord;
 	}
 	
@@ -70,7 +70,7 @@ 
 			if (($fact->getDate() || $fact->getPlace()) && $fact->canShow()) {
 				switch ($style) {
 					case 10:
-					    return '<i>'.$fact->getLabel().' '. \MyArtJaub\Webtrees\Functions\FunctionsPrint::formatFactDateShort($fact) .'&nbsp;'. MyArtJaub\Webtrees\Functions\FunctionsPrint::formatFactPlaceShort($fact, '%1') .'</i>';
+					    return '<i>'.$fact->getLabel().' '.\MyArtJaub\Webtrees\Functions\FunctionsPrint::formatFactDateShort($fact).'&nbsp;'.MyArtJaub\Webtrees\Functions\FunctionsPrint::formatFactPlaceShort($fact, '%1').'</i>';
 					default:
 						return $this->gedcomrecord->formatFirstMajorFact($facts, $style);
 				}
@@ -85,9 +85,9 @@ 
 	 * @param int $access_level
 	 * @return boolean
 	 */
-	public function canDisplayIsSourced($access_level = null){
-		if(!$this->gedcomrecord->canShow($access_level)) return false;
-		if($access_level === null )
+	public function canDisplayIsSourced($access_level = null) {
+		if (!$this->gedcomrecord->canShow($access_level)) return false;
+		if ($access_level === null)
 		    $access_level = \Fisharebest\Webtrees\Auth::accessLevel($this->gedcomrecord->getTree());
 
 		$global_facts = Globals::getGlobalFacts();
@@ -107,14 +107,14 @@ 
 	 *
 	 * @return int Level of sources
 	 */
-	public function isSourced(){
-		if($this->_issourced !== null) return $this->_issourced;
-		$this->_issourced=-1;
+	public function isSourced() {
+		if ($this->_issourced !== null) return $this->_issourced;
+		$this->_issourced = -1;
 		$sourcesfacts = $this->gedcomrecord->getFacts('SOUR');
-		foreach($sourcesfacts as $sourcefact){
-			$this->_issourced=max($this->_issourced, 1);
-			if($sourcefact->getAttribute('_ACT')){
-				$this->_issourced=max($this->_issourced, 2);
+		foreach ($sourcesfacts as $sourcefact) {
+			$this->_issourced = max($this->_issourced, 1);
+			if ($sourcefact->getAttribute('_ACT')) {
+				$this->_issourced = max($this->_issourced, 2);
 			}
 		}
 		return $this->_issourced;
@@ -126,19 +126,19 @@ 
 	 * @param string $eventslist
 	 * @return int Level of sources
 	 */
-	public function isFactSourced($eventslist){
-	    if(empty($eventslist)) return 0;
-		$isSourced=0;
+	public function isFactSourced($eventslist) {
+	    if (empty($eventslist)) return 0;
+		$isSourced = 0;
 		$facts = $this->gedcomrecord->getFacts($eventslist);
-		foreach($facts as $fact){
-			if($isSourced < Fact::MAX_IS_SOURCED_LEVEL){
+		foreach ($facts as $fact) {
+			if ($isSourced < Fact::MAX_IS_SOURCED_LEVEL) {
 				$dfact = new Fact($fact);
 				$tmpIsSourced = $dfact->isSourced();
-				if($tmpIsSourced != 0) {
-					if($isSourced==0) {
-						$isSourced =  $tmpIsSourced;
+				if ($tmpIsSourced != 0) {
+					if ($isSourced == 0) {
+						$isSourced = $tmpIsSourced;
 					}
-					else{
+					else {
 						$isSourced = max($isSourced, $tmpIsSourced);
 					}
 				}

src/Webtrees/Module/GeoDispersion/AdminConfigController.php

Indentation +216 added lines, -216 removed lines

@@ -36,58 +36,58 @@ 
  */
 class AdminConfigController extends MvcController
 {    
-    /**
-     * GeoAnalysis Provider
-     * @var GeoAnalysisProvider $provider
-     */
-    protected $provider;    
+	/**
+	 * GeoAnalysis Provider
+	 * @var GeoAnalysisProvider $provider
+	 */
+	protected $provider;    
     
-    /**
-     * Constructor for Admin Config controller
-     * @param AbstractModule $module
-     */
-    public function __construct(AbstractModule $module) {
-        parent::__construct($module);
+	/**
+	 * Constructor for Admin Config controller
+	 * @param AbstractModule $module
+	 */
+	public function __construct(AbstractModule $module) {
+		parent::__construct($module);
         
-        $this->provider = $this->module->getProvider();
-    }    
+		$this->provider = $this->module->getProvider();
+	}    
     
-    /**
-     * Pages
-     */
+	/**
+	 * Pages
+	 */
         
-    /**
-     * AdminConfig@index
-     */
-    public function index() {
-        $wt_tree = Globals::getTree();
-        Theme::theme(new AdministrationTheme)->init($wt_tree);
-        $controller = new PageController();
-        $controller
-            ->restrictAccess(Auth::isManager($wt_tree))
-            ->setPageTitle($this->module->getTitle());
+	/**
+	 * AdminConfig@index
+	 */
+	public function index() {
+		$wt_tree = Globals::getTree();
+		Theme::theme(new AdministrationTheme)->init($wt_tree);
+		$controller = new PageController();
+		$controller
+			->restrictAccess(Auth::isManager($wt_tree))
+			->setPageTitle($this->module->getTitle());
         
-        $data = new ViewBag();
-        $data->set('title', $controller->getPageTitle());
-        $data->set('tree', $wt_tree);
+		$data = new ViewBag();
+		$data->set('title', $controller->getPageTitle());
+		$data->set('tree', $wt_tree);
         
-        $data->set('root_url', 'module.php?mod=' . $this->module->getName() . '&mod_action=AdminConfig');
+		$data->set('root_url', 'module.php?mod=' . $this->module->getName() . '&mod_action=AdminConfig');
                 
-        $table_id = 'table-geoanalysis-' . Uuid::uuid4();
-        $data->set('table_id', $table_id);
+		$table_id = 'table-geoanalysis-' . Uuid::uuid4();
+		$data->set('table_id', $table_id);
         
-        $other_trees = array();
-        foreach (Tree::getAll() as $tree) {
-            if($tree->getTreeId() != $wt_tree->getTreeId()) $other_trees[] = $tree;
-        }      
-        $data->set('other_trees', $other_trees);
+		$other_trees = array();
+		foreach (Tree::getAll() as $tree) {
+			if($tree->getTreeId() != $wt_tree->getTreeId()) $other_trees[] = $tree;
+		}      
+		$data->set('other_trees', $other_trees);
         
-        $data->set('places_hierarchy', $this->provider->getPlacesHierarchy());
+		$data->set('places_hierarchy', $this->provider->getPlacesHierarchy());
         
-        $controller
-            ->addExternalJavascript(WT_JQUERY_DATATABLES_JS_URL)
-            ->addExternalJavascript(WT_DATATABLES_BOOTSTRAP_JS_URL)
-            ->addInlineJavascript('
+		$controller
+			->addExternalJavascript(WT_JQUERY_DATATABLES_JS_URL)
+			->addExternalJavascript(WT_DATATABLES_BOOTSTRAP_JS_URL)
+			->addInlineJavascript('
 				jQuery.fn.dataTableExt.oSort["text-asc"] = textCompareAsc;
 				jQuery.fn.dataTableExt.oSort["text-desc"] = textCompareDesc;
                 
@@ -119,7 +119,7 @@ 
 				});
                 
                 ')
-                ->addInlineJavascript('				
+				->addInlineJavascript('				
                     function set_geoanalysis_status(ga_id, status, gedcom) {
                 		jQuery.ajax({
                             url: "module.php", 
@@ -163,54 +163,54 @@ 
                 ');
         
         
-        ViewFactory::make('AdminConfig', $this, $controller, $data)->render();
-    }
+		ViewFactory::make('AdminConfig', $this, $controller, $data)->render();
+	}
 
-    /**
-     * AdminConfig@jsonGeoAnalysisList
-     */
-    public function jsonGeoAnalysisList() {
-        $wt_tree = Globals::getTree();
-        $controller = new JsonController();
-        $controller
-            ->restrictAccess(Auth::isManager($wt_tree));
+	/**
+	 * AdminConfig@jsonGeoAnalysisList
+	 */
+	public function jsonGeoAnalysisList() {
+		$wt_tree = Globals::getTree();
+		$controller = new JsonController();
+		$controller
+			->restrictAccess(Auth::isManager($wt_tree));
         
-        // Generate an AJAX/JSON response for datatables to load a block of rows
-        $search = Filter::postArray('search');
-        if($search) $search = $search['value'];
-        $start  = Filter::postInteger('start');
-        $length = Filter::postInteger('length');
-        $order  = Filter::postArray('order');
+		// Generate an AJAX/JSON response for datatables to load a block of rows
+		$search = Filter::postArray('search');
+		if($search) $search = $search['value'];
+		$start  = Filter::postInteger('start');
+		$length = Filter::postInteger('length');
+		$order  = Filter::postArray('order');
         
-        foreach($order as $key => &$value) {
-            switch($value['column']) {
-                case 3:
-                    $value['column'] = 'majgd_descr';
-                    break;
-                case 5;
-                    $value['column'] = 'majgd_sublevel';
-                    break;
-                default:
-                    unset($order[$key]);
-            }
-        }
+		foreach($order as $key => &$value) {
+			switch($value['column']) {
+				case 3:
+					$value['column'] = 'majgd_descr';
+					break;
+				case 5;
+					$value['column'] = 'majgd_sublevel';
+					break;
+				default:
+					unset($order[$key]);
+			}
+		}
         
-        /** @var GeoAnalysisProvider $provider */
-        $provider = $this->module->getProvider();
+		/** @var GeoAnalysisProvider $provider */
+		$provider = $this->module->getProvider();
         
-        $list = $provider->getFilteredGeoAnalysisList($search, $order, $start, $length);
-        $recordsFiltered = count($list);
-        $recordsTotal = $this->provider->getGeoAnalysisCount();
+		$list = $provider->getFilteredGeoAnalysisList($search, $order, $start, $length);
+		$recordsFiltered = count($list);
+		$recordsTotal = $this->provider->getGeoAnalysisCount();
         
-        $data = array();
-        $place_hierarchy = $this->provider->getPlacesHierarchy();
-        foreach($list as $ga) {
-            /** @var GeoAnalysis $ga */
+		$data = array();
+		$place_hierarchy = $this->provider->getPlacesHierarchy();
+		foreach($list as $ga) {
+			/** @var GeoAnalysis $ga */
             
-            $datum = array();
-            $options= $ga->getOptions();
+			$datum = array();
+			$options= $ga->getOptions();
             
-            $datum[0] = '
+			$datum[0] = '
                 <div class="btn-group">
                     <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
                         <i class="fa fa-pencil"></i><span class="caret"></span>
@@ -234,107 +234,107 @@ 
                        </li>
                     </ul>
                 </div>';
-		    $datum[1] = $ga->getId();
-		    $datum[2] = $ga->isEnabled() ? 
+			$datum[1] = $ga->getId();
+			$datum[2] = $ga->isEnabled() ? 
 				'<i class="fa fa-check"></i><span class="sr-only">'.I18N::translate('Enabled').'</span>' : 
 				'<i class="fa fa-times"></i><span class="sr-only">'.I18N::translate('Disabled').'</span>';
-		    $datum[3] = $ga->getTitle();
-		    $analysis_level = $ga->getAnalysisLevel();
-		    if($place_hierarchy['type'] == 'header') {
-		        $datum[4] = $place_hierarchy['hierarchy'][$analysis_level - 1];
-		    } else {
-		        $datum[4] = $analysis_level . '(' . $place_hierarchy['hierarchy'][$analysis_level - 1] . ')';
-		    }
-		    $datum[5] = $ga->getAnalysisLevel();
-		    $datum[6] = '<i class="fa fa-times"></i><span class="sr-only">'.I18N::translate('None').'</span>';
-		    $datum[7] = '<i class="fa fa-times"></i><span class="sr-only">'.I18N::translate('None').'</span>';
-		    if($ga->hasMap()) {
-		        $datum[6] = $options->getMap()->getDescription();
-		        $datum[7] = '<span data-toggle="tooltip" title="' . $options->getMap()->getTopLevelName() . '" />';
-		        $top_level = $options->getMapLevel();
-		        if($place_hierarchy['type'] == 'header') {
-		            $datum[7] .= $place_hierarchy['hierarchy'][$top_level - 1];
-		        } else {
-		            $datum[7] .= $top_level . '(' . $place_hierarchy['hierarchy'][$top_level - 1] . ')';
-		        }
-		        $datum[7] .= '</span>';
-		    }
-		    $datum[8] = $options->isUsingFlags() ? 
+			$datum[3] = $ga->getTitle();
+			$analysis_level = $ga->getAnalysisLevel();
+			if($place_hierarchy['type'] == 'header') {
+				$datum[4] = $place_hierarchy['hierarchy'][$analysis_level - 1];
+			} else {
+				$datum[4] = $analysis_level . '(' . $place_hierarchy['hierarchy'][$analysis_level - 1] . ')';
+			}
+			$datum[5] = $ga->getAnalysisLevel();
+			$datum[6] = '<i class="fa fa-times"></i><span class="sr-only">'.I18N::translate('None').'</span>';
+			$datum[7] = '<i class="fa fa-times"></i><span class="sr-only">'.I18N::translate('None').'</span>';
+			if($ga->hasMap()) {
+				$datum[6] = $options->getMap()->getDescription();
+				$datum[7] = '<span data-toggle="tooltip" title="' . $options->getMap()->getTopLevelName() . '" />';
+				$top_level = $options->getMapLevel();
+				if($place_hierarchy['type'] == 'header') {
+					$datum[7] .= $place_hierarchy['hierarchy'][$top_level - 1];
+				} else {
+					$datum[7] .= $top_level . '(' . $place_hierarchy['hierarchy'][$top_level - 1] . ')';
+				}
+				$datum[7] .= '</span>';
+			}
+			$datum[8] = $options->isUsingFlags() ? 
 				'<i class="fa fa-check"></i><span class="sr-only">'.I18N::translate('Yes').'</span>' : 
 				'<i class="fa fa-times"></i><span class="sr-only">'.I18N::translate('No').'</span>';
-		    $datum[9] = $options->getMaxDetailsInGen() > 0 ? $options->getMaxDetailsInGen() : I18N::translate('All');
+			$datum[9] = $options->getMaxDetailsInGen() > 0 ? $options->getMaxDetailsInGen() : I18N::translate('All');
 		    
-		    $data[] = $datum;
-        }
+			$data[] = $datum;
+		}
         
-        $controller->pageHeader();
+		$controller->pageHeader();
         
-        $controller->encode(array(
-            'draw'            => Filter::getInteger('draw'),
-            'recordsTotal'    => $recordsTotal,
-            'recordsFiltered' => $recordsFiltered,
-            'data'            => $data
-        ));
+		$controller->encode(array(
+			'draw'            => Filter::getInteger('draw'),
+			'recordsTotal'    => $recordsTotal,
+			'recordsFiltered' => $recordsFiltered,
+			'data'            => $data
+		));
         
-    }
+	}
 
-    /**
-     * AdminConfig@edit
-     */
-    public function edit() {
-        $ga_id = Filter::getInteger('ga_id');
-        $ga = $this->provider->getGeoAnalysis($ga_id, false);
+	/**
+	 * AdminConfig@edit
+	 */
+	public function edit() {
+		$ga_id = Filter::getInteger('ga_id');
+		$ga = $this->provider->getGeoAnalysis($ga_id, false);
         
-        $this->renderEdit($ga);
-    }
+		$this->renderEdit($ga);
+	}
     
-    /**
-     * AdminConfig@add
-     */
-    public function add() {
-        $this->renderEdit(null);
-    }
+	/**
+	 * AdminConfig@add
+	 */
+	public function add() {
+		$this->renderEdit(null);
+	}
     
-    /**
-     * AdminConfig@save
-     */
-    public function save() {
-        $wt_tree = Globals::getTree();
-        $tmp_contrl = new PageController();
-        $tmp_contrl->restrictAccess(
-            Auth::isManager($wt_tree) 
-            && Filter::checkCsrf()
-         );
+	/**
+	 * AdminConfig@save
+	 */
+	public function save() {
+		$wt_tree = Globals::getTree();
+		$tmp_contrl = new PageController();
+		$tmp_contrl->restrictAccess(
+			Auth::isManager($wt_tree) 
+			&& Filter::checkCsrf()
+		 );
         
-        $ga_id          = Filter::postInteger('ga_id');
-        $description    = Filter::post('description');
-        $analysislevel  = Filter::postInteger('analysislevel');
-        $use_map        = Filter::postBool('use_map');
-        if($use_map) {
-            $map_file   = base64_decode(Filter::post('map_file'));
-            $map_top_level   = Filter::postInteger('map_top_level');
-        }
-        $use_flags      = Filter::postBool('use_flags');
-        $gen_details    = Filter::postInteger('gen_details');
+		$ga_id          = Filter::postInteger('ga_id');
+		$description    = Filter::post('description');
+		$analysislevel  = Filter::postInteger('analysislevel');
+		$use_map        = Filter::postBool('use_map');
+		if($use_map) {
+			$map_file   = base64_decode(Filter::post('map_file'));
+			$map_top_level   = Filter::postInteger('map_top_level');
+		}
+		$use_flags      = Filter::postBool('use_flags');
+		$gen_details    = Filter::postInteger('gen_details');
         
-        $success = false; 
-        if($ga_id) {
-            $ga = $this->provider->getGeoAnalysis($ga_id, false);
-            if($ga) {
-                $ga->setTitle($description);
-                $ga->setAnalysisLevel($analysislevel + 1);
-                $options = $ga->getOptions();
-                if($options) {
-                    $options->setUsingFlags($use_flags);
-                    $options->setMaxDetailsInGen($gen_details);
-                    if($use_map) {
-                        $options->setMap(new OutlineMap($map_file));
-                        $options->setMapLevel($map_top_level + 1);
-                    }
-                    else {
-                        $options->setMap(null);
-                    }
-                }
+		$success = false; 
+		if($ga_id) {
+			$ga = $this->provider->getGeoAnalysis($ga_id, false);
+			if($ga) {
+				$ga->setTitle($description);
+				$ga->setAnalysisLevel($analysislevel + 1);
+				$options = $ga->getOptions();
+				if($options) {
+					$options->setUsingFlags($use_flags);
+					$options->setMaxDetailsInGen($gen_details);
+					if($use_map) {
+						$options->setMap(new OutlineMap($map_file));
+						$options->setMapLevel($map_top_level + 1);
+					}
+					else {
+						$options->setMap(null);
+					}
+				}
 				
 				$res = $this->provider->updateGeoAnalysis($ga);
 				if($res) {
@@ -347,8 +347,8 @@ 
 					FlashMessages::addMessage(I18N::translate('An error occured while updating the geographical dispersion analysis “%s”', $ga->getTitle()), 'danger');
 					Log::addConfigurationLog('Module '.$this->module->getName().' : Geo Analysis ID “'. $ga->getId() .'” could not be updated. See error log.');
 				}
-            }
-        } else {
+			}
+		} else {
 			$ga = $this->provider->createGeoAnalysis(
 				$description,
 				$analysislevel + 1,
@@ -366,33 +366,33 @@ 
 				FlashMessages::addMessage(I18N::translate('An error occured while adding the geographical dispersion analysis “%s”', $description), 'danger');
 				Log::addConfigurationLog('Module '.$this->module->getName().' : Geo Analysis “'.$description.'” could not be added. See error log.');
 			}
-        }
+		}
         
-        $redirection_url = 'module.php?mod=' . $this->module->getName() . '&mod_action=AdminConfig&ged=' . $wt_tree->getNameUrl();
-        if(!$success) {			
-            if($ga) {
-                $redirection_url = 'module.php?mod=' . $this->module->getName() . '&mod_action=AdminConfig@edit&ga_id='. $ga->getId() .'&ged=' . $wt_tree->getNameUrl();
-            }
-            else {
-                $redirection_url = 'module.php?mod=' . $this->module->getName() . '&mod_action=AdminConfig@add&ged=' . $wt_tree->getNameUrl();
-            }
-        }        
-        header('Location: ' . WT_BASE_URL . $redirection_url);
+		$redirection_url = 'module.php?mod=' . $this->module->getName() . '&mod_action=AdminConfig&ged=' . $wt_tree->getNameUrl();
+		if(!$success) {			
+			if($ga) {
+				$redirection_url = 'module.php?mod=' . $this->module->getName() . '&mod_action=AdminConfig@edit&ga_id='. $ga->getId() .'&ged=' . $wt_tree->getNameUrl();
+			}
+			else {
+				$redirection_url = 'module.php?mod=' . $this->module->getName() . '&mod_action=AdminConfig@add&ged=' . $wt_tree->getNameUrl();
+			}
+		}        
+		header('Location: ' . WT_BASE_URL . $redirection_url);
         
-    }
+	}
      
 	/**
 	 * Renders the edit form, whether it is an edition of an existing GeoAnalysis, or the addition of a new one.
 	 * 
 	 * @param (GeoAnalysis!null) $ga GeoAnalysis to edit
 	 */
-    protected function renderEdit(GeoAnalysis $ga = null) {
-        $wt_tree = Globals::getTree();
-        Theme::theme(new AdministrationTheme)->init($wt_tree);
-        $controller = new PageController();        
-        $controller
-            ->restrictAccess(Auth::isManager($wt_tree))
-            ->addInlineJavascript('
+	protected function renderEdit(GeoAnalysis $ga = null) {
+		$wt_tree = Globals::getTree();
+		Theme::theme(new AdministrationTheme)->init($wt_tree);
+		$controller = new PageController();        
+		$controller
+			->restrictAccess(Auth::isManager($wt_tree))
+			->addInlineJavascript('
                 function toggleMapOptions() {
                     if($("input:radio[name=\'use_map\']:checked").val() == 1) {
                         $("#map_options").show();
@@ -406,34 +406,34 @@ 
                 toggleMapOptions();
             ');
         
-        $data = new ViewBag();
-        if($ga) {
-            $controller->setPageTitle(I18N::translate('Edit the geographical dispersion analysis'));
-            $data->set('geo_analysis', $ga);
-        } else {
-            $controller->setPageTitle(I18N::translate('Add a geographical dispersion analysis'));
-        }
+		$data = new ViewBag();
+		if($ga) {
+			$controller->setPageTitle(I18N::translate('Edit the geographical dispersion analysis'));
+			$data->set('geo_analysis', $ga);
+		} else {
+			$controller->setPageTitle(I18N::translate('Add a geographical dispersion analysis'));
+		}
         
-        $data->set('title', $controller->getPageTitle());
-        $data->set('admin_config_url', 'module.php?mod=' . $this->module->getName() . '&mod_action=AdminConfig&ged=' . $wt_tree->getNameUrl());
-        $data->set('module_title', $this->module->getTitle());
-        $data->set('save_url', 'module.php?mod=' . $this->module->getName() . '&mod_action=AdminConfig@save&ged=' . $wt_tree->getNameUrl());
-        $data->set('places_hierarchy', $this->provider->getPlacesHierarchy());
+		$data->set('title', $controller->getPageTitle());
+		$data->set('admin_config_url', 'module.php?mod=' . $this->module->getName() . '&mod_action=AdminConfig&ged=' . $wt_tree->getNameUrl());
+		$data->set('module_title', $this->module->getTitle());
+		$data->set('save_url', 'module.php?mod=' . $this->module->getName() . '&mod_action=AdminConfig@save&ged=' . $wt_tree->getNameUrl());
+		$data->set('places_hierarchy', $this->provider->getPlacesHierarchy());
     
-        $map_list = array_map(
-            function(OutlineMap $map) {
-                return $map->getDescription();
-            },
-            $this->provider->getOutlineMapsList()
-            );
-        asort($map_list);
-        $data->set('map_list', $map_list);
+		$map_list = array_map(
+			function(OutlineMap $map) {
+				return $map->getDescription();
+			},
+			$this->provider->getOutlineMapsList()
+			);
+		asort($map_list);
+		$data->set('map_list', $map_list);
     
-        $gen_details = array(0 => I18N::translate('All'));
-        for($i = 1; $i <= 10 ; $i++) $gen_details[$i] = $i;
-        $data->set('generation_details', $gen_details);
+		$gen_details = array(0 => I18N::translate('All'));
+		for($i = 1; $i <= 10 ; $i++) $gen_details[$i] = $i;
+		$data->set('generation_details', $gen_details);
     
-        ViewFactory::make('GeoAnalysisEdit', $this, $controller, $data)->render();
-    }
+		ViewFactory::make('GeoAnalysisEdit', $this, $controller, $data)->render();
+	}
     
 }
\ No newline at end of file

Spacing +43 added lines, -45 removed lines

@@ -71,14 +71,14 @@ 
         $data->set('title', $controller->getPageTitle());
         $data->set('tree', $wt_tree);
         
-        $data->set('root_url', 'module.php?mod=' . $this->module->getName() . '&mod_action=AdminConfig');
+        $data->set('root_url', 'module.php?mod='.$this->module->getName().'&mod_action=AdminConfig');
                 
-        $table_id = 'table-geoanalysis-' . Uuid::uuid4();
+        $table_id = 'table-geoanalysis-'.Uuid::uuid4();
         $data->set('table_id', $table_id);
         
         $other_trees = array();
         foreach (Tree::getAll() as $tree) {
-            if($tree->getTreeId() != $wt_tree->getTreeId()) $other_trees[] = $tree;
+            if ($tree->getTreeId() != $wt_tree->getTreeId()) $other_trees[] = $tree;
         }      
         $data->set('other_trees', $other_trees);
         
@@ -101,7 +101,7 @@ 
                     processing: true,
                     serverSide : true,
 					ajax : {
-						url : "module.php?mod='.$this->module->getName().'&mod_action=AdminConfig@jsonGeoAnalysisList&ged='. $wt_tree->getNameUrl().'",
+						url : "module.php?mod='.$this->module->getName().'&mod_action=AdminConfig@jsonGeoAnalysisList&ged='.$wt_tree->getNameUrl().'",
                         type : "POST"
 					},
                     columns: [
@@ -125,7 +125,7 @@ 
                             url: "module.php", 
                             type: "GET",
                             data: {
-                			    mod: "' . $this->module->getName() .'",
+                			    mod: "' . $this->module->getName().'",
                                 mod_action:  "GeoAnalysis@setStatus",
                 			    ga_id: ga_id,
                 			    ged: typeof gedcom === "undefined" ? WT_GEDCOM : gedcom,
@@ -133,7 +133,7 @@ 
                             },
                             error: function(result, stat, error) {
                                 var err = typeof result.responseJSON === "undefined" ? error : result.responseJSON.error;
-                                alert("' . I18N::translate('An error occured while editing this analysis:') . '" + err);
+                                alert("' . I18N::translate('An error occured while editing this analysis:').'" + err);
                             },
                             complete: function(result, stat) {
                                 geoAnalysisTable.ajax.reload(null, false);
@@ -146,14 +146,14 @@ 
                             url: "module.php", 
                             type: "GET",
                             data: {
-                			    mod: "' . $this->module->getName() .'",
+                			    mod: "' . $this->module->getName().'",
                                 mod_action:  "GeoAnalysis@delete",
                 			    ga_id: ga_id,
                 			    ged: typeof gedcom === "undefined" ? WT_GEDCOM : gedcom
                             },
                             error: function(result, stat, error) {
                                 var err = typeof result.responseJSON === "undefined" ? error : result.responseJSON.error;
-                                alert("' . I18N::translate('An error occured while deleting this analysis:') . '" + err);
+                                alert("' . I18N::translate('An error occured while deleting this analysis:').'" + err);
                             },
                             complete: function(result, stat) {
                                 geoAnalysisTable.ajax.reload(null, false);
@@ -177,13 +177,13 @@ 
         
         // Generate an AJAX/JSON response for datatables to load a block of rows
         $search = Filter::postArray('search');
-        if($search) $search = $search['value'];
+        if ($search) $search = $search['value'];
         $start  = Filter::postInteger('start');
         $length = Filter::postInteger('length');
         $order  = Filter::postArray('order');
         
-        foreach($order as $key => &$value) {
-            switch($value['column']) {
+        foreach ($order as $key => &$value) {
+            switch ($value['column']) {
                 case 3:
                     $value['column'] = 'majgd_descr';
                     break;
@@ -204,11 +204,11 @@ 
         
         $data = array();
         $place_hierarchy = $this->provider->getPlacesHierarchy();
-        foreach($list as $ga) {
+        foreach ($list as $ga) {
             /** @var GeoAnalysis $ga */
             
             $datum = array();
-            $options= $ga->getOptions();
+            $options = $ga->getOptions();
             
             $datum[0] = '
                 <div class="btn-group">
@@ -218,50 +218,48 @@ 
                     <ul class="dropdown-menu" role="menu">
                        <li>
                             <a href="#" onclick="return set_geoanalysis_status('. $ga->getId().', '.($ga->isEnabled() ? 'false' : 'true').', \''.Filter::escapeJs($wt_tree->getName()).'\');">
-                                <i class="fa fa-fw '.($ga->isEnabled() ? 'fa-times' : 'fa-check').'"></i> ' . ($ga->isEnabled() ? I18N::translate('Disable') : I18N::translate('Enable')) . '
+                                <i class="fa fa-fw '.($ga->isEnabled() ? 'fa-times' : 'fa-check').'"></i> '.($ga->isEnabled() ? I18N::translate('Disable') : I18N::translate('Enable')).'
                             </a>
                        </li>
                         <li>
                             <a href="module.php?mod='.$this->module->getName().'&mod_action=AdminConfig@edit&ga_id='.$ga->getId().'&ged='.$wt_tree->getName().'">
-                                <i class="fa fa-fw fa-pencil"></i> ' . I18N::translate('Edit') . '
+                                <i class="fa fa-fw fa-pencil"></i> ' . I18N::translate('Edit').'
                             </a>
                        </li>
                        <li class="divider" />
                        <li>
                             <a href="#" onclick="return delete_geoanalysis('. $ga->getId().', \''.Filter::escapeJs($wt_tree->getName()).'\');">
-                                <i class="fa fa-fw fa-trash-o"></i> ' . I18N::translate('Delete') . '
+                                <i class="fa fa-fw fa-trash-o"></i> ' . I18N::translate('Delete').'
                             </a>
                        </li>
                     </ul>
                 </div>';
 		    $datum[1] = $ga->getId();
 		    $datum[2] = $ga->isEnabled() ? 
-				'<i class="fa fa-check"></i><span class="sr-only">'.I18N::translate('Enabled').'</span>' : 
-				'<i class="fa fa-times"></i><span class="sr-only">'.I18N::translate('Disabled').'</span>';
+				'<i class="fa fa-check"></i><span class="sr-only">'.I18N::translate('Enabled').'</span>' : '<i class="fa fa-times"></i><span class="sr-only">'.I18N::translate('Disabled').'</span>';
 		    $datum[3] = $ga->getTitle();
 		    $analysis_level = $ga->getAnalysisLevel();
-		    if($place_hierarchy['type'] == 'header') {
+		    if ($place_hierarchy['type'] == 'header') {
 		        $datum[4] = $place_hierarchy['hierarchy'][$analysis_level - 1];
 		    } else {
-		        $datum[4] = $analysis_level . '(' . $place_hierarchy['hierarchy'][$analysis_level - 1] . ')';
+		        $datum[4] = $analysis_level.'('.$place_hierarchy['hierarchy'][$analysis_level - 1].')';
 		    }
 		    $datum[5] = $ga->getAnalysisLevel();
 		    $datum[6] = '<i class="fa fa-times"></i><span class="sr-only">'.I18N::translate('None').'</span>';
 		    $datum[7] = '<i class="fa fa-times"></i><span class="sr-only">'.I18N::translate('None').'</span>';
-		    if($ga->hasMap()) {
+		    if ($ga->hasMap()) {
 		        $datum[6] = $options->getMap()->getDescription();
-		        $datum[7] = '<span data-toggle="tooltip" title="' . $options->getMap()->getTopLevelName() . '" />';
+		        $datum[7] = '<span data-toggle="tooltip" title="'.$options->getMap()->getTopLevelName().'" />';
 		        $top_level = $options->getMapLevel();
-		        if($place_hierarchy['type'] == 'header') {
+		        if ($place_hierarchy['type'] == 'header') {
 		            $datum[7] .= $place_hierarchy['hierarchy'][$top_level - 1];
 		        } else {
-		            $datum[7] .= $top_level . '(' . $place_hierarchy['hierarchy'][$top_level - 1] . ')';
+		            $datum[7] .= $top_level.'('.$place_hierarchy['hierarchy'][$top_level - 1].')';
 		        }
 		        $datum[7] .= '</span>';
 		    }
 		    $datum[8] = $options->isUsingFlags() ? 
-				'<i class="fa fa-check"></i><span class="sr-only">'.I18N::translate('Yes').'</span>' : 
-				'<i class="fa fa-times"></i><span class="sr-only">'.I18N::translate('No').'</span>';
+				'<i class="fa fa-check"></i><span class="sr-only">'.I18N::translate('Yes').'</span>' : '<i class="fa fa-times"></i><span class="sr-only">'.I18N::translate('No').'</span>';
 		    $datum[9] = $options->getMaxDetailsInGen() > 0 ? $options->getMaxDetailsInGen() : I18N::translate('All');
 		    
 		    $data[] = $datum;
@@ -310,24 +308,24 @@ 
         $description    = Filter::post('description');
         $analysislevel  = Filter::postInteger('analysislevel');
         $use_map        = Filter::postBool('use_map');
-        if($use_map) {
+        if ($use_map) {
             $map_file   = base64_decode(Filter::post('map_file'));
-            $map_top_level   = Filter::postInteger('map_top_level');
+            $map_top_level = Filter::postInteger('map_top_level');
         }
         $use_flags      = Filter::postBool('use_flags');
         $gen_details    = Filter::postInteger('gen_details');
         
         $success = false; 
-        if($ga_id) {
+        if ($ga_id) {
             $ga = $this->provider->getGeoAnalysis($ga_id, false);
-            if($ga) {
+            if ($ga) {
                 $ga->setTitle($description);
                 $ga->setAnalysisLevel($analysislevel + 1);
                 $options = $ga->getOptions();
-                if($options) {
+                if ($options) {
                     $options->setUsingFlags($use_flags);
                     $options->setMaxDetailsInGen($gen_details);
-                    if($use_map) {
+                    if ($use_map) {
                         $options->setMap(new OutlineMap($map_file));
                         $options->setMapLevel($map_top_level + 1);
                     }
@@ -337,7 +335,7 @@ 
                 }
 				
 				$res = $this->provider->updateGeoAnalysis($ga);
-				if($res) {
+				if ($res) {
 					FlashMessages::addMessage(I18N::translate('The geographical dispersion analysis “%s” has been successfully updated', $res->getTitle()), 'success');
 					Log::addConfigurationLog('Module '.$this->module->getName().' : Geo Analysis ID “'.$res->getId().'” has been updated.');
 					$ga = $res;
@@ -345,7 +343,7 @@ 
 				}
 				else {
 					FlashMessages::addMessage(I18N::translate('An error occured while updating the geographical dispersion analysis “%s”', $ga->getTitle()), 'danger');
-					Log::addConfigurationLog('Module '.$this->module->getName().' : Geo Analysis ID “'. $ga->getId() .'” could not be updated. See error log.');
+					Log::addConfigurationLog('Module '.$this->module->getName().' : Geo Analysis ID “'.$ga->getId().'” could not be updated. See error log.');
 				}
             }
         } else {
@@ -357,7 +355,7 @@ 
 				$use_flags,
 				$gen_details
 			);
-			if($ga) {
+			if ($ga) {
 				FlashMessages::addMessage(I18N::translate('The geographical dispersion analysis “%s” has been successfully added.', $ga->getTitle()), 'success');
 				Log::addConfigurationLog('Module '.$this->module->getName().' : Geo Analysis ID “'.$ga->getId().'” has been added.');
 				$success = true;
@@ -368,16 +366,16 @@ 
 			}
         }
         
-        $redirection_url = 'module.php?mod=' . $this->module->getName() . '&mod_action=AdminConfig&ged=' . $wt_tree->getNameUrl();
-        if(!$success) {			
-            if($ga) {
-                $redirection_url = 'module.php?mod=' . $this->module->getName() . '&mod_action=AdminConfig@edit&ga_id='. $ga->getId() .'&ged=' . $wt_tree->getNameUrl();
+        $redirection_url = 'module.php?mod='.$this->module->getName().'&mod_action=AdminConfig&ged='.$wt_tree->getNameUrl();
+        if (!$success) {			
+            if ($ga) {
+                $redirection_url = 'module.php?mod='.$this->module->getName().'&mod_action=AdminConfig@edit&ga_id='.$ga->getId().'&ged='.$wt_tree->getNameUrl();
             }
             else {
-                $redirection_url = 'module.php?mod=' . $this->module->getName() . '&mod_action=AdminConfig@add&ged=' . $wt_tree->getNameUrl();
+                $redirection_url = 'module.php?mod='.$this->module->getName().'&mod_action=AdminConfig@add&ged='.$wt_tree->getNameUrl();
             }
         }        
-        header('Location: ' . WT_BASE_URL . $redirection_url);
+        header('Location: '.WT_BASE_URL.$redirection_url);
         
     }
      
@@ -407,7 +405,7 @@ 
             ');
         
         $data = new ViewBag();
-        if($ga) {
+        if ($ga) {
             $controller->setPageTitle(I18N::translate('Edit the geographical dispersion analysis'));
             $data->set('geo_analysis', $ga);
         } else {
@@ -415,9 +413,9 @@ 
         }
         
         $data->set('title', $controller->getPageTitle());
-        $data->set('admin_config_url', 'module.php?mod=' . $this->module->getName() . '&mod_action=AdminConfig&ged=' . $wt_tree->getNameUrl());
+        $data->set('admin_config_url', 'module.php?mod='.$this->module->getName().'&mod_action=AdminConfig&ged='.$wt_tree->getNameUrl());
         $data->set('module_title', $this->module->getTitle());
-        $data->set('save_url', 'module.php?mod=' . $this->module->getName() . '&mod_action=AdminConfig@save&ged=' . $wt_tree->getNameUrl());
+        $data->set('save_url', 'module.php?mod='.$this->module->getName().'&mod_action=AdminConfig@save&ged='.$wt_tree->getNameUrl());
         $data->set('places_hierarchy', $this->provider->getPlacesHierarchy());
     
         $map_list = array_map(
@@ -430,7 +428,7 @@ 
         $data->set('map_list', $map_list);
     
         $gen_details = array(0 => I18N::translate('All'));
-        for($i = 1; $i <= 10 ; $i++) $gen_details[$i] = $i;
+        for ($i = 1; $i <= 10; $i++) $gen_details[$i] = $i;
         $data->set('generation_details', $gen_details);
     
         ViewFactory::make('GeoAnalysisEdit', $this, $controller, $data)->render();

Braces +13 added lines, -11 removed lines

@@ -78,7 +78,9 @@ 
         
         $other_trees = array();
         foreach (Tree::getAll() as $tree) {
-            if($tree->getTreeId() != $wt_tree->getTreeId()) $other_trees[] = $tree;
+            if($tree->getTreeId() != $wt_tree->getTreeId()) {
+            	$other_trees[] = $tree;
+            }
         }      
         $data->set('other_trees', $other_trees);
         
@@ -177,7 +179,9 @@ 
         
         // Generate an AJAX/JSON response for datatables to load a block of rows
         $search = Filter::postArray('search');
-        if($search) $search = $search['value'];
+        if($search) {
+        	$search = $search['value'];
+        }
         $start  = Filter::postInteger('start');
         $length = Filter::postInteger('length');
         $order  = Filter::postArray('order');
@@ -330,8 +334,7 @@ 
                     if($use_map) {
                         $options->setMap(new OutlineMap($map_file));
                         $options->setMapLevel($map_top_level + 1);
-                    }
-                    else {
+                    } else {
                         $options->setMap(null);
                     }
                 }
@@ -342,8 +345,7 @@ 
 					Log::addConfigurationLog('Module '.$this->module->getName().' : Geo Analysis ID “'.$res->getId().'” has been updated.');
 					$ga = $res;
 					$success = true;
-				}
-				else {
+				} else {
 					FlashMessages::addMessage(I18N::translate('An error occured while updating the geographical dispersion analysis “%s”', $ga->getTitle()), 'danger');
 					Log::addConfigurationLog('Module '.$this->module->getName().' : Geo Analysis ID “'. $ga->getId() .'” could not be updated. See error log.');
 				}
@@ -361,8 +363,7 @@ 
 				FlashMessages::addMessage(I18N::translate('The geographical dispersion analysis “%s” has been successfully added.', $ga->getTitle()), 'success');
 				Log::addConfigurationLog('Module '.$this->module->getName().' : Geo Analysis ID “'.$ga->getId().'” has been added.');
 				$success = true;
-			}
-			else {
+			} else {
 				FlashMessages::addMessage(I18N::translate('An error occured while adding the geographical dispersion analysis “%s”', $description), 'danger');
 				Log::addConfigurationLog('Module '.$this->module->getName().' : Geo Analysis “'.$description.'” could not be added. See error log.');
 			}
@@ -372,8 +373,7 @@ 
         if(!$success) {			
             if($ga) {
                 $redirection_url = 'module.php?mod=' . $this->module->getName() . '&mod_action=AdminConfig@edit&ga_id='. $ga->getId() .'&ged=' . $wt_tree->getNameUrl();
-            }
-            else {
+            } else {
                 $redirection_url = 'module.php?mod=' . $this->module->getName() . '&mod_action=AdminConfig@add&ged=' . $wt_tree->getNameUrl();
             }
         }        
@@ -430,7 +430,9 @@ 
         $data->set('map_list', $map_list);
     
         $gen_details = array(0 => I18N::translate('All'));
-        for($i = 1; $i <= 10 ; $i++) $gen_details[$i] = $i;
+        for($i = 1; $i <= 10 ; $i++) {
+        	$gen_details[$i] = $i;
+        }
         $data->set('generation_details', $gen_details);
     
         ViewFactory::make('GeoAnalysisEdit', $this, $controller, $data)->render();

src/Webtrees/Module/Certificates/CertificateController.php

Indentation +152 added lines, -152 removed lines

@@ -33,155 +33,155 @@ 
  */
 class CertificateController extends MvcController
 {
-    /**
-     * Certificate Provider
-     * @var CertificateProviderInterface $provider
-     */
-    protected $provider;
+	/**
+	 * Certificate Provider
+	 * @var CertificateProviderInterface $provider
+	 */
+	protected $provider;
     
-    /**
-     * Constructor for Certificate controller
-     * @param AbstractModule $module
-     */
-    public function __construct(AbstractModule $module) {
-        parent::__construct($module);
-        
-        $this->provider = $this->module->getProvider();
-    }
+	/**
+	 * Constructor for Certificate controller
+	 * @param AbstractModule $module
+	 */
+	public function __construct(AbstractModule $module) {
+		parent::__construct($module);
+        
+		$this->provider = $this->module->getProvider();
+	}
     
     
-    /**
-     * Pages
-     */
-        
-    /**
-     * Certificate@index
-     */
-    public function index() {        
-        $tree = Globals::getTree();
-        $controller = new PageController();
-        $controller
-        ->setPageTitle(I18N::translate('Certificate'))
-        ->restrictAccess(
-            $this->module->getSetting('MAJ_SHOW_CERT', Auth::PRIV_HIDE) >= Auth::accessLevel($tree)
-        );
-        
-        $cid = Filter::get('cid');
-        
-        $certificate = null;
-        if(!empty($cid) && strlen($cid) > 22){
-            $certificate = Certificate::getInstance($cid, $tree, null, $this->provider);
-        }
-        
-        $data = new ViewBag();
-        $data->set('title', $controller->getPageTitle());
-        
-        $data->set('has_certif', false);
-        if($certificate) {
-            $controller->restrictAccess($certificate->canShow());
-            $data->set('title', $certificate->getTitle());
-            $data->set('has_certif', true);
-            $data->set('certificate', $certificate);
+	/**
+	 * Pages
+	 */
+        
+	/**
+	 * Certificate@index
+	 */
+	public function index() {        
+		$tree = Globals::getTree();
+		$controller = new PageController();
+		$controller
+		->setPageTitle(I18N::translate('Certificate'))
+		->restrictAccess(
+			$this->module->getSetting('MAJ_SHOW_CERT', Auth::PRIV_HIDE) >= Auth::accessLevel($tree)
+		);
+        
+		$cid = Filter::get('cid');
+        
+		$certificate = null;
+		if(!empty($cid) && strlen($cid) > 22){
+			$certificate = Certificate::getInstance($cid, $tree, null, $this->provider);
+		}
+        
+		$data = new ViewBag();
+		$data->set('title', $controller->getPageTitle());
+        
+		$data->set('has_certif', false);
+		if($certificate) {
+			$controller->restrictAccess($certificate->canShow());
+			$data->set('title', $certificate->getTitle());
+			$data->set('has_certif', true);
+			$data->set('certificate', $certificate);
             
-            $data->set(
-                'url_certif_city', 
-                'module.php?mod=' . Constants::MODULE_MAJ_CERTIF_NAME . 
-                    '&mod_action=Certificate@listAll' .
-                    '&ged=' . $tree->getNameUrl() .
-                    '&city=' . Functions::encryptToSafeBase64($certificate->getCity())
-            );
+			$data->set(
+				'url_certif_city', 
+				'module.php?mod=' . Constants::MODULE_MAJ_CERTIF_NAME . 
+					'&mod_action=Certificate@listAll' .
+					'&ged=' . $tree->getNameUrl() .
+					'&city=' . Functions::encryptToSafeBase64($certificate->getCity())
+			);
             
-            $controller->addInlineJavascript('
+			$controller->addInlineJavascript('
                 jQuery("#certificate-tabs").tabs();
 			    jQuery("#certificate-tabs").css("visibility", "visible");    
             ');
             
-            $data->set('has_linked_indis', false);
-            $data->set('has_linked_fams', false);
+			$data->set('has_linked_indis', false);
+			$data->set('has_linked_fams', false);
             
-            $linked_indis = $certificate->linkedIndividuals();
-            $linked_fams = $certificate->linkedFamilies();
+			$linked_indis = $certificate->linkedIndividuals();
+			$linked_fams = $certificate->linkedFamilies();
                         
-            if($linked_indis && count($linked_indis) > 0) {
-                $data->set('has_linked_indis', true);
-                $data->set('linked_indis', $linked_indis);
-            }
+			if($linked_indis && count($linked_indis) > 0) {
+				$data->set('has_linked_indis', true);
+				$data->set('linked_indis', $linked_indis);
+			}
             
-            if(!empty($linked_fams)) {
-                $data->set('has_linked_fams', true);
-                $data->set('linked_fams', $linked_fams);
-            }
-        }
-        
-        ViewFactory::make('Certificate', $this, $controller, $data)->render();
-    }
+			if(!empty($linked_fams)) {
+				$data->set('has_linked_fams', true);
+				$data->set('linked_fams', $linked_fams);
+			}
+		}
+        
+		ViewFactory::make('Certificate', $this, $controller, $data)->render();
+	}
     
-    /**
-     * Certificate@image
-     */
-    public function image() {
-        $tree = Globals::getTree();
-        $cid   = Filter::get('cid');
-        $certificate = null;
-        if(!empty($cid)) $certificate =  Certificate::getInstance($cid, $tree, null, $this->provider);
-        
-        $imageBuilder = new ImageBuilder($certificate);
-        
-        if (!empty(Filter::get('cb'))) {
-            $imageBuilder->setExpireOffset($imageBuilder->getExpireOffset() * 7);
-        }
-        
-        $imageBuilder
-            ->setShowWatermark(Auth::accessLevel($tree) >= $this->module->getSetting('MAJ_SHOW_NO_WATERMARK', Auth::PRIV_HIDE))
-            ->setFontMaxSize($this->module->getSetting('MAJ_WM_FONT_MAXSIZE', 18))
-            ->setFontColor($this->module->getSetting('MAJ_WM_FONT_COLOR', '#4D6DF3'))
-        ;
-        
-        $imageBuilder->render();
-        
-    }
+	/**
+	 * Certificate@image
+	 */
+	public function image() {
+		$tree = Globals::getTree();
+		$cid   = Filter::get('cid');
+		$certificate = null;
+		if(!empty($cid)) $certificate =  Certificate::getInstance($cid, $tree, null, $this->provider);
+        
+		$imageBuilder = new ImageBuilder($certificate);
+        
+		if (!empty(Filter::get('cb'))) {
+			$imageBuilder->setExpireOffset($imageBuilder->getExpireOffset() * 7);
+		}
+        
+		$imageBuilder
+			->setShowWatermark(Auth::accessLevel($tree) >= $this->module->getSetting('MAJ_SHOW_NO_WATERMARK', Auth::PRIV_HIDE))
+			->setFontMaxSize($this->module->getSetting('MAJ_WM_FONT_MAXSIZE', 18))
+			->setFontColor($this->module->getSetting('MAJ_WM_FONT_COLOR', '#4D6DF3'))
+		;
+        
+		$imageBuilder->render();
+        
+	}
     
-    /**
-     * Certificate@listAll
-     */
-    public function listAll() {
-        $tree = Globals::getTree();
-        $controller = new PageController();
-        $controller
-            ->setPageTitle(I18N::translate('Certificates'))
-            ->restrictAccess(
-                $this->module->getSetting('MAJ_SHOW_CERT', Auth::PRIV_HIDE) >= Auth::accessLevel($tree)
-            );
-        
-        $city = Filter::get('city');
-        
-        if(!empty($city) && strlen($city) > 22){
-            $city = Functions::decryptFromSafeBase64($city);
-            $controller->setPageTitle(I18N::translate('Certificates for %s', $city));
-        }
-        
-        $data = new ViewBag();
-        $data->set('title', $controller->getPageTitle());
-        $data->set('url_module', $this->module->getName());
-        $data->set('url_action', 'Certificate@listAll');
-        $data->set('url_ged', $tree->getNameUrl());
-        
-        $data->set('cities', $this->provider->getCitiesList());
-        $data->set('selected_city', $city);
-        
-        $data->set('has_list', false);        
-        if(!empty($city)) {            
-            $table_id = 'table-certiflist-' . Uuid::uuid4();
+	/**
+	 * Certificate@listAll
+	 */
+	public function listAll() {
+		$tree = Globals::getTree();
+		$controller = new PageController();
+		$controller
+			->setPageTitle(I18N::translate('Certificates'))
+			->restrictAccess(
+				$this->module->getSetting('MAJ_SHOW_CERT', Auth::PRIV_HIDE) >= Auth::accessLevel($tree)
+			);
+        
+		$city = Filter::get('city');
+        
+		if(!empty($city) && strlen($city) > 22){
+			$city = Functions::decryptFromSafeBase64($city);
+			$controller->setPageTitle(I18N::translate('Certificates for %s', $city));
+		}
+        
+		$data = new ViewBag();
+		$data->set('title', $controller->getPageTitle());
+		$data->set('url_module', $this->module->getName());
+		$data->set('url_action', 'Certificate@listAll');
+		$data->set('url_ged', $tree->getNameUrl());
+        
+		$data->set('cities', $this->provider->getCitiesList());
+		$data->set('selected_city', $city);
+        
+		$data->set('has_list', false);        
+		if(!empty($city)) {            
+			$table_id = 'table-certiflist-' . Uuid::uuid4();
             
-            $certif_list = $this->provider->getCertificatesList($city);            
-            if(!empty($certif_list)) {                
-                $data->set('has_list', true);
-                $data->set('table_id', $table_id);
-                $data->set('certificate_list', $certif_list);
+			$certif_list = $this->provider->getCertificatesList($city);            
+			if(!empty($certif_list)) {                
+				$data->set('has_list', true);
+				$data->set('table_id', $table_id);
+				$data->set('certificate_list', $certif_list);
                 
-                $controller
-                    ->addExternalJavascript(WT_JQUERY_DATATABLES_JS_URL)
-                    ->addInlineJavascript('
+				$controller
+					->addExternalJavascript(WT_JQUERY_DATATABLES_JS_URL)
+					->addInlineJavascript('
 				        jQuery.fn.dataTableExt.oSort["text-asc"] = textCompareAsc;
 				        jQuery.fn.dataTableExt.oSort["text-desc"] = textCompareDesc;
                         
@@ -203,28 +203,28 @@ 
         				jQuery(".certificate-list").css("visibility", "visible");
         				jQuery(".loading-image").css("display", "none");
                     ');
-            }
-        }
+			}
+		}
         
-        ViewFactory::make('CertificatesList', $this, $controller, $data)->render();
+		ViewFactory::make('CertificatesList', $this, $controller, $data)->render();
         
-    }
+	}
     
-    /**
-     * Certificate@autocomplete
-     */
-    public function autocomplete() {
-        $tree = Globals::getTree();
-        $controller = new JsonController();
-        
-        $city = Filter::get('city');
-        $contains = Filter::get('term');        
+	/**
+	 * Certificate@autocomplete
+	 */
+	public function autocomplete() {
+		$tree = Globals::getTree();
+		$controller = new JsonController();
+        
+		$city = Filter::get('city');
+		$contains = Filter::get('term');        
 
-        $controller
-            ->restrictAccess(Auth::isEditor($tree) && !empty($city) && !empty($contains))
-            ->pageHeader();
+		$controller
+			->restrictAccess(Auth::isEditor($tree) && !empty($city) && !empty($contains))
+			->pageHeader();
         
-        $listCert = $this->provider->getCertificatesListBeginWith($city, $contains); 
-        $controller->encode($listCert);
-    }
+		$listCert = $this->provider->getCertificatesListBeginWith($city, $contains); 
+		$controller->encode($listCert);
+	}
 }
\ No newline at end of file

Spacing +15 added lines, -15 removed lines

@@ -69,7 +69,7 @@ 
         $cid = Filter::get('cid');
         
         $certificate = null;
-        if(!empty($cid) && strlen($cid) > 22){
+        if (!empty($cid) && strlen($cid) > 22) {
             $certificate = Certificate::getInstance($cid, $tree, null, $this->provider);
         }
         
@@ -77,7 +77,7 @@ 
         $data->set('title', $controller->getPageTitle());
         
         $data->set('has_certif', false);
-        if($certificate) {
+        if ($certificate) {
             $controller->restrictAccess($certificate->canShow());
             $data->set('title', $certificate->getTitle());
             $data->set('has_certif', true);
@@ -85,10 +85,10 @@ 
             
             $data->set(
                 'url_certif_city', 
-                'module.php?mod=' . Constants::MODULE_MAJ_CERTIF_NAME . 
-                    '&mod_action=Certificate@listAll' .
-                    '&ged=' . $tree->getNameUrl() .
-                    '&city=' . Functions::encryptToSafeBase64($certificate->getCity())
+                'module.php?mod='.Constants::MODULE_MAJ_CERTIF_NAME. 
+                    '&mod_action=Certificate@listAll'.
+                    '&ged='.$tree->getNameUrl().
+                    '&city='.Functions::encryptToSafeBase64($certificate->getCity())
             );
             
             $controller->addInlineJavascript('
@@ -102,12 +102,12 @@ 
             $linked_indis = $certificate->linkedIndividuals();
             $linked_fams = $certificate->linkedFamilies();
                         
-            if($linked_indis && count($linked_indis) > 0) {
+            if ($linked_indis && count($linked_indis) > 0) {
                 $data->set('has_linked_indis', true);
                 $data->set('linked_indis', $linked_indis);
             }
             
-            if(!empty($linked_fams)) {
+            if (!empty($linked_fams)) {
                 $data->set('has_linked_fams', true);
                 $data->set('linked_fams', $linked_fams);
             }
@@ -121,9 +121,9 @@ 
      */
     public function image() {
         $tree = Globals::getTree();
-        $cid   = Filter::get('cid');
+        $cid = Filter::get('cid');
         $certificate = null;
-        if(!empty($cid)) $certificate =  Certificate::getInstance($cid, $tree, null, $this->provider);
+        if (!empty($cid)) $certificate = Certificate::getInstance($cid, $tree, null, $this->provider);
         
         $imageBuilder = new ImageBuilder($certificate);
         
@@ -155,7 +155,7 @@ 
         
         $city = Filter::get('city');
         
-        if(!empty($city) && strlen($city) > 22){
+        if (!empty($city) && strlen($city) > 22) {
             $city = Functions::decryptFromSafeBase64($city);
             $controller->setPageTitle(I18N::translate('Certificates for %s', $city));
         }
@@ -170,11 +170,11 @@ 
         $data->set('selected_city', $city);
         
         $data->set('has_list', false);        
-        if(!empty($city)) {            
-            $table_id = 'table-certiflist-' . Uuid::uuid4();
+        if (!empty($city)) {            
+            $table_id = 'table-certiflist-'.Uuid::uuid4();
             
             $certif_list = $this->provider->getCertificatesList($city);            
-            if(!empty($certif_list)) {                
+            if (!empty($certif_list)) {                
                 $data->set('has_list', true);
                 $data->set('table_id', $table_id);
                 $data->set('certificate_list', $certif_list);
@@ -186,7 +186,7 @@ 
 				        jQuery.fn.dataTableExt.oSort["text-desc"] = textCompareDesc;
                         
                         jQuery("#'.$table_id.'").dataTable( {
-        					dom: \'<"H"<"filtersH_' . $table_id . '">T<"dt-clear">pf<"dt-clear">irl>t<"F"pl<"dt-clear"><"filtersF_' . $table_id . '">>\',
+        					dom: \'<"H"<"filtersH_' . $table_id.'">T<"dt-clear">pf<"dt-clear">irl>t<"F"pl<"dt-clear"><"filtersF_'.$table_id.'">>\',
     					    '.I18N::datatablesI18N().',
     					    jQueryUI: true,
         					autoWidth: false,

Braces +3 added lines, -1 removed lines

@@ -123,7 +123,9 @@
         $tree = Globals::getTree();
         $cid   = Filter::get('cid');
         $certificate = null;
-        if(!empty($cid)) $certificate =  Certificate::getInstance($cid, $tree, null, $this->provider);
+        if(!empty($cid)) {
+        	$certificate =  Certificate::getInstance($cid, $tree, null, $this->provider);
+        }
         
         $imageBuilder = new ImageBuilder($certificate);