@@ -21,6 +21,7 @@ discard block |
||
| 21 | 21 | * Insert some content before the record name text. |
| 22 | 22 | * |
| 23 | 23 | * @param GedcomRecord $grec Gedcom record |
| 24 | + * @return void |
|
| 24 | 25 | */ |
| 25 | 26 | public function hRecordNamePrepend(GedcomRecord $grec); |
| 26 | 27 | |
@@ -28,6 +29,7 @@ discard block |
||
| 28 | 29 | * Insert some content after the record name text. |
| 29 | 30 | * |
| 30 | 31 | * @param GedcomRecord $grec Gedcom record |
| 32 | + * @return string |
|
| 31 | 33 | */ |
| 32 | 34 | public function hRecordNameAppend(GedcomRecord $grec); |
| 33 | 35 | |
@@ -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; |
| 12 | 12 | |
| 13 | 13 | use \Fisharebest\Webtrees as fw; |
@@ -23,14 +23,14 @@ discard block |
||
| 23 | 23 | protected $gedcomrecord; |
| 24 | 24 | |
| 25 | 25 | /** @var bool Is the GedcomRecord sourced (cache) */ |
| 26 | - protected $_issourced=null; |
|
| 26 | + protected $_issourced = null; |
|
| 27 | 27 | |
| 28 | 28 | /** |
| 29 | 29 | * Contructor for the decorator |
| 30 | 30 | * |
| 31 | 31 | * @param \Fisharebest\Webtrees\GedcomRecord $gedcomrecord_in The GedcomRecord to extend |
| 32 | 32 | */ |
| 33 | - public function __construct(\Fisharebest\Webtrees\GedcomRecord $gedcomrecord_in){ |
|
| 33 | + public function __construct(\Fisharebest\Webtrees\GedcomRecord $gedcomrecord_in) { |
|
| 34 | 34 | $this->gedcomrecord = $gedcomrecord_in; |
| 35 | 35 | } |
| 36 | 36 | |
@@ -39,7 +39,7 @@ discard block |
||
| 39 | 39 | * |
| 40 | 40 | * @return \Fisharebest\Webtrees\GedcomRecord Embedded gedcom record |
| 41 | 41 | */ |
| 42 | - public function getDerivedRecord(){ |
|
| 42 | + public function getDerivedRecord() { |
|
| 43 | 43 | return $this->gedcomrecord; |
| 44 | 44 | } |
| 45 | 45 | |
@@ -85,7 +85,7 @@ discard block |
||
| 85 | 85 | if (($fact->getDate() || $fact->getPlace()) && $fact->canShow()) { |
| 86 | 86 | switch ($style) { |
| 87 | 87 | case 10: |
| 88 | - return '<i>'.$fact->getLabel().' '. mw\Functions\FunctionsPrint::formatFactDateShort($fact) .' '. mw\Functions\FunctionsPrint::formatFactPlaceShort($fact, '%1') .'</i>'; |
|
| 88 | + return '<i>'.$fact->getLabel().' '.mw\Functions\FunctionsPrint::formatFactDateShort($fact).' '.mw\Functions\FunctionsPrint::formatFactPlaceShort($fact, '%1').'</i>'; |
|
| 89 | 89 | break; |
| 90 | 90 | default: |
| 91 | 91 | return $this->gedcomrecord->formatFirstMajorFact($facts, $style); |
@@ -101,11 +101,11 @@ discard block |
||
| 101 | 101 | * @param int $access_level |
| 102 | 102 | * @return boolean |
| 103 | 103 | */ |
| 104 | - public function canDisplayIsSourced($access_level = null){ |
|
| 104 | + public function canDisplayIsSourced($access_level = null) { |
|
| 105 | 105 | global $global_facts; |
| 106 | 106 | |
| 107 | - if(!$this->gedcomrecord->canShow($access_level)) return false; |
|
| 108 | - if($access_level === null ) |
|
| 107 | + if (!$this->gedcomrecord->canShow($access_level)) return false; |
|
| 108 | + if ($access_level === null) |
|
| 109 | 109 | $access_level = \Fisharebest\Webtrees\Auth::accessLevel($this->gedcomrecord->getTree()); |
| 110 | 110 | |
| 111 | 111 | if (isset($global_facts['SOUR'])) { |
@@ -124,14 +124,14 @@ discard block |
||
| 124 | 124 | * |
| 125 | 125 | * @return int Level of sources |
| 126 | 126 | */ |
| 127 | - public function isSourced(){ |
|
| 128 | - if($this->_issourced !== null) return $this->_issourced; |
|
| 129 | - $this->_issourced=-1; |
|
| 127 | + public function isSourced() { |
|
| 128 | + if ($this->_issourced !== null) return $this->_issourced; |
|
| 129 | + $this->_issourced = -1; |
|
| 130 | 130 | $sourcesfacts = $this->gedcomrecord->getFacts('SOUR'); |
| 131 | - foreach($sourcesfacts as $sourcefact){ |
|
| 132 | - $this->_issourced=max($this->_issourced, 1); |
|
| 133 | - if($sourcefact->getAttribute('_ACT')){ |
|
| 134 | - $this->_issourced=max($this->_issourced, 2); |
|
| 131 | + foreach ($sourcesfacts as $sourcefact) { |
|
| 132 | + $this->_issourced = max($this->_issourced, 1); |
|
| 133 | + if ($sourcefact->getAttribute('_ACT')) { |
|
| 134 | + $this->_issourced = max($this->_issourced, 2); |
|
| 135 | 135 | } |
| 136 | 136 | } |
| 137 | 137 | return $this->_issourced; |
@@ -143,19 +143,19 @@ discard block |
||
| 143 | 143 | * @param string $eventslist |
| 144 | 144 | * @return int Level of sources |
| 145 | 145 | */ |
| 146 | - public function isFactSourced($eventslist){ |
|
| 147 | - if(empty($eventslist)) return 0; |
|
| 148 | - $isSourced=0; |
|
| 146 | + public function isFactSourced($eventslist) { |
|
| 147 | + if (empty($eventslist)) return 0; |
|
| 148 | + $isSourced = 0; |
|
| 149 | 149 | $facts = $this->gedcomrecord->getFacts($eventslist); |
| 150 | - foreach($facts as $fact){ |
|
| 151 | - if($isSourced < Fact::MAX_IS_SOURCED_LEVEL){ |
|
| 150 | + foreach ($facts as $fact) { |
|
| 151 | + if ($isSourced < Fact::MAX_IS_SOURCED_LEVEL) { |
|
| 152 | 152 | $dfact = new Fact($fact); |
| 153 | 153 | $tmpIsSourced = $dfact->isSourced(); |
| 154 | - if($tmpIsSourced != 0) { |
|
| 155 | - if($isSourced==0) { |
|
| 156 | - $isSourced = $tmpIsSourced; |
|
| 154 | + if ($tmpIsSourced != 0) { |
|
| 155 | + if ($isSourced == 0) { |
|
| 156 | + $isSourced = $tmpIsSourced; |
|
| 157 | 157 | } |
| 158 | - else{ |
|
| 158 | + else { |
|
| 159 | 159 | $isSourced = max($isSourced, $tmpIsSourced); |
| 160 | 160 | } |
| 161 | 161 | } |
@@ -104,9 +104,12 @@ discard block |
||
| 104 | 104 | public function canDisplayIsSourced($access_level = null){ |
| 105 | 105 | global $global_facts; |
| 106 | 106 | |
| 107 | - if(!$this->gedcomrecord->canShow($access_level)) return false; |
|
| 108 | - if($access_level === null ) |
|
| 109 | - $access_level = \Fisharebest\Webtrees\Auth::accessLevel($this->gedcomrecord->getTree()); |
|
| 107 | + if(!$this->gedcomrecord->canShow($access_level)) { |
|
| 108 | + return false; |
|
| 109 | + } |
|
| 110 | + if($access_level === null ) { |
|
| 111 | + $access_level = \Fisharebest\Webtrees\Auth::accessLevel($this->gedcomrecord->getTree()); |
|
| 112 | + } |
|
| 110 | 113 | |
| 111 | 114 | if (isset($global_facts['SOUR'])) { |
| 112 | 115 | return $global_facts['SOUR'] >= $access_level; |
@@ -125,7 +128,9 @@ discard block |
||
| 125 | 128 | * @return int Level of sources |
| 126 | 129 | */ |
| 127 | 130 | public function isSourced(){ |
| 128 | - if($this->_issourced !== null) return $this->_issourced; |
|
| 131 | + if($this->_issourced !== null) { |
|
| 132 | + return $this->_issourced; |
|
| 133 | + } |
|
| 129 | 134 | $this->_issourced=-1; |
| 130 | 135 | $sourcesfacts = $this->gedcomrecord->getFacts('SOUR'); |
| 131 | 136 | foreach($sourcesfacts as $sourcefact){ |
@@ -144,7 +149,9 @@ discard block |
||
| 144 | 149 | * @return int Level of sources |
| 145 | 150 | */ |
| 146 | 151 | public function isFactSourced($eventslist){ |
| 147 | - if(empty($eventslist)) return 0; |
|
| 152 | + if(empty($eventslist)) { |
|
| 153 | + return 0; |
|
| 154 | + } |
|
| 148 | 155 | $isSourced=0; |
| 149 | 156 | $facts = $this->gedcomrecord->getFacts($eventslist); |
| 150 | 157 | foreach($facts as $fact){ |
@@ -154,8 +161,7 @@ discard block |
||
| 154 | 161 | if($tmpIsSourced != 0) { |
| 155 | 162 | if($isSourced==0) { |
| 156 | 163 | $isSourced = $tmpIsSourced; |
| 157 | - } |
|
| 158 | - else{ |
|
| 164 | + } else{ |
|
| 159 | 165 | $isSourced = max($isSourced, $tmpIsSourced); |
| 160 | 166 | } |
| 161 | 167 | } |
@@ -91,7 +91,7 @@ discard block |
||
| 91 | 91 | |
| 92 | 92 | if(!$this->gedcomrecord->canShow($access_level)) return false; |
| 93 | 93 | if($access_level === null ) |
| 94 | - $access_level = \Fisharebest\Webtrees\Auth::accessLevel($this->gedcomrecord->getTree()); |
|
| 94 | + $access_level = \Fisharebest\Webtrees\Auth::accessLevel($this->gedcomrecord->getTree()); |
|
| 95 | 95 | |
| 96 | 96 | if (isset($global_facts['SOUR'])) { |
| 97 | 97 | return $global_facts['SOUR'] >= $access_level; |
@@ -129,7 +129,7 @@ discard block |
||
| 129 | 129 | * @return int Level of sources |
| 130 | 130 | */ |
| 131 | 131 | public function isFactSourced($eventslist){ |
| 132 | - if(empty($eventslist)) return 0; |
|
| 132 | + if(empty($eventslist)) return 0; |
|
| 133 | 133 | $isSourced=0; |
| 134 | 134 | $facts = $this->gedcomrecord->getFacts($eventslist); |
| 135 | 135 | foreach($facts as $fact){ |
@@ -23,64 +23,64 @@ discard block |
||
| 23 | 23 | class AdminTasksModule extends AbstractModule |
| 24 | 24 | implements ModuleConfigInterface, ModuleBlockInterface |
| 25 | 25 | { |
| 26 | - // How to update the database schema for this module |
|
| 27 | - const SCHEMA_TARGET_VERSION = 1; |
|
| 28 | - const SCHEMA_SETTING_NAME = 'MAJ_ADMTASKS_SCHEMA_VERSION'; |
|
| 29 | - const SCHEMA_MIGRATION_PREFIX = '\MyArtJaub\Webtrees\Module\AdminTasks\Schema'; |
|
| 26 | + // How to update the database schema for this module |
|
| 27 | + const SCHEMA_TARGET_VERSION = 1; |
|
| 28 | + const SCHEMA_SETTING_NAME = 'MAJ_ADMTASKS_SCHEMA_VERSION'; |
|
| 29 | + const SCHEMA_MIGRATION_PREFIX = '\MyArtJaub\Webtrees\Module\AdminTasks\Schema'; |
|
| 30 | 30 | |
| 31 | - /** @var string For custom modules - link for support, upgrades, etc. */ |
|
| 32 | - const CUSTOM_WEBSITE = 'https://github.com/jon48/webtrees-lib'; |
|
| 31 | + /** @var string For custom modules - link for support, upgrades, etc. */ |
|
| 32 | + const CUSTOM_WEBSITE = 'https://github.com/jon48/webtrees-lib'; |
|
| 33 | 33 | |
| 34 | - /** |
|
| 35 | - * Admin Task provider |
|
| 36 | - * @var \MyArtJaub\Webtrees\Module\AdminTasks\Model\TaskProviderInterface $provider |
|
| 37 | - */ |
|
| 38 | - protected $provider; |
|
| 34 | + /** |
|
| 35 | + * Admin Task provider |
|
| 36 | + * @var \MyArtJaub\Webtrees\Module\AdminTasks\Model\TaskProviderInterface $provider |
|
| 37 | + */ |
|
| 38 | + protected $provider; |
|
| 39 | 39 | |
| 40 | - /** |
|
| 41 | - * {@inheritDoc} |
|
| 42 | - * @see \Fisharebest\Webtrees\Module\AbstractModule::getTitle() |
|
| 43 | - */ |
|
| 44 | - public function getTitle() { |
|
| 45 | - return I18N::translate('Administration Tasks'); |
|
| 46 | - } |
|
| 40 | + /** |
|
| 41 | + * {@inheritDoc} |
|
| 42 | + * @see \Fisharebest\Webtrees\Module\AbstractModule::getTitle() |
|
| 43 | + */ |
|
| 44 | + public function getTitle() { |
|
| 45 | + return I18N::translate('Administration Tasks'); |
|
| 46 | + } |
|
| 47 | 47 | |
| 48 | 48 | /** |
| 49 | 49 | * {@inheritDoc} |
| 50 | 50 | * @see \Fisharebest\Webtrees\Module\AbstractModule::getDescription() |
| 51 | 51 | */ |
| 52 | - public function getDescription() { |
|
| 53 | - return I18N::translate('Manage and run nearly-scheduled administration tasks.'); |
|
| 54 | - } |
|
| 52 | + public function getDescription() { |
|
| 53 | + return I18N::translate('Manage and run nearly-scheduled administration tasks.'); |
|
| 54 | + } |
|
| 55 | 55 | |
| 56 | - /** |
|
| 57 | - * {@inheritDoc} |
|
| 58 | - * @see \Fisharebest\Webtrees\Module\AbstractModule::modAction() |
|
| 59 | - */ |
|
| 60 | - public function modAction($mod_action) { |
|
| 61 | - Database::updateSchema(self::SCHEMA_MIGRATION_PREFIX, self::SCHEMA_SETTING_NAME, self::SCHEMA_TARGET_VERSION); |
|
| 56 | + /** |
|
| 57 | + * {@inheritDoc} |
|
| 58 | + * @see \Fisharebest\Webtrees\Module\AbstractModule::modAction() |
|
| 59 | + */ |
|
| 60 | + public function modAction($mod_action) { |
|
| 61 | + Database::updateSchema(self::SCHEMA_MIGRATION_PREFIX, self::SCHEMA_SETTING_NAME, self::SCHEMA_TARGET_VERSION); |
|
| 62 | 62 | |
| 63 | - \MyArtJaub\Webtrees\Mvc\Dispatcher::getInstance()->handle($this, $mod_action); |
|
| 64 | - } |
|
| 63 | + \MyArtJaub\Webtrees\Mvc\Dispatcher::getInstance()->handle($this, $mod_action); |
|
| 64 | + } |
|
| 65 | 65 | |
| 66 | - /** |
|
| 67 | - * {@inheritDoc} |
|
| 68 | - * @see \Fisharebest\Webtrees\Module\ModuleConfigInterface::getConfigLink() |
|
| 69 | - */ |
|
| 70 | - public function getConfigLink() { |
|
| 71 | - Database::updateSchema(self::SCHEMA_MIGRATION_PREFIX, self::SCHEMA_SETTING_NAME, self::SCHEMA_TARGET_VERSION); |
|
| 66 | + /** |
|
| 67 | + * {@inheritDoc} |
|
| 68 | + * @see \Fisharebest\Webtrees\Module\ModuleConfigInterface::getConfigLink() |
|
| 69 | + */ |
|
| 70 | + public function getConfigLink() { |
|
| 71 | + Database::updateSchema(self::SCHEMA_MIGRATION_PREFIX, self::SCHEMA_SETTING_NAME, self::SCHEMA_TARGET_VERSION); |
|
| 72 | 72 | |
| 73 | - return 'module.php?mod=' . $this->getName() . '&mod_action=AdminConfig'; |
|
| 74 | - } |
|
| 73 | + return 'module.php?mod=' . $this->getName() . '&mod_action=AdminConfig'; |
|
| 74 | + } |
|
| 75 | 75 | |
| 76 | - /** |
|
| 77 | - * {@inheritDoc} |
|
| 78 | - * @see \Fisharebest\Webtrees\Module\ModuleBlockInterface::getBlock() |
|
| 79 | - */ |
|
| 80 | - public function getBlock($block_id, $template = true, $cfg = array()) { |
|
| 81 | - global $controller; |
|
| 76 | + /** |
|
| 77 | + * {@inheritDoc} |
|
| 78 | + * @see \Fisharebest\Webtrees\Module\ModuleBlockInterface::getBlock() |
|
| 79 | + */ |
|
| 80 | + public function getBlock($block_id, $template = true, $cfg = array()) { |
|
| 81 | + global $controller; |
|
| 82 | 82 | |
| 83 | - $controller->addInlineJavascript(' |
|
| 83 | + $controller->addInlineJavascript(' |
|
| 84 | 84 | $(document).ready(function(){ |
| 85 | 85 | $.ajax({ |
| 86 | 86 | url: "module.php", |
@@ -91,60 +91,60 @@ discard block |
||
| 91 | 91 | }); |
| 92 | 92 | }); |
| 93 | 93 | '); |
| 94 | - return ''; |
|
| 95 | - } |
|
| 94 | + return ''; |
|
| 95 | + } |
|
| 96 | 96 | |
| 97 | - /** |
|
| 98 | - * {@inheritDoc} |
|
| 99 | - * @see \Fisharebest\Webtrees\Module\ModuleBlockInterface::loadAjax() |
|
| 100 | - */ |
|
| 101 | - public function loadAjax() { |
|
| 102 | - return false; |
|
| 103 | - } |
|
| 97 | + /** |
|
| 98 | + * {@inheritDoc} |
|
| 99 | + * @see \Fisharebest\Webtrees\Module\ModuleBlockInterface::loadAjax() |
|
| 100 | + */ |
|
| 101 | + public function loadAjax() { |
|
| 102 | + return false; |
|
| 103 | + } |
|
| 104 | 104 | |
| 105 | - /** |
|
| 106 | - * {@inheritDoc} |
|
| 107 | - * @see \Fisharebest\Webtrees\Module\ModuleBlockInterface::isGedcomBlock() |
|
| 108 | - */ |
|
| 109 | - public function isGedcomBlock() { |
|
| 110 | - return true; |
|
| 111 | - } |
|
| 105 | + /** |
|
| 106 | + * {@inheritDoc} |
|
| 107 | + * @see \Fisharebest\Webtrees\Module\ModuleBlockInterface::isGedcomBlock() |
|
| 108 | + */ |
|
| 109 | + public function isGedcomBlock() { |
|
| 110 | + return true; |
|
| 111 | + } |
|
| 112 | 112 | |
| 113 | - /** |
|
| 114 | - * {@inheritDoc} |
|
| 115 | - * @see \Fisharebest\Webtrees\Module\ModuleBlockInterface::isUserBlock() |
|
| 116 | - */ |
|
| 117 | - public function isUserBlock() { |
|
| 118 | - return false; |
|
| 119 | - } |
|
| 113 | + /** |
|
| 114 | + * {@inheritDoc} |
|
| 115 | + * @see \Fisharebest\Webtrees\Module\ModuleBlockInterface::isUserBlock() |
|
| 116 | + */ |
|
| 117 | + public function isUserBlock() { |
|
| 118 | + return false; |
|
| 119 | + } |
|
| 120 | 120 | |
| 121 | - /** |
|
| 122 | - * {@inheritDoc} |
|
| 123 | - * @see \Fisharebest\Webtrees\Module\ModuleBlockInterface::configureBlock() |
|
| 124 | - */ |
|
| 125 | - public function configureBlock($block_id) { |
|
| 121 | + /** |
|
| 122 | + * {@inheritDoc} |
|
| 123 | + * @see \Fisharebest\Webtrees\Module\ModuleBlockInterface::configureBlock() |
|
| 124 | + */ |
|
| 125 | + public function configureBlock($block_id) { |
|
| 126 | 126 | |
| 127 | - } |
|
| 127 | + } |
|
| 128 | 128 | |
| 129 | 129 | /** |
| 130 | - * Get the Admin Tasks Provider (initialise it if not done yet). |
|
| 131 | - * |
|
| 132 | - * @return \MyArtJaub\Webtrees\Module\AdminTasks\Model\TaskProviderInterface |
|
| 133 | - */ |
|
| 134 | - public function getProvider() { |
|
| 135 | - if(!$this->provider) { |
|
| 136 | - $this->provider = new TaskProvider(WT_ROOT.WT_MODULES_DIR.$this->getName().'/tasks/'); |
|
| 137 | - } |
|
| 138 | - return $this->provider; |
|
| 139 | - } |
|
| 130 | + * Get the Admin Tasks Provider (initialise it if not done yet). |
|
| 131 | + * |
|
| 132 | + * @return \MyArtJaub\Webtrees\Module\AdminTasks\Model\TaskProviderInterface |
|
| 133 | + */ |
|
| 134 | + public function getProvider() { |
|
| 135 | + if(!$this->provider) { |
|
| 136 | + $this->provider = new TaskProvider(WT_ROOT.WT_MODULES_DIR.$this->getName().'/tasks/'); |
|
| 137 | + } |
|
| 138 | + return $this->provider; |
|
| 139 | + } |
|
| 140 | 140 | |
| 141 | 141 | /** |
| 142 | 142 | * Set the Admin Tasks Provider. |
| 143 | 143 | * |
| 144 | 144 | * @return \MyArtJaub\Webtrees\Module\GeoDispersion\Model\TaskProviderInterface |
| 145 | 145 | */ |
| 146 | - public function setProvider(TaskProviderInterface $provider) { |
|
| 147 | - $this->provider = $provider; |
|
| 148 | - } |
|
| 146 | + public function setProvider(TaskProviderInterface $provider) { |
|
| 147 | + $this->provider = $provider; |
|
| 148 | + } |
|
| 149 | 149 | } |
| 150 | 150 | |
| 151 | 151 | \ No newline at end of file |
@@ -64,7 +64,7 @@ discard block |
||
| 64 | 64 | public function getConfigLink() { |
| 65 | 65 | Database::updateSchema(self::SCHEMA_MIGRATION_PREFIX, self::SCHEMA_SETTING_NAME, self::SCHEMA_TARGET_VERSION); |
| 66 | 66 | |
| 67 | - return 'module.php?mod=' . $this->getName() . '&mod_action=AdminConfig'; |
|
| 67 | + return 'module.php?mod='.$this->getName().'&mod_action=AdminConfig'; |
|
| 68 | 68 | } |
| 69 | 69 | |
| 70 | 70 | /** |
@@ -83,7 +83,7 @@ discard block |
||
| 83 | 83 | public function getProvider() { |
| 84 | 84 | global $WT_TREE; |
| 85 | 85 | |
| 86 | - if(!$this->provider) { |
|
| 86 | + if (!$this->provider) { |
|
| 87 | 87 | $this->provider = new GeoAnalysisProvider($WT_TREE); |
| 88 | 88 | } |
| 89 | 89 | return $this->provider; |
@@ -54,30 +54,30 @@ discard block |
||
| 54 | 54 | public function buildLineages() { |
| 55 | 55 | $indis = \Fisharebest\Webtrees\Query\QueryName::individuals($this->tree, $this->surname, null, null, false, false); |
| 56 | 56 | |
| 57 | - if(count($indis) == 0) return null; |
|
| 57 | + if (count($indis) == 0) return null; |
|
| 58 | 58 | |
| 59 | 59 | $root_lineages = array(); |
| 60 | 60 | |
| 61 | - foreach($indis as $indi) { |
|
| 61 | + foreach ($indis as $indi) { |
|
| 62 | 62 | $pid = $indi->getXref(); |
| 63 | - if(!isset($this->used_indis[$pid])){ |
|
| 63 | + if (!isset($this->used_indis[$pid])) { |
|
| 64 | 64 | //Find the root of the lineage |
| 65 | 65 | /** @var Fisharebest\Webtrees\Individual $indiFirst */ |
| 66 | - $indiFirst= $this->getLineageRootIndividual($indi); |
|
| 67 | - if($indiFirst){ |
|
| 66 | + $indiFirst = $this->getLineageRootIndividual($indi); |
|
| 67 | + if ($indiFirst) { |
|
| 68 | 68 | $this->used_indis[$indiFirst->getXref()] = true; |
| 69 | - if($indiFirst->canShow()){ |
|
| 69 | + if ($indiFirst->canShow()) { |
|
| 70 | 70 | //Check if the root individual has brothers and sisters, without parents |
| 71 | 71 | $indiChildFamily = $indiFirst->getPrimaryChildFamily(); |
| 72 | - if($indiChildFamily !== null){ |
|
| 72 | + if ($indiChildFamily !== null) { |
|
| 73 | 73 | $root_node = new LineageRootNode(null); |
| 74 | 74 | $root_node->addFamily($indiChildFamily); |
| 75 | 75 | } |
| 76 | - else{ |
|
| 76 | + else { |
|
| 77 | 77 | $root_node = new LineageRootNode($indiFirst); |
| 78 | 78 | } |
| 79 | 79 | $root_node = $this->buildLineage($root_node); |
| 80 | - if($root_node) $root_lineages[] = $root_node; |
|
| 80 | + if ($root_node) $root_lineages[] = $root_node; |
|
| 81 | 81 | } |
| 82 | 82 | } |
| 83 | 83 | } |
@@ -94,45 +94,45 @@ discard block |
||
| 94 | 94 | * @return (Individual|null) Root individual |
| 95 | 95 | */ |
| 96 | 96 | protected function getLineageRootIndividual(Individual $indi) { |
| 97 | - $is_first=false; |
|
| 97 | + $is_first = false; |
|
| 98 | 98 | $dindi = new \MyArtJaub\Webtrees\Individual($indi); |
| 99 | - $indi_surname=$dindi->getUnprotectedPrimarySurname(); |
|
| 99 | + $indi_surname = $dindi->getUnprotectedPrimarySurname(); |
|
| 100 | 100 | $resIndi = $indi; |
| 101 | - while(!$is_first){ |
|
| 101 | + while (!$is_first) { |
|
| 102 | 102 | //Get the individual parents family |
| 103 | - $fam=$resIndi->getPrimaryChildFamily(); |
|
| 104 | - if($fam){ |
|
| 105 | - $husb=$fam->getHusband(); |
|
| 106 | - $wife=$fam->getWife(); |
|
| 103 | + $fam = $resIndi->getPrimaryChildFamily(); |
|
| 104 | + if ($fam) { |
|
| 105 | + $husb = $fam->getHusband(); |
|
| 106 | + $wife = $fam->getWife(); |
|
| 107 | 107 | //If the father exists, take him |
| 108 | - if($husb){ |
|
| 108 | + if ($husb) { |
|
| 109 | 109 | $dhusb = new \MyArtJaub\Webtrees\Individual($husb); |
| 110 | - $dhusb->isNewAddition() ? $is_first = true : $resIndi=$husb; |
|
| 110 | + $dhusb->isNewAddition() ? $is_first = true : $resIndi = $husb; |
|
| 111 | 111 | } |
| 112 | 112 | //If only a mother exists |
| 113 | - else if($wife){ |
|
| 113 | + else if ($wife) { |
|
| 114 | 114 | $dwife = new \MyArtJaub\Webtrees\Individual($wife); |
| 115 | - $wife_surname=$dwife->getUnprotectedPrimarySurname(); |
|
| 115 | + $wife_surname = $dwife->getUnprotectedPrimarySurname(); |
|
| 116 | 116 | //Check if the child is a natural child of the mother (based on the surname - Warning : surname must be identical) |
| 117 | - if(!$dwife->isNewAddition() && I18N::strcasecmp($wife_surname, $indi_surname) == 0){ |
|
| 118 | - $resIndi=$wife; |
|
| 117 | + if (!$dwife->isNewAddition() && I18N::strcasecmp($wife_surname, $indi_surname) == 0) { |
|
| 118 | + $resIndi = $wife; |
|
| 119 | 119 | } |
| 120 | - else{ |
|
| 121 | - $is_first=true; |
|
| 120 | + else { |
|
| 121 | + $is_first = true; |
|
| 122 | 122 | } |
| 123 | 123 | } |
| 124 | - else{ |
|
| 125 | - $is_first=true; |
|
| 124 | + else { |
|
| 125 | + $is_first = true; |
|
| 126 | 126 | } |
| 127 | 127 | } |
| 128 | - else{ |
|
| 129 | - $is_first=true; |
|
| 128 | + else { |
|
| 129 | + $is_first = true; |
|
| 130 | 130 | } |
| 131 | 131 | } |
| 132 | - if(isset($this->used_indis[$resIndi->getXref()])){ |
|
| 132 | + if (isset($this->used_indis[$resIndi->getXref()])) { |
|
| 133 | 133 | return null; |
| 134 | 134 | } |
| 135 | - else{ |
|
| 135 | + else { |
|
| 136 | 136 | return $resIndi; |
| 137 | 137 | } |
| 138 | 138 | } |
@@ -145,15 +145,15 @@ discard block |
||
| 145 | 145 | * @return LineageNode Computed lineage |
| 146 | 146 | */ |
| 147 | 147 | protected function buildLineage(LineageNode $node) { |
| 148 | - if($node === null) return; |
|
| 148 | + if ($node === null) return; |
|
| 149 | 149 | |
| 150 | 150 | $indi_surname = null; |
| 151 | 151 | |
| 152 | 152 | $indi_node = $node->getIndividual(); |
| 153 | - if($indi_node) { |
|
| 154 | - if(count($node->getFamiliesNodes()) == 0) { |
|
| 153 | + if ($indi_node) { |
|
| 154 | + if (count($node->getFamiliesNodes()) == 0) { |
|
| 155 | 155 | $indiSpouseFamilies = $indi_node->getSpouseFamilies(); |
| 156 | - foreach($indiSpouseFamilies as $indiSpouseFamily) { |
|
| 156 | + foreach ($indiSpouseFamilies as $indiSpouseFamily) { |
|
| 157 | 157 | $node->addFamily($indiSpouseFamily); |
| 158 | 158 | } |
| 159 | 159 | } |
@@ -162,62 +162,62 @@ discard block |
||
| 162 | 162 | $indi_surname = $dindi_node->getUnprotectedPrimarySurname(); |
| 163 | 163 | |
| 164 | 164 | //Get the estimated birth place and put it in the place table |
| 165 | - $place=$dindi_node->getEstimatedBirthPlace(false); |
|
| 166 | - if($place && strlen($place) > 0){ |
|
| 167 | - $place=trim($place); |
|
| 165 | + $place = $dindi_node->getEstimatedBirthPlace(false); |
|
| 166 | + if ($place && strlen($place) > 0) { |
|
| 167 | + $place = trim($place); |
|
| 168 | 168 | $node->getRootNode()->addPlace(new Place($place, $this->tree)); |
| 169 | 169 | } |
| 170 | 170 | |
| 171 | 171 | //Tag the individual as used |
| 172 | - $this->used_indis[$indi_node->getXref()]=true; |
|
| 172 | + $this->used_indis[$indi_node->getXref()] = true; |
|
| 173 | 173 | } |
| 174 | 174 | |
| 175 | - foreach($node->getFamiliesNodes() as $family) { |
|
| 175 | + foreach ($node->getFamiliesNodes() as $family) { |
|
| 176 | 176 | $spouse_surname = null; |
| 177 | - if($indi_node && $spouse = $family->getSpouse($indi_node)) { |
|
| 177 | + if ($indi_node && $spouse = $family->getSpouse($indi_node)) { |
|
| 178 | 178 | $dspouse = new \MyArtJaub\Webtrees\Individual($spouse); |
| 179 | - $spouse_surname=$dspouse->getUnprotectedPrimarySurname(); |
|
| 179 | + $spouse_surname = $dspouse->getUnprotectedPrimarySurname(); |
|
| 180 | 180 | } |
| 181 | 181 | |
| 182 | 182 | $children = $family->getChildren(); |
| 183 | 183 | |
| 184 | - $nbChildren=0; |
|
| 185 | - $nbNatural=0; |
|
| 184 | + $nbChildren = 0; |
|
| 185 | + $nbNatural = 0; |
|
| 186 | 186 | |
| 187 | - foreach($children as $child){ |
|
| 187 | + foreach ($children as $child) { |
|
| 188 | 188 | $dchild = new \MyArtJaub\Webtrees\Individual($child); |
| 189 | - $child_surname=$dchild->getUnprotectedPrimarySurname(); |
|
| 189 | + $child_surname = $dchild->getUnprotectedPrimarySurname(); |
|
| 190 | 190 | |
| 191 | - if(!$dchild->isNewAddition()) { |
|
| 191 | + if (!$dchild->isNewAddition()) { |
|
| 192 | 192 | $nbChildren++; |
| 193 | 193 | //If the root individual is the mother |
| 194 | - if($indi_node && I18N::strcasecmp($indi_node->getSex(), 'F') == 0) { |
|
| 194 | + if ($indi_node && I18N::strcasecmp($indi_node->getSex(), 'F') == 0) { |
|
| 195 | 195 | //Print only lineages of children with the same surname as their mother (supposing they are natural children) |
| 196 | - if(!$spouse || ($spouse_surname && I18N::strcasecmp($child_surname, $spouse_surname) != 0)){ |
|
| 197 | - if(I18N::strcasecmp($child_surname, $indi_surname) == 0){ |
|
| 196 | + if (!$spouse || ($spouse_surname && I18N::strcasecmp($child_surname, $spouse_surname) != 0)) { |
|
| 197 | + if (I18N::strcasecmp($child_surname, $indi_surname) == 0) { |
|
| 198 | 198 | $nbNatural++; |
| 199 | 199 | $node_child = new LineageNode($child, $node->getRootNode()); |
| 200 | 200 | $node_child = $this->buildLineage($node_child); |
| 201 | - if($node_child) $node->addChild($family, $node_child); |
|
| 201 | + if ($node_child) $node->addChild($family, $node_child); |
|
| 202 | 202 | } |
| 203 | 203 | } |
| 204 | 204 | } |
| 205 | 205 | //If the root individual is the father |
| 206 | 206 | else { |
| 207 | 207 | //Print if the children does not bear the same name as his mother (and different from his father) |
| 208 | - if( strlen($child_surname) == 0 || strlen($indi_surname) == 0 || strlen($spouse_surname) == 0 || |
|
| 208 | + if (strlen($child_surname) == 0 || strlen($indi_surname) == 0 || strlen($spouse_surname) == 0 || |
|
| 209 | 209 | I18N::strcasecmp($child_surname, $indi_surname) == 0 || |
| 210 | - I18N::strcasecmp($child_surname, $spouse_surname) != 0 ) |
|
| 210 | + I18N::strcasecmp($child_surname, $spouse_surname) != 0) |
|
| 211 | 211 | { |
| 212 | 212 | $nbNatural++; |
| 213 | 213 | $node_child = new LineageNode($child, $node->getRootNode()); |
| 214 | 214 | $node_child = $this->buildLineage($node_child); |
| 215 | - if($node_child) $node->addChild($family, $node_child); |
|
| 215 | + if ($node_child) $node->addChild($family, $node_child); |
|
| 216 | 216 | } |
| 217 | 217 | else { |
| 218 | 218 | $nbNatural++; |
| 219 | 219 | $node_child = new LineageNode($child, $node->getRootNode(), $child_surname); |
| 220 | - if($node_child) $node->addChild($family, $node_child); |
|
| 220 | + if ($node_child) $node->addChild($family, $node_child); |
|
| 221 | 221 | } |
| 222 | 222 | } |
| 223 | 223 | } |
@@ -225,7 +225,7 @@ discard block |
||
| 225 | 225 | |
| 226 | 226 | |
| 227 | 227 | //Do not print other children |
| 228 | - if(($nbChildren-$nbNatural)>0){ |
|
| 228 | + if (($nbChildren - $nbNatural) > 0) { |
|
| 229 | 229 | $node->addChild($family, null); |
| 230 | 230 | } |
| 231 | 231 | } |
@@ -54,7 +54,9 @@ discard block |
||
| 54 | 54 | public function buildLineages() { |
| 55 | 55 | $indis = \Fisharebest\Webtrees\Query\QueryName::individuals($this->tree, $this->surname, null, null, false, false); |
| 56 | 56 | |
| 57 | - if(count($indis) == 0) return null; |
|
| 57 | + if(count($indis) == 0) { |
|
| 58 | + return null; |
|
| 59 | + } |
|
| 58 | 60 | |
| 59 | 61 | $root_lineages = array(); |
| 60 | 62 | |
@@ -72,12 +74,13 @@ discard block |
||
| 72 | 74 | if($indiChildFamily !== null){ |
| 73 | 75 | $root_node = new LineageRootNode(null); |
| 74 | 76 | $root_node->addFamily($indiChildFamily); |
| 75 | - } |
|
| 76 | - else{ |
|
| 77 | + } else{ |
|
| 77 | 78 | $root_node = new LineageRootNode($indiFirst); |
| 78 | 79 | } |
| 79 | 80 | $root_node = $this->buildLineage($root_node); |
| 80 | - if($root_node) $root_lineages[] = $root_node; |
|
| 81 | + if($root_node) { |
|
| 82 | + $root_lineages[] = $root_node; |
|
| 83 | + } |
|
| 81 | 84 | } |
| 82 | 85 | } |
| 83 | 86 | } |
@@ -116,23 +119,19 @@ discard block |
||
| 116 | 119 | //Check if the child is a natural child of the mother (based on the surname - Warning : surname must be identical) |
| 117 | 120 | if(!$dwife->isNewAddition() && I18N::strcasecmp($wife_surname, $indi_surname) == 0){ |
| 118 | 121 | $resIndi=$wife; |
| 119 | - } |
|
| 120 | - else{ |
|
| 122 | + } else{ |
|
| 121 | 123 | $is_first=true; |
| 122 | 124 | } |
| 123 | - } |
|
| 124 | - else{ |
|
| 125 | + } else{ |
|
| 125 | 126 | $is_first=true; |
| 126 | 127 | } |
| 127 | - } |
|
| 128 | - else{ |
|
| 128 | + } else{ |
|
| 129 | 129 | $is_first=true; |
| 130 | 130 | } |
| 131 | 131 | } |
| 132 | 132 | if(isset($this->used_indis[$resIndi->getXref()])){ |
| 133 | 133 | return null; |
| 134 | - } |
|
| 135 | - else{ |
|
| 134 | + } else{ |
|
| 136 | 135 | return $resIndi; |
| 137 | 136 | } |
| 138 | 137 | } |
@@ -145,7 +144,9 @@ discard block |
||
| 145 | 144 | * @return LineageNode Computed lineage |
| 146 | 145 | */ |
| 147 | 146 | protected function buildLineage(LineageNode $node) { |
| 148 | - if($node === null) return; |
|
| 147 | + if($node === null) { |
|
| 148 | + return; |
|
| 149 | + } |
|
| 149 | 150 | |
| 150 | 151 | $indi_surname = null; |
| 151 | 152 | |
@@ -198,7 +199,9 @@ discard block |
||
| 198 | 199 | $nbNatural++; |
| 199 | 200 | $node_child = new LineageNode($child, $node->getRootNode()); |
| 200 | 201 | $node_child = $this->buildLineage($node_child); |
| 201 | - if($node_child) $node->addChild($family, $node_child); |
|
| 202 | + if($node_child) { |
|
| 203 | + $node->addChild($family, $node_child); |
|
| 204 | + } |
|
| 202 | 205 | } |
| 203 | 206 | } |
| 204 | 207 | } |
@@ -212,12 +215,15 @@ discard block |
||
| 212 | 215 | $nbNatural++; |
| 213 | 216 | $node_child = new LineageNode($child, $node->getRootNode()); |
| 214 | 217 | $node_child = $this->buildLineage($node_child); |
| 215 | - if($node_child) $node->addChild($family, $node_child); |
|
| 216 | - } |
|
| 217 | - else { |
|
| 218 | + if($node_child) { |
|
| 219 | + $node->addChild($family, $node_child); |
|
| 220 | + } |
|
| 221 | + } else { |
|
| 218 | 222 | $nbNatural++; |
| 219 | 223 | $node_child = new LineageNode($child, $node->getRootNode(), $child_surname); |
| 220 | - if($node_child) $node->addChild($family, $node_child); |
|
| 224 | + if($node_child) { |
|
| 225 | + $node->addChild($family, $node_child); |
|
| 226 | + } |
|
| 221 | 227 | } |
| 222 | 228 | } |
| 223 | 229 | } |
@@ -20,111 +20,111 @@ |
||
| 20 | 20 | */ |
| 21 | 21 | class CertificateFileProvider implements CertificateProviderInterface { |
| 22 | 22 | |
| 23 | - /** |
|
| 24 | - * Relative path to the root certificate folder |
|
| 25 | - * @var string $root_path |
|
| 26 | - */ |
|
| 27 | - protected $root_path; |
|
| 23 | + /** |
|
| 24 | + * Relative path to the root certificate folder |
|
| 25 | + * @var string $root_path |
|
| 26 | + */ |
|
| 27 | + protected $root_path; |
|
| 28 | 28 | |
| 29 | - /** |
|
| 30 | - * Reference tree |
|
| 31 | - * @var Tree $tree |
|
| 32 | - */ |
|
| 33 | - protected $tree; |
|
| 29 | + /** |
|
| 30 | + * Reference tree |
|
| 31 | + * @var Tree $tree |
|
| 32 | + */ |
|
| 33 | + protected $tree; |
|
| 34 | 34 | |
| 35 | - /** |
|
| 36 | - * Cached list of certificates' cities. |
|
| 37 | - * @var (null|array) $cities_list |
|
| 38 | - */ |
|
| 39 | - protected $cities_list = null; |
|
| 35 | + /** |
|
| 36 | + * Cached list of certificates' cities. |
|
| 37 | + * @var (null|array) $cities_list |
|
| 38 | + */ |
|
| 39 | + protected $cities_list = null; |
|
| 40 | 40 | |
| 41 | - /** |
|
| 42 | - * Constructor for the File Provider |
|
| 43 | - * @param string $root_path |
|
| 44 | - * @param Tree $tree |
|
| 45 | - */ |
|
| 46 | - public function __construct($root_path, Tree $tree) { |
|
| 47 | - $this->root_path = $root_path; |
|
| 48 | - $this->tree = $tree; |
|
| 49 | - } |
|
| 41 | + /** |
|
| 42 | + * Constructor for the File Provider |
|
| 43 | + * @param string $root_path |
|
| 44 | + * @param Tree $tree |
|
| 45 | + */ |
|
| 46 | + public function __construct($root_path, Tree $tree) { |
|
| 47 | + $this->root_path = $root_path; |
|
| 48 | + $this->tree = $tree; |
|
| 49 | + } |
|
| 50 | 50 | |
| 51 | - /** |
|
| 52 | - * {@inhericDoc} |
|
| 53 | - * @see \MyArtJaub\Webtrees\Module\Certificates\Model\CertificateProviderInterface::getRealCertificatesDirectory() |
|
| 54 | - */ |
|
| 55 | - public function getRealCertificatesDirectory(){ |
|
| 56 | - return WT_DATA_DIR . $this->root_path; |
|
| 57 | - } |
|
| 51 | + /** |
|
| 52 | + * {@inhericDoc} |
|
| 53 | + * @see \MyArtJaub\Webtrees\Module\Certificates\Model\CertificateProviderInterface::getRealCertificatesDirectory() |
|
| 54 | + */ |
|
| 55 | + public function getRealCertificatesDirectory(){ |
|
| 56 | + return WT_DATA_DIR . $this->root_path; |
|
| 57 | + } |
|
| 58 | 58 | |
| 59 | - /** |
|
| 60 | - * {@inhericDoc} |
|
| 61 | - * @see \MyArtJaub\Webtrees\Module\Certificates\Model\CertificateProviderInterface::getCitiesList() |
|
| 62 | - */ |
|
| 63 | - public function getCitiesList(){ |
|
| 64 | - if(!isset($this->cities_list) || is_null($this->cities_list)){ |
|
| 65 | - $certdir = $this->getRealCertificatesDirectory(); |
|
| 66 | - $this->cities_list = array(); |
|
| 59 | + /** |
|
| 60 | + * {@inhericDoc} |
|
| 61 | + * @see \MyArtJaub\Webtrees\Module\Certificates\Model\CertificateProviderInterface::getCitiesList() |
|
| 62 | + */ |
|
| 63 | + public function getCitiesList(){ |
|
| 64 | + if(!isset($this->cities_list) || is_null($this->cities_list)){ |
|
| 65 | + $certdir = $this->getRealCertificatesDirectory(); |
|
| 66 | + $this->cities_list = array(); |
|
| 67 | 67 | |
| 68 | - $dir = opendir($certdir); |
|
| 68 | + $dir = opendir($certdir); |
|
| 69 | 69 | |
| 70 | - while($entry = readdir($dir)){ |
|
| 71 | - if($entry != '.' && $entry != '..' && is_dir($certdir.$entry)){ |
|
| 72 | - $this->cities_list[]= Functions::encodeFileSystemToUtf8($entry); |
|
| 73 | - } |
|
| 74 | - } |
|
| 75 | - sort($this->cities_list); |
|
| 76 | - } |
|
| 77 | - return $this->cities_list; |
|
| 78 | - } |
|
| 70 | + while($entry = readdir($dir)){ |
|
| 71 | + if($entry != '.' && $entry != '..' && is_dir($certdir.$entry)){ |
|
| 72 | + $this->cities_list[]= Functions::encodeFileSystemToUtf8($entry); |
|
| 73 | + } |
|
| 74 | + } |
|
| 75 | + sort($this->cities_list); |
|
| 76 | + } |
|
| 77 | + return $this->cities_list; |
|
| 78 | + } |
|
| 79 | 79 | |
| 80 | - /** |
|
| 81 | - * {@inhericDoc} |
|
| 82 | - * @see \MyArtJaub\Webtrees\Module\Certificates\Model\CertificateProviderInterface::getCertificatesList() |
|
| 83 | - */ |
|
| 84 | - public function getCertificatesList($selCity){ |
|
| 80 | + /** |
|
| 81 | + * {@inhericDoc} |
|
| 82 | + * @see \MyArtJaub\Webtrees\Module\Certificates\Model\CertificateProviderInterface::getCertificatesList() |
|
| 83 | + */ |
|
| 84 | + public function getCertificatesList($selCity){ |
|
| 85 | 85 | |
| 86 | - $selCity = Functions::encodeUtf8ToFileSystem($selCity); |
|
| 86 | + $selCity = Functions::encodeUtf8ToFileSystem($selCity); |
|
| 87 | 87 | |
| 88 | - $certdir = $this->getRealCertificatesDirectory(); |
|
| 89 | - $tabCertif= array(); |
|
| 88 | + $certdir = $this->getRealCertificatesDirectory(); |
|
| 89 | + $tabCertif= array(); |
|
| 90 | 90 | |
| 91 | - if(is_dir($certdir.$selCity)){ |
|
| 92 | - $dir=opendir($certdir.$selCity); |
|
| 93 | - while($entry = readdir($dir)){ |
|
| 94 | - if($entry!='.' && $entry!='..' && !is_dir($certdir.$entry.'/')){ |
|
| 95 | - $path = Functions::encodeFileSystemToUtf8($selCity.'/'.$entry); |
|
| 96 | - $certificate = new Certificate($path, $this->tree, $this); |
|
| 97 | - if(Functions::isImageTypeSupported($certificate->extension())){ |
|
| 98 | - $tabCertif[] = $certificate; |
|
| 99 | - } |
|
| 100 | - } |
|
| 101 | - } |
|
| 102 | - } |
|
| 103 | - return $tabCertif; |
|
| 104 | - } |
|
| 91 | + if(is_dir($certdir.$selCity)){ |
|
| 92 | + $dir=opendir($certdir.$selCity); |
|
| 93 | + while($entry = readdir($dir)){ |
|
| 94 | + if($entry!='.' && $entry!='..' && !is_dir($certdir.$entry.'/')){ |
|
| 95 | + $path = Functions::encodeFileSystemToUtf8($selCity.'/'.$entry); |
|
| 96 | + $certificate = new Certificate($path, $this->tree, $this); |
|
| 97 | + if(Functions::isImageTypeSupported($certificate->extension())){ |
|
| 98 | + $tabCertif[] = $certificate; |
|
| 99 | + } |
|
| 100 | + } |
|
| 101 | + } |
|
| 102 | + } |
|
| 103 | + return $tabCertif; |
|
| 104 | + } |
|
| 105 | 105 | |
| 106 | - /** |
|
| 107 | - * {@inhericDoc} |
|
| 108 | - * @see \MyArtJaub\Webtrees\Module\Certificates\Model\CertificateProviderInterface::getCertificatesListBeginWith() |
|
| 109 | - */ |
|
| 110 | - public function getCertificatesListBeginWith($city, $contains, $limit= 9999){ |
|
| 111 | - $tabFiles= array(); |
|
| 112 | - $dirPath= $this->getRealCertificatesDirectory() . Functions::encodeUtf8ToFileSystem($city).'/'; |
|
| 113 | - $contains = utf8_decode($contains); |
|
| 114 | - $nbCert = 0; |
|
| 106 | + /** |
|
| 107 | + * {@inhericDoc} |
|
| 108 | + * @see \MyArtJaub\Webtrees\Module\Certificates\Model\CertificateProviderInterface::getCertificatesListBeginWith() |
|
| 109 | + */ |
|
| 110 | + public function getCertificatesListBeginWith($city, $contains, $limit= 9999){ |
|
| 111 | + $tabFiles= array(); |
|
| 112 | + $dirPath= $this->getRealCertificatesDirectory() . Functions::encodeUtf8ToFileSystem($city).'/'; |
|
| 113 | + $contains = utf8_decode($contains); |
|
| 114 | + $nbCert = 0; |
|
| 115 | 115 | |
| 116 | - if(is_dir($dirPath)){ |
|
| 117 | - $dir=opendir($dirPath); |
|
| 118 | - while(($entry = readdir($dir)) && $nbCert < $limit){ |
|
| 119 | - if($entry!='.' && $entry!='..' && $entry!='Thumbs.db' &&!is_dir($dirPath.$entry.'/') && stripos($entry, $contains)!== false){ |
|
| 120 | - $tabFiles[]= Functions::encodeFileSystemToUtf8($entry); |
|
| 121 | - $nbCert++; |
|
| 122 | - } |
|
| 123 | - } |
|
| 124 | - } |
|
| 125 | - sort($tabFiles); |
|
| 126 | - return $tabFiles; |
|
| 127 | - } |
|
| 116 | + if(is_dir($dirPath)){ |
|
| 117 | + $dir=opendir($dirPath); |
|
| 118 | + while(($entry = readdir($dir)) && $nbCert < $limit){ |
|
| 119 | + if($entry!='.' && $entry!='..' && $entry!='Thumbs.db' &&!is_dir($dirPath.$entry.'/') && stripos($entry, $contains)!== false){ |
|
| 120 | + $tabFiles[]= Functions::encodeFileSystemToUtf8($entry); |
|
| 121 | + $nbCert++; |
|
| 122 | + } |
|
| 123 | + } |
|
| 124 | + } |
|
| 125 | + sort($tabFiles); |
|
| 126 | + return $tabFiles; |
|
| 127 | + } |
|
| 128 | 128 | |
| 129 | 129 | } |
| 130 | 130 | |
@@ -52,24 +52,24 @@ discard block |
||
| 52 | 52 | * {@inhericDoc} |
| 53 | 53 | * @see \MyArtJaub\Webtrees\Module\Certificates\Model\CertificateProviderInterface::getRealCertificatesDirectory() |
| 54 | 54 | */ |
| 55 | - public function getRealCertificatesDirectory(){ |
|
| 56 | - return WT_DATA_DIR . $this->root_path; |
|
| 55 | + public function getRealCertificatesDirectory() { |
|
| 56 | + return WT_DATA_DIR.$this->root_path; |
|
| 57 | 57 | } |
| 58 | 58 | |
| 59 | 59 | /** |
| 60 | 60 | * {@inhericDoc} |
| 61 | 61 | * @see \MyArtJaub\Webtrees\Module\Certificates\Model\CertificateProviderInterface::getCitiesList() |
| 62 | 62 | */ |
| 63 | - public function getCitiesList(){ |
|
| 64 | - if(!isset($this->cities_list) || is_null($this->cities_list)){ |
|
| 63 | + public function getCitiesList() { |
|
| 64 | + if (!isset($this->cities_list) || is_null($this->cities_list)) { |
|
| 65 | 65 | $certdir = $this->getRealCertificatesDirectory(); |
| 66 | 66 | $this->cities_list = array(); |
| 67 | 67 | |
| 68 | 68 | $dir = opendir($certdir); |
| 69 | 69 | |
| 70 | - while($entry = readdir($dir)){ |
|
| 71 | - if($entry != '.' && $entry != '..' && is_dir($certdir.$entry)){ |
|
| 72 | - $this->cities_list[]= Functions::encodeFileSystemToUtf8($entry); |
|
| 70 | + while ($entry = readdir($dir)) { |
|
| 71 | + if ($entry != '.' && $entry != '..' && is_dir($certdir.$entry)) { |
|
| 72 | + $this->cities_list[] = Functions::encodeFileSystemToUtf8($entry); |
|
| 73 | 73 | } |
| 74 | 74 | } |
| 75 | 75 | sort($this->cities_list); |
@@ -81,21 +81,21 @@ discard block |
||
| 81 | 81 | * {@inhericDoc} |
| 82 | 82 | * @see \MyArtJaub\Webtrees\Module\Certificates\Model\CertificateProviderInterface::getCertificatesList() |
| 83 | 83 | */ |
| 84 | - public function getCertificatesList($selCity){ |
|
| 84 | + public function getCertificatesList($selCity) { |
|
| 85 | 85 | |
| 86 | 86 | $selCity = Functions::encodeUtf8ToFileSystem($selCity); |
| 87 | 87 | |
| 88 | 88 | $certdir = $this->getRealCertificatesDirectory(); |
| 89 | - $tabCertif= array(); |
|
| 89 | + $tabCertif = array(); |
|
| 90 | 90 | |
| 91 | - if(is_dir($certdir.$selCity)){ |
|
| 92 | - $dir=opendir($certdir.$selCity); |
|
| 93 | - while($entry = readdir($dir)){ |
|
| 94 | - if($entry!='.' && $entry!='..' && !is_dir($certdir.$entry.'/')){ |
|
| 91 | + if (is_dir($certdir.$selCity)) { |
|
| 92 | + $dir = opendir($certdir.$selCity); |
|
| 93 | + while ($entry = readdir($dir)) { |
|
| 94 | + if ($entry != '.' && $entry != '..' && !is_dir($certdir.$entry.'/')) { |
|
| 95 | 95 | $path = Functions::encodeFileSystemToUtf8($selCity.'/'.$entry); |
| 96 | 96 | $certificate = new Certificate($path, $this->tree, $this); |
| 97 | - if(Functions::isImageTypeSupported($certificate->extension())){ |
|
| 98 | - $tabCertif[] = $certificate; |
|
| 97 | + if (Functions::isImageTypeSupported($certificate->extension())) { |
|
| 98 | + $tabCertif[] = $certificate; |
|
| 99 | 99 | } |
| 100 | 100 | } |
| 101 | 101 | } |
@@ -107,17 +107,17 @@ discard block |
||
| 107 | 107 | * {@inhericDoc} |
| 108 | 108 | * @see \MyArtJaub\Webtrees\Module\Certificates\Model\CertificateProviderInterface::getCertificatesListBeginWith() |
| 109 | 109 | */ |
| 110 | - public function getCertificatesListBeginWith($city, $contains, $limit= 9999){ |
|
| 111 | - $tabFiles= array(); |
|
| 112 | - $dirPath= $this->getRealCertificatesDirectory() . Functions::encodeUtf8ToFileSystem($city).'/'; |
|
| 110 | + public function getCertificatesListBeginWith($city, $contains, $limit = 9999) { |
|
| 111 | + $tabFiles = array(); |
|
| 112 | + $dirPath = $this->getRealCertificatesDirectory().Functions::encodeUtf8ToFileSystem($city).'/'; |
|
| 113 | 113 | $contains = utf8_decode($contains); |
| 114 | 114 | $nbCert = 0; |
| 115 | 115 | |
| 116 | - if(is_dir($dirPath)){ |
|
| 117 | - $dir=opendir($dirPath); |
|
| 118 | - while(($entry = readdir($dir)) && $nbCert < $limit){ |
|
| 119 | - if($entry!='.' && $entry!='..' && $entry!='Thumbs.db' &&!is_dir($dirPath.$entry.'/') && stripos($entry, $contains)!== false){ |
|
| 120 | - $tabFiles[]= Functions::encodeFileSystemToUtf8($entry); |
|
| 116 | + if (is_dir($dirPath)) { |
|
| 117 | + $dir = opendir($dirPath); |
|
| 118 | + while (($entry = readdir($dir)) && $nbCert < $limit) { |
|
| 119 | + if ($entry != '.' && $entry != '..' && $entry != 'Thumbs.db' && !is_dir($dirPath.$entry.'/') && stripos($entry, $contains) !== false) { |
|
| 120 | + $tabFiles[] = Functions::encodeFileSystemToUtf8($entry); |
|
| 121 | 121 | $nbCert++; |
| 122 | 122 | } |
| 123 | 123 | } |
@@ -19,76 +19,76 @@ |
||
| 19 | 19 | * Welcome Block Module. |
| 20 | 20 | */ |
| 21 | 21 | class WelcomeBlockModule extends AbstractModule |
| 22 | - implements ModuleBlockInterface |
|
| 22 | + implements ModuleBlockInterface |
|
| 23 | 23 | { |
| 24 | - /** @var string For custom modules - link for support, upgrades, etc. */ |
|
| 25 | - const CUSTOM_WEBSITE = 'https://github.com/jon48/webtrees-lib'; |
|
| 24 | + /** @var string For custom modules - link for support, upgrades, etc. */ |
|
| 25 | + const CUSTOM_WEBSITE = 'https://github.com/jon48/webtrees-lib'; |
|
| 26 | 26 | |
| 27 | - /** |
|
| 28 | - * {@inhericDoc} |
|
| 29 | - */ |
|
| 30 | - public function getTitle() { |
|
| 31 | - return /* I18N: Name of the “WelcomeBlock” module */ I18N::translate('MyArtJaub Welcome Block'); |
|
| 32 | - } |
|
| 27 | + /** |
|
| 28 | + * {@inhericDoc} |
|
| 29 | + */ |
|
| 30 | + public function getTitle() { |
|
| 31 | + return /* I18N: Name of the “WelcomeBlock” module */ I18N::translate('MyArtJaub Welcome Block'); |
|
| 32 | + } |
|
| 33 | 33 | |
| 34 | - /** |
|
| 35 | - * {@inhericDoc} |
|
| 36 | - */ |
|
| 37 | - public function getDescription() { |
|
| 38 | - return /* I18N: Description of the “WelcomeBlock” module */ I18N::translate('The MyArtJaub Welcome block welcomes the visitor to the site, allows a quick login to the site, and displays statistics on visits.'); |
|
| 39 | - } |
|
| 34 | + /** |
|
| 35 | + * {@inhericDoc} |
|
| 36 | + */ |
|
| 37 | + public function getDescription() { |
|
| 38 | + return /* I18N: Description of the “WelcomeBlock” module */ I18N::translate('The MyArtJaub Welcome block welcomes the visitor to the site, allows a quick login to the site, and displays statistics on visits.'); |
|
| 39 | + } |
|
| 40 | 40 | |
| 41 | - /** |
|
| 42 | - * {@inhericDoc} |
|
| 43 | - */ |
|
| 44 | - public function modAction($mod_action) { |
|
| 45 | - \MyArtJaub\Webtrees\Mvc\Dispatcher::getInstance()->handle($this, $mod_action); |
|
| 46 | - } |
|
| 41 | + /** |
|
| 42 | + * {@inhericDoc} |
|
| 43 | + */ |
|
| 44 | + public function modAction($mod_action) { |
|
| 45 | + \MyArtJaub\Webtrees\Mvc\Dispatcher::getInstance()->handle($this, $mod_action); |
|
| 46 | + } |
|
| 47 | 47 | |
| 48 | - /** |
|
| 49 | - * {@inhericDoc} |
|
| 50 | - * @see \Fisharebest\Webtrees\Module\ModuleBlockInterface::getBlock() |
|
| 51 | - */ |
|
| 48 | + /** |
|
| 49 | + * {@inhericDoc} |
|
| 50 | + * @see \Fisharebest\Webtrees\Module\ModuleBlockInterface::getBlock() |
|
| 51 | + */ |
|
| 52 | 52 | public function getBlock($block_id, $template = true, $cfg = array()) { |
| 53 | - global $controller, $WT_TREE; |
|
| 53 | + global $controller, $WT_TREE; |
|
| 54 | 54 | |
| 55 | - $wb_controller = new WelcomeBlockController($this); |
|
| 56 | - return $wb_controller->index($controller, $WT_TREE, $block_id, $template); |
|
| 57 | - } |
|
| 55 | + $wb_controller = new WelcomeBlockController($this); |
|
| 56 | + return $wb_controller->index($controller, $WT_TREE, $block_id, $template); |
|
| 57 | + } |
|
| 58 | 58 | |
| 59 | - /** |
|
| 60 | - * {@inhericDoc} |
|
| 61 | - * @see \Fisharebest\Webtrees\Module\ModuleBlockInterface::loadAjax() |
|
| 62 | - */ |
|
| 63 | - public function loadAjax() { |
|
| 64 | - return false; |
|
| 65 | - } |
|
| 59 | + /** |
|
| 60 | + * {@inhericDoc} |
|
| 61 | + * @see \Fisharebest\Webtrees\Module\ModuleBlockInterface::loadAjax() |
|
| 62 | + */ |
|
| 63 | + public function loadAjax() { |
|
| 64 | + return false; |
|
| 65 | + } |
|
| 66 | 66 | |
| 67 | - /** |
|
| 68 | - * {@inhericDoc} |
|
| 69 | - * @see \Fisharebest\Webtrees\Module\ModuleBlockInterface::isUserBlock() |
|
| 70 | - */ |
|
| 71 | - public function isUserBlock() { |
|
| 72 | - return false; |
|
| 73 | - } |
|
| 67 | + /** |
|
| 68 | + * {@inhericDoc} |
|
| 69 | + * @see \Fisharebest\Webtrees\Module\ModuleBlockInterface::isUserBlock() |
|
| 70 | + */ |
|
| 71 | + public function isUserBlock() { |
|
| 72 | + return false; |
|
| 73 | + } |
|
| 74 | 74 | |
| 75 | - /** |
|
| 76 | - * {@inhericDoc} |
|
| 77 | - * @see \Fisharebest\Webtrees\Module\ModuleBlockInterface::isGedcomBlock() |
|
| 78 | - */ |
|
| 79 | - public function isGedcomBlock() { |
|
| 80 | - return true; |
|
| 81 | - } |
|
| 75 | + /** |
|
| 76 | + * {@inhericDoc} |
|
| 77 | + * @see \Fisharebest\Webtrees\Module\ModuleBlockInterface::isGedcomBlock() |
|
| 78 | + */ |
|
| 79 | + public function isGedcomBlock() { |
|
| 80 | + return true; |
|
| 81 | + } |
|
| 82 | 82 | |
| 83 | - /** |
|
| 84 | - * {@inhericDoc} |
|
| 85 | - * @see \Fisharebest\Webtrees\Module\ModuleBlockInterface::configureBlock() |
|
| 86 | - */ |
|
| 87 | - public function configureBlock($block_id) { |
|
| 83 | + /** |
|
| 84 | + * {@inhericDoc} |
|
| 85 | + * @see \Fisharebest\Webtrees\Module\ModuleBlockInterface::configureBlock() |
|
| 86 | + */ |
|
| 87 | + public function configureBlock($block_id) { |
|
| 88 | 88 | |
| 89 | - $wb_controller = new WelcomeBlockController($this); |
|
| 90 | - return $wb_controller->config($block_id); |
|
| 91 | - } |
|
| 89 | + $wb_controller = new WelcomeBlockController($this); |
|
| 90 | + return $wb_controller->config($block_id); |
|
| 91 | + } |
|
| 92 | 92 | |
| 93 | 93 | } |
| 94 | 94 | |
| 95 | 95 | \ No newline at end of file |
@@ -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 PageFooterExtender { |
| 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 @@ 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 PageHeaderExtender { |
| 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 @@ |
||
| 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; |
| 12 | 12 | |
| 13 | 13 | use \Fisharebest\Webtrees as fw; |