@@ -293,10 +293,8 @@ discard block |
||
| 293 | 293 | <?= I18N::number($family->getNumberOfChildren()) ?> |
| 294 | 294 | </td> |
| 295 | 295 | <td hidden><?php |
| 296 | - if (!$mdate->isOK()) { echo 'U'; } |
|
| 297 | - else { |
|
| 298 | - if (Date::compare($mdate, new Date(date('Y') - 100)) > 0) { echo 'Y100'; } |
|
| 299 | - else { echo 'YES'; } |
|
| 296 | + if (!$mdate->isOK()) { echo 'U'; } else { |
|
| 297 | + if (Date::compare($mdate, new Date(date('Y') - 100)) > 0) { echo 'Y100'; } else { echo 'YES'; } |
|
| 300 | 298 | } |
| 301 | 299 | if ($family->getFacts(WT_EVENTS_DIV)) { echo 'D'; } |
| 302 | 300 | if (count($husb->getSpouseFamilies()) > 1 || count($wife->getSpouseFamilies()) > 1) { |
@@ -316,9 +314,7 @@ discard block |
||
| 316 | 314 | if (!$husb->isDead() && !$wife->isDead()) { echo 'N'; } ?> |
| 317 | 315 | </td> |
| 318 | 316 | <td hidden><?php |
| 319 | - if (!$husb->getChildFamilies() && !$wife->getChildFamilies()) { echo 'R'; } |
|
| 320 | - elseif (!$husb->isDead() && !$wife->isDead() && $family->getNumberOfChildren() < 1) { echo 'L'; } |
|
| 321 | - else { echo ' '; } ?> |
|
| 317 | + if (!$husb->getChildFamilies() && !$wife->getChildFamilies()) { echo 'R'; } elseif (!$husb->isDead() && !$wife->isDead() && $family->getNumberOfChildren() < 1) { echo 'L'; } else { echo ' '; } ?> |
|
| 322 | 318 | </td> |
| 323 | 319 | </tr> |
| 324 | 320 | <?php } ?> |
@@ -32,11 +32,11 @@ discard block |
||
| 32 | 32 | * {@inhericDoc} |
| 33 | 33 | * @see \MyArtJaub\Webtrees\Mvc\View\AbstractView::renderContent() |
| 34 | 34 | */ |
| 35 | - protected function renderContent() { |
|
| 35 | + protected function renderContent() { |
|
| 36 | 36 | |
| 37 | - if($this->data->get('has_sosa', false)) { |
|
| 38 | - $table_id = $this->data->get('table_id'); |
|
| 39 | - ?> |
|
| 37 | + if($this->data->get('has_sosa', false)) { |
|
| 38 | + $table_id = $this->data->get('table_id'); |
|
| 39 | + ?> |
|
| 40 | 40 | |
| 41 | 41 | <div id="sosa-fam-list" class="sosa-list"> |
| 42 | 42 | <table id="<?php echo $table_id; ?>"> |
@@ -176,61 +176,61 @@ discard block |
||
| 176 | 176 | <tbody> |
| 177 | 177 | |
| 178 | 178 | <?php foreach($this->data->get('sosa_list') as $sosa => $family) { |
| 179 | - /** @var \Fisharebest\Webtrees\Family $person */ |
|
| 179 | + /** @var \Fisharebest\Webtrees\Family $person */ |
|
| 180 | 180 | |
| 181 | - //PERSO Create decorator for Family |
|
| 182 | - $dfamily = new Family($family); |
|
| 181 | + //PERSO Create decorator for Family |
|
| 182 | + $dfamily = new Family($family); |
|
| 183 | 183 | |
| 184 | - $husb = $family->getHusband(); |
|
| 185 | - if (is_null($husb)) { |
|
| 186 | - $husb = new Individual('H', '0 @H@ INDI', null, $family->getTree()); |
|
| 187 | - } |
|
| 188 | - $wife = $family->getWife(); |
|
| 189 | - if (is_null($wife)) { |
|
| 190 | - $wife = new Individual('W', '0 @W@ INDI', null, $family->getTree()); |
|
| 191 | - } |
|
| 184 | + $husb = $family->getHusband(); |
|
| 185 | + if (is_null($husb)) { |
|
| 186 | + $husb = new Individual('H', '0 @H@ INDI', null, $family->getTree()); |
|
| 187 | + } |
|
| 188 | + $wife = $family->getWife(); |
|
| 189 | + if (is_null($wife)) { |
|
| 190 | + $wife = new Individual('W', '0 @W@ INDI', null, $family->getTree()); |
|
| 191 | + } |
|
| 192 | 192 | |
| 193 | - $mdate=$family->getMarriageDate(); |
|
| 193 | + $mdate=$family->getMarriageDate(); |
|
| 194 | 194 | |
| 195 | - if ($family->isPendingAddtion()) { |
|
| 196 | - $class = ' class="new"'; |
|
| 197 | - } elseif ($family->isPendingDeletion()) { |
|
| 198 | - $class = ' class="old"'; |
|
| 199 | - } else { |
|
| 200 | - $class = ''; |
|
| 201 | - } |
|
| 202 | - ?> |
|
| 195 | + if ($family->isPendingAddtion()) { |
|
| 196 | + $class = ' class="new"'; |
|
| 197 | + } elseif ($family->isPendingDeletion()) { |
|
| 198 | + $class = ' class="old"'; |
|
| 199 | + } else { |
|
| 200 | + $class = ''; |
|
| 201 | + } |
|
| 202 | + ?> |
|
| 203 | 203 | <tr <?= $class ?>> |
| 204 | 204 | <td class="transparent" data-sort="<?= $sosa ?>"><?= I18N::translate('%1$d/%2$d', $sosa, ($sosa + 1) % 10) ?></td> |
| 205 | 205 | <!-- HUSBAND --> |
| 206 | 206 | <?php list($surn_givn, $givn_surn) = FunctionsPrintLists::sortableNames($husb); ?> |
| 207 | 207 | <td colspan="2" data-sort="<?= Filter::escapeHtml($givn_surn) ?>"> |
| 208 | 208 | <?php foreach ($husb->getAllNames() as $num=>$name) { |
| 209 | - if ($name['type']=='NAME') { |
|
| 210 | - $title=''; |
|
| 211 | - } else { |
|
| 212 | - $title='title="'.strip_tags(GedcomTag::getLabel($name['type'], $husb)).'"'; |
|
| 213 | - } |
|
| 214 | - if ($num==$husb->getPrimaryName()) { |
|
| 215 | - $class=' class="name2"'; |
|
| 216 | - $sex_image=$husb->getSexImage(); |
|
| 217 | - } else { |
|
| 218 | - $class=''; |
|
| 219 | - $sex_image=''; |
|
| 220 | - } ?> |
|
| 209 | + if ($name['type']=='NAME') { |
|
| 210 | + $title=''; |
|
| 211 | + } else { |
|
| 212 | + $title='title="'.strip_tags(GedcomTag::getLabel($name['type'], $husb)).'"'; |
|
| 213 | + } |
|
| 214 | + if ($num==$husb->getPrimaryName()) { |
|
| 215 | + $class=' class="name2"'; |
|
| 216 | + $sex_image=$husb->getSexImage(); |
|
| 217 | + } else { |
|
| 218 | + $class=''; |
|
| 219 | + $sex_image=''; |
|
| 220 | + } ?> |
|
| 221 | 221 | <a <?php echo $title.' '.$class; ?> href="<?php echo $husb->getHtmlUrl(); ?>"> |
| 222 | 222 | <?php echo \Fisharebest\Webtrees\Functions\FunctionsPrint::highlightSearchHits($name['full']); ?> |
| 223 | 223 | </a> |
| 224 | 224 | <?php echo $sex_image; |
| 225 | - echo implode(' ', |
|
| 226 | - \MyArtJaub\Webtrees\Hook\HookProvider::getInstance() |
|
| 227 | - ->get('hRecordNameAppend') |
|
| 228 | - ->executeOnlyFor(array(Constants::MODULE_MAJ_SOSA_NAME), $husb, 'smaller')); |
|
| 229 | - ?> |
|
| 225 | + echo implode(' ', |
|
| 226 | + \MyArtJaub\Webtrees\Hook\HookProvider::getInstance() |
|
| 227 | + ->get('hRecordNameAppend') |
|
| 228 | + ->executeOnlyFor(array(Constants::MODULE_MAJ_SOSA_NAME), $husb, 'smaller')); |
|
| 229 | + ?> |
|
| 230 | 230 | <br/> |
| 231 | 231 | <?php } |
| 232 | - echo $husb->getPrimaryParentsNames('parents details1', 'none'); |
|
| 233 | - ?> |
|
| 232 | + echo $husb->getPrimaryParentsNames('parents details1', 'none'); |
|
| 233 | + ?> |
|
| 234 | 234 | </td> |
| 235 | 235 | <td hidden data-sort="<?= Filter::escapeHtml($surn_givn) ?>"></td> |
| 236 | 236 | <?php $hdate=$husb->getBirthDate(); ?> |
@@ -239,60 +239,60 @@ discard block |
||
| 239 | 239 | <?php list($surn_givn, $givn_surn) = FunctionsPrintLists::sortableNames($wife); ?> |
| 240 | 240 | <td colspan="2"> |
| 241 | 241 | <?php foreach ($wife->getAllNames() as $num=>$name) { |
| 242 | - if ($name['type']=='NAME') { |
|
| 243 | - $title=''; |
|
| 244 | - } else { |
|
| 245 | - $title='title="'.strip_tags(GedcomTag::getLabel($name['type'], $wife)).'"'; |
|
| 246 | - } |
|
| 247 | - if ($num==$wife->getPrimaryName()) { |
|
| 248 | - $class=' class="name2"'; |
|
| 249 | - $sex_image=$wife->getSexImage(); |
|
| 250 | - } else { |
|
| 251 | - $class=''; |
|
| 252 | - $sex_image=''; |
|
| 253 | - } ?> |
|
| 242 | + if ($name['type']=='NAME') { |
|
| 243 | + $title=''; |
|
| 244 | + } else { |
|
| 245 | + $title='title="'.strip_tags(GedcomTag::getLabel($name['type'], $wife)).'"'; |
|
| 246 | + } |
|
| 247 | + if ($num==$wife->getPrimaryName()) { |
|
| 248 | + $class=' class="name2"'; |
|
| 249 | + $sex_image=$wife->getSexImage(); |
|
| 250 | + } else { |
|
| 251 | + $class=''; |
|
| 252 | + $sex_image=''; |
|
| 253 | + } ?> |
|
| 254 | 254 | <a <?= $title.' '.$class ?> href="<?= $wife->getHtmlUrl() ?>"> |
| 255 | 255 | <?= \Fisharebest\Webtrees\Functions\FunctionsPrint::highlightSearchHits($name['full']) ?> |
| 256 | 256 | </a> |
| 257 | 257 | <?= $sex_image; |
| 258 | - echo implode(' ', |
|
| 259 | - \MyArtJaub\Webtrees\Hook\HookProvider::getInstance() |
|
| 260 | - ->get('hRecordNameAppend') |
|
| 261 | - ->executeOnlyFor(array(Constants::MODULE_MAJ_SOSA_NAME), $wife, 'smaller')); |
|
| 262 | - ?> |
|
| 258 | + echo implode(' ', |
|
| 259 | + \MyArtJaub\Webtrees\Hook\HookProvider::getInstance() |
|
| 260 | + ->get('hRecordNameAppend') |
|
| 261 | + ->executeOnlyFor(array(Constants::MODULE_MAJ_SOSA_NAME), $wife, 'smaller')); |
|
| 262 | + ?> |
|
| 263 | 263 | <br/> |
| 264 | 264 | <?php } |
| 265 | - echo $wife->getPrimaryParentsNames('parents details1', 'none'); |
|
| 266 | - ?> |
|
| 265 | + echo $wife->getPrimaryParentsNames('parents details1', 'none'); |
|
| 266 | + ?> |
|
| 267 | 267 | </td> |
| 268 | 268 | <td hidden data-sort="<?= Filter::escapeHtml($surn_givn) ?>"></td> |
| 269 | 269 | <?php $wdate=$wife->getBirthDate(); ?> |
| 270 | 270 | <td class="center" data-sort="<?= Date::getAge($wdate, $mdate, 1) ?>"><?= Date::getAge($wdate, $mdate, 2) ?></td> |
| 271 | 271 | <td data-sort="<?= $mdate->julianDay() ?>"><?php |
| 272 | - if ($marriage_dates = $family->getAllMarriageDates()) { |
|
| 273 | - foreach ($marriage_dates as $n => $marriage_date) { |
|
| 274 | - if ($n) { echo '<br>'; } ?> |
|
| 272 | + if ($marriage_dates = $family->getAllMarriageDates()) { |
|
| 273 | + foreach ($marriage_dates as $n => $marriage_date) { |
|
| 274 | + if ($n) { echo '<br>'; } ?> |
|
| 275 | 275 | <div><?= $marriage_date->display(true) ?></div> |
| 276 | 276 | <?php } |
| 277 | - } elseif ($family->getFacts('_NMR')) { |
|
| 278 | - echo I18N::translate('no'); |
|
| 279 | - } elseif ($family->getFacts('MARR')) { |
|
| 280 | - echo I18N::translate('yes'); |
|
| 281 | - } else { |
|
| 282 | - echo ' '; |
|
| 283 | - } ?> |
|
| 277 | + } elseif ($family->getFacts('_NMR')) { |
|
| 278 | + echo I18N::translate('no'); |
|
| 279 | + } elseif ($family->getFacts('MARR')) { |
|
| 280 | + echo I18N::translate('yes'); |
|
| 281 | + } else { |
|
| 282 | + echo ' '; |
|
| 283 | + } ?> |
|
| 284 | 284 | </td> |
| 285 | 285 | <td><?php |
| 286 | - foreach ($family->getAllMarriagePlaces() as $n => $marriage_place) { |
|
| 287 | - $tmp = new Place($marriage_place, $family->getTree()); |
|
| 288 | - if ($n) { ?><br><?php } ?> |
|
| 286 | + foreach ($family->getAllMarriagePlaces() as $n => $marriage_place) { |
|
| 287 | + $tmp = new Place($marriage_place, $family->getTree()); |
|
| 288 | + if ($n) { ?><br><?php } ?> |
|
| 289 | 289 | <a href="'<?= $tmp->getURL() ?>" title="<?= strip_tags($tmp->getFullName()) ?>"> |
| 290 | 290 | <?= \Fisharebest\Webtrees\Functions\FunctionsPrint::highlightSearchHits($tmp->getShortName()) ?> |
| 291 | 291 | </a> |
| 292 | 292 | <?php } ?> |
| 293 | 293 | </td> |
| 294 | 294 | <?php if (ModuleManager::getInstance()->isOperational(Constants::MODULE_MAJ_ISSOURCED_NAME)) { |
| 295 | - $isMSourced = $dfamily->isMarriageSourced(); ?> |
|
| 295 | + $isMSourced = $dfamily->isMarriageSourced(); ?> |
|
| 296 | 296 | <td data-sort=<?= $isMSourced ?>><?= FunctionsPrint::formatIsSourcedIcon('E', $isMSourced, 'MARR', 1, 'medium') ?></td> |
| 297 | 297 | <?php } else { ?> |
| 298 | 298 | <td> </td> |
@@ -303,30 +303,30 @@ discard block |
||
| 303 | 303 | <td hidden><?php |
| 304 | 304 | if (!$mdate->isOK()) { echo 'U'; } |
| 305 | 305 | else { |
| 306 | - if (Date::compare($mdate, new Date(date('Y') - 100)) > 0) { echo 'Y100'; } |
|
| 307 | - else { echo 'YES'; } |
|
| 306 | + if (Date::compare($mdate, new Date(date('Y') - 100)) > 0) { echo 'Y100'; } |
|
| 307 | + else { echo 'YES'; } |
|
| 308 | 308 | } |
| 309 | 309 | if ($family->getFacts(WT_EVENTS_DIV)) { echo 'D'; } |
| 310 | 310 | if (count($husb->getSpouseFamilies()) > 1 || count($wife->getSpouseFamilies()) > 1) { |
| 311 | - echo 'M'; |
|
| 311 | + echo 'M'; |
|
| 312 | 312 | } ?> |
| 313 | 313 | </td> |
| 314 | 314 | <td hidden><?php |
| 315 | - if ($husb->isDead() && $wife->isDead()) { echo 'Y'; } |
|
| 316 | - if ($husb->isDead() && !$wife->isDead()) { |
|
| 317 | - if ($wife->getSex() == 'F') { echo 'H'; } |
|
| 318 | - if ($wife->getSex() == 'M') { echo 'W'; } // male partners |
|
| 319 | - } |
|
| 320 | - if (!$husb->isDead() && $wife->isDead()) { |
|
| 321 | - if ($husb->getSex() == 'M') { echo 'W'; } |
|
| 322 | - if ($husb->getSex() == 'F') { echo 'H'; } // female partners |
|
| 323 | - } |
|
| 324 | - if (!$husb->isDead() && !$wife->isDead()) { echo 'N'; } ?> |
|
| 315 | + if ($husb->isDead() && $wife->isDead()) { echo 'Y'; } |
|
| 316 | + if ($husb->isDead() && !$wife->isDead()) { |
|
| 317 | + if ($wife->getSex() == 'F') { echo 'H'; } |
|
| 318 | + if ($wife->getSex() == 'M') { echo 'W'; } // male partners |
|
| 319 | + } |
|
| 320 | + if (!$husb->isDead() && $wife->isDead()) { |
|
| 321 | + if ($husb->getSex() == 'M') { echo 'W'; } |
|
| 322 | + if ($husb->getSex() == 'F') { echo 'H'; } // female partners |
|
| 323 | + } |
|
| 324 | + if (!$husb->isDead() && !$wife->isDead()) { echo 'N'; } ?> |
|
| 325 | 325 | </td> |
| 326 | 326 | <td hidden><?php |
| 327 | - if (!$husb->getChildFamilies() && !$wife->getChildFamilies()) { echo 'R'; } |
|
| 328 | - elseif (!$husb->isDead() && !$wife->isDead() && $family->getNumberOfChildren() < 1) { echo 'L'; } |
|
| 329 | - else { echo ' '; } ?> |
|
| 327 | + if (!$husb->getChildFamilies() && !$wife->getChildFamilies()) { echo 'R'; } |
|
| 328 | + elseif (!$husb->isDead() && !$wife->isDead() && $family->getNumberOfChildren() < 1) { echo 'L'; } |
|
| 329 | + else { echo ' '; } ?> |
|
| 330 | 330 | </td> |
| 331 | 331 | </tr> |
| 332 | 332 | <?php } ?> |
@@ -364,7 +364,7 @@ discard block |
||
| 364 | 364 | <p class="warning"><?= I18N::translate('No family has been found for generation %d', $this->data->get('generation')) ?></p> |
| 365 | 365 | <?php |
| 366 | 366 | } |
| 367 | - } |
|
| 367 | + } |
|
| 368 | 368 | |
| 369 | 369 | } |
| 370 | 370 | |
| 371 | 371 | \ No newline at end of file |
@@ -34,7 +34,7 @@ discard block |
||
| 34 | 34 | */ |
| 35 | 35 | protected function renderContent() { |
| 36 | 36 | |
| 37 | - if($this->data->get('has_sosa', false)) { |
|
| 37 | + if ($this->data->get('has_sosa', false)) { |
|
| 38 | 38 | $table_id = $this->data->get('table_id'); |
| 39 | 39 | ?> |
| 40 | 40 | |
@@ -52,7 +52,7 @@ discard block |
||
| 52 | 52 | class="ui-state-default" |
| 53 | 53 | title="<?php echo I18N::translate('Show individuals who are alive or couples where both partners are alive.'); ?>" |
| 54 | 54 | > |
| 55 | - <?php echo I18N::translate('Both alive');?> |
|
| 55 | + <?php echo I18N::translate('Both alive'); ?> |
|
| 56 | 56 | </button> |
| 57 | 57 | <button |
| 58 | 58 | type="button" |
@@ -61,7 +61,7 @@ discard block |
||
| 61 | 61 | class="ui-state-default" |
| 62 | 62 | title="<?php echo I18N::translate('Show couples where only the female partner is dead.'); ?>" |
| 63 | 63 | > |
| 64 | - <?php echo I18N::translate('Widower');?> |
|
| 64 | + <?php echo I18N::translate('Widower'); ?> |
|
| 65 | 65 | </button> |
| 66 | 66 | <button |
| 67 | 67 | type="button" |
@@ -175,7 +175,7 @@ discard block |
||
| 175 | 175 | </thead> |
| 176 | 176 | <tbody> |
| 177 | 177 | |
| 178 | - <?php foreach($this->data->get('sosa_list') as $sosa => $family) { |
|
| 178 | + <?php foreach ($this->data->get('sosa_list') as $sosa => $family) { |
|
| 179 | 179 | /** @var \Fisharebest\Webtrees\Family $person */ |
| 180 | 180 | |
| 181 | 181 | //PERSO Create decorator for Family |
@@ -190,7 +190,7 @@ discard block |
||
| 190 | 190 | $wife = new Individual('W', '0 @W@ INDI', null, $family->getTree()); |
| 191 | 191 | } |
| 192 | 192 | |
| 193 | - $mdate=$family->getMarriageDate(); |
|
| 193 | + $mdate = $family->getMarriageDate(); |
|
| 194 | 194 | |
| 195 | 195 | if ($family->isPendingAddtion()) { |
| 196 | 196 | $class = ' class="new"'; |
@@ -206,17 +206,17 @@ discard block |
||
| 206 | 206 | <?php list($surn_givn, $givn_surn) = FunctionsPrintLists::sortableNames($husb); ?> |
| 207 | 207 | <td colspan="2" data-sort="<?= Filter::escapeHtml($givn_surn) ?>"> |
| 208 | 208 | <?php foreach ($husb->getAllNames() as $num=>$name) { |
| 209 | - if ($name['type']=='NAME') { |
|
| 210 | - $title=''; |
|
| 209 | + if ($name['type'] == 'NAME') { |
|
| 210 | + $title = ''; |
|
| 211 | 211 | } else { |
| 212 | - $title='title="'.strip_tags(GedcomTag::getLabel($name['type'], $husb)).'"'; |
|
| 212 | + $title = 'title="'.strip_tags(GedcomTag::getLabel($name['type'], $husb)).'"'; |
|
| 213 | 213 | } |
| 214 | - if ($num==$husb->getPrimaryName()) { |
|
| 215 | - $class=' class="name2"'; |
|
| 216 | - $sex_image=$husb->getSexImage(); |
|
| 214 | + if ($num == $husb->getPrimaryName()) { |
|
| 215 | + $class = ' class="name2"'; |
|
| 216 | + $sex_image = $husb->getSexImage(); |
|
| 217 | 217 | } else { |
| 218 | - $class=''; |
|
| 219 | - $sex_image=''; |
|
| 218 | + $class = ''; |
|
| 219 | + $sex_image = ''; |
|
| 220 | 220 | } ?> |
| 221 | 221 | <a <?php echo $title.' '.$class; ?> href="<?php echo $husb->getHtmlUrl(); ?>"> |
| 222 | 222 | <?php echo \Fisharebest\Webtrees\Functions\FunctionsPrint::highlightSearchHits($name['full']); ?> |
@@ -225,7 +225,7 @@ discard block |
||
| 225 | 225 | echo implode(' ', |
| 226 | 226 | \MyArtJaub\Webtrees\Hook\HookProvider::getInstance() |
| 227 | 227 | ->get('hRecordNameAppend') |
| 228 | - ->executeOnlyFor(array(Constants::MODULE_MAJ_SOSA_NAME), $husb, 'smaller')); |
|
| 228 | + ->executeOnlyFor(array(Constants::MODULE_MAJ_SOSA_NAME), $husb, 'smaller')); |
|
| 229 | 229 | ?> |
| 230 | 230 | <br/> |
| 231 | 231 | <?php } |
@@ -233,23 +233,23 @@ discard block |
||
| 233 | 233 | ?> |
| 234 | 234 | </td> |
| 235 | 235 | <td hidden data-sort="<?= Filter::escapeHtml($surn_givn) ?>"></td> |
| 236 | - <?php $hdate=$husb->getBirthDate(); ?> |
|
| 236 | + <?php $hdate = $husb->getBirthDate(); ?> |
|
| 237 | 237 | <td class="center" data-sort="<?= Date::getAge($hdate, $mdate, 1) ?>"><?= Date::getAge($hdate, $mdate, 2) ?></td> |
| 238 | 238 | <!-- WIFE --> |
| 239 | 239 | <?php list($surn_givn, $givn_surn) = FunctionsPrintLists::sortableNames($wife); ?> |
| 240 | 240 | <td colspan="2"> |
| 241 | 241 | <?php foreach ($wife->getAllNames() as $num=>$name) { |
| 242 | - if ($name['type']=='NAME') { |
|
| 243 | - $title=''; |
|
| 242 | + if ($name['type'] == 'NAME') { |
|
| 243 | + $title = ''; |
|
| 244 | 244 | } else { |
| 245 | - $title='title="'.strip_tags(GedcomTag::getLabel($name['type'], $wife)).'"'; |
|
| 245 | + $title = 'title="'.strip_tags(GedcomTag::getLabel($name['type'], $wife)).'"'; |
|
| 246 | 246 | } |
| 247 | - if ($num==$wife->getPrimaryName()) { |
|
| 248 | - $class=' class="name2"'; |
|
| 249 | - $sex_image=$wife->getSexImage(); |
|
| 247 | + if ($num == $wife->getPrimaryName()) { |
|
| 248 | + $class = ' class="name2"'; |
|
| 249 | + $sex_image = $wife->getSexImage(); |
|
| 250 | 250 | } else { |
| 251 | - $class=''; |
|
| 252 | - $sex_image=''; |
|
| 251 | + $class = ''; |
|
| 252 | + $sex_image = ''; |
|
| 253 | 253 | } ?> |
| 254 | 254 | <a <?= $title.' '.$class ?> href="<?= $wife->getHtmlUrl() ?>"> |
| 255 | 255 | <?= \Fisharebest\Webtrees\Functions\FunctionsPrint::highlightSearchHits($name['full']) ?> |
@@ -258,7 +258,7 @@ discard block |
||
| 258 | 258 | echo implode(' ', |
| 259 | 259 | \MyArtJaub\Webtrees\Hook\HookProvider::getInstance() |
| 260 | 260 | ->get('hRecordNameAppend') |
| 261 | - ->executeOnlyFor(array(Constants::MODULE_MAJ_SOSA_NAME), $wife, 'smaller')); |
|
| 261 | + ->executeOnlyFor(array(Constants::MODULE_MAJ_SOSA_NAME), $wife, 'smaller')); |
|
| 262 | 262 | ?> |
| 263 | 263 | <br/> |
| 264 | 264 | <?php } |
@@ -266,7 +266,7 @@ discard block |
||
| 266 | 266 | ?> |
| 267 | 267 | </td> |
| 268 | 268 | <td hidden data-sort="<?= Filter::escapeHtml($surn_givn) ?>"></td> |
| 269 | - <?php $wdate=$wife->getBirthDate(); ?> |
|
| 269 | + <?php $wdate = $wife->getBirthDate(); ?> |
|
| 270 | 270 | <td class="center" data-sort="<?= Date::getAge($wdate, $mdate, 1) ?>"><?= Date::getAge($wdate, $mdate, 2) ?></td> |
| 271 | 271 | <td data-sort="<?= $mdate->julianDay() ?>"><?php |
| 272 | 272 | if ($marriage_dates = $family->getAllMarriageDates()) { |
@@ -184,7 +184,10 @@ |
||
| 184 | 184 | <td class="ui-state-default" colspan="11"> |
| 185 | 185 | <div class="center"> |
| 186 | 186 | <?= I18N::translate('Number of different missing ancestors: %s', I18N::number($this->data->get('missing_diff_count'))) ?> |
| 187 | - <?php if($this->data->get('missing_hidden') > 0) echo ' ['. I18N::translate('%s hidden', I18N::number($this->data->get('missing_hidden'))).']'; ?> |
|
| 187 | + <?php if($this->data->get('missing_hidden') > 0) { |
|
| 188 | + echo ' ['. I18N::translate('%s hidden', I18N::number($this->data->get('missing_hidden'))).']'; |
|
| 189 | +} |
|
| 190 | +?> |
|
| 188 | 191 | <?= ' - ' . I18N::translate('Generation complete at %s', I18N::percentage($this->data->get('perc_sosa'), 2)) ?> |
| 189 | 192 | <?= ' [' . I18N::translate('Potential %s', I18N::percentage($this->data->get('perc_sosa_potential'),2)).']' ?> |
| 190 | 193 | </div> |
@@ -30,16 +30,16 @@ discard block |
||
| 30 | 30 | * {@inhericDoc} |
| 31 | 31 | * @see \MyArtJaub\Webtrees\Mvc\View\AbstractView::renderContent() |
| 32 | 32 | */ |
| 33 | - protected function renderContent() { |
|
| 34 | - ?> |
|
| 33 | + protected function renderContent() { |
|
| 34 | + ?> |
|
| 35 | 35 | <div id="maj-sosa-missing-page" class="center"> |
| 36 | 36 | <h2><?= $this->data->get('title') ?></h2> |
| 37 | 37 | |
| 38 | 38 | <?php if($this->data->get('is_setup')) { |
| 39 | - $this->renderSosaHeader(); |
|
| 40 | - if($this->data->get('has_missing', false)) { |
|
| 41 | - $table_id = $this->data->get('table_id'); |
|
| 42 | - ?> |
|
| 39 | + $this->renderSosaHeader(); |
|
| 40 | + if($this->data->get('has_missing', false)) { |
|
| 41 | + $table_id = $this->data->get('table_id'); |
|
| 42 | + ?> |
|
| 43 | 43 | <div id="sosa-indi-missing" class="smissing-list"> |
| 44 | 44 | <table id="<?= $table_id ?>"> |
| 45 | 45 | <thead> |
@@ -103,52 +103,52 @@ discard block |
||
| 103 | 103 | <tbody> |
| 104 | 104 | |
| 105 | 105 | <?php foreach($this->data->get('missing_list') as $missing_tab) { |
| 106 | - $person = $missing_tab['indi']; |
|
| 106 | + $person = $missing_tab['indi']; |
|
| 107 | 107 | |
| 108 | - /** @var \Fisharebest\Webtrees\Individual $person */ |
|
| 109 | - if ($person->isPendingAddtion()) { |
|
| 110 | - $class = ' class="new"'; |
|
| 111 | - } elseif ($person->isPendingDeletion()) { |
|
| 112 | - $class = ' class="old"'; |
|
| 113 | - } else { |
|
| 114 | - $class = ''; |
|
| 115 | - } |
|
| 116 | - $dperson = new \MyArtJaub\Webtrees\Individual($person); |
|
| 117 | - list($surn_givn, $givn_surn) = FunctionsPrintLists::sortableNames($person); |
|
| 118 | - ?> |
|
| 108 | + /** @var \Fisharebest\Webtrees\Individual $person */ |
|
| 109 | + if ($person->isPendingAddtion()) { |
|
| 110 | + $class = ' class="new"'; |
|
| 111 | + } elseif ($person->isPendingDeletion()) { |
|
| 112 | + $class = ' class="old"'; |
|
| 113 | + } else { |
|
| 114 | + $class = ''; |
|
| 115 | + } |
|
| 116 | + $dperson = new \MyArtJaub\Webtrees\Individual($person); |
|
| 117 | + list($surn_givn, $givn_surn) = FunctionsPrintLists::sortableNames($person); |
|
| 118 | + ?> |
|
| 119 | 119 | <tr <?= $class ?>> |
| 120 | 120 | <td class="transparent"><?= $missing_tab['sosa'] ?></td> |
| 121 | 121 | <td class="transparent"><?= $person->getXref() ?></td> |
| 122 | 122 | <td colspan="2" data-sort="<?= Filter::escapeHtml($givn_surn) ?>"> |
| 123 | 123 | <?php foreach ($person->getAllNames() as $num=>$name) { |
| 124 | - if ($name['type']=='NAME') { |
|
| 125 | - $title=''; |
|
| 126 | - } else { |
|
| 127 | - $title='title="'.strip_tags(GedcomTag::getLabel($name['type'], $person)).'"'; |
|
| 128 | - } |
|
| 129 | - if ($num==$person->getPrimaryName()) { |
|
| 130 | - $class=' class="name2"'; |
|
| 131 | - $sex_image=$person->getSexImage(); |
|
| 132 | - } else { |
|
| 133 | - $class=''; |
|
| 134 | - $sex_image=''; |
|
| 135 | - } ?> |
|
| 124 | + if ($name['type']=='NAME') { |
|
| 125 | + $title=''; |
|
| 126 | + } else { |
|
| 127 | + $title='title="'.strip_tags(GedcomTag::getLabel($name['type'], $person)).'"'; |
|
| 128 | + } |
|
| 129 | + if ($num==$person->getPrimaryName()) { |
|
| 130 | + $class=' class="name2"'; |
|
| 131 | + $sex_image=$person->getSexImage(); |
|
| 132 | + } else { |
|
| 133 | + $class=''; |
|
| 134 | + $sex_image=''; |
|
| 135 | + } ?> |
|
| 136 | 136 | <a <?= $title.' '.$class ?> href="<?= $person->getHtmlUrl() ?>"> |
| 137 | 137 | <?= \Fisharebest\Webtrees\Functions\FunctionsPrint::highlightSearchHits($name['full']) ?> |
| 138 | 138 | </a> |
| 139 | 139 | <?= $sex_image; |
| 140 | - echo implode(' ', |
|
| 141 | - \MyArtJaub\Webtrees\Hook\HookProvider::getInstance() |
|
| 142 | - ->get('hRecordNameAppend') |
|
| 143 | - ->executeOnlyFor(array(Constants::MODULE_MAJ_SOSA_NAME), $person, 'smaller')); ?> |
|
| 140 | + echo implode(' ', |
|
| 141 | + \MyArtJaub\Webtrees\Hook\HookProvider::getInstance() |
|
| 142 | + ->get('hRecordNameAppend') |
|
| 143 | + ->executeOnlyFor(array(Constants::MODULE_MAJ_SOSA_NAME), $person, 'smaller')); ?> |
|
| 144 | 144 | <br/> |
| 145 | 145 | <?php } |
| 146 | - echo $person->getPrimaryParentsNames('parents details1', 'none'); |
|
| 147 | - ?> |
|
| 146 | + echo $person->getPrimaryParentsNames('parents details1', 'none'); |
|
| 147 | + ?> |
|
| 148 | 148 | </td> |
| 149 | 149 | <td hidden data-sort="<?= Filter::escapeHtml($surn_givn) ?>"></td> |
| 150 | 150 | <?php if (ModuleManager::getInstance()->isOperational(Constants::MODULE_MAJ_ISSOURCED_NAME)) { |
| 151 | - $isISourced = $dperson->isSourced(); ?> |
|
| 151 | + $isISourced = $dperson->isSourced(); ?> |
|
| 152 | 152 | <td data-sort="<?= $isISourced ?>"><?= FunctionsPrint::formatIsSourcedIcon('R', $isISourced, 'INDI', 1, 'medium') ?></td> |
| 153 | 153 | <?php } else { ?> |
| 154 | 154 | <td> </td> |
@@ -158,23 +158,23 @@ discard block |
||
| 158 | 158 | <?php $birth_dates = $person->getAllBirthDates(); ?> |
| 159 | 159 | <td data-sort="<?= $person->getEstimatedBirthDate()->julianDay() ?>"> |
| 160 | 160 | <?php |
| 161 | - foreach ($birth_dates as $n => $birth_date) { |
|
| 162 | - if ($n > 0) { ?> <br> <?php } |
|
| 163 | - echo $birth_date->display(true); |
|
| 164 | - } |
|
| 165 | - ?> |
|
| 161 | + foreach ($birth_dates as $n => $birth_date) { |
|
| 162 | + if ($n > 0) { ?> <br> <?php } |
|
| 163 | + echo $birth_date->display(true); |
|
| 164 | + } |
|
| 165 | + ?> |
|
| 166 | 166 | </td> |
| 167 | 167 | <td> |
| 168 | 168 | <?php foreach ($person->getAllBirthPlaces() as $n => $birth_place) { |
| 169 | - $tmp = new \Fisharebest\Webtrees\Place($birth_place, $person->getTree()); |
|
| 170 | - if ($n > 0) { ?><br><?php } ?> |
|
| 169 | + $tmp = new \Fisharebest\Webtrees\Place($birth_place, $person->getTree()); |
|
| 170 | + if ($n > 0) { ?><br><?php } ?> |
|
| 171 | 171 | <a href="'<?= $tmp->getURL(); ?>" title="<?= strip_tags($tmp->getFullName()) ?>"> |
| 172 | 172 | <?= \Fisharebest\Webtrees\Functions\FunctionsPrint::highlightSearchHits($tmp->getShortName()) ?> |
| 173 | 173 | </a> |
| 174 | 174 | <?php } ?> |
| 175 | 175 | </td> |
| 176 | 176 | <?php if (ModuleManager::getInstance()->isOperational(Constants::MODULE_MAJ_ISSOURCED_NAME)) { |
| 177 | - $isBSourced = $dperson->isBirthSourced(); ?> |
|
| 177 | + $isBSourced = $dperson->isBirthSourced(); ?> |
|
| 178 | 178 | <td data-sort="<?= $isBSourced ?>"><?= FunctionsPrint::formatIsSourcedIcon('E', $isBSourced, 'BIRT', 1, 'medium') ?></td> |
| 179 | 179 | <?php } else { ?> |
| 180 | 180 | <td> </td> |
@@ -199,7 +199,7 @@ discard block |
||
| 199 | 199 | <?php } else if ($this->data->get('generation', 0) > 0) { ?> |
| 200 | 200 | <p><?= I18N::translate('No ancestors are missing for this generation. Generation complete at %s.', I18N::percentage($this->data->get('perc_sosa'), 2)) ?></p> |
| 201 | 201 | <?php } |
| 202 | - } else { ?> |
|
| 202 | + } else { ?> |
|
| 203 | 203 | <p class="warning"><?= I18N::translate('The list could not be displayed. Reasons might be:') ?><br/> |
| 204 | 204 | <ul> |
| 205 | 205 | <li><?= I18N::translate('No Sosa root individual has been defined.') ?></li> |
@@ -210,6 +210,6 @@ discard block |
||
| 210 | 210 | <?php } ?> |
| 211 | 211 | </div> |
| 212 | 212 | <?php |
| 213 | - } |
|
| 213 | + } |
|
| 214 | 214 | } |
| 215 | 215 | |
| 216 | 216 | \ No newline at end of file |
@@ -35,9 +35,9 @@ discard block |
||
| 35 | 35 | <div id="maj-sosa-missing-page" class="center"> |
| 36 | 36 | <h2><?= $this->data->get('title') ?></h2> |
| 37 | 37 | |
| 38 | - <?php if($this->data->get('is_setup')) { |
|
| 38 | + <?php if ($this->data->get('is_setup')) { |
|
| 39 | 39 | $this->renderSosaHeader(); |
| 40 | - if($this->data->get('has_missing', false)) { |
|
| 40 | + if ($this->data->get('has_missing', false)) { |
|
| 41 | 41 | $table_id = $this->data->get('table_id'); |
| 42 | 42 | ?> |
| 43 | 43 | <div id="sosa-indi-missing" class="smissing-list"> |
@@ -102,7 +102,7 @@ discard block |
||
| 102 | 102 | </thead> |
| 103 | 103 | <tbody> |
| 104 | 104 | |
| 105 | - <?php foreach($this->data->get('missing_list') as $missing_tab) { |
|
| 105 | + <?php foreach ($this->data->get('missing_list') as $missing_tab) { |
|
| 106 | 106 | $person = $missing_tab['indi']; |
| 107 | 107 | |
| 108 | 108 | /** @var \Fisharebest\Webtrees\Individual $person */ |
@@ -121,17 +121,17 @@ discard block |
||
| 121 | 121 | <td class="transparent"><?= $person->getXref() ?></td> |
| 122 | 122 | <td colspan="2" data-sort="<?= Filter::escapeHtml($givn_surn) ?>"> |
| 123 | 123 | <?php foreach ($person->getAllNames() as $num=>$name) { |
| 124 | - if ($name['type']=='NAME') { |
|
| 125 | - $title=''; |
|
| 124 | + if ($name['type'] == 'NAME') { |
|
| 125 | + $title = ''; |
|
| 126 | 126 | } else { |
| 127 | - $title='title="'.strip_tags(GedcomTag::getLabel($name['type'], $person)).'"'; |
|
| 127 | + $title = 'title="'.strip_tags(GedcomTag::getLabel($name['type'], $person)).'"'; |
|
| 128 | 128 | } |
| 129 | - if ($num==$person->getPrimaryName()) { |
|
| 130 | - $class=' class="name2"'; |
|
| 131 | - $sex_image=$person->getSexImage(); |
|
| 129 | + if ($num == $person->getPrimaryName()) { |
|
| 130 | + $class = ' class="name2"'; |
|
| 131 | + $sex_image = $person->getSexImage(); |
|
| 132 | 132 | } else { |
| 133 | - $class=''; |
|
| 134 | - $sex_image=''; |
|
| 133 | + $class = ''; |
|
| 134 | + $sex_image = ''; |
|
| 135 | 135 | } ?> |
| 136 | 136 | <a <?= $title.' '.$class ?> href="<?= $person->getHtmlUrl() ?>"> |
| 137 | 137 | <?= \Fisharebest\Webtrees\Functions\FunctionsPrint::highlightSearchHits($name['full']) ?> |
@@ -140,7 +140,7 @@ discard block |
||
| 140 | 140 | echo implode(' ', |
| 141 | 141 | \MyArtJaub\Webtrees\Hook\HookProvider::getInstance() |
| 142 | 142 | ->get('hRecordNameAppend') |
| 143 | - ->executeOnlyFor(array(Constants::MODULE_MAJ_SOSA_NAME), $person, 'smaller')); ?> |
|
| 143 | + ->executeOnlyFor(array(Constants::MODULE_MAJ_SOSA_NAME), $person, 'smaller')); ?> |
|
| 144 | 144 | <br/> |
| 145 | 145 | <?php } |
| 146 | 146 | echo $person->getPrimaryParentsNames('parents details1', 'none'); |
@@ -188,9 +188,9 @@ discard block |
||
| 188 | 188 | <td class="ui-state-default" colspan="11"> |
| 189 | 189 | <div class="center"> |
| 190 | 190 | <?= I18N::translate('Number of different missing ancestors: %s', I18N::number($this->data->get('missing_diff_count'))) ?> |
| 191 | - <?php if($this->data->get('missing_hidden') > 0) echo ' ['. I18N::translate('%s hidden', I18N::number($this->data->get('missing_hidden'))).']'; ?> |
|
| 192 | - <?= ' - ' . I18N::translate('Generation complete at %s', I18N::percentage($this->data->get('perc_sosa'), 2)) ?> |
|
| 193 | - <?= ' [' . I18N::translate('Potential %s', I18N::percentage($this->data->get('perc_sosa_potential'),2)).']' ?> |
|
| 191 | + <?php if ($this->data->get('missing_hidden') > 0) echo ' ['.I18N::translate('%s hidden', I18N::number($this->data->get('missing_hidden'))).']'; ?> |
|
| 192 | + <?= ' - '.I18N::translate('Generation complete at %s', I18N::percentage($this->data->get('perc_sosa'), 2)) ?> |
|
| 193 | + <?= ' ['.I18N::translate('Potential %s', I18N::percentage($this->data->get('perc_sosa_potential'), 2)).']' ?> |
|
| 194 | 194 | </div> |
| 195 | 195 | </td> |
| 196 | 196 | </tr> |
@@ -94,14 +94,15 @@ discard block |
||
| 94 | 94 | $this->provider->setTaskStatus($task, $status); |
| 95 | 95 | $res['status'] = $status; |
| 96 | 96 | Log::addConfigurationLog('Module '.$this->module->getName().' : Admin Task "'.$task->getName().'" has been '. ($status ? 'enabled' : 'disabled') .'.'); |
| 97 | - } |
|
| 98 | - catch (\Exception $ex) { |
|
| 97 | + } catch (\Exception $ex) { |
|
| 99 | 98 | $res['error'] = $ex->getMessage(); |
| 100 | 99 | Log::addErrorLog('Module '.$this->module->getName().' : Admin Task "'.$task->getName().'" could not be ' . ($status ? 'enabled' : 'disabled') .'. Error: '. $ex->getMessage()); |
| 101 | 100 | } |
| 102 | 101 | |
| 103 | 102 | $controller->pageHeader(); |
| 104 | - if($res['error']) http_response_code(500); |
|
| 103 | + if($res['error']) { |
|
| 104 | + http_response_code(500); |
|
| 105 | + } |
|
| 105 | 106 | |
| 106 | 107 | $controller->encode($res); |
| 107 | 108 | } |
@@ -169,8 +170,7 @@ discard block |
||
| 169 | 170 | $task->setFrequency($frequency); |
| 170 | 171 | if($is_limited == 1) { |
| 171 | 172 | $task->setRemainingOccurrences($nb_occur); |
| 172 | - } |
|
| 173 | - else { |
|
| 173 | + } else { |
|
| 174 | 174 | $task->setRemainingOccurrences(0); |
| 175 | 175 | } |
| 176 | 176 | |
@@ -191,8 +191,7 @@ discard block |
||
| 191 | 191 | Log::addConfigurationLog('Module '.$this->module->getName().' : AdminTask “'.$task->getName() .'” has been updated.'); |
| 192 | 192 | $success = true; |
| 193 | 193 | } |
| 194 | - } |
|
| 195 | - else { |
|
| 194 | + } else { |
|
| 196 | 195 | FlashMessages::addMessage(I18N::translate('An error occured while updating the administrative task “%s”', $task->getTitle()), 'danger'); |
| 197 | 196 | Log::addConfigurationLog('Module '.$this->module->getName().' : AdminTask “'. $task->getName() .'” could not be updated. See error log.'); |
| 198 | 197 | } |
@@ -35,25 +35,25 @@ discard block |
||
| 35 | 35 | */ |
| 36 | 36 | class TaskController extends MvcController |
| 37 | 37 | { |
| 38 | - /** |
|
| 39 | - * Tasks Provider |
|
| 40 | - * @var TaskProviderInterface $provider |
|
| 41 | - */ |
|
| 42 | - protected $provider; |
|
| 38 | + /** |
|
| 39 | + * Tasks Provider |
|
| 40 | + * @var TaskProviderInterface $provider |
|
| 41 | + */ |
|
| 42 | + protected $provider; |
|
| 43 | 43 | |
| 44 | - /** |
|
| 45 | - * Constructor for Admin Config controller |
|
| 46 | - * @param AbstractModule $module |
|
| 47 | - */ |
|
| 48 | - public function __construct(AbstractModule $module) { |
|
| 49 | - parent::__construct($module); |
|
| 44 | + /** |
|
| 45 | + * Constructor for Admin Config controller |
|
| 46 | + * @param AbstractModule $module |
|
| 47 | + */ |
|
| 48 | + public function __construct(AbstractModule $module) { |
|
| 49 | + parent::__construct($module); |
|
| 50 | 50 | |
| 51 | - $this->provider = $this->module->getProvider(); |
|
| 52 | - } |
|
| 51 | + $this->provider = $this->module->getProvider(); |
|
| 52 | + } |
|
| 53 | 53 | |
| 54 | - /** |
|
| 55 | - * Pages |
|
| 56 | - */ |
|
| 54 | + /** |
|
| 55 | + * Pages |
|
| 56 | + */ |
|
| 57 | 57 | |
| 58 | 58 | /** |
| 59 | 59 | * Task@trigger |
@@ -77,50 +77,50 @@ discard block |
||
| 77 | 77 | /** |
| 78 | 78 | * Task@setStatus |
| 79 | 79 | */ |
| 80 | - public function setStatus() { |
|
| 81 | - $controller = new JsonController(); |
|
| 80 | + public function setStatus() { |
|
| 81 | + $controller = new JsonController(); |
|
| 82 | 82 | |
| 83 | - $task_name = Filter::get('task'); |
|
| 84 | - $task = $this->provider->getTask($task_name, false); |
|
| 83 | + $task_name = Filter::get('task'); |
|
| 84 | + $task = $this->provider->getTask($task_name, false); |
|
| 85 | 85 | |
| 86 | - $controller->restrictAccess( |
|
| 87 | - true // Filter::checkCsrf() -- Cannot use CSRF on a GET request (modules can only work with GET requests) |
|
| 88 | - && Auth::isAdmin() |
|
| 89 | - && $task |
|
| 90 | - ); |
|
| 86 | + $controller->restrictAccess( |
|
| 87 | + true // Filter::checkCsrf() -- Cannot use CSRF on a GET request (modules can only work with GET requests) |
|
| 88 | + && Auth::isAdmin() |
|
| 89 | + && $task |
|
| 90 | + ); |
|
| 91 | 91 | |
| 92 | - $status = Filter::getBool('status'); |
|
| 93 | - $res = array('task' => $task->getName() , 'error' => null); |
|
| 94 | - try{ |
|
| 95 | - $this->provider->setTaskStatus($task, $status); |
|
| 96 | - $res['status'] = $status; |
|
| 92 | + $status = Filter::getBool('status'); |
|
| 93 | + $res = array('task' => $task->getName() , 'error' => null); |
|
| 94 | + try{ |
|
| 95 | + $this->provider->setTaskStatus($task, $status); |
|
| 96 | + $res['status'] = $status; |
|
| 97 | 97 | Log::addConfigurationLog('Module '.$this->module->getName().' : Admin Task "'.$task->getName().'" has been '. ($status ? 'enabled' : 'disabled') .'.'); |
| 98 | - } |
|
| 99 | - catch (\Exception $ex) { |
|
| 100 | - $res['error'] = $ex->getMessage(); |
|
| 98 | + } |
|
| 99 | + catch (\Exception $ex) { |
|
| 100 | + $res['error'] = $ex->getMessage(); |
|
| 101 | 101 | Log::addErrorLog('Module '.$this->module->getName().' : Admin Task "'.$task->getName().'" could not be ' . ($status ? 'enabled' : 'disabled') .'. Error: '. $ex->getMessage()); |
| 102 | - } |
|
| 102 | + } |
|
| 103 | 103 | |
| 104 | - $controller->pageHeader(); |
|
| 105 | - if($res['error']) http_response_code(500); |
|
| 104 | + $controller->pageHeader(); |
|
| 105 | + if($res['error']) http_response_code(500); |
|
| 106 | 106 | |
| 107 | - $controller->encode($res); |
|
| 108 | - } |
|
| 107 | + $controller->encode($res); |
|
| 108 | + } |
|
| 109 | 109 | |
| 110 | 110 | /** |
| 111 | 111 | * Task@edit |
| 112 | 112 | */ |
| 113 | 113 | public function edit() { |
| 114 | - $tree = Globals::getTree(); |
|
| 115 | - $task_name = Filter::get('task'); |
|
| 116 | - $task = $this->provider->getTask($task_name, false); |
|
| 114 | + $tree = Globals::getTree(); |
|
| 115 | + $task_name = Filter::get('task'); |
|
| 116 | + $task = $this->provider->getTask($task_name, false); |
|
| 117 | 117 | |
| 118 | - Theme::theme(new AdministrationTheme)->init($tree); |
|
| 119 | - $controller = new PageController(); |
|
| 120 | - $controller |
|
| 121 | - ->restrictAccess(Auth::isAdmin() && $task) |
|
| 118 | + Theme::theme(new AdministrationTheme)->init($tree); |
|
| 119 | + $controller = new PageController(); |
|
| 120 | + $controller |
|
| 121 | + ->restrictAccess(Auth::isAdmin() && $task) |
|
| 122 | 122 | ->setPageTitle(I18N::translate('Edit the administrative task')) |
| 123 | - ->addInlineJavascript(' |
|
| 123 | + ->addInlineJavascript(' |
|
| 124 | 124 | function toggleRemainingOccurrences() { |
| 125 | 125 | if($("input:radio[name=\'is_limited\']:checked").val() == 1) { |
| 126 | 126 | $("#nb_occurences").show(); |
@@ -133,39 +133,39 @@ discard block |
||
| 133 | 133 | $("[name=\'is_limited\']").on("change", toggleRemainingOccurrences); |
| 134 | 134 | toggleRemainingOccurrences(); |
| 135 | 135 | ') |
| 136 | - ; |
|
| 136 | + ; |
|
| 137 | 137 | |
| 138 | 138 | |
| 139 | - $data = new ViewBag(); |
|
| 140 | - $data->set('title', $controller->getPageTitle()); |
|
| 139 | + $data = new ViewBag(); |
|
| 140 | + $data->set('title', $controller->getPageTitle()); |
|
| 141 | 141 | $data->set('admin_config_url', 'module.php?mod=' . $this->module->getName() . '&mod_action=AdminConfig&ged=' . $tree->getNameUrl()); |
| 142 | - $data->set('module_title', $this->module->getTitle()); |
|
| 142 | + $data->set('module_title', $this->module->getTitle()); |
|
| 143 | 143 | $data->set('save_url', 'module.php?mod=' . $this->module->getName() . '&mod_action=Task@save&ged=' . $tree->getNameUrl()); |
| 144 | 144 | $data->set('task', $task); |
| 145 | 145 | |
| 146 | - ViewFactory::make('TaskEdit', $this, $controller, $data)->render(); |
|
| 146 | + ViewFactory::make('TaskEdit', $this, $controller, $data)->render(); |
|
| 147 | 147 | } |
| 148 | 148 | |
| 149 | 149 | /** |
| 150 | 150 | * Task@save |
| 151 | 151 | */ |
| 152 | 152 | public function save() { |
| 153 | - $tmp_contrl = new PageController(); |
|
| 153 | + $tmp_contrl = new PageController(); |
|
| 154 | 154 | |
| 155 | - $tmp_contrl->restrictAccess( |
|
| 156 | - Auth::isAdmin() |
|
| 157 | - && Filter::checkCsrf() |
|
| 158 | - ); |
|
| 155 | + $tmp_contrl->restrictAccess( |
|
| 156 | + Auth::isAdmin() |
|
| 157 | + && Filter::checkCsrf() |
|
| 158 | + ); |
|
| 159 | 159 | |
| 160 | 160 | $task_name = Filter::post('task'); |
| 161 | - $frequency = Filter::postInteger('frequency'); |
|
| 162 | - $is_limited = Filter::postInteger('is_limited', 0, 1); |
|
| 163 | - $nb_occur = Filter::postInteger('nb_occur'); |
|
| 161 | + $frequency = Filter::postInteger('frequency'); |
|
| 162 | + $is_limited = Filter::postInteger('is_limited', 0, 1); |
|
| 163 | + $nb_occur = Filter::postInteger('nb_occur'); |
|
| 164 | 164 | |
| 165 | 165 | $task = $this->provider->getTask($task_name, false); |
| 166 | 166 | |
| 167 | - $success = false; |
|
| 168 | - if($task) { |
|
| 167 | + $success = false; |
|
| 168 | + if($task) { |
|
| 169 | 169 | $task->setFrequency($frequency); |
| 170 | 170 | if($is_limited == 1) { |
| 171 | 171 | $task->setRemainingOccurrences($nb_occur); |
@@ -197,13 +197,13 @@ discard block |
||
| 197 | 197 | Log::addConfigurationLog('Module '.$this->module->getName().' : AdminTask “'. $task->getName() .'” could not be updated. See error log.'); |
| 198 | 198 | } |
| 199 | 199 | |
| 200 | - } |
|
| 200 | + } |
|
| 201 | 201 | |
| 202 | - $redirection_url = 'module.php?mod=' . $this->module->getName() . '&mod_action=AdminConfig'; |
|
| 203 | - if(!$success) { |
|
| 202 | + $redirection_url = 'module.php?mod=' . $this->module->getName() . '&mod_action=AdminConfig'; |
|
| 203 | + if(!$success) { |
|
| 204 | 204 | $redirection_url = 'module.php?mod=' . $this->module->getName() . '&mod_action=Task@edit&task='. $task->getName(); |
| 205 | - } |
|
| 206 | - header('Location: ' . WT_BASE_URL . $redirection_url); |
|
| 205 | + } |
|
| 206 | + header('Location: ' . WT_BASE_URL . $redirection_url); |
|
| 207 | 207 | } |
| 208 | 208 | |
| 209 | 209 | } |
| 210 | 210 | \ No newline at end of file |
@@ -69,7 +69,7 @@ discard block |
||
| 69 | 69 | |
| 70 | 70 | $tasks = $this->provider->getTasksToRun($token == $token_submitted, $task_name); |
| 71 | 71 | |
| 72 | - foreach($tasks as $task) { |
|
| 72 | + foreach ($tasks as $task) { |
|
| 73 | 73 | $task->execute(); |
| 74 | 74 | } |
| 75 | 75 | } |
@@ -90,19 +90,19 @@ discard block |
||
| 90 | 90 | ); |
| 91 | 91 | |
| 92 | 92 | $status = Filter::getBool('status'); |
| 93 | - $res = array('task' => $task->getName() , 'error' => null); |
|
| 94 | - try{ |
|
| 93 | + $res = array('task' => $task->getName(), 'error' => null); |
|
| 94 | + try { |
|
| 95 | 95 | $this->provider->setTaskStatus($task, $status); |
| 96 | 96 | $res['status'] = $status; |
| 97 | - Log::addConfigurationLog('Module '.$this->module->getName().' : Admin Task "'.$task->getName().'" has been '. ($status ? 'enabled' : 'disabled') .'.'); |
|
| 97 | + Log::addConfigurationLog('Module '.$this->module->getName().' : Admin Task "'.$task->getName().'" has been '.($status ? 'enabled' : 'disabled').'.'); |
|
| 98 | 98 | } |
| 99 | 99 | catch (\Exception $ex) { |
| 100 | 100 | $res['error'] = $ex->getMessage(); |
| 101 | - Log::addErrorLog('Module '.$this->module->getName().' : Admin Task "'.$task->getName().'" could not be ' . ($status ? 'enabled' : 'disabled') .'. Error: '. $ex->getMessage()); |
|
| 101 | + Log::addErrorLog('Module '.$this->module->getName().' : Admin Task "'.$task->getName().'" could not be '.($status ? 'enabled' : 'disabled').'. Error: '.$ex->getMessage()); |
|
| 102 | 102 | } |
| 103 | 103 | |
| 104 | 104 | $controller->pageHeader(); |
| 105 | - if($res['error']) http_response_code(500); |
|
| 105 | + if ($res['error']) http_response_code(500); |
|
| 106 | 106 | |
| 107 | 107 | $controller->encode($res); |
| 108 | 108 | } |
@@ -138,9 +138,9 @@ discard block |
||
| 138 | 138 | |
| 139 | 139 | $data = new ViewBag(); |
| 140 | 140 | $data->set('title', $controller->getPageTitle()); |
| 141 | - $data->set('admin_config_url', 'module.php?mod=' . $this->module->getName() . '&mod_action=AdminConfig&ged=' . $tree->getNameUrl()); |
|
| 141 | + $data->set('admin_config_url', 'module.php?mod='.$this->module->getName().'&mod_action=AdminConfig&ged='.$tree->getNameUrl()); |
|
| 142 | 142 | $data->set('module_title', $this->module->getTitle()); |
| 143 | - $data->set('save_url', 'module.php?mod=' . $this->module->getName() . '&mod_action=Task@save&ged=' . $tree->getNameUrl()); |
|
| 143 | + $data->set('save_url', 'module.php?mod='.$this->module->getName().'&mod_action=Task@save&ged='.$tree->getNameUrl()); |
|
| 144 | 144 | $data->set('task', $task); |
| 145 | 145 | |
| 146 | 146 | ViewFactory::make('TaskEdit', $this, $controller, $data)->render(); |
@@ -157,17 +157,17 @@ discard block |
||
| 157 | 157 | && Filter::checkCsrf() |
| 158 | 158 | ); |
| 159 | 159 | |
| 160 | - $task_name = Filter::post('task'); |
|
| 161 | - $frequency = Filter::postInteger('frequency'); |
|
| 162 | - $is_limited = Filter::postInteger('is_limited', 0, 1); |
|
| 163 | - $nb_occur = Filter::postInteger('nb_occur'); |
|
| 160 | + $task_name = Filter::post('task'); |
|
| 161 | + $frequency = Filter::postInteger('frequency'); |
|
| 162 | + $is_limited = Filter::postInteger('is_limited', 0, 1); |
|
| 163 | + $nb_occur = Filter::postInteger('nb_occur'); |
|
| 164 | 164 | |
| 165 | 165 | $task = $this->provider->getTask($task_name, false); |
| 166 | 166 | |
| 167 | 167 | $success = false; |
| 168 | - if($task) { |
|
| 168 | + if ($task) { |
|
| 169 | 169 | $task->setFrequency($frequency); |
| 170 | - if($is_limited == 1) { |
|
| 170 | + if ($is_limited == 1) { |
|
| 171 | 171 | $task->setRemainingOccurrences($nb_occur); |
| 172 | 172 | } |
| 173 | 173 | else { |
@@ -176,34 +176,34 @@ discard block |
||
| 176 | 176 | |
| 177 | 177 | $res = $task->save(); |
| 178 | 178 | |
| 179 | - if($res) { |
|
| 180 | - if($task instanceof MyArtJaub\Webtrees\Module\AdminTasks\Model\ConfigurableTaskInterface) { |
|
| 179 | + if ($res) { |
|
| 180 | + if ($task instanceof MyArtJaub\Webtrees\Module\AdminTasks\Model\ConfigurableTaskInterface) { |
|
| 181 | 181 | $res = $task->saveConfig(); |
| 182 | 182 | |
| 183 | - if(!$res) { |
|
| 183 | + if (!$res) { |
|
| 184 | 184 | FlashMessages::addMessage(I18N::translate('An error occured while updating the specific settings of administrative task “%s”', $task->getTitle()), 'danger'); |
| 185 | - Log::addConfigurationLog('Module '.$this->module->getName().' : AdminTask “'. $task->getName() .'” specific settings could not be updated. See error log.'); |
|
| 185 | + Log::addConfigurationLog('Module '.$this->module->getName().' : AdminTask “'.$task->getName().'” specific settings could not be updated. See error log.'); |
|
| 186 | 186 | } |
| 187 | 187 | } |
| 188 | 188 | |
| 189 | - if($res) { |
|
| 189 | + if ($res) { |
|
| 190 | 190 | FlashMessages::addMessage(I18N::translate('The administrative task “%s” has been successfully updated', $task->getTitle()), 'success'); |
| 191 | - Log::addConfigurationLog('Module '.$this->module->getName().' : AdminTask “'.$task->getName() .'” has been updated.'); |
|
| 191 | + Log::addConfigurationLog('Module '.$this->module->getName().' : AdminTask “'.$task->getName().'” has been updated.'); |
|
| 192 | 192 | $success = true; |
| 193 | 193 | } |
| 194 | 194 | } |
| 195 | 195 | else { |
| 196 | 196 | FlashMessages::addMessage(I18N::translate('An error occured while updating the administrative task “%s”', $task->getTitle()), 'danger'); |
| 197 | - Log::addConfigurationLog('Module '.$this->module->getName().' : AdminTask “'. $task->getName() .'” could not be updated. See error log.'); |
|
| 197 | + Log::addConfigurationLog('Module '.$this->module->getName().' : AdminTask “'.$task->getName().'” could not be updated. See error log.'); |
|
| 198 | 198 | } |
| 199 | 199 | |
| 200 | 200 | } |
| 201 | 201 | |
| 202 | - $redirection_url = 'module.php?mod=' . $this->module->getName() . '&mod_action=AdminConfig'; |
|
| 203 | - if(!$success) { |
|
| 204 | - $redirection_url = 'module.php?mod=' . $this->module->getName() . '&mod_action=Task@edit&task='. $task->getName(); |
|
| 202 | + $redirection_url = 'module.php?mod='.$this->module->getName().'&mod_action=AdminConfig'; |
|
| 203 | + if (!$success) { |
|
| 204 | + $redirection_url = 'module.php?mod='.$this->module->getName().'&mod_action=Task@edit&task='.$task->getName(); |
|
| 205 | 205 | } |
| 206 | - header('Location: ' . WT_BASE_URL . $redirection_url); |
|
| 206 | + header('Location: '.WT_BASE_URL.$redirection_url); |
|
| 207 | 207 | } |
| 208 | 208 | |
| 209 | 209 | } |
| 210 | 210 | \ No newline at end of file |
@@ -1,13 +1,13 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | /** |
| 3 | - * webtrees-lib: MyArtJaub library for webtrees |
|
| 4 | - * |
|
| 5 | - * @package MyArtJaub\Webtrees |
|
| 6 | - * @subpackage Hook |
|
| 7 | - * @author Jonathan Jaubart <[email protected]> |
|
| 8 | - * @copyright Copyright (c) 2011-2016, Jonathan Jaubart |
|
| 9 | - * @license http://www.gnu.org/licenses/gpl.html GNU General Public License, version 3 |
|
| 10 | - */ |
|
| 3 | + * webtrees-lib: MyArtJaub library for webtrees |
|
| 4 | + * |
|
| 5 | + * @package MyArtJaub\Webtrees |
|
| 6 | + * @subpackage Hook |
|
| 7 | + * @author Jonathan Jaubart <[email protected]> |
|
| 8 | + * @copyright Copyright (c) 2011-2016, Jonathan Jaubart |
|
| 9 | + * @license http://www.gnu.org/licenses/gpl.html GNU General Public License, version 3 |
|
| 10 | + */ |
|
| 11 | 11 | namespace MyArtJaub\Webtrees\Hook\HookInterfaces; |
| 12 | 12 | |
| 13 | 13 | use Fisharebest\Webtrees\GedcomRecord; |
@@ -1,13 +1,13 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | /** |
| 3 | - * webtrees-lib: MyArtJaub library for webtrees |
|
| 4 | - * |
|
| 5 | - * @package MyArtJaub\Webtrees |
|
| 6 | - * @subpackage Hook |
|
| 7 | - * @author Jonathan Jaubart <[email protected]> |
|
| 8 | - * @copyright Copyright (c) 2011-2016, Jonathan Jaubart |
|
| 9 | - * @license http://www.gnu.org/licenses/gpl.html GNU General Public License, version 3 |
|
| 10 | - */ |
|
| 3 | + * webtrees-lib: MyArtJaub library for webtrees |
|
| 4 | + * |
|
| 5 | + * @package MyArtJaub\Webtrees |
|
| 6 | + * @subpackage Hook |
|
| 7 | + * @author Jonathan Jaubart <[email protected]> |
|
| 8 | + * @copyright Copyright (c) 2011-2016, Jonathan Jaubart |
|
| 9 | + * @license http://www.gnu.org/licenses/gpl.html GNU General Public License, version 3 |
|
| 10 | + */ |
|
| 11 | 11 | namespace MyArtJaub\Webtrees\Hook\HookInterfaces; |
| 12 | 12 | |
| 13 | 13 | /** |
@@ -1,13 +1,13 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | /** |
| 3 | - * webtrees-lib: MyArtJaub library for webtrees |
|
| 4 | - * |
|
| 5 | - * @package MyArtJaub\Webtrees |
|
| 6 | - * @subpackage Hook |
|
| 7 | - * @author Jonathan Jaubart <[email protected]> |
|
| 8 | - * @copyright Copyright (c) 2011-2016, Jonathan Jaubart |
|
| 9 | - * @license http://www.gnu.org/licenses/gpl.html GNU General Public License, version 3 |
|
| 10 | - */ |
|
| 3 | + * webtrees-lib: MyArtJaub library for webtrees |
|
| 4 | + * |
|
| 5 | + * @package MyArtJaub\Webtrees |
|
| 6 | + * @subpackage Hook |
|
| 7 | + * @author Jonathan Jaubart <[email protected]> |
|
| 8 | + * @copyright Copyright (c) 2011-2016, Jonathan Jaubart |
|
| 9 | + * @license http://www.gnu.org/licenses/gpl.html GNU General Public License, version 3 |
|
| 10 | + */ |
|
| 11 | 11 | namespace MyArtJaub\Webtrees\Hook\HookInterfaces; |
| 12 | 12 | |
| 13 | 13 | /** |
@@ -15,12 +15,12 @@ discard block |
||
| 15 | 15 | */ |
| 16 | 16 | interface PageHeaderExtenderInterface { |
| 17 | 17 | |
| 18 | - /** |
|
| 19 | - * Get HTML code for extending the header of a page. |
|
| 20 | - * |
|
| 21 | - * @return string HTML code extension |
|
| 22 | - */ |
|
| 23 | - public function hPrintHeader(); |
|
| 18 | + /** |
|
| 19 | + * Get HTML code for extending the header of a page. |
|
| 20 | + * |
|
| 21 | + * @return string HTML code extension |
|
| 22 | + */ |
|
| 23 | + public function hPrintHeader(); |
|
| 24 | 24 | |
| 25 | 25 | } |
| 26 | 26 | |
@@ -1,13 +1,13 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | /** |
| 3 | - * webtrees-lib: MyArtJaub library for webtrees |
|
| 4 | - * |
|
| 5 | - * @package MyArtJaub\Webtrees |
|
| 6 | - * @subpackage Hook |
|
| 7 | - * @author Jonathan Jaubart <[email protected]> |
|
| 8 | - * @copyright Copyright (c) 2011-2016, Jonathan Jaubart |
|
| 9 | - * @license http://www.gnu.org/licenses/gpl.html GNU General Public License, version 3 |
|
| 10 | - */ |
|
| 3 | + * webtrees-lib: MyArtJaub library for webtrees |
|
| 4 | + * |
|
| 5 | + * @package MyArtJaub\Webtrees |
|
| 6 | + * @subpackage Hook |
|
| 7 | + * @author Jonathan Jaubart <[email protected]> |
|
| 8 | + * @copyright Copyright (c) 2011-2016, Jonathan Jaubart |
|
| 9 | + * @license http://www.gnu.org/licenses/gpl.html GNU General Public License, version 3 |
|
| 10 | + */ |
|
| 11 | 11 | namespace MyArtJaub\Webtrees\Hook\HookInterfaces; |
| 12 | 12 | |
| 13 | 13 | /** |
@@ -15,12 +15,12 @@ discard block |
||
| 15 | 15 | */ |
| 16 | 16 | interface PageFooterExtenderInterface { |
| 17 | 17 | |
| 18 | - /** |
|
| 19 | - * Get HTML code for extending the footer of a page. |
|
| 20 | - * |
|
| 21 | - * @return string HTML code extension |
|
| 22 | - */ |
|
| 23 | - public function hPrintFooter(); |
|
| 18 | + /** |
|
| 19 | + * Get HTML code for extending the footer of a page. |
|
| 20 | + * |
|
| 21 | + * @return string HTML code extension |
|
| 22 | + */ |
|
| 23 | + public function hPrintFooter(); |
|
| 24 | 24 | |
| 25 | 25 | } |
| 26 | 26 | |
@@ -1,13 +1,13 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | /** |
| 3 | - * webtrees-lib: MyArtJaub library for webtrees |
|
| 4 | - * |
|
| 5 | - * @package MyArtJaub\Webtrees |
|
| 6 | - * @subpackage Hook |
|
| 7 | - * @author Jonathan Jaubart <[email protected]> |
|
| 8 | - * @copyright Copyright (c) 2011-2016, Jonathan Jaubart |
|
| 9 | - * @license http://www.gnu.org/licenses/gpl.html GNU General Public License, version 3 |
|
| 10 | - */ |
|
| 3 | + * webtrees-lib: MyArtJaub library for webtrees |
|
| 4 | + * |
|
| 5 | + * @package MyArtJaub\Webtrees |
|
| 6 | + * @subpackage Hook |
|
| 7 | + * @author Jonathan Jaubart <[email protected]> |
|
| 8 | + * @copyright Copyright (c) 2011-2016, Jonathan Jaubart |
|
| 9 | + * @license http://www.gnu.org/licenses/gpl.html GNU General Public License, version 3 |
|
| 10 | + */ |
|
| 11 | 11 | namespace MyArtJaub\Webtrees\Hook\HookInterfaces; |
| 12 | 12 | |
| 13 | 13 | use Fisharebest\Webtrees\Controller\IndividualController; |
@@ -1,13 +1,13 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | /** |
| 3 | - * webtrees-lib: MyArtJaub library for webtrees |
|
| 4 | - * |
|
| 5 | - * @package MyArtJaub\Webtrees |
|
| 6 | - * @subpackage Hook |
|
| 7 | - * @author Jonathan Jaubart <[email protected]> |
|
| 8 | - * @copyright Copyright (c) 2011-2016, Jonathan Jaubart |
|
| 9 | - * @license http://www.gnu.org/licenses/gpl.html GNU General Public License, version 3 |
|
| 10 | - */ |
|
| 3 | + * webtrees-lib: MyArtJaub library for webtrees |
|
| 4 | + * |
|
| 5 | + * @package MyArtJaub\Webtrees |
|
| 6 | + * @subpackage Hook |
|
| 7 | + * @author Jonathan Jaubart <[email protected]> |
|
| 8 | + * @copyright Copyright (c) 2011-2016, Jonathan Jaubart |
|
| 9 | + * @license http://www.gnu.org/licenses/gpl.html GNU General Public License, version 3 |
|
| 10 | + */ |
|
| 11 | 11 | namespace MyArtJaub\Webtrees\Hook\HookInterfaces; |
| 12 | 12 | |
| 13 | 13 | /** |
@@ -18,12 +18,12 @@ discard block |
||
| 18 | 18 | interface CustomSimpleTagManagerInterface { |
| 19 | 19 | |
| 20 | 20 | |
| 21 | - /** |
|
| 22 | - * Returns the list of expected tags, classified by type of records. |
|
| 23 | - * |
|
| 24 | - * @return array List of expected tags |
|
| 25 | - */ |
|
| 26 | - public function hGetExpectedTags(); |
|
| 21 | + /** |
|
| 22 | + * Returns the list of expected tags, classified by type of records. |
|
| 23 | + * |
|
| 24 | + * @return array List of expected tags |
|
| 25 | + */ |
|
| 26 | + public function hGetExpectedTags(); |
|
| 27 | 27 | |
| 28 | 28 | /** |
| 29 | 29 | * Return the HTML code to be display for this tag. |