jon48 / webtrees-lib

src/Webtrees/Map/GoogleMapsProvider.php

Braces +7 added lines, -2 removed lines

@@ -30,11 +30,16 @@
 			$place_id = 0;
 			for ($i=0; $i<count($parent); $i++) {
 				$parent[$i] = trim($parent[$i]);
-				if (empty($parent[$i])) $parent[$i]='unknown';// GoogleMap module uses "unknown" while GEDCOM uses , ,
+				if (empty($parent[$i])) {
+					$parent[$i]='unknown';
+				}
+				// GoogleMap module uses "unknown" while GEDCOM uses , ,
 				$pl_id=Database::prepare('SELECT pl_id FROM `##placelocation` WHERE pl_level=? AND pl_parent_id=? AND pl_place LIKE ? ORDER BY pl_place')
 					->execute(array($i, $place_id, $parent[$i]))
 					->fetchOne();
-				if (empty($pl_id)) break;
+				if (empty($pl_id)) {
+					break;
+				}
 				$place_id = $pl_id;
 			}
 			return $place_id;

src/Webtrees/Module/IsSourcedModule.php

Braces +9 added lines, -6 removed lines

@@ -63,8 +63,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 '';
 	}
@@ -97,8 +98,9 @@ 
 	        $dindi = new Individual($grec);
 	        $html .= FunctionsPrint::formatIsSourcedIcon('R', $dindi->isSourced(), 'INDI', 1, 'small');
 	        $html .= FunctionsPrint::formatIsSourcedIcon('E', $dindi->isBirthSourced(), 'BIRT', 1, 'small');
-	        if($grec->isDead())
-	            $html .= FunctionsPrint::formatIsSourcedIcon('E', $dindi->isDeathSourced(), 'DEAT', 1, 'small');
+	        if($grec->isDead()) {
+	        	            $html .= FunctionsPrint::formatIsSourcedIcon('E', $dindi->isDeathSourced(), 'DEAT', 1, 'small');
+	        }
 	    }
 	    return $html;
 	}
@@ -171,12 +173,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>';
 	        }

src/Webtrees/Module/AdminTasks/TaskController.php

Braces +6 added lines, -7 removed lines

@@ -95,14 +95,15 @@ 
             $this->provider->setTaskStatus($task, $status);
             $res['status'] = $status;
 			Log::addConfigurationLog('Module '.$this->module->getName().' : Admin Task "'.$task->getName().'" has been '. ($status ? 'enabled' : 'disabled') .'.');
-        }
-        catch (\Exception $ex) {
+        } catch (\Exception $ex) {
             $res['error'] = $ex->getMessage();
 			Log::addErrorLog('Module '.$this->module->getName().' : Admin Task "'.$task->getName().'" could not be ' . ($status ? 'enabled' : 'disabled') .'. Error: '. $ex->getMessage());
         }
         
         $controller->pageHeader();
-        if($res['error']) http_response_code(500);
+        if($res['error']) {
+        	http_response_code(500);
+        }
         
         echo \Zend_Json::encode($res);
     }
@@ -170,8 +171,7 @@ 
 			$task->setFrequency($frequency);
 			if($is_limited == 1) {
 				$task->setRemainingOccurrences($nb_occur);
-			}
-			else {
+			} else {
 				$task->setRemainingOccurrences(0);
 			}
 			
@@ -192,8 +192,7 @@ 
 					Log::addConfigurationLog('Module '.$this->module->getName().' : AdminTask “'.$task->getName() .'” has been updated.');
 					$success = true;
 				}
-			}
-			else {
+			} else {
 				FlashMessages::addMessage(I18N::translate('An error occured while updating the administrative task “%s”', $task->getTitle()), 'danger');
 				Log::addConfigurationLog('Module '.$this->module->getName().' : AdminTask “'. $task->getName() .'” could not be updated. See error log.');
 			}

src/Webtrees/Module/AdminTasks/Model/AbstractTask.php

Braces +9 added lines, -4 removed lines

@@ -236,7 +236,9 @@ 
 	 * @return bool
 	 */
 	public function save() {
-	    if(!$this->provider) throw new \Exception('The task has not been initialised with a provider.');
+	    if(!$this->provider) {
+	    	throw new \Exception('The task has not been initialised with a provider.');
+	    }
 		return $this->provider->updateTask($this);
 	}
 	
@@ -246,8 +248,9 @@ 
      */
     public function execute(){
     
-        if($this->last_updated->add(new \DateInterval('PT'.self::TASK_TIME_OUT.'S')) < new \DateTime())
-            $this->is_running = false;
+        if($this->last_updated->add(new \DateInterval('PT'.self::TASK_TIME_OUT.'S')) < new \DateTime()) {
+                    $this->is_running = false;
+        }
     
         if(!$this->is_running){  //TODO put in place a time_out for running...
             //TODO Log the executions in the logs
@@ -261,7 +264,9 @@ 
                 $this->last_updated = new \DateTime();
                 if($this->nb_occurrences > 0){
                     $this->nb_occurrences--;
-                    if($this->nb_occurrences == 0) $this->is_enabled = false;
+                    if($this->nb_occurrences == 0) {
+                    	$this->is_enabled = false;
+                    }
                 }
             }
             $this->is_running = false;

src/Webtrees/Module/AdminTasks/Model/TaskProvider.php

Braces +9 added lines, -13 removed lines

@@ -49,8 +49,7 @@ 
 					return $task;
 				}
 			}
-		}
-		catch(\Exception $ex) { }
+		} catch(\Exception $ex) { }
 		
 		return null;
 	}
@@ -83,8 +82,7 @@ 
 				);
         
 			return $task;
-		}
-		else {
+		} else {
 		    $this->deleteTask($row['majat_name']);
 		}
 		return null;
@@ -156,8 +154,7 @@ 
                     'is_running' => $task->isRunning() ? 1 : 0
                 ));
             return true;
-        }
-        catch (\Exception $ex) {
+        } catch (\Exception $ex) {
             Log::addErrorLog(sprintf('Error while updating the Admin Task %s. Exception: %s', $task->getName(), $ex->getMessage()));
             return false;
         }        
@@ -279,7 +276,9 @@ 
 		$dir=opendir($this->root_path);
 		while (($file=readdir($dir))!==false){ 
 			try {
-			    if($file == '.' || $file == '..') continue;
+			    if($file == '.' || $file == '..') {
+			    	continue;
+			    }
 				$task = include $this->root_path . $file;
 				if($task ) {
 				    $task->setProvider($this);
@@ -294,12 +293,10 @@ 
 					));
 					
 					$tasks[] = $task;
-				}
-				else {
+				} else {
 					throw new \Exception;
 				}
-			}
-			catch (\Exception $ex) {
+			} catch (\Exception $ex) {
 				Log::addErrorLog('An error occured while trying to load the task in file ' . $file . '. Exception: ' . $ex->getMessage());
 			}
 		}
@@ -325,8 +322,7 @@ 
 			Log::addConfigurationLog('Admin Task '.$task_name.' has been deleted from disk - deleting it from DB');
 			
 			return true;
-		}
-		catch(\Exception $ex) {
+		} catch(\Exception $ex) {
 			Database::rollback();
 		
 			Log::addErrorLog('An error occurred while deleting Admin Task '.$task_name.'. Exception: '. $ex->getMessage());

src/Webtrees/Module/AdminTasks/Tasks/HealthCheckEmailTask.php

Braces +2 added lines, -4 removed lines

@@ -185,8 +185,7 @@ 
 						I18N::translate('Error').Mail::EOL.
 						str_repeat('-', $nb_char_count_title)."\t".str_repeat('-', $nb_char_type)."\t".str_repeat('-', 20)."\t".str_repeat('-', strlen(I18N::translate('Error'))).Mail::EOL.
 						$tmp_message.Mail::EOL;
-				}
-				else{
+				} else{
 					$message .= I18N::translate('No errors', $nb_errors).Mail::EOL.Mail::EOL;
 				}
 				
@@ -251,8 +250,7 @@ 
 				}
 			}
 			return true;
-		}
-		catch (\Exception $ex) {
+		} catch (\Exception $ex) {
 			Log::addErrorLog(sprintf('Error while updating the Admin Task "%s". Exception: %s', $this->getName(), $ex->getMessage()));
 			return false;
 		}

src/Webtrees/Module/AdminTasks/AdminConfigController.php

Braces +4 added lines, -3 removed lines

@@ -187,7 +187,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');
@@ -261,8 +263,7 @@ 
     			    <button id="bt_runtask_'. $task->getName() .'" class="btn btn-primary" href="#" onclick="return run_admintask(\''. $task->getName() .'\')">
     			         <div id="bt_runtasktext_'. $task->getName() .'"><i class="fa fa-cog fa-fw" ></i>' . I18N::translate('Run') . '</div>
     			    </button>';
-			}
-			else {
+			} else {
 			    $datum[9] = '';
 			}			    
 						

src/Webtrees/Module/Sosa/SosaConfigController.php

Braces +10 added lines, -5 removed lines

@@ -106,7 +106,9 @@ 
             }');
         
         $action = Filter::post('action');
-        if($action === 'update') $this->update($controller);
+        if($action === 'update') {
+        	$this->update($controller);
+        }
         
         $view_bag = new ViewBag();
         $view_bag->set('title', $controller->getPageTitle());
@@ -153,7 +155,9 @@ 
         $user = User::find(Filter::getInteger('userid', -1));
         if($user) {
             $calculator = new SosaCalculator($WT_TREE, $user);
-            if($calculator->computeAll()) $view_bag->set('is_success', true);
+            if($calculator->computeAll()) {
+            	$view_bag->set('is_success', true);
+            }
         }
         ViewFactory::make('SosaComputeResult', $this, $controller, $view_bag)->render();
     }
@@ -175,9 +179,10 @@ 
         
         if($user && $indi) {
             $calculator = new SosaCalculator($WT_TREE, $user);
-            if($calculator->computeFromIndividual($indi)) $view_bag->set('is_success', true);
-        }
-        else {
+            if($calculator->computeFromIndividual($indi)) {
+            	$view_bag->set('is_success', true);
+            }
+        } else {
             $view_bag->set('error', I18N::translate('Non existing individual'));
         }
             

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

Braces +6 added lines, -2 removed lines

@@ -114,8 +114,12 @@
         $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($husb = $fam->getHusband()) {
+            	$this->addNode($husb, 2 * $sosa);
+            }
+            if($wife = $fam->getWife()) {
+            	$this->addNode($wife, 2 * $sosa + 1);
+            }
         }
     }