@@ -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; |
@@ -22,6 +22,7 @@ discard block |
||
| 22 | 22 | * |
| 23 | 23 | * @param GedcomRecord $grec Gedcom record |
| 24 | 24 | * @param string $size Prepend size |
| 25 | + * @return void |
|
| 25 | 26 | */ |
| 26 | 27 | public function hRecordNamePrepend(GedcomRecord $grec, $size); |
| 27 | 28 | |
@@ -30,6 +31,7 @@ discard block |
||
| 30 | 31 | * |
| 31 | 32 | * @param GedcomRecord $grec Gedcom record |
| 32 | 33 | * @param string $size Append size |
| 34 | + * @return string |
|
| 33 | 35 | */ |
| 34 | 36 | public function hRecordNameAppend(GedcomRecord $grec, $size); |
| 35 | 37 | |
@@ -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; |
@@ -31,11 +31,16 @@ |
||
| 31 | 31 | $nb_levels = count($parent); |
| 32 | 32 | for ($i=0; $i < $nb_levels; $i++) { |
| 33 | 33 | $parent[$i] = trim($parent[$i]); |
| 34 | - if (empty($parent[$i])) $parent[$i]='unknown';// GoogleMap module uses "unknown" while GEDCOM uses , , |
|
| 34 | + if (empty($parent[$i])) { |
|
| 35 | + $parent[$i]='unknown'; |
|
| 36 | + } |
|
| 37 | + // GoogleMap module uses "unknown" while GEDCOM uses , , |
|
| 35 | 38 | $pl_id=Database::prepare('SELECT pl_id FROM `##placelocation` WHERE pl_level=? AND pl_parent_id=? AND pl_place LIKE ? ORDER BY pl_place') |
| 36 | 39 | ->execute(array($i, $place_id, $parent[$i])) |
| 37 | 40 | ->fetchOne(); |
| 38 | - if (empty($pl_id)) break; |
|
| 41 | + if (empty($pl_id)) { |
|
| 42 | + break; |
|
| 43 | + } |
|
| 39 | 44 | $place_id = $pl_id; |
| 40 | 45 | } |
| 41 | 46 | return $place_id; |
@@ -25,14 +25,14 @@ discard block |
||
| 25 | 25 | * @see \MyArtJaub\Webtrees\Map\MapProviderInterface::getProviderPlaceId() |
| 26 | 26 | */ |
| 27 | 27 | public function getProviderPlaceId(\Fisharebest\Webtrees\Place $place) { |
| 28 | - if(!$place->isEmpty()) { |
|
| 29 | - $parent = array_reverse(explode (',', $place->getGedcomName())); |
|
| 28 | + if (!$place->isEmpty()) { |
|
| 29 | + $parent = array_reverse(explode(',', $place->getGedcomName())); |
|
| 30 | 30 | $place_id = 0; |
| 31 | 31 | $nb_levels = count($parent); |
| 32 | - for ($i=0; $i < $nb_levels; $i++) { |
|
| 32 | + for ($i = 0; $i < $nb_levels; $i++) { |
|
| 33 | 33 | $parent[$i] = trim($parent[$i]); |
| 34 | - if (empty($parent[$i])) $parent[$i]='unknown';// GoogleMap module uses "unknown" while GEDCOM uses , , |
|
| 35 | - $pl_id=Database::prepare('SELECT pl_id FROM `##placelocation` WHERE pl_level=? AND pl_parent_id=? AND pl_place LIKE ? ORDER BY pl_place') |
|
| 34 | + if (empty($parent[$i])) $parent[$i] = 'unknown'; // GoogleMap module uses "unknown" while GEDCOM uses , , |
|
| 35 | + $pl_id = Database::prepare('SELECT pl_id FROM `##placelocation` WHERE pl_level=? AND pl_parent_id=? AND pl_place LIKE ? ORDER BY pl_place') |
|
| 36 | 36 | ->execute(array($i, $place_id, $parent[$i])) |
| 37 | 37 | ->fetchOne(); |
| 38 | 38 | if (empty($pl_id)) break; |
@@ -48,12 +48,12 @@ discard block |
||
| 48 | 48 | * @see \MyArtJaub\Webtrees\Map\MapProviderInterface::getPlaceIcon() |
| 49 | 49 | */ |
| 50 | 50 | public function getPlaceIcon(\Fisharebest\Webtrees\Place $place) { |
| 51 | - if(!$place->isEmpty()){ |
|
| 51 | + if (!$place->isEmpty()) { |
|
| 52 | 52 | $place_details = |
| 53 | 53 | Database::prepare('SELECT pl_icon FROM `##placelocation` WHERE pl_id=? ORDER BY pl_place') |
| 54 | 54 | ->execute(array($this->getProviderPlaceId($place))) |
| 55 | 55 | ->fetchOneRow(); |
| 56 | - if($place_details){ |
|
| 56 | + if ($place_details) { |
|
| 57 | 57 | return WT_MODULES_DIR.'googlemap/'.$place_details->pl_icon; |
| 58 | 58 | } |
| 59 | 59 | } |
@@ -34,26 +34,26 @@ |
||
| 34 | 34 | protected $fact; |
| 35 | 35 | |
| 36 | 36 | /** |
| 37 | - * Contructor for the decorator |
|
| 38 | - * |
|
| 39 | - * @param \Fisharebest\Webtrees\Fact $fact_in The Fact to extend |
|
| 40 | - */ |
|
| 37 | + * Contructor for the decorator |
|
| 38 | + * |
|
| 39 | + * @param \Fisharebest\Webtrees\Fact $fact_in The Fact to extend |
|
| 40 | + */ |
|
| 41 | 41 | public function __construct(\Fisharebest\Webtrees\Fact $fact_in){ |
| 42 | 42 | $this->fact = $fact_in; |
| 43 | 43 | } |
| 44 | 44 | |
| 45 | 45 | /** |
| 46 | - * Check if a fact has a date and is sourced |
|
| 47 | - * Values: |
|
| 48 | - * - 0, if no date is found for the fact |
|
| 49 | - * - -1, if the date is not precise |
|
| 50 | - * - -2, if the date is precise, but no source is found |
|
| 51 | - * - 1, if the date is precise, and a source is found |
|
| 52 | - * - 2, if the date is precise, a source exists, and is supported by a certificate (requires _ACT usage) |
|
| 53 | - * - 3, if the date is precise, a source exists, and the certificate supporting the fact is within an acceptable range of date |
|
| 54 | - * |
|
| 55 | - * @return int Level of sources |
|
| 56 | - */ |
|
| 46 | + * Check if a fact has a date and is sourced |
|
| 47 | + * Values: |
|
| 48 | + * - 0, if no date is found for the fact |
|
| 49 | + * - -1, if the date is not precise |
|
| 50 | + * - -2, if the date is precise, but no source is found |
|
| 51 | + * - 1, if the date is precise, and a source is found |
|
| 52 | + * - 2, if the date is precise, a source exists, and is supported by a certificate (requires _ACT usage) |
|
| 53 | + * - 3, if the date is precise, a source exists, and the certificate supporting the fact is within an acceptable range of date |
|
| 54 | + * |
|
| 55 | + * @return int Level of sources |
|
| 56 | + */ |
|
| 57 | 57 | public function isSourced(){ |
| 58 | 58 | $isSourced=0; |
| 59 | 59 | $date = $this->fact->getDate(); |
@@ -38,7 +38,7 @@ discard block |
||
| 38 | 38 | * |
| 39 | 39 | * @param \Fisharebest\Webtrees\Fact $fact_in The Fact to extend |
| 40 | 40 | */ |
| 41 | - public function __construct(\Fisharebest\Webtrees\Fact $fact_in){ |
|
| 41 | + public function __construct(\Fisharebest\Webtrees\Fact $fact_in) { |
|
| 42 | 42 | $this->fact = $fact_in; |
| 43 | 43 | } |
| 44 | 44 | |
@@ -54,22 +54,22 @@ discard block |
||
| 54 | 54 | * |
| 55 | 55 | * @return int Level of sources |
| 56 | 56 | */ |
| 57 | - public function isSourced(){ |
|
| 58 | - $isSourced=0; |
|
| 57 | + public function isSourced() { |
|
| 58 | + $isSourced = 0; |
|
| 59 | 59 | $date = $this->fact->getDate(); |
| 60 | - if($date->isOK()) { |
|
| 61 | - $isSourced=-1; |
|
| 62 | - if($date->qual1=='' && $date->minimumJulianDay() == $date->maximumJulianDay()){ |
|
| 63 | - $isSourced=-2; |
|
| 60 | + if ($date->isOK()) { |
|
| 61 | + $isSourced = -1; |
|
| 62 | + if ($date->qual1 == '' && $date->minimumJulianDay() == $date->maximumJulianDay()) { |
|
| 63 | + $isSourced = -2; |
|
| 64 | 64 | $citations = $this->fact->getCitations(); |
| 65 | - foreach($citations as $citation){ |
|
| 66 | - $isSourced=max($isSourced, 1); |
|
| 67 | - if(preg_match('/3 _ACT (.*)/', $citation) ){ |
|
| 68 | - $isSourced=max($isSourced, 2); |
|
| 65 | + foreach ($citations as $citation) { |
|
| 66 | + $isSourced = max($isSourced, 1); |
|
| 67 | + if (preg_match('/3 _ACT (.*)/', $citation)) { |
|
| 68 | + $isSourced = max($isSourced, 2); |
|
| 69 | 69 | preg_match_all("/4 DATE (.*)/", $citation, $datessource, PREG_SET_ORDER); |
| 70 | - foreach($datessource as $daterec){ |
|
| 70 | + foreach ($datessource as $daterec) { |
|
| 71 | 71 | $datesource = new Date($daterec[1]); |
| 72 | - if(abs($datesource->julianDay() - $date->julianDay()) < self::DATE_PRECISION_MARGIN){ |
|
| 72 | + if (abs($datesource->julianDay() - $date->julianDay()) < self::DATE_PRECISION_MARGIN) { |
|
| 73 | 73 | $isSourced = max($isSourced, 3); //If this level increases, do not forget to change the constant MAX_IS_SOURCED_LEVEL |
| 74 | 74 | } |
| 75 | 75 | } |
@@ -24,16 +24,16 @@ discard block |
||
| 24 | 24 | * {@inhericDoc} |
| 25 | 25 | * @see \MyArtJaub\Webtrees\Mvc\View\AbstractView::renderContent() |
| 26 | 26 | */ |
| 27 | - protected function renderContent() { |
|
| 28 | - /** @var \Fisharebest\Webtrees\Individual $indi */ |
|
| 29 | - $indi = $this->data->get('indi'); |
|
| 27 | + protected function renderContent() { |
|
| 28 | + /** @var \Fisharebest\Webtrees\Individual $indi */ |
|
| 29 | + $indi = $this->data->get('indi'); |
|
| 30 | 30 | |
| 31 | - /** @var \Fisharebest\Webtrees\Tree $tree */ |
|
| 32 | - $tree = $this->data->get('tree'); |
|
| 31 | + /** @var \Fisharebest\Webtrees\Tree $tree */ |
|
| 32 | + $tree = $this->data->get('tree'); |
|
| 33 | 33 | |
| 34 | - //Welcome section - gedcom title, date, statistics - based on gedcom_block |
|
| 35 | - $content = |
|
| 36 | - '<table> |
|
| 34 | + //Welcome section - gedcom title, date, statistics - based on gedcom_block |
|
| 35 | + $content = |
|
| 36 | + '<table> |
|
| 37 | 37 | <tr> |
| 38 | 38 | <td> |
| 39 | 39 | <a href="pedigree.php?rootid=' . $indi->getXref() . '&ged=' . $tree->getNameUrl() . '"> |
@@ -46,50 +46,50 @@ discard block |
||
| 46 | 46 | </a> |
| 47 | 47 | </td>'; |
| 48 | 48 | |
| 49 | - if (Site::getPreference('USE_REGISTRATION_MODULE') && !Auth::check()) { |
|
| 50 | - $content .= ' |
|
| 49 | + if (Site::getPreference('USE_REGISTRATION_MODULE') && !Auth::check()) { |
|
| 50 | + $content .= ' |
|
| 51 | 51 | <td> |
| 52 | 52 | <a href="' . WT_LOGIN_URL . '?action=register"> |
| 53 | 53 | <i class="icon-user_add"></i><br>'.I18N::translate('Request a new user account').' |
| 54 | 54 | </a> |
| 55 | 55 | </td>'; |
| 56 | - } |
|
| 57 | - $content .= ' |
|
| 56 | + } |
|
| 57 | + $content .= ' |
|
| 58 | 58 | </tr> |
| 59 | 59 | </table>'; |
| 60 | 60 | |
| 61 | - // Piwik Statistics |
|
| 62 | - if ($this->data->get('piwik_enabled', false)){ |
|
| 63 | - $content .= ' |
|
| 61 | + // Piwik Statistics |
|
| 62 | + if ($this->data->get('piwik_enabled', false)){ |
|
| 63 | + $content .= ' |
|
| 64 | 64 | <div class="center"> |
| 65 | 65 | <div id="piwik_stats"> |
| 66 | 66 | <i class="icon-loading-small"></i> ' . I18N::translate('Retrieving Piwik statistics...') . ' |
| 67 | 67 | </div> |
| 68 | 68 | </div>'; |
| 69 | - } |
|
| 69 | + } |
|
| 70 | 70 | |
| 71 | - $content .= '<hr />'; |
|
| 71 | + $content .= '<hr />'; |
|
| 72 | 72 | |
| 73 | - // Login section - based on login_block |
|
| 74 | - if (Auth::check()) { |
|
| 75 | - $content .= ' |
|
| 73 | + // Login section - based on login_block |
|
| 74 | + if (Auth::check()) { |
|
| 75 | + $content .= ' |
|
| 76 | 76 | <div class="center"> |
| 77 | 77 | <form method="post" action="logout.php" name="logoutform" onsubmit="return true;"> |
| 78 | 78 | <br>' . |
| 79 | - I18N::translate('You are signed in as %s.', '<a href="edituser.php" class="name2">' . Auth::user()->getRealNameHtml() . '</a>') . |
|
| 80 | - '<br><br> |
|
| 79 | + I18N::translate('You are signed in as %s.', '<a href="edituser.php" class="name2">' . Auth::user()->getRealNameHtml() . '</a>') . |
|
| 80 | + '<br><br> |
|
| 81 | 81 | <input type="submit" value="'.I18N::translate('sign out').'"> |
| 82 | 82 | <br><br> |
| 83 | 83 | </form> |
| 84 | 84 | </div>'; |
| 85 | - } else { |
|
| 86 | - $content .= ' |
|
| 85 | + } else { |
|
| 86 | + $content .= ' |
|
| 87 | 87 | <div id="maj-login-box"> |
| 88 | 88 | <form id="maj-login-form" name="maj-login-form" method="post" action="'.WT_LOGIN_URL.'"> |
| 89 | 89 | <input type="hidden" name="action" value="login"> |
| 90 | 90 | <div> |
| 91 | 91 | <label for="maj-username">'. I18N::translate('Username'). |
| 92 | - '<input type="text" id="maj-username" name="username" class="formField"> |
|
| 92 | + '<input type="text" id="maj-username" name="username" class="formField"> |
|
| 93 | 93 | </label> |
| 94 | 94 | </div> |
| 95 | 95 | <div> |
@@ -103,17 +103,17 @@ discard block |
||
| 103 | 103 | <div> |
| 104 | 104 | <a href="#" id="maj-passwd_click">'. I18N::translate('Request a new password').'</a> |
| 105 | 105 | </div>'; |
| 106 | - if (Site::getPreference('USE_REGISTRATION_MODULE')) { |
|
| 107 | - $content.= ' |
|
| 106 | + if (Site::getPreference('USE_REGISTRATION_MODULE')) { |
|
| 107 | + $content.= ' |
|
| 108 | 108 | <div> |
| 109 | 109 | <a href="'.WT_LOGIN_URL.'?action=register">'. I18N::translate('Request a new user account').'</a> |
| 110 | 110 | </div>'; |
| 111 | - } |
|
| 112 | - $content.= ' |
|
| 111 | + } |
|
| 112 | + $content.= ' |
|
| 113 | 113 | </form>'; // close "login-form" |
| 114 | 114 | |
| 115 | - // hidden New Password block |
|
| 116 | - $content.= ' |
|
| 115 | + // hidden New Password block |
|
| 116 | + $content.= ' |
|
| 117 | 117 | <div id="maj-new_passwd"> |
| 118 | 118 | <form id="maj-new_passwd_form" name="new_passwd_form" action="'.WT_LOGIN_URL.'" method="post"> |
| 119 | 119 | <input type="hidden" name="time" value=""> |
@@ -130,10 +130,10 @@ discard block |
||
| 130 | 130 | </form> |
| 131 | 131 | </div> |
| 132 | 132 | </div>';//"login-box" |
| 133 | - } |
|
| 133 | + } |
|
| 134 | 134 | |
| 135 | - return $content; |
|
| 136 | - } |
|
| 135 | + return $content; |
|
| 136 | + } |
|
| 137 | 137 | |
| 138 | 138 | |
| 139 | 139 | } |
@@ -36,20 +36,20 @@ discard block |
||
| 36 | 36 | '<table> |
| 37 | 37 | <tr> |
| 38 | 38 | <td> |
| 39 | - <a href="pedigree.php?rootid=' . $indi->getXref() . '&ged=' . $tree->getNameUrl() . '"> |
|
| 40 | - <i class="icon-pedigree"></i><br>' . I18N::translate('Default chart') . ' |
|
| 39 | + <a href="pedigree.php?rootid=' . $indi->getXref().'&ged='.$tree->getNameUrl().'"> |
|
| 40 | + <i class="icon-pedigree"></i><br>' . I18N::translate('Default chart').' |
|
| 41 | 41 | </a> |
| 42 | 42 | </td> |
| 43 | 43 | <td> |
| 44 | - <a href="individual.php?pid=' . $indi->getXref() . '&ged=' . $tree->getNameUrl() . '"> |
|
| 45 | - <i class="icon-indis"></i><br>' . I18N::translate('Default individual') . ' |
|
| 44 | + <a href="individual.php?pid=' . $indi->getXref().'&ged='.$tree->getNameUrl().'"> |
|
| 45 | + <i class="icon-indis"></i><br>' . I18N::translate('Default individual').' |
|
| 46 | 46 | </a> |
| 47 | 47 | </td>'; |
| 48 | 48 | |
| 49 | 49 | if (Site::getPreference('USE_REGISTRATION_MODULE') && !Auth::check()) { |
| 50 | 50 | $content .= ' |
| 51 | 51 | <td> |
| 52 | - <a href="' . WT_LOGIN_URL . '?action=register"> |
|
| 52 | + <a href="' . WT_LOGIN_URL.'?action=register"> |
|
| 53 | 53 | <i class="icon-user_add"></i><br>'.I18N::translate('Request a new user account').' |
| 54 | 54 | </a> |
| 55 | 55 | </td>'; |
@@ -59,16 +59,16 @@ discard block |
||
| 59 | 59 | </table>'; |
| 60 | 60 | |
| 61 | 61 | // Piwik Statistics |
| 62 | - if ($this->data->get('piwik_enabled', false)){ |
|
| 62 | + if ($this->data->get('piwik_enabled', false)) { |
|
| 63 | 63 | $content .= ' |
| 64 | 64 | <div class="center"> |
| 65 | 65 | <div id="piwik_stats"> |
| 66 | - <i class="icon-loading-small"></i> ' . I18N::translate('Retrieving Piwik statistics...') . ' |
|
| 66 | + <i class="icon-loading-small"></i> ' . I18N::translate('Retrieving Piwik statistics...').' |
|
| 67 | 67 | </div> |
| 68 | 68 | </div>'; |
| 69 | 69 | } |
| 70 | 70 | |
| 71 | - $content .= '<hr />'; |
|
| 71 | + $content .= '<hr />'; |
|
| 72 | 72 | |
| 73 | 73 | // Login section - based on login_block |
| 74 | 74 | if (Auth::check()) { |
@@ -76,7 +76,7 @@ discard block |
||
| 76 | 76 | <div class="center"> |
| 77 | 77 | <form method="post" action="logout.php" name="logoutform" onsubmit="return true;"> |
| 78 | 78 | <br>' . |
| 79 | - I18N::translate('You are signed in as %s.', '<a href="edituser.php" class="name2">' . Auth::user()->getRealNameHtml() . '</a>') . |
|
| 79 | + I18N::translate('You are signed in as %s.', '<a href="edituser.php" class="name2">'.Auth::user()->getRealNameHtml().'</a>'). |
|
| 80 | 80 | '<br><br> |
| 81 | 81 | <input type="submit" value="'.I18N::translate('sign out').'"> |
| 82 | 82 | <br><br> |
@@ -98,34 +98,34 @@ discard block |
||
| 98 | 98 | </label> |
| 99 | 99 | </div> |
| 100 | 100 | <div> |
| 101 | - <input type="submit" value="'. I18N::translate('sign in'). '"> |
|
| 101 | + <input type="submit" value="'. I18N::translate('sign in').'"> |
|
| 102 | 102 | </div> |
| 103 | 103 | <div> |
| 104 | 104 | <a href="#" id="maj-passwd_click">'. I18N::translate('Request a new password').'</a> |
| 105 | 105 | </div>'; |
| 106 | 106 | if (Site::getPreference('USE_REGISTRATION_MODULE')) { |
| 107 | - $content.= ' |
|
| 107 | + $content .= ' |
|
| 108 | 108 | <div> |
| 109 | - <a href="'.WT_LOGIN_URL.'?action=register">'. I18N::translate('Request a new user account').'</a> |
|
| 109 | + <a href="'.WT_LOGIN_URL.'?action=register">'.I18N::translate('Request a new user account').'</a> |
|
| 110 | 110 | </div>'; |
| 111 | 111 | } |
| 112 | - $content.= ' |
|
| 112 | + $content .= ' |
|
| 113 | 113 | </form>'; // close "login-form" |
| 114 | 114 | |
| 115 | 115 | // hidden New Password block |
| 116 | - $content.= ' |
|
| 116 | + $content .= ' |
|
| 117 | 117 | <div id="maj-new_passwd"> |
| 118 | 118 | <form id="maj-new_passwd_form" name="new_passwd_form" action="'.WT_LOGIN_URL.'" method="post"> |
| 119 | 119 | <input type="hidden" name="time" value=""> |
| 120 | 120 | <input type="hidden" name="action" value="requestpw"> |
| 121 | 121 | <h4>'. I18N::translate('Lost password request').'</h4> |
| 122 | 122 | <div> |
| 123 | - <label for="maj-new_passwd_username">'. I18N::translate('Username or email address') . ' |
|
| 123 | + <label for="maj-new_passwd_username">'. I18N::translate('Username or email address').' |
|
| 124 | 124 | <input type="text" id="maj-new_passwd_username" name="new_passwd_username" value=""> |
| 125 | 125 | </label> |
| 126 | 126 | </div> |
| 127 | 127 | <div> |
| 128 | - <input type="submit" value="'. I18N::translate('Continue'). '"> |
|
| 128 | + <input type="submit" value="'. I18N::translate('Continue').'"> |
|
| 129 | 129 | </div> |
| 130 | 130 | </form> |
| 131 | 131 | </div> |
@@ -63,7 +63,7 @@ discard block |
||
| 63 | 63 | * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\IndividualHeaderExtenderInterface::hExtendIndiHeaderIcons() |
| 64 | 64 | */ |
| 65 | 65 | public function hExtendIndiHeaderIcons(IndividualController $ctrlIndi) { |
| 66 | - if($ctrlIndi){ |
|
| 66 | + if ($ctrlIndi) { |
|
| 67 | 67 | $dindi = new Individual($ctrlIndi->getSignificantIndividual()); |
| 68 | 68 | if ($dindi->canDisplayIsSourced()) |
| 69 | 69 | return FunctionsPrint::formatIsSourcedIcon('R', $dindi->isSourced(), 'INDI', 1, 'large'); |
@@ -87,19 +87,19 @@ discard block |
||
| 87 | 87 | * {@inheritDoc} |
| 88 | 88 | * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\RecordNameTextExtenderInterface::hRecordNamePrepend() |
| 89 | 89 | */ |
| 90 | - public function hRecordNamePrepend(GedcomRecord $grec, $size){ } |
|
| 90 | + public function hRecordNamePrepend(GedcomRecord $grec, $size) { } |
|
| 91 | 91 | |
| 92 | 92 | /** |
| 93 | 93 | * {@inheritDoc} |
| 94 | 94 | * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\RecordNameTextExtenderInterface::hRecordNameAppend() |
| 95 | 95 | */ |
| 96 | - public function hRecordNameAppend(GedcomRecord $grec, $size = 'small'){ |
|
| 96 | + public function hRecordNameAppend(GedcomRecord $grec, $size = 'small') { |
|
| 97 | 97 | $html = ''; |
| 98 | - if($grec instanceof \Fisharebest\Webtrees\Individual){ |
|
| 98 | + if ($grec instanceof \Fisharebest\Webtrees\Individual) { |
|
| 99 | 99 | $dindi = new Individual($grec); |
| 100 | 100 | $html .= FunctionsPrint::formatIsSourcedIcon('R', $dindi->isSourced(), 'INDI', 1, $size); |
| 101 | 101 | $html .= FunctionsPrint::formatIsSourcedIcon('E', $dindi->isBirthSourced(), 'BIRT', 1, $size); |
| 102 | - if($grec->isDead()) |
|
| 102 | + if ($grec->isDead()) |
|
| 103 | 103 | $html .= FunctionsPrint::formatIsSourcedIcon('E', $dindi->isDeathSourced(), 'DEAT', 1, $size); |
| 104 | 104 | } |
| 105 | 105 | return $html; |
@@ -117,7 +117,7 @@ discard block |
||
| 117 | 117 | * {@inheritDoc} |
| 118 | 118 | * @see \Fisharebest\Webtrees\Module\ModuleSidebarInterface::hasSidebarContent() |
| 119 | 119 | */ |
| 120 | - public function hasSidebarContent(){ |
|
| 120 | + public function hasSidebarContent() { |
|
| 121 | 121 | return true; |
| 122 | 122 | } |
| 123 | 123 | |
@@ -147,24 +147,24 @@ discard block |
||
| 147 | 147 | echo ' |
| 148 | 148 | <table class="issourcedtable"> |
| 149 | 149 | <tr> |
| 150 | - <td class="slabel"> ' . GedcomTag::getLabel('INDI') . '</td> |
|
| 150 | + <td class="slabel"> ' . GedcomTag::getLabel('INDI').'</td> |
|
| 151 | 151 | <td class="svalue">' . FunctionsPrint::formatIsSourcedIcon('R', $dindi->isSourced(), 'INDI', 1).'</td> |
| 152 | 152 | </tr> |
| 153 | 153 | <tr> |
| 154 | - <td class="slabel">' . GedcomTag::getLabel('BIRT') . '</td> |
|
| 154 | + <td class="slabel">' . GedcomTag::getLabel('BIRT').'</td> |
|
| 155 | 155 | <td class="svalue">' . FunctionsPrint::formatIsSourcedIcon('E', $dindi->isBirthSourced(), 'BIRT', 1).'</td> |
| 156 | 156 | </tr>'; |
| 157 | 157 | |
| 158 | 158 | $fams = $root->getSpouseFamilies(); |
| 159 | - ($ct = count($fams)) > 1 ? $nb=1 : $nb=' '; |
|
| 160 | - foreach($fams as $fam){ |
|
| 159 | + ($ct = count($fams)) > 1 ? $nb = 1 : $nb = ' '; |
|
| 160 | + foreach ($fams as $fam) { |
|
| 161 | 161 | $dfam = new Family($fam); |
| 162 | 162 | echo ' |
| 163 | 163 | <tr> |
| 164 | 164 | <td class="slabel right"> |
| 165 | - <a href="' . $fam->getHtmlUrl() . '"> '. GedcomTag::getLabel('MARR'); |
|
| 166 | - if($ct > 1){ |
|
| 167 | - echo ' ',$nb; |
|
| 165 | + <a href="' . $fam->getHtmlUrl().'"> '.GedcomTag::getLabel('MARR'); |
|
| 166 | + if ($ct > 1) { |
|
| 167 | + echo ' ', $nb; |
|
| 168 | 168 | $nb++; |
| 169 | 169 | } |
| 170 | 170 | echo ' </a> |
@@ -173,10 +173,10 @@ discard block |
||
| 173 | 173 | </tr>'; |
| 174 | 174 | } |
| 175 | 175 | |
| 176 | - if( $root->isDead() ) |
|
| 176 | + if ($root->isDead()) |
|
| 177 | 177 | echo ' |
| 178 | 178 | <tr> |
| 179 | - <td class="slabel">' . GedcomTag::getLabel('DEAT') . '</td> |
|
| 179 | + <td class="slabel">' . GedcomTag::getLabel('DEAT').'</td> |
|
| 180 | 180 | <td class="svalue">' . FunctionsPrint::formatIsSourcedIcon('E', $dindi->isDeathSourced(), 'DEAT', 1).'</td> |
| 181 | 181 | </tr>'; |
| 182 | 182 | |
@@ -65,8 +65,9 @@ discard block |
||
| 65 | 65 | public function hExtendIndiHeaderIcons(IndividualController $ctrlIndi) { |
| 66 | 66 | if($ctrlIndi){ |
| 67 | 67 | $dindi = new Individual($ctrlIndi->getSignificantIndividual()); |
| 68 | - if ($dindi->canDisplayIsSourced()) |
|
| 69 | - return FunctionsPrint::formatIsSourcedIcon('R', $dindi->isSourced(), 'INDI', 1, 'large'); |
|
| 68 | + if ($dindi->canDisplayIsSourced()) { |
|
| 69 | + return FunctionsPrint::formatIsSourcedIcon('R', $dindi->isSourced(), 'INDI', 1, 'large'); |
|
| 70 | + } |
|
| 70 | 71 | } |
| 71 | 72 | return ''; |
| 72 | 73 | } |
@@ -99,8 +100,9 @@ discard block |
||
| 99 | 100 | $dindi = new Individual($grec); |
| 100 | 101 | $html .= FunctionsPrint::formatIsSourcedIcon('R', $dindi->isSourced(), 'INDI', 1, $size); |
| 101 | 102 | $html .= FunctionsPrint::formatIsSourcedIcon('E', $dindi->isBirthSourced(), 'BIRT', 1, $size); |
| 102 | - if($grec->isDead()) |
|
| 103 | - $html .= FunctionsPrint::formatIsSourcedIcon('E', $dindi->isDeathSourced(), 'DEAT', 1, $size); |
|
| 103 | + if($grec->isDead()) { |
|
| 104 | + $html .= FunctionsPrint::formatIsSourcedIcon('E', $dindi->isDeathSourced(), 'DEAT', 1, $size); |
|
| 105 | + } |
|
| 104 | 106 | } |
| 105 | 107 | return $html; |
| 106 | 108 | } |
@@ -173,12 +175,13 @@ discard block |
||
| 173 | 175 | </tr>'; |
| 174 | 176 | } |
| 175 | 177 | |
| 176 | - if( $root->isDead() ) |
|
| 177 | - echo ' |
|
| 178 | + if( $root->isDead() ) { |
|
| 179 | + echo ' |
|
| 178 | 180 | <tr> |
| 179 | 181 | <td class="slabel">' . GedcomTag::getLabel('DEAT') . '</td> |
| 180 | 182 | <td class="svalue">' . FunctionsPrint::formatIsSourcedIcon('E', $dindi->isDeathSourced(), 'DEAT', 1).'</td> |
| 181 | 183 | </tr>'; |
| 184 | + } |
|
| 182 | 185 | |
| 183 | 186 | echo '</table>'; |
| 184 | 187 | } |
@@ -30,29 +30,29 @@ discard block |
||
| 30 | 30 | class IsSourcedModule extends AbstractModule |
| 31 | 31 | implements ModuleSidebarInterface, HookSubscriberInterface, IndividualHeaderExtenderInterface, RecordNameTextExtenderInterface |
| 32 | 32 | { |
| 33 | - /** @var string For custom modules - link for support, upgrades, etc. */ |
|
| 34 | - const CUSTOM_WEBSITE = 'https://github.com/jon48/webtrees-lib'; |
|
| 33 | + /** @var string For custom modules - link for support, upgrades, etc. */ |
|
| 34 | + const CUSTOM_WEBSITE = 'https://github.com/jon48/webtrees-lib'; |
|
| 35 | 35 | |
| 36 | - /** |
|
| 37 | - * {@inheritDoc} |
|
| 38 | - * @see \Fisharebest\Webtrees\Module\AbstractModule::getTitle() |
|
| 39 | - */ |
|
| 40 | - public function getTitle() { |
|
| 41 | - return I18N::translate('Sourced events'); |
|
| 42 | - } |
|
| 36 | + /** |
|
| 37 | + * {@inheritDoc} |
|
| 38 | + * @see \Fisharebest\Webtrees\Module\AbstractModule::getTitle() |
|
| 39 | + */ |
|
| 40 | + public function getTitle() { |
|
| 41 | + return I18N::translate('Sourced events'); |
|
| 42 | + } |
|
| 43 | 43 | |
| 44 | 44 | /** |
| 45 | 45 | * {@inheritDoc} |
| 46 | 46 | * @see \Fisharebest\Webtrees\Module\AbstractModule::getDescription() |
| 47 | 47 | */ |
| 48 | - public function getDescription() { |
|
| 49 | - return I18N::translate('Indicate if events related to an record are sourced.'); |
|
| 50 | - } |
|
| 48 | + public function getDescription() { |
|
| 49 | + return I18N::translate('Indicate if events related to an record are sourced.'); |
|
| 50 | + } |
|
| 51 | 51 | |
| 52 | - /** |
|
| 53 | - * {@inheritDoc} |
|
| 54 | - * @see \MyArtJaub\Webtrees\Hook\HookSubscriberInterface::getSubscribedHooks() |
|
| 55 | - */ |
|
| 52 | + /** |
|
| 53 | + * {@inheritDoc} |
|
| 54 | + * @see \MyArtJaub\Webtrees\Hook\HookSubscriberInterface::getSubscribedHooks() |
|
| 55 | + */ |
|
| 56 | 56 | public function getSubscribedHooks() { |
| 57 | 57 | return array( |
| 58 | 58 | 'hExtendIndiHeaderIcons' => 10, |
@@ -65,12 +65,12 @@ discard block |
||
| 65 | 65 | * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\IndividualHeaderExtenderInterface::hExtendIndiHeaderIcons() |
| 66 | 66 | */ |
| 67 | 67 | public function hExtendIndiHeaderIcons(IndividualController $ctrlIndi) { |
| 68 | - if($ctrlIndi){ |
|
| 69 | - $dindi = new Individual($ctrlIndi->getSignificantIndividual()); |
|
| 70 | - if ($dindi->canDisplayIsSourced()) |
|
| 71 | - return FunctionsPrint::formatIsSourcedIcon('R', $dindi->isSourced(), 'INDI', 1, 'large'); |
|
| 72 | - } |
|
| 73 | - return ''; |
|
| 68 | + if($ctrlIndi){ |
|
| 69 | + $dindi = new Individual($ctrlIndi->getSignificantIndividual()); |
|
| 70 | + if ($dindi->canDisplayIsSourced()) |
|
| 71 | + return FunctionsPrint::formatIsSourcedIcon('R', $dindi->isSourced(), 'INDI', 1, 'large'); |
|
| 72 | + } |
|
| 73 | + return ''; |
|
| 74 | 74 | } |
| 75 | 75 | |
| 76 | 76 | /** |
@@ -96,15 +96,15 @@ discard block |
||
| 96 | 96 | * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\RecordNameTextExtenderInterface::hRecordNameAppend() |
| 97 | 97 | */ |
| 98 | 98 | public function hRecordNameAppend(GedcomRecord $grec, $size = 'small'){ |
| 99 | - $html = ''; |
|
| 100 | - if($grec instanceof \Fisharebest\Webtrees\Individual){ |
|
| 101 | - $dindi = new Individual($grec); |
|
| 102 | - $html .= FunctionsPrint::formatIsSourcedIcon('R', $dindi->isSourced(), 'INDI', 1, $size); |
|
| 103 | - $html .= FunctionsPrint::formatIsSourcedIcon('E', $dindi->isBirthSourced(), 'BIRT', 1, $size); |
|
| 104 | - if($grec->isDead()) |
|
| 105 | - $html .= FunctionsPrint::formatIsSourcedIcon('E', $dindi->isDeathSourced(), 'DEAT', 1, $size); |
|
| 106 | - } |
|
| 107 | - return $html; |
|
| 99 | + $html = ''; |
|
| 100 | + if($grec instanceof \Fisharebest\Webtrees\Individual){ |
|
| 101 | + $dindi = new Individual($grec); |
|
| 102 | + $html .= FunctionsPrint::formatIsSourcedIcon('R', $dindi->isSourced(), 'INDI', 1, $size); |
|
| 103 | + $html .= FunctionsPrint::formatIsSourcedIcon('E', $dindi->isBirthSourced(), 'BIRT', 1, $size); |
|
| 104 | + if($grec->isDead()) |
|
| 105 | + $html .= FunctionsPrint::formatIsSourcedIcon('E', $dindi->isDeathSourced(), 'DEAT', 1, $size); |
|
| 106 | + } |
|
| 107 | + return $html; |
|
| 108 | 108 | } |
| 109 | 109 | |
| 110 | 110 | /** |
@@ -112,7 +112,7 @@ discard block |
||
| 112 | 112 | * @see \Fisharebest\Webtrees\Module\ModuleSidebarInterface::defaultSidebarOrder() |
| 113 | 113 | */ |
| 114 | 114 | public function defaultSidebarOrder() { |
| 115 | - return 15; |
|
| 115 | + return 15; |
|
| 116 | 116 | } |
| 117 | 117 | |
| 118 | 118 | /** |
@@ -120,7 +120,7 @@ discard block |
||
| 120 | 120 | * @see \Fisharebest\Webtrees\Module\ModuleSidebarInterface::hasSidebarContent() |
| 121 | 121 | */ |
| 122 | 122 | public function hasSidebarContent(){ |
| 123 | - return true; |
|
| 123 | + return true; |
|
| 124 | 124 | } |
| 125 | 125 | |
| 126 | 126 | /** |
@@ -128,7 +128,7 @@ discard block |
||
| 128 | 128 | * @see \Fisharebest\Webtrees\Module\ModuleSidebarInterface::getSidebarAjaxContent() |
| 129 | 129 | */ |
| 130 | 130 | public function getSidebarAjaxContent() { |
| 131 | - return ''; |
|
| 131 | + return ''; |
|
| 132 | 132 | } |
| 133 | 133 | |
| 134 | 134 | /** |
@@ -136,15 +136,15 @@ discard block |
||
| 136 | 136 | * @see \Fisharebest\Webtrees\Module\ModuleSidebarInterface::getSidebarContent() |
| 137 | 137 | */ |
| 138 | 138 | public function getSidebarContent() { |
| 139 | - ob_start(); |
|
| 140 | - $root = Globals::getController()->getSignificantIndividual(); |
|
| 141 | - if ($root) { |
|
| 142 | - $dindi = new Individual($root); |
|
| 139 | + ob_start(); |
|
| 140 | + $root = Globals::getController()->getSignificantIndividual(); |
|
| 141 | + if ($root) { |
|
| 142 | + $dindi = new Individual($root); |
|
| 143 | 143 | |
| 144 | - if (!$dindi->canDisplayIsSourced()) { |
|
| 145 | - echo '<div class="error">', I18N::translate('This information is private and cannot be shown.'), '</div>'; |
|
| 146 | - } else { |
|
| 147 | - echo ' |
|
| 144 | + if (!$dindi->canDisplayIsSourced()) { |
|
| 145 | + echo '<div class="error">', I18N::translate('This information is private and cannot be shown.'), '</div>'; |
|
| 146 | + } else { |
|
| 147 | + echo ' |
|
| 148 | 148 | <table class="issourcedtable"> |
| 149 | 149 | <tr> |
| 150 | 150 | <td class="slabel"> ' . GedcomTag::getLabel('INDI') . '</td> |
@@ -155,35 +155,35 @@ discard block |
||
| 155 | 155 | <td class="svalue">' . FunctionsPrint::formatIsSourcedIcon('E', $dindi->isBirthSourced(), 'BIRT', 1).'</td> |
| 156 | 156 | </tr>'; |
| 157 | 157 | |
| 158 | - $fams = $root->getSpouseFamilies(); |
|
| 159 | - ($ct = count($fams)) > 1 ? $nb=1 : $nb=' '; |
|
| 160 | - foreach($fams as $fam){ |
|
| 161 | - $dfam = new Family($fam); |
|
| 162 | - echo ' |
|
| 158 | + $fams = $root->getSpouseFamilies(); |
|
| 159 | + ($ct = count($fams)) > 1 ? $nb=1 : $nb=' '; |
|
| 160 | + foreach($fams as $fam){ |
|
| 161 | + $dfam = new Family($fam); |
|
| 162 | + echo ' |
|
| 163 | 163 | <tr> |
| 164 | 164 | <td class="slabel right"> |
| 165 | 165 | <a href="' . $fam->getHtmlUrl() . '"> '. GedcomTag::getLabel('MARR'); |
| 166 | - if($ct > 1){ |
|
| 167 | - echo ' ',$nb; |
|
| 168 | - $nb++; |
|
| 169 | - } |
|
| 170 | - echo ' </a> |
|
| 166 | + if($ct > 1){ |
|
| 167 | + echo ' ',$nb; |
|
| 168 | + $nb++; |
|
| 169 | + } |
|
| 170 | + echo ' </a> |
|
| 171 | 171 | </td> |
| 172 | 172 | <td class="svalue">' . FunctionsPrint::formatIsSourcedIcon('E', $dfam->isMarriageSourced(), 'MARR', 1).'</td> |
| 173 | 173 | </tr>'; |
| 174 | - } |
|
| 174 | + } |
|
| 175 | 175 | |
| 176 | - if( $root->isDead() ) |
|
| 177 | - echo ' |
|
| 176 | + if( $root->isDead() ) |
|
| 177 | + echo ' |
|
| 178 | 178 | <tr> |
| 179 | 179 | <td class="slabel">' . GedcomTag::getLabel('DEAT') . '</td> |
| 180 | 180 | <td class="svalue">' . FunctionsPrint::formatIsSourcedIcon('E', $dindi->isDeathSourced(), 'DEAT', 1).'</td> |
| 181 | 181 | </tr>'; |
| 182 | 182 | |
| 183 | - echo '</table>'; |
|
| 184 | - } |
|
| 185 | - } |
|
| 186 | - return ob_get_clean(); |
|
| 183 | + echo '</table>'; |
|
| 184 | + } |
|
| 185 | + } |
|
| 186 | + return ob_get_clean(); |
|
| 187 | 187 | } |
| 188 | 188 | |
| 189 | 189 | |
@@ -31,11 +31,11 @@ discard block |
||
| 31 | 31 | * {@inhericDoc} |
| 32 | 32 | * @see \MyArtJaub\Webtrees\Mvc\View\AbstractView::renderContent() |
| 33 | 33 | */ |
| 34 | - protected function renderContent() { |
|
| 34 | + protected function renderContent() { |
|
| 35 | 35 | |
| 36 | - if($this->data->get('has_sosa', false)) { |
|
| 37 | - $table_id = $this->data->get('table_id'); |
|
| 38 | - ?> |
|
| 36 | + if($this->data->get('has_sosa', false)) { |
|
| 37 | + $table_id = $this->data->get('table_id'); |
|
| 38 | + ?> |
|
| 39 | 39 | |
| 40 | 40 | <div id="sosa-indi-list" class="sosa-list"> |
| 41 | 41 | <table id="<?= $table_id ?>"> |
@@ -177,67 +177,67 @@ discard block |
||
| 177 | 177 | <tbody> |
| 178 | 178 | |
| 179 | 179 | <?php foreach($this->data->get('sosa_list') as $sosa => $person) { |
| 180 | - /** @var \Fisharebest\Webtrees\Individual $person */ |
|
| 181 | - if ($person->isPendingAddtion()) { |
|
| 182 | - $class = ' class="new"'; |
|
| 183 | - } elseif ($person->isPendingDeletion()) { |
|
| 184 | - $class = ' class="old"'; |
|
| 185 | - } else { |
|
| 186 | - $class = ''; |
|
| 187 | - } |
|
| 188 | - $dperson = new \MyArtJaub\Webtrees\Individual($person); |
|
| 189 | - ?> |
|
| 180 | + /** @var \Fisharebest\Webtrees\Individual $person */ |
|
| 181 | + if ($person->isPendingAddtion()) { |
|
| 182 | + $class = ' class="new"'; |
|
| 183 | + } elseif ($person->isPendingDeletion()) { |
|
| 184 | + $class = ' class="old"'; |
|
| 185 | + } else { |
|
| 186 | + $class = ''; |
|
| 187 | + } |
|
| 188 | + $dperson = new \MyArtJaub\Webtrees\Individual($person); |
|
| 189 | + ?> |
|
| 190 | 190 | <tr <?= $class ?>> |
| 191 | 191 | <td class="transparent"><?= $sosa ?></td> |
| 192 | 192 | <td hidden><?= $person->getXref() ?></td> |
| 193 | 193 | <?php list($surn_givn, $givn_surn) = FunctionsPrintLists::sortableNames($person); ?> |
| 194 | 194 | <td colspan="2" data-sort="<?= Filter::escapeHtml($givn_surn) ?>"> |
| 195 | 195 | <?php foreach ($person->getAllNames() as $num=>$name) { |
| 196 | - if ($name['type']=='NAME') { |
|
| 197 | - $title=''; |
|
| 198 | - } else { |
|
| 199 | - $title='title="'.strip_tags(GedcomTag::getLabel($name['type'], $person)).'"'; |
|
| 200 | - } |
|
| 201 | - if ($num==$person->getPrimaryName()) { |
|
| 202 | - $class=' class="name2"'; |
|
| 203 | - $sex_image=$person->getSexImage(); |
|
| 204 | - } else { |
|
| 205 | - $class=''; |
|
| 206 | - $sex_image=''; |
|
| 207 | - } ?> |
|
| 196 | + if ($name['type']=='NAME') { |
|
| 197 | + $title=''; |
|
| 198 | + } else { |
|
| 199 | + $title='title="'.strip_tags(GedcomTag::getLabel($name['type'], $person)).'"'; |
|
| 200 | + } |
|
| 201 | + if ($num==$person->getPrimaryName()) { |
|
| 202 | + $class=' class="name2"'; |
|
| 203 | + $sex_image=$person->getSexImage(); |
|
| 204 | + } else { |
|
| 205 | + $class=''; |
|
| 206 | + $sex_image=''; |
|
| 207 | + } ?> |
|
| 208 | 208 | <a <?= $title.' '.$class; ?> href="<?= $person->getHtmlUrl() ?>"> |
| 209 | 209 | <?= \Fisharebest\Webtrees\Functions\FunctionsPrint::highlightSearchHits($name['full']) ?> |
| 210 | 210 | </a> |
| 211 | 211 | <?= $sex_image; |
| 212 | - echo implode(' ', |
|
| 213 | - \MyArtJaub\Webtrees\Hook\HookProvider::getInstance() |
|
| 214 | - ->get('hRecordNameAppend') |
|
| 215 | - ->executeOnlyFor(array(Constants::MODULE_MAJ_SOSA_NAME), $person, 'smaller')); |
|
| 216 | - ?> |
|
| 212 | + echo implode(' ', |
|
| 213 | + \MyArtJaub\Webtrees\Hook\HookProvider::getInstance() |
|
| 214 | + ->get('hRecordNameAppend') |
|
| 215 | + ->executeOnlyFor(array(Constants::MODULE_MAJ_SOSA_NAME), $person, 'smaller')); |
|
| 216 | + ?> |
|
| 217 | 217 | <br/> |
| 218 | 218 | <?php } |
| 219 | - echo $person->getPrimaryParentsNames('parents details1', 'none'); |
|
| 220 | - ?> |
|
| 219 | + echo $person->getPrimaryParentsNames('parents details1', 'none'); |
|
| 220 | + ?> |
|
| 221 | 221 | </td> |
| 222 | 222 | <td hidden data-sort="<?= Filter::escapeHtml($surn_givn) ?>"></td> |
| 223 | 223 | <?php $birth_dates = $person->getAllBirthDates(); ?> |
| 224 | 224 | <td data-sort="<?= $person->getEstimatedBirthDate()->julianDay() ?>"> |
| 225 | 225 | <?php foreach ($birth_dates as $n => $birth_date) { |
| 226 | - if ($n > 0) { ?><br/><?php } ?> |
|
| 226 | + if ($n > 0) { ?><br/><?php } ?> |
|
| 227 | 227 | <?php echo $birth_date->display(true); |
| 228 | - } ?> |
|
| 228 | + } ?> |
|
| 229 | 229 | </td> |
| 230 | 230 | <td> |
| 231 | 231 | <?php foreach ($person->getAllBirthPlaces() as $n => $birth_place) { |
| 232 | - $tmp = new \Fisharebest\Webtrees\Place($birth_place, $person->getTree()); |
|
| 233 | - if ($n > 0) { ?><br><?php } ?> |
|
| 232 | + $tmp = new \Fisharebest\Webtrees\Place($birth_place, $person->getTree()); |
|
| 233 | + if ($n > 0) { ?><br><?php } ?> |
|
| 234 | 234 | <a href="'<?= $tmp->getURL() ?>" title="<?= strip_tags($tmp->getFullName()) ?>"> |
| 235 | 235 | <?= \Fisharebest\Webtrees\Functions\FunctionsPrint::highlightSearchHits($tmp->getShortName()) ?> |
| 236 | 236 | </a> |
| 237 | 237 | <?php } ?> |
| 238 | 238 | </td> |
| 239 | 239 | <?php if (ModuleManager::getInstance()->isOperational(Constants::MODULE_MAJ_ISSOURCED_NAME)) { |
| 240 | - $isBSourced = $dperson->isBirthSourced(); ?> |
|
| 240 | + $isBSourced = $dperson->isBirthSourced(); ?> |
|
| 241 | 241 | <td data-sort="<?= $isBSourced ?>"><?= FunctionsPrint::formatIsSourcedIcon('E', $isBSourced, 'BIRT', 1, 'medium') ?></td> |
| 242 | 242 | <?php } else { ?> |
| 243 | 243 | <td> </td> |
@@ -245,63 +245,63 @@ discard block |
||
| 245 | 245 | <?php $death_dates = $person->getAllDeathDates(); ?> |
| 246 | 246 | <td data-sort="<?= $person->getEstimatedDeathDate()->julianDay() ?>"> |
| 247 | 247 | <?php foreach ($death_dates as $num => $death_date) { |
| 248 | - if ($num) { ?><br/><?php } ?> |
|
| 248 | + if ($num) { ?><br/><?php } ?> |
|
| 249 | 249 | <?php echo $death_date->display(true); |
| 250 | - } ?> |
|
| 250 | + } ?> |
|
| 251 | 251 | </td> |
| 252 | 252 | <?php if (isset($birth_dates[0]) && isset($death_dates[0])) { |
| 253 | - $age_at_death = Date::getAge($birth_dates[0], $death_dates[0], 0); |
|
| 254 | - $age_at_death_sort = Date::getAge($birth_dates[0], $death_dates[0], 2); |
|
| 255 | - } else { |
|
| 256 | - $age_at_death = ''; |
|
| 257 | - $age_at_death_sort = PHP_INT_MAX; |
|
| 258 | - } ?> |
|
| 253 | + $age_at_death = Date::getAge($birth_dates[0], $death_dates[0], 0); |
|
| 254 | + $age_at_death_sort = Date::getAge($birth_dates[0], $death_dates[0], 2); |
|
| 255 | + } else { |
|
| 256 | + $age_at_death = ''; |
|
| 257 | + $age_at_death_sort = PHP_INT_MAX; |
|
| 258 | + } ?> |
|
| 259 | 259 | <td class="center" data-sort="<?= $age_at_death_sort ?>"><?= $age_at_death ?></td> |
| 260 | 260 | <td> |
| 261 | 261 | <?php foreach ($person->getAllDeathPlaces() as $n => $death_place) { |
| 262 | - $tmp = new Place($death_place, $person->getTree()); |
|
| 263 | - if ($n) { ?><br><?php } ?> |
|
| 262 | + $tmp = new Place($death_place, $person->getTree()); |
|
| 263 | + if ($n) { ?><br><?php } ?> |
|
| 264 | 264 | <a href="'<?= $tmp->getURL() ?>" title="<?= strip_tags($tmp->getFullName()) ?>"> |
| 265 | 265 | <?= \Fisharebest\Webtrees\Functions\FunctionsPrint::highlightSearchHits($tmp->getShortName()) ?> |
| 266 | 266 | </a> |
| 267 | 267 | <?php } ?> |
| 268 | 268 | </td> |
| 269 | 269 | <?php if (ModuleManager::getInstance()->isOperational(Constants::MODULE_MAJ_ISSOURCED_NAME)) { |
| 270 | - if($person->isDead()) { |
|
| 271 | - $isDSourced = $dperson->isDeathSourced(); ?> |
|
| 270 | + if($person->isDead()) { |
|
| 271 | + $isDSourced = $dperson->isDeathSourced(); ?> |
|
| 272 | 272 | <td data-sort=<?= $isDSourced ?>><?= FunctionsPrint::formatIsSourcedIcon('E', $isDSourced, 'DEAT', 1, 'medium') ?></td> |
| 273 | 273 | <?php } else { ?> |
| 274 | 274 | <td data-sort="-99"> </td> |
| 275 | 275 | <?php } |
| 276 | - } else { ?> |
|
| 276 | + } else { ?> |
|
| 277 | 277 | <td> </td> |
| 278 | 278 | <?php } ?> |
| 279 | 279 | <td hidden><?= $person->getSex() ?></td> |
| 280 | 280 | <td hidden> |
| 281 | 281 | <?php if (!$person->canShow() || Date::compare($person->getEstimatedBirthDate(), new Date(date('Y') - 100)) > 0) { |
| 282 | - echo 'Y100'; |
|
| 283 | - } else { |
|
| 284 | - echo 'YES'; |
|
| 285 | - } ?> |
|
| 282 | + echo 'Y100'; |
|
| 283 | + } else { |
|
| 284 | + echo 'YES'; |
|
| 285 | + } ?> |
|
| 286 | 286 | </td> |
| 287 | 287 | <td hidden> |
| 288 | 288 | <?php if (isset($death_dates[0]) && Date::compare($death_dates[0], new Date(date('Y') - 100)) > 0) { |
| 289 | - echo 'Y100'; |
|
| 290 | - } elseif ($person->isDead()) { |
|
| 291 | - echo 'YES'; |
|
| 292 | - } else { |
|
| 293 | - echo 'N'; |
|
| 294 | - } ?> |
|
| 289 | + echo 'Y100'; |
|
| 290 | + } elseif ($person->isDead()) { |
|
| 291 | + echo 'YES'; |
|
| 292 | + } else { |
|
| 293 | + echo 'N'; |
|
| 294 | + } ?> |
|
| 295 | 295 | </td> |
| 296 | 296 | <td hidden> |
| 297 | 297 | <?php if (!$person->getChildFamilies()) { |
| 298 | - echo 'R'; |
|
| 298 | + echo 'R'; |
|
| 299 | 299 | } // roots |
| 300 | 300 | elseif (!$person->isDead() && $person->getNumberOfChildren() < 1) { |
| 301 | - echo 'L'; |
|
| 301 | + echo 'L'; |
|
| 302 | 302 | } // leaves |
| 303 | 303 | else { |
| 304 | - echo ' '; |
|
| 304 | + echo ' '; |
|
| 305 | 305 | } ?> |
| 306 | 306 | </td> |
| 307 | 307 | </tr> |
@@ -312,12 +312,12 @@ discard block |
||
| 312 | 312 | <th class="ui-state-default" colspan="15"> |
| 313 | 313 | <div class="center"> |
| 314 | 314 | <?= I18N::translate('Number of Sosa ancestors: %1$s known / %2$s theoretical (%3$s)', |
| 315 | - I18N::number($this->data->get('sosa_count')), |
|
| 316 | - I18N::number($this->data->get('sosa_theo')), |
|
| 317 | - I18N::percentage($this->data->get('sosa_ratio'),2) |
|
| 318 | - ) ?> |
|
| 315 | + I18N::number($this->data->get('sosa_count')), |
|
| 316 | + I18N::number($this->data->get('sosa_theo')), |
|
| 317 | + I18N::percentage($this->data->get('sosa_ratio'),2) |
|
| 318 | + ) ?> |
|
| 319 | 319 | <?php if($this->data->get('sosa_hidden') > 0) { |
| 320 | - echo '['. I18N::translate('%s hidden', I18N::number($this->data->get('sosa_hidden'))).']'; |
|
| 320 | + echo '['. I18N::translate('%s hidden', I18N::number($this->data->get('sosa_hidden'))).']'; |
|
| 321 | 321 | } ?> |
| 322 | 322 | </div> |
| 323 | 323 | </th> |
@@ -351,8 +351,8 @@ discard block |
||
| 351 | 351 | </div> |
| 352 | 352 | </div> |
| 353 | 353 | <?php |
| 354 | - } |
|
| 355 | - } |
|
| 354 | + } |
|
| 355 | + } |
|
| 356 | 356 | |
| 357 | 357 | } |
| 358 | 358 | |
| 359 | 359 | \ No newline at end of file |
@@ -33,7 +33,7 @@ discard block |
||
| 33 | 33 | */ |
| 34 | 34 | protected function renderContent() { |
| 35 | 35 | |
| 36 | - if($this->data->get('has_sosa', false)) { |
|
| 36 | + if ($this->data->get('has_sosa', false)) { |
|
| 37 | 37 | $table_id = $this->data->get('table_id'); |
| 38 | 38 | ?> |
| 39 | 39 | |
@@ -176,7 +176,7 @@ discard block |
||
| 176 | 176 | </thead> |
| 177 | 177 | <tbody> |
| 178 | 178 | |
| 179 | - <?php foreach($this->data->get('sosa_list') as $sosa => $person) { |
|
| 179 | + <?php foreach ($this->data->get('sosa_list') as $sosa => $person) { |
|
| 180 | 180 | /** @var \Fisharebest\Webtrees\Individual $person */ |
| 181 | 181 | if ($person->isPendingAddtion()) { |
| 182 | 182 | $class = ' class="new"'; |
@@ -193,17 +193,17 @@ discard block |
||
| 193 | 193 | <?php list($surn_givn, $givn_surn) = FunctionsPrintLists::sortableNames($person); ?> |
| 194 | 194 | <td colspan="2" data-sort="<?= Filter::escapeHtml($givn_surn) ?>"> |
| 195 | 195 | <?php foreach ($person->getAllNames() as $num=>$name) { |
| 196 | - if ($name['type']=='NAME') { |
|
| 197 | - $title=''; |
|
| 196 | + if ($name['type'] == 'NAME') { |
|
| 197 | + $title = ''; |
|
| 198 | 198 | } else { |
| 199 | - $title='title="'.strip_tags(GedcomTag::getLabel($name['type'], $person)).'"'; |
|
| 199 | + $title = 'title="'.strip_tags(GedcomTag::getLabel($name['type'], $person)).'"'; |
|
| 200 | 200 | } |
| 201 | - if ($num==$person->getPrimaryName()) { |
|
| 202 | - $class=' class="name2"'; |
|
| 203 | - $sex_image=$person->getSexImage(); |
|
| 201 | + if ($num == $person->getPrimaryName()) { |
|
| 202 | + $class = ' class="name2"'; |
|
| 203 | + $sex_image = $person->getSexImage(); |
|
| 204 | 204 | } else { |
| 205 | - $class=''; |
|
| 206 | - $sex_image=''; |
|
| 205 | + $class = ''; |
|
| 206 | + $sex_image = ''; |
|
| 207 | 207 | } ?> |
| 208 | 208 | <a <?= $title.' '.$class; ?> href="<?= $person->getHtmlUrl() ?>"> |
| 209 | 209 | <?= \Fisharebest\Webtrees\Functions\FunctionsPrint::highlightSearchHits($name['full']) ?> |
@@ -212,7 +212,7 @@ discard block |
||
| 212 | 212 | echo implode(' ', |
| 213 | 213 | \MyArtJaub\Webtrees\Hook\HookProvider::getInstance() |
| 214 | 214 | ->get('hRecordNameAppend') |
| 215 | - ->executeOnlyFor(array(Constants::MODULE_MAJ_SOSA_NAME), $person, 'smaller')); |
|
| 215 | + ->executeOnlyFor(array(Constants::MODULE_MAJ_SOSA_NAME), $person, 'smaller')); |
|
| 216 | 216 | ?> |
| 217 | 217 | <br/> |
| 218 | 218 | <?php } |
@@ -267,7 +267,7 @@ discard block |
||
| 267 | 267 | <?php } ?> |
| 268 | 268 | </td> |
| 269 | 269 | <?php if (ModuleManager::getInstance()->isOperational(Constants::MODULE_MAJ_ISSOURCED_NAME)) { |
| 270 | - if($person->isDead()) { |
|
| 270 | + if ($person->isDead()) { |
|
| 271 | 271 | $isDSourced = $dperson->isDeathSourced(); ?> |
| 272 | 272 | <td data-sort=<?= $isDSourced ?>><?= FunctionsPrint::formatIsSourcedIcon('E', $isDSourced, 'DEAT', 1, 'medium') ?></td> |
| 273 | 273 | <?php } else { ?> |
@@ -314,10 +314,10 @@ discard block |
||
| 314 | 314 | <?= I18N::translate('Number of Sosa ancestors: %1$s known / %2$s theoretical (%3$s)', |
| 315 | 315 | I18N::number($this->data->get('sosa_count')), |
| 316 | 316 | I18N::number($this->data->get('sosa_theo')), |
| 317 | - I18N::percentage($this->data->get('sosa_ratio'),2) |
|
| 317 | + I18N::percentage($this->data->get('sosa_ratio'), 2) |
|
| 318 | 318 | ) ?> |
| 319 | - <?php if($this->data->get('sosa_hidden') > 0) { |
|
| 320 | - echo '['. I18N::translate('%s hidden', I18N::number($this->data->get('sosa_hidden'))).']'; |
|
| 319 | + <?php if ($this->data->get('sosa_hidden') > 0) { |
|
| 320 | + echo '['.I18N::translate('%s hidden', I18N::number($this->data->get('sosa_hidden'))).']'; |
|
| 321 | 321 | } ?> |
| 322 | 322 | </div> |
| 323 | 323 | </th> |
@@ -329,7 +329,7 @@ discard block |
||
| 329 | 329 | <button type="button" class="ui-state-default btn-toggle-parents"> |
| 330 | 330 | <?= I18N::translate('Show parents') ?> |
| 331 | 331 | </button> |
| 332 | - <button id="btn-toggle-statistics-<?= $table_id ;?>" type="button" class="ui-state-default btn-toggle-statistics"> |
|
| 332 | + <button id="btn-toggle-statistics-<?= $table_id; ?>" type="button" class="ui-state-default btn-toggle-statistics"> |
|
| 333 | 333 | <?= I18N::translate('Show statistics charts') ?> |
| 334 | 334 | </button> |
| 335 | 335 | </div> |