jon48 /
webtrees-lib
@@ -32,12 +32,12 @@ discard block |
||
| 32 | 32 | */ |
| 33 | 33 | protected function renderContent() { |
| 34 | 34 | |
| 35 | - if($this->data->get('has_sosa', false)) { |
|
| 35 | + if ($this->data->get('has_sosa', false)) { |
|
| 36 | 36 | $table_id = $this->data->get('table_id'); |
| 37 | 37 | ?> |
| 38 | 38 | |
| 39 | 39 | <div id="sosa-indi-list" class="sosa-list"> |
| 40 | - <table id="<?php echo $table_id;?>"> |
|
| 40 | + <table id="<?php echo $table_id; ?>"> |
|
| 41 | 41 | <thead> |
| 42 | 42 | <tr> |
| 43 | 43 | <th colspan="22"> |
@@ -184,7 +184,7 @@ discard block |
||
| 184 | 184 | </thead> |
| 185 | 185 | <tbody> |
| 186 | 186 | |
| 187 | - <?php foreach($this->data->get('sosa_list') as $sosa => $person) { |
|
| 187 | + <?php foreach ($this->data->get('sosa_list') as $sosa => $person) { |
|
| 188 | 188 | /** @var \Fisharebest\Webtrees\Individual $person */ |
| 189 | 189 | if ($person->isPendingAddtion()) { |
| 190 | 190 | $class = ' class="new"'; |
@@ -200,18 +200,18 @@ discard block |
||
| 200 | 200 | <td class="transparent"><?php echo $person->getXref(); ?></td> |
| 201 | 201 | <td colspan="2"> |
| 202 | 202 | <?php foreach ($person->getAllNames() as $num=>$name) { |
| 203 | - if ($name['type']=='NAME') { |
|
| 204 | - $title=''; |
|
| 203 | + if ($name['type'] == 'NAME') { |
|
| 204 | + $title = ''; |
|
| 205 | 205 | } else { |
| 206 | - $title='title="'.strip_tags(GedcomTag::getLabel($name['type'], $person)).'"'; |
|
| 206 | + $title = 'title="'.strip_tags(GedcomTag::getLabel($name['type'], $person)).'"'; |
|
| 207 | 207 | } |
| 208 | - if ($num==$person->getPrimaryName()) { |
|
| 209 | - $class=' class="name2"'; |
|
| 210 | - $sex_image=$person->getSexImage(); |
|
| 211 | - list($surn, $givn)=explode(',', $name['sort']); |
|
| 208 | + if ($num == $person->getPrimaryName()) { |
|
| 209 | + $class = ' class="name2"'; |
|
| 210 | + $sex_image = $person->getSexImage(); |
|
| 211 | + list($surn, $givn) = explode(',', $name['sort']); |
|
| 212 | 212 | } else { |
| 213 | - $class=''; |
|
| 214 | - $sex_image=''; |
|
| 213 | + $class = ''; |
|
| 214 | + $sex_image = ''; |
|
| 215 | 215 | } ?> |
| 216 | 216 | <a <?php echo $title.' '.$class; ?> href="<?php echo $person->getHtmlUrl(); ?>"> |
| 217 | 217 | <?php echo \Fisharebest\Webtrees\Functions\FunctionsPrint::highlightSearchHits($name['full']); ?> |
@@ -224,14 +224,14 @@ discard block |
||
| 224 | 224 | </td> |
| 225 | 225 | <td style="display:none;"></td> |
| 226 | 226 | <td> |
| 227 | - <?php echo Filter::escapeHtml(str_replace('@P.N.', 'AAAA', $givn)) . 'AAAA' . Filter::escapeHtml(str_replace('@N.N.', 'AAAA', $surn)); ?> |
|
| 227 | + <?php echo Filter::escapeHtml(str_replace('@P.N.', 'AAAA', $givn)).'AAAA'.Filter::escapeHtml(str_replace('@N.N.', 'AAAA', $surn)); ?> |
|
| 228 | 228 | </td> |
| 229 | 229 | <td> |
| 230 | - <?php echo Filter::escapeHtml(str_replace('@N.N.', 'AAAA', $surn)) . 'AAAA' . Filter::escapeHtml(str_replace('@P.N.', 'AAAA', $givn)); ?> |
|
| 230 | + <?php echo Filter::escapeHtml(str_replace('@N.N.', 'AAAA', $surn)).'AAAA'.Filter::escapeHtml(str_replace('@P.N.', 'AAAA', $givn)); ?> |
|
| 231 | 231 | </td> |
| 232 | 232 | <td> |
| 233 | 233 | <?php |
| 234 | - if ($birth_dates=$person->getAllBirthDates()) { |
|
| 234 | + if ($birth_dates = $person->getAllBirthDates()) { |
|
| 235 | 235 | foreach ($birth_dates as $num=>$birth_date) { |
| 236 | 236 | if ($num) { ?><br/><?php } ?> |
| 237 | 237 | <?php echo $birth_date->display(true); |
@@ -239,7 +239,7 @@ discard block |
||
| 239 | 239 | } else { |
| 240 | 240 | $birth_date = new Date(''); |
| 241 | 241 | if ($person->getTree()->getPreference('SHOW_EST_LIST_DATES')) { |
| 242 | - $birth_date=$person->getEstimatedBirthDate(); |
|
| 242 | + $birth_date = $person->getEstimatedBirthDate(); |
|
| 243 | 243 | echo $birth_date->display(true); |
| 244 | 244 | } else { |
| 245 | 245 | echo ' '; |
@@ -248,7 +248,7 @@ discard block |
||
| 248 | 248 | } |
| 249 | 249 | ?> |
| 250 | 250 | </td> |
| 251 | - <td><?php echo $birth_date->julianDay();?></td> |
|
| 251 | + <td><?php echo $birth_date->julianDay(); ?></td> |
|
| 252 | 252 | <td> |
| 253 | 253 | <?php foreach ($person->getAllBirthPlaces() as $n => $birth_place) { |
| 254 | 254 | $tmp = new \Fisharebest\Webtrees\Place($birth_place, $person->getTree()); |
@@ -345,10 +345,10 @@ discard block |
||
| 345 | 345 | <?php echo I18N::translate('Number of Sosa ancestors: %1$s known / %2$s theoretical (%3$s)', |
| 346 | 346 | I18N::number($this->data->get('sosa_count')), |
| 347 | 347 | I18N::number($this->data->get('sosa_theo')), |
| 348 | - I18N::percentage($this->data->get('sosa_ratio'),2) |
|
| 348 | + I18N::percentage($this->data->get('sosa_ratio'), 2) |
|
| 349 | 349 | ); ?> |
| 350 | - <?php if($this->data->get('sosa_hidden') > 0) { |
|
| 351 | - echo '['. I18N::translate('%s hidden', I18N::number($this->data->get('sosa_hidden'))).']'; |
|
| 350 | + <?php if ($this->data->get('sosa_hidden') > 0) { |
|
| 351 | + echo '['.I18N::translate('%s hidden', I18N::number($this->data->get('sosa_hidden'))).']'; |
|
| 352 | 352 | } ?> |
| 353 | 353 | </div> |
| 354 | 354 | </th> |
@@ -360,7 +360,7 @@ discard block |
||
| 360 | 360 | <button type="button" class="ui-state-default btn-toggle-parents"> |
| 361 | 361 | <?php echo I18N::translate('Show parents') ?> |
| 362 | 362 | </button> |
| 363 | - <button id="btn-toggle-statistics-<?php echo $table_id ;?>" type="button" class="ui-state-default btn-toggle-statistics"> |
|
| 363 | + <button id="btn-toggle-statistics-<?php echo $table_id; ?>" type="button" class="ui-state-default btn-toggle-statistics"> |
|
| 364 | 364 | <?php echo I18N::translate('Show statistics charts') ?> |
| 365 | 365 | </button> |
| 366 | 366 | </div> |
@@ -47,13 +47,13 @@ |
||
| 47 | 47 | <div class="value"> |
| 48 | 48 | <?php |
| 49 | 49 | $users = $this->data->get('users_settings'); |
| 50 | - if(count($users) == 1) { |
|
| 51 | - $root_indi = $users[0]['rootid']; ?> |
|
| 50 | + if (count($users) == 1) { |
|
| 51 | + $root_indi = $users[0]['rootid']; ?> |
|
| 52 | 52 | <label> |
| 53 | 53 | <input id="maj_sosa_input_userid" type="hidden" name="userid" value="<?php echo $users[0]['user']->getUserId(); ?>" /> |
| 54 | 54 | <?php echo $users[0]['user']->getRealNameHtml() ?> |
| 55 | 55 | </label> |
| 56 | - <?php } else if(count($users) > 1) { ?> |
|
| 56 | + <?php } else if (count($users) > 1) { ?> |
|
| 57 | 57 | <select id='maj-sosa-config-select' name="userid"> |
| 58 | 58 | <?php |
| 59 | 59 | $root_indi = $users[0]['rootid']; |
@@ -34,13 +34,13 @@ discard block |
||
| 34 | 34 | <div id="maj-sosa-missing-page" class="center"> |
| 35 | 35 | <h2><?php echo $this->data->get('title'); ?></h2> |
| 36 | 36 | |
| 37 | - <?php if($this->data->get('is_setup')) { |
|
| 37 | + <?php if ($this->data->get('is_setup')) { |
|
| 38 | 38 | $this->renderSosaHeader(); |
| 39 | - if($this->data->get('has_missing', false)) { |
|
| 39 | + if ($this->data->get('has_missing', false)) { |
|
| 40 | 40 | $table_id = $this->data->get('table_id'); |
| 41 | 41 | ?> |
| 42 | 42 | <div id="sosa-indi-missing" class="smissing-list"> |
| 43 | - <table id="<?php echo $table_id;?>"> |
|
| 43 | + <table id="<?php echo $table_id; ?>"> |
|
| 44 | 44 | <thead> |
| 45 | 45 | <tr> |
| 46 | 46 | <th colspan="16"> |
@@ -108,7 +108,7 @@ discard block |
||
| 108 | 108 | </thead> |
| 109 | 109 | <tbody> |
| 110 | 110 | |
| 111 | - <?php foreach($this->data->get('missing_list') as $missing_tab) { |
|
| 111 | + <?php foreach ($this->data->get('missing_list') as $missing_tab) { |
|
| 112 | 112 | $person = $missing_tab['indi']; |
| 113 | 113 | |
| 114 | 114 | /** @var \Fisharebest\Webtrees\Individual $person */ |
@@ -126,18 +126,18 @@ discard block |
||
| 126 | 126 | <td class="transparent"><?php echo $person->getXref(); ?></td> |
| 127 | 127 | <td colspan="2"> |
| 128 | 128 | <?php foreach ($person->getAllNames() as $num=>$name) { |
| 129 | - if ($name['type']=='NAME') { |
|
| 130 | - $title=''; |
|
| 129 | + if ($name['type'] == 'NAME') { |
|
| 130 | + $title = ''; |
|
| 131 | 131 | } else { |
| 132 | - $title='title="'.strip_tags(GedcomTag::getLabel($name['type'], $person)).'"'; |
|
| 132 | + $title = 'title="'.strip_tags(GedcomTag::getLabel($name['type'], $person)).'"'; |
|
| 133 | 133 | } |
| 134 | - if ($num==$person->getPrimaryName()) { |
|
| 135 | - $class=' class="name2"'; |
|
| 136 | - $sex_image=$person->getSexImage(); |
|
| 137 | - list($surn, $givn)=explode(',', $name['sort']); |
|
| 134 | + if ($num == $person->getPrimaryName()) { |
|
| 135 | + $class = ' class="name2"'; |
|
| 136 | + $sex_image = $person->getSexImage(); |
|
| 137 | + list($surn, $givn) = explode(',', $name['sort']); |
|
| 138 | 138 | } else { |
| 139 | - $class=''; |
|
| 140 | - $sex_image=''; |
|
| 139 | + $class = ''; |
|
| 140 | + $sex_image = ''; |
|
| 141 | 141 | } ?> |
| 142 | 142 | <a <?php echo $title.' '.$class; ?> href="<?php echo $person->getHtmlUrl(); ?>"> |
| 143 | 143 | <?php echo \Fisharebest\Webtrees\Functions\FunctionsPrint::highlightSearchHits($name['full']); ?> |
@@ -150,10 +150,10 @@ discard block |
||
| 150 | 150 | </td> |
| 151 | 151 | <td style="display:none;"></td> |
| 152 | 152 | <td> |
| 153 | - <?php echo Filter::escapeHtml(str_replace('@P.N.', 'AAAA', $givn)) . 'AAAA' . Filter::escapeHtml(str_replace('@N.N.', 'AAAA', $surn)); ?> |
|
| 153 | + <?php echo Filter::escapeHtml(str_replace('@P.N.', 'AAAA', $givn)).'AAAA'.Filter::escapeHtml(str_replace('@N.N.', 'AAAA', $surn)); ?> |
|
| 154 | 154 | </td> |
| 155 | 155 | <td> |
| 156 | - <?php echo Filter::escapeHtml(str_replace('@N.N.', 'AAAA', $surn)) . 'AAAA' . Filter::escapeHtml(str_replace('@P.N.', 'AAAA', $givn)); ?> |
|
| 156 | + <?php echo Filter::escapeHtml(str_replace('@N.N.', 'AAAA', $surn)).'AAAA'.Filter::escapeHtml(str_replace('@P.N.', 'AAAA', $givn)); ?> |
|
| 157 | 157 | </td> |
| 158 | 158 | <?php if (ModuleManager::getInstance()->isOperational(Constants::MODULE_MAJ_ISSOURCED_NAME)) { |
| 159 | 159 | $isISourced = $dperson->isSourced(); ?> |
@@ -163,11 +163,11 @@ discard block |
||
| 163 | 163 | <td> </td> |
| 164 | 164 | <td></td> |
| 165 | 165 | <?php } ?> |
| 166 | - <td><?php echo $missing_tab['has_father'] ? ' ' : 'X';?></td> |
|
| 167 | - <td><?php echo $missing_tab['has_mother'] ? ' ' : 'X';?></td> |
|
| 166 | + <td><?php echo $missing_tab['has_father'] ? ' ' : 'X'; ?></td> |
|
| 167 | + <td><?php echo $missing_tab['has_mother'] ? ' ' : 'X'; ?></td> |
|
| 168 | 168 | <td> |
| 169 | 169 | <?php |
| 170 | - if ($birth_dates=$person->getAllBirthDates()) { |
|
| 170 | + if ($birth_dates = $person->getAllBirthDates()) { |
|
| 171 | 171 | foreach ($birth_dates as $num=>$birth_date) { |
| 172 | 172 | if ($num) { ?><br/><?php } ?> |
| 173 | 173 | <?php echo $birth_date->display(true); |
@@ -175,7 +175,7 @@ discard block |
||
| 175 | 175 | } else { |
| 176 | 176 | $birth_date = new Date(''); |
| 177 | 177 | if ($person->getTree()->getPreference('SHOW_EST_LIST_DATES')) { |
| 178 | - $birth_date=$person->getEstimatedBirthDate(); |
|
| 178 | + $birth_date = $person->getEstimatedBirthDate(); |
|
| 179 | 179 | echo $birth_date->display(true); |
| 180 | 180 | } else { |
| 181 | 181 | echo ' '; |
@@ -184,7 +184,7 @@ discard block |
||
| 184 | 184 | } |
| 185 | 185 | ?> |
| 186 | 186 | </td> |
| 187 | - <td><?php echo $birth_date->julianDay();?></td> |
|
| 187 | + <td><?php echo $birth_date->julianDay(); ?></td> |
|
| 188 | 188 | <td> |
| 189 | 189 | <?php foreach ($person->getAllBirthPlaces() as $n => $birth_place) { |
| 190 | 190 | $tmp = new \Fisharebest\Webtrees\Place($birth_place, $person->getTree()); |
@@ -211,9 +211,9 @@ discard block |
||
| 211 | 211 | <td class="ui-state-default" colspan="16"> |
| 212 | 212 | <div class="center"> |
| 213 | 213 | <?php echo I18N::translate('Number of different missing ancestors: %s', I18N::number($this->data->get('missing_diff_count'))); ?> |
| 214 | - <?php if($this->data->get('missing_hidden') > 0) echo ' ['. I18N::translate('%s hidden', I18N::number($this->data->get('missing_hidden'))).']'; ?> |
|
| 215 | - <?php echo ' - ' . I18N::translate('Generation complete at %s', I18N::percentage($this->data->get('perc_sosa'), 2)); ?> |
|
| 216 | - <?php echo ' [' . I18N::translate('Potential %s', I18N::percentage($this->data->get('perc_sosa_potential'),2)).']'; ?> |
|
| 214 | + <?php if ($this->data->get('missing_hidden') > 0) echo ' ['.I18N::translate('%s hidden', I18N::number($this->data->get('missing_hidden'))).']'; ?> |
|
| 215 | + <?php echo ' - '.I18N::translate('Generation complete at %s', I18N::percentage($this->data->get('perc_sosa'), 2)); ?> |
|
| 216 | + <?php echo ' ['.I18N::translate('Potential %s', I18N::percentage($this->data->get('perc_sosa_potential'), 2)).']'; ?> |
|
| 217 | 217 | </div> |
| 218 | 218 | </td> |
| 219 | 219 | </tr> |
