jon48 / webtrees-lib

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/Module/Sosa/Views/SosaListMissingView.php

Spacing +23 added lines, -23 removed lines

@@ -34,13 +34,13 @@ 
             <div id="maj-sosa-missing-page" class="center">
     			<h2><?php echo $this->data->get('title'); ?></h2>
     			
-    			<?php  if($this->data->get('is_setup')) { 
+    			<?php  if ($this->data->get('is_setup')) { 
     			    $this->renderSosaHeader();
-    			    if($this->data->get('has_missing', false)) {
+    			    if ($this->data->get('has_missing', false)) {
     			        $table_id = $this->data->get('table_id');
     			        ?>
     			<div id="sosa-indi-missing" class="smissing-list">
-                	<table id="<?php echo $table_id;?>">
+                	<table id="<?php echo $table_id; ?>">
         				<thead>     
             				<tr>
     							<th colspan="16">
@@ -108,7 +108,7 @@ 
         				</thead>
         			<tbody>
         			
-        			<?php foreach($this->data->get('missing_list') as $missing_tab) {
+        			<?php foreach ($this->data->get('missing_list') as $missing_tab) {
         			    $person = $missing_tab['indi'];
         			    
         			    /** @var \Fisharebest\Webtrees\Individual $person */
@@ -126,18 +126,18 @@ 
                 			<td class="transparent"><?php echo $person->getXref(); ?></td>
                 			<td colspan="2">
                 			<?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();
-                					list($surn, $givn)=explode(',', $name['sort']);
+                				if ($num == $person->getPrimaryName()) {
+                					$class = ' class="name2"';
+                					$sex_image = $person->getSexImage();
+                					list($surn, $givn) = explode(',', $name['sort']);
                 				} else {
-                					$class='';
-                					$sex_image='';
+                					$class = '';
+                					$sex_image = '';
                 				} ?>
                 				<a <?php echo $title.' '.$class; ?> href="<?php echo $person->getHtmlUrl(); ?>">
                 					<?php echo \Fisharebest\Webtrees\Functions\FunctionsPrint::highlightSearchHits($name['full']); ?>
@@ -150,10 +150,10 @@ 
                     		</td>
                     		<td style="display:none;"></td>
                     		<td>
-                    			<?php echo Filter::escapeHtml(str_replace('@P.N.', 'AAAA', $givn)) . 'AAAA' . Filter::escapeHtml(str_replace('@N.N.', 'AAAA', $surn)); ?>
+                    			<?php echo Filter::escapeHtml(str_replace('@P.N.', 'AAAA', $givn)).'AAAA'.Filter::escapeHtml(str_replace('@N.N.', 'AAAA', $surn)); ?>
                     		</td>
                     		<td>
-                    			<?php echo Filter::escapeHtml(str_replace('@N.N.', 'AAAA', $surn)) . 'AAAA' . Filter::escapeHtml(str_replace('@P.N.', 'AAAA', $givn)); ?>
+                    			<?php echo Filter::escapeHtml(str_replace('@N.N.', 'AAAA', $surn)).'AAAA'.Filter::escapeHtml(str_replace('@P.N.', 'AAAA', $givn)); ?>
                     		</td>                    		
                 			<?php if (ModuleManager::getInstance()->isOperational(Constants::MODULE_MAJ_ISSOURCED_NAME)) {
         				        $isISourced = $dperson->isSourced(); ?>
@@ -163,11 +163,11 @@ 
         					<td>&nbsp;</td>
         					<td></td>
         					<?php } ?>
-        					<td><?php echo $missing_tab['has_father'] ? '&nbsp;' : 'X';?></td>
-        					<td><?php echo $missing_tab['has_mother'] ? '&nbsp;' : 'X';?></td>
+        					<td><?php echo $missing_tab['has_father'] ? '&nbsp;' : 'X'; ?></td>
+        					<td><?php echo $missing_tab['has_mother'] ? '&nbsp;' : 'X'; ?></td>
         					<td>
                     		<?php 
-                    		if ($birth_dates=$person->getAllBirthDates()) {
+                    		if ($birth_dates = $person->getAllBirthDates()) {
         			            foreach ($birth_dates as $num=>$birth_date) {
             					   if ($num) { ?><br/><?php } ?>
             						<?php  echo $birth_date->display(true);
@@ -175,7 +175,7 @@ 
                     		} else {
                     		    $birth_date = new Date('');
                     		    if ($person->getTree()->getPreference('SHOW_EST_LIST_DATES')) {
-                    		        $birth_date=$person->getEstimatedBirthDate();
+                    		        $birth_date = $person->getEstimatedBirthDate();
                     		        echo $birth_date->display(true);
                     		    } else {
                     		        echo '&nbsp;';
@@ -184,7 +184,7 @@ 
                     		}
                     		?>
                     		</td>
-                    		<td><?php echo $birth_date->julianDay();?></td>
+                    		<td><?php echo $birth_date->julianDay(); ?></td>
                 			<td>
                 			<?php foreach ($person->getAllBirthPlaces() as $n => $birth_place) {
         				        $tmp = new \Fisharebest\Webtrees\Place($birth_place, $person->getTree());
@@ -211,9 +211,9 @@ 
 							<td class="ui-state-default" colspan="16">
 								<div class="center">
 									<?php echo I18N::translate('Number of different missing ancestors: %s', I18N::number($this->data->get('missing_diff_count'))); ?>
-									<?php if($this->data->get('missing_hidden') > 0) echo ' ['. I18N::translate('%s hidden', I18N::number($this->data->get('missing_hidden'))).']'; ?>
-									<?php echo ' - ' . I18N::translate('Generation complete at %s', I18N::percentage($this->data->get('perc_sosa'), 2)); ?>
-									<?php echo ' [' . I18N::translate('Potential %s', I18N::percentage($this->data->get('perc_sosa_potential'),2)).']'; ?>
+									<?php if ($this->data->get('missing_hidden') > 0) echo ' ['.I18N::translate('%s hidden', I18N::number($this->data->get('missing_hidden'))).']'; ?>
+									<?php echo ' - '.I18N::translate('Generation complete at %s', I18N::percentage($this->data->get('perc_sosa'), 2)); ?>
+									<?php echo ' ['.I18N::translate('Potential %s', I18N::percentage($this->data->get('perc_sosa_potential'), 2)).']'; ?>
 								</div>
 							</td>
 						</tr>

src/Webtrees/Hook/HookProvider.php

Spacing +25 added lines, -25 removed lines

@@ -71,7 +71,7 @@ 
 	 * @see \MyArtJaub\Webtrees\Hook\HookProviderInterface::getPossibleHooks()
 	 */
 	public function getPossibleHooks() {
-		static $hooks=null;
+		static $hooks = null;
 		if ($hooks === null) {
 		    $hooks = array();
 		    
@@ -83,31 +83,31 @@ 
 		        'SELECT SQL_CACHE module_name FROM `##module`'
 		    )->fetchOneColumn();
 		    
-		    foreach($module_names as $module_name) {
+		    foreach ($module_names as $module_name) {
 		        $module = Module::getModuleByName($module_name);
 		        
-		        if($module instanceof HookSubscriberInterface){
+		        if ($module instanceof HookSubscriberInterface) {
 					$subscribedhooks = $module->getSubscribedHooks();
-					if(is_array($subscribedhooks)){
-						foreach($subscribedhooks as $key => $value){
-							if(is_int($key)) {
+					if (is_array($subscribedhooks)) {
+						foreach ($subscribedhooks as $key => $value) {
+							if (is_int($key)) {
 								$hook_item = $value;
 								$priority = self::DEFAULT_PRIORITY;
 							}
-							else{
+							else {
 								$hook_item = explode('#', $key, 2);
 								$priority = $value;
 							}
-							if($hook_item && count($hook_item) == 2){
+							if ($hook_item && count($hook_item) == 2) {
 								$hook_func = $hook_item[0];
 								$hook_cont = $hook_item[1];
 							}
-							else{
+							else {
 								$hook_func = $hook_item[0];
 								$hook_cont = 'all';
 							}
-							if(method_exists($module, $hook_func)){
-								$hooks[$module->getName().'#'.$hook_func.'#'.$hook_cont]=$priority;
+							if (method_exists($module, $hook_func)) {
+								$hooks[$module->getName().'#'.$hook_func.'#'.$hook_cont] = $priority;
 							}
 						}
 					}
@@ -121,8 +121,8 @@ 
 	 * {@inheritDoc}
 	 * @see \MyArtJaub\Webtrees\Hook\HookProviderInterface::getRawInstalledHooks()
 	 */
-	public function getRawInstalledHooks(){
-		if(self::isModuleOperational()){
+	public function getRawInstalledHooks() {
+		if (self::isModuleOperational()) {
 			return Database::prepare(
 					"SELECT majh_id AS id, majh_module_name AS module, majh_hook_function AS hook, majh_hook_context as context, majh_module_priority AS priority,  majh_status AS status".
 					" FROM `##maj_hooks`".
@@ -136,11 +136,11 @@ 
 	 * {@inheritDoc}
 	 * @see \MyArtJaub\Webtrees\Hook\HookProviderInterface::getInstalledHooks()
 	 */
-	public function getInstalledHooks(){
-		static $installedhooks =null;
-		if($installedhooks===null){
-			$dbhooks=self::getRawInstalledHooks();
-			foreach($dbhooks as $dbhook){
+	public function getInstalledHooks() {
+		static $installedhooks = null;
+		if ($installedhooks === null) {
+			$dbhooks = self::getRawInstalledHooks();
+			foreach ($dbhooks as $dbhook) {
 				$installedhooks[($dbhook->module).'#'.($dbhook->hook).'#'.($dbhook->context)] = array('id' => $dbhook->id, 'status' => $dbhook->status, 'priority' => $dbhook->priority);
 			}
 		}
@@ -153,15 +153,15 @@ 
 	 */
 	public function updateHooks() {
 	    
-	    if(Auth::isAdmin()){
+	    if (Auth::isAdmin()) {
 	        $ihooks = self::getInstalledHooks();
 	        $phooks = self::getPossibleHooks();
 	        	
 	        // Insert hooks not existing yet in the DB
-	        if($phooks !== null){
-	            foreach($phooks as $phook => $priority){
+	        if ($phooks !== null) {
+	            foreach ($phooks as $phook => $priority) {
 	                $array_hook = explode('#', $phook);
-	                if($ihooks === null || !array_key_exists($phook, $ihooks)){
+	                if ($ihooks === null || !array_key_exists($phook, $ihooks)) {
 	                    $chook = new Hook($array_hook[1], $array_hook[2]);
 	                    $chook->subscribe($array_hook[0]);
 	                    $chook->setPriority($array_hook[0], $priority);
@@ -170,10 +170,10 @@ 
 	        }
 	        	
 	        //Remove hooks not existing any more in the file system
-	        if($ihooks !== null){
-	            foreach(array_keys($ihooks) as $ihook){
+	        if ($ihooks !== null) {
+	            foreach (array_keys($ihooks) as $ihook) {
 	                $array_hook = explode('#', $ihook);
-	                if($phooks === null || !array_key_exists($ihook, $phooks)){
+	                if ($phooks === null || !array_key_exists($ihook, $phooks)) {
 	                    $chook = new Hook($array_hook[1], $array_hook[2]);
 	                    $chook->remove($array_hook[0]);
 	                }