jon48 / webtrees-lib

src/Webtrees/Controller/IndividualController.php

Spacing +5 added lines, -5 removed lines

@@ -32,7 +32,7 @@ 
 	 *
 	 * @param \Fisharebest\Webtrees\Controller\IndividualController $ctrl_individual_in The Individual Controller to extend
 	 */
-	public function __construct(fw\Controller\IndividualController $ctrl_individual_in){
+	public function __construct(fw\Controller\IndividualController $ctrl_individual_in) {
 		$this->ctrl_individual = $ctrl_individual_in;
 		$this->dindi = new mw\Individual($this->ctrl_individual->getSignificantIndividual());
 	}
@@ -43,7 +43,7 @@ 
 	 * 
 	 * @uses \MyArtJaub\Webtrees\Hook\Hook
 	 */
-	public function printHeaderExtensions(){
+	public function printHeaderExtensions() {
 		$hook_extend_indi_header_left = new mw\Hook\Hook('hExtendIndiHeaderLeft');
 		$hook_extend_indi_header_right = new mw\Hook\Hook('hExtendIndiHeaderRight');
 		$hook_extend_indi_header_left = $hook_extend_indi_header_left->execute($this->ctrl_individual);
@@ -52,7 +52,7 @@ 
 		echo '<div id="indi_perso_header">',
 			'<div id="indi_perso_header_left">';
 		foreach ($hook_extend_indi_header_left as $div) {
-			if(count($div)==2){
+			if (count($div) == 2) {
 				echo '<div id="', $div[0], '" class="indi_perso_header_left_div">',
 					$div[1], '</div>';
 			}
@@ -60,7 +60,7 @@ 
 		echo '</div>',
 			'<div id="indi_perso_header_right">';
 		foreach ($hook_extend_indi_header_right as $div) {
-			if(count($div)==2){
+			if (count($div) == 2) {
 				echo '<div id="', $div[0], '" class="indi_perso_header_right_div">',
 					$div[1], '</div>';
 			}
@@ -75,7 +75,7 @@ 
 	 *
 	 * @uses \MyArtJaub\Webtrees\Hook\Hook
 	 */
-	public function printHeaderExtraIcons(){
+	public function printHeaderExtraIcons() {
 		$hook_extend_indi_header_icons = new Hook('hExtendIndiHeaderIcons');
 		$hook_extend_indi_header_icons = $hook_extend_indi_header_icons->execute($this->ctrl_individual);
 		

src/Webtrees/Mvc/Dispatcher.php

Spacing +8 added lines, -8 removed lines

@@ -49,10 +49,10 @@ 
     public function handle(fw\Module\AbstractModule $module, $request) {
 		
 		$fq_modclass_name = get_class($module);
-		$ctrl_namespace = substr($fq_modclass_name, 0, - strlen('Module')) . '\\';
+		$ctrl_namespace = substr($fq_modclass_name, 0, - strlen('Module')).'\\';
 		
-		$args = explode( '@', $request, 2);
-		switch(count($args)) {
+		$args = explode('@', $request, 2);
+		switch (count($args)) {
 			case 1:
 				$ctrl_name = $args[0];
 				$method = 'index';
@@ -64,16 +64,16 @@ 
 				break;
 		}
 		
-		$ctrl_class = $ctrl_namespace . $ctrl_name . 'Controller';
-		if(class_exists($ctrl_class) 
+		$ctrl_class = $ctrl_namespace.$ctrl_name.'Controller';
+		if (class_exists($ctrl_class) 
 		    && is_subclass_of($ctrl_class, '\\MyArtJaub\\Webtrees\\Mvc\\Controller\\MvcController')
-			&& $ctrl = new $ctrl_class($module) ) {
-			if(method_exists($ctrl, $method)) {
+			&& $ctrl = new $ctrl_class($module)) {
+			if (method_exists($ctrl, $method)) {
 			    try {
 			        call_user_func_array(array($ctrl, $method), array());
 			    }
 			    catch (MvcException $ex) {
-			        if(!headers_sent()) {
+			        if (!headers_sent()) {
 			            http_response_code($ex->getHttpCode());
 			        }
 			        echo $ex->getMessage();			        

src/Webtrees/Mvc/MvcException.php

Spacing +3 added lines, -3 removed lines

@@ -17,7 +17,7 @@ 
 class MvcException extends \Exception {
 
     /** @var int[] $VALID_HTTP List of valid HTTP codes */
-    protected static $VALID_HTTP =  array(
+    protected static $VALID_HTTP = array(
         100, 101,
         200, 201, 202, 203, 204, 205, 206,
         300, 301, 302, 303, 304, 305, 306, 307,
@@ -58,9 +58,9 @@ 
      * @throws InvalidArgumentException Thrown if not valid Http code
      */
     public function setHttpCode($http_code) {
-        if(!in_array($http_code, self::$VALID_HTTP))
+        if (!in_array($http_code, self::$VALID_HTTP))
             throw new \InvalidArgumentException('Invalid HTTP code');
-        $this->http_code= $http_code;
+        $this->http_code = $http_code;
     }   
 
 }

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

Spacing +3 added lines, -3 removed lines

@@ -47,13 +47,13 @@
         			<div class="value">
         				<?php 
         				    $users = $this->data->get('users_settings');
-        				    if(count($users) == 1) {
-        				        $root_indi = $users[0]['rootid'];  ?>
+        				    if (count($users) == 1) {
+        				        $root_indi = $users[0]['rootid']; ?>
         					<label>
         						<input id="maj_sosa_input_userid" type="hidden" name="userid" value="<?php echo $users[0]['user']->getUserId(); ?>" />
         						<?php echo $users[0]['user']->getRealNameHtml() ?>
         					</label>
-        				<?php  } else if(count($users) > 1) { ?>
+        				<?php  } else if (count($users) > 1) { ?>
         					<select id='maj-sosa-config-select' name="userid">
         					<?php 
         					   $root_indi = $users[0]['rootid'];

src/Webtrees/Functions/FunctionsPrintLists.php

Spacing +2 added lines, -2 removed lines

@@ -35,8 +35,8 @@
         $surn = str_replace('@N.N.', 'AAAA', $surn);
 
         return array(
-            $surn . 'AAAA' . $givn,
-            $givn . 'AAAA' . $surn,
+            $surn.'AAAA'.$givn,
+            $givn.'AAAA'.$surn,
         );
     }
 

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

Spacing +5 added lines, -5 removed lines

@@ -39,13 +39,13 @@ 
     			<input type="hidden" name="ged" value="<?= $this->data->get('url_ged') ?>">
     			<select name="city">
     			<?php foreach ($cities as $city) { ?>
-    				<option value="<?= Functions::encryptToSafeBase64($city) ?>" <?php if(trim($city) == trim($selected_city)) echo 'selected="selected"'?> ><?= $city ?></option>
+    				<option value="<?= Functions::encryptToSafeBase64($city) ?>" <?php if (trim($city) == trim($selected_city)) echo 'selected="selected"'?> ><?= $city ?></option>
     			<?php } ?>
     			</select>
     			<input type="submit" value="<?= I18N::translate('Show') ?>" />
     		</form>
     		
-    		<?php if($this->data->get('has_list', false)) { ?>
+    		<?php if ($this->data->get('has_list', false)) { ?>
     		<div class="loading-image">&nbsp;</div>
     		<div class="certificate-list">
     			<table id="<?= $this->data->get('table_id') ?>">
@@ -62,7 +62,7 @@ 
     				    ?>
     					<tr>
     						<!-- Certificate date -->
-    						<?php if($date = $certificate->getCertificateDate()) { ?>
+    						<?php if ($date = $certificate->getCertificateDate()) { ?>
     						<td data-sort="<?= $date->julianDay() ?>"><?= $date->display() ?></td>
     						<?php } else { ?>
     						<td data-sort="0">&nbsp;</td>
@@ -73,8 +73,8 @@ 
     						<?php 
     						$name = $certificate->getCertificateDetails() ?: '';
     						$sortname = "";
-    						$ct_names=preg_match("/([A-Z]{2,})/", $name, $match);
-    						if($ct_names > 0) $sortname = $match[1].'_';
+    						$ct_names = preg_match("/([A-Z]{2,})/", $name, $match);
+    						if ($ct_names > 0) $sortname = $match[1].'_';
     						$sortname .= $name;
     						?>
     						<td data-sort="<?= Filter::escapeHtml($sortname) ?>">

src/Webtrees/Module/Sosa/Model/SosaCalculator.php

Spacing +8 added lines, -8 removed lines

@@ -58,7 +58,7 @@ 
         $this->tree = $tree;
         $this->user = $user;
         
-        $this->sosa_provider = new SosaProvider($this->tree, $this->user);;
+        $this->sosa_provider = new SosaProvider($this->tree, $this->user); ;
     }
     
     /**
@@ -68,7 +68,7 @@ 
     public function computeAll() {
         $root_id = $this->tree->getUserPreference($this->user, 'MAJ_SOSA_ROOT_ID');        
         $indi = Individual::getInstance($root_id, $this->tree);
-        if($indi){
+        if ($indi) {
             $this->sosa_provider->deleteAll();
             $this->addNode($indi, 1);
             $this->flushTmpSosaTable(true);
@@ -85,7 +85,7 @@ 
     public function computeFromIndividual(Individual $indi) {
         $dindi = new \MyArtJaub\Webtrees\Individual($indi);
         $current_sosas = $dindi->getSosaNumbers();
-        foreach($current_sosas as $current_sosa => $gen) {
+        foreach ($current_sosas as $current_sosa => $gen) {
             $this->sosa_provider->deleteAncestors($current_sosa);
             $this->addNode($indi, $current_sosa);
         }
@@ -111,9 +111,9 @@ 
         
         $this->flushTmpSosaTable();
         
-        if($fam = $indi->getPrimaryChildFamily()) {
-            if($husb = $fam->getHusband()) $this->addNode($husb, 2 * $sosa);
-            if($wife = $fam->getWife()) $this->addNode($wife, 2 * $sosa + 1);
+        if ($fam = $indi->getPrimaryChildFamily()) {
+            if ($husb = $fam->getHusband()) $this->addNode($husb, 2 * $sosa);
+            if ($wife = $fam->getWife()) $this->addNode($wife, 2 * $sosa + 1);
         }
     }
     
@@ -123,8 +123,8 @@ 
      * @param bool $force Should the flush be forced
      */
     protected function flushTmpSosaTable($force = false) {
-        if( count($this->tmp_sosa_table)> 0 && 
-            ($force ||  count($this->tmp_sosa_table) >= self::TMP_SOSA_TABLE_LIMIT)){            
+        if (count($this->tmp_sosa_table) > 0 && 
+            ($force || count($this->tmp_sosa_table) >= self::TMP_SOSA_TABLE_LIMIT)) {            
                 $this->sosa_provider->insertOrUpdate($this->tmp_sosa_table);
                 $this->tmp_sosa_table = array();
         }

src/Webtrees/Module/HooksModule.php

Spacing +1 added lines, -1 removed lines

@@ -57,7 +57,7 @@
     public function getConfigLink() {
         Database::updateSchema(self::SCHEMA_MIGRATION_PREFIX, self::SCHEMA_SETTING_NAME, self::SCHEMA_TARGET_VERSION);
         
-        return 'module.php?mod=' . $this->getName() . '&mod_action=AdminConfig';
+        return 'module.php?mod='.$this->getName().'&mod_action=AdminConfig';
     }
     
     /**

src/Webtrees/Fact.php

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
  							}
  						}