@@ -30,10 +30,10 @@ discard block |
||
| 30 | 30 | * @param string $gedcom |
| 31 | 31 | * @return NULL|\MyArtJaub\Webtrees\Family |
| 32 | 32 | */ |
| 33 | - public static function getIntance($xref, Tree $tree, $gedcom = null){ |
|
| 33 | + public static function getIntance($xref, Tree $tree, $gedcom = null) { |
|
| 34 | 34 | $dfam = null; |
| 35 | 35 | $fam = fw\Family::getInstance($xref, $tree, $gedcom); |
| 36 | - if($fam){ |
|
| 36 | + if ($fam) { |
|
| 37 | 37 | $dfam = new Family($fam); |
| 38 | 38 | } |
| 39 | 39 | return $dfam; |
@@ -44,8 +44,8 @@ discard block |
||
| 44 | 44 | * |
| 45 | 45 | * @return int Level of sources |
| 46 | 46 | * */ |
| 47 | - function isMarriageSourced(){ |
|
| 48 | - if($this->is_marriage_sourced !== null) return $this->is_marriage_sourced; |
|
| 47 | + function isMarriageSourced() { |
|
| 48 | + if ($this->is_marriage_sourced !== null) return $this->is_marriage_sourced; |
|
| 49 | 49 | $this->is_marriage_sourced = $this->isFactSourced(WT_EVENTS_MARR.'|MARC'); |
| 50 | 50 | return $this->is_marriage_sourced; |
| 51 | 51 | } |
@@ -45,7 +45,9 @@ |
||
| 45 | 45 | * @return int Level of sources |
| 46 | 46 | * */ |
| 47 | 47 | function isMarriageSourced(){ |
| 48 | - if($this->is_marriage_sourced !== null) return $this->is_marriage_sourced; |
|
| 48 | + if($this->is_marriage_sourced !== null) { |
|
| 49 | + return $this->is_marriage_sourced; |
|
| 50 | + } |
|
| 49 | 51 | $this->is_marriage_sourced = $this->isFactSourced(WT_EVENTS_MARR.'|MARC'); |
| 50 | 52 | return $this->is_marriage_sourced; |
| 51 | 53 | } |
@@ -40,10 +40,10 @@ |
||
| 40 | 40 | } |
| 41 | 41 | |
| 42 | 42 | /** |
| 43 | - * Check if this family's marriages are sourced |
|
| 44 | - * |
|
| 45 | - * @return int Level of sources |
|
| 46 | - * */ |
|
| 43 | + * Check if this family's marriages are sourced |
|
| 44 | + * |
|
| 45 | + * @return int Level of sources |
|
| 46 | + * */ |
|
| 47 | 47 | function isMarriageSourced(){ |
| 48 | 48 | if($this->is_marriage_sourced !== null) return $this->is_marriage_sourced; |
| 49 | 49 | $this->is_marriage_sourced = $this->isFactSourced(WT_EVENTS_MARR.'|MARC'); |
@@ -113,29 +113,29 @@ discard block |
||
| 113 | 113 | * @return string|array Estimated birth place if found, null otherwise |
| 114 | 114 | */ |
| 115 | 115 | public function getSignificantPlace(){ |
| 116 | - if($bplace = $this->gedcomrecord->getBirthPlace()){ |
|
| 117 | - return $bplace; |
|
| 118 | - } |
|
| 116 | + if($bplace = $this->gedcomrecord->getBirthPlace()){ |
|
| 117 | + return $bplace; |
|
| 118 | + } |
|
| 119 | 119 | |
| 120 | - foreach ($this->gedcomrecord->getAllEventPlaces('RESI') as $rplace) { |
|
| 121 | - if ($rplace) { |
|
| 122 | - return $rplace; |
|
| 123 | - } |
|
| 124 | - } |
|
| 120 | + foreach ($this->gedcomrecord->getAllEventPlaces('RESI') as $rplace) { |
|
| 121 | + if ($rplace) { |
|
| 122 | + return $rplace; |
|
| 123 | + } |
|
| 124 | + } |
|
| 125 | 125 | |
| 126 | - if($dplace = $this->gedcomrecord->getDeathPlace()){ |
|
| 127 | - return $dplace; |
|
| 128 | - } |
|
| 126 | + if($dplace = $this->gedcomrecord->getDeathPlace()){ |
|
| 127 | + return $dplace; |
|
| 128 | + } |
|
| 129 | 129 | |
| 130 | - foreach($this->gedcomrecord->getSpouseFamilies() as $fams) { |
|
| 131 | - foreach ($fams->getAllEventPlaces('RESI') as $rplace) { |
|
| 132 | - if ($rplace) { |
|
| 133 | - return $rplace; |
|
| 134 | - } |
|
| 135 | - } |
|
| 136 | - } |
|
| 130 | + foreach($this->gedcomrecord->getSpouseFamilies() as $fams) { |
|
| 131 | + foreach ($fams->getAllEventPlaces('RESI') as $rplace) { |
|
| 132 | + if ($rplace) { |
|
| 133 | + return $rplace; |
|
| 134 | + } |
|
| 135 | + } |
|
| 136 | + } |
|
| 137 | 137 | |
| 138 | - return null; |
|
| 138 | + return null; |
|
| 139 | 139 | } |
| 140 | 140 | |
| 141 | 141 | /** |
@@ -144,7 +144,7 @@ discard block |
||
| 144 | 144 | * @return boolean Is the individual a Sosa ancestor |
| 145 | 145 | */ |
| 146 | 146 | public function isSosa(){ |
| 147 | - return count($this->getSosaNumbers()) > 0; |
|
| 147 | + return count($this->getSosaNumbers()) > 0; |
|
| 148 | 148 | } |
| 149 | 149 | |
| 150 | 150 | /** |
@@ -155,11 +155,11 @@ discard block |
||
| 155 | 155 | * @return array List of Sosa numbers |
| 156 | 156 | */ |
| 157 | 157 | public function getSosaNumbers(){ |
| 158 | - if($this->sosa === null) { |
|
| 159 | - $provider = new SosaProvider($this->gedcomrecord->getTree()); |
|
| 160 | - $this->sosa = $provider->getSosaNumbers($this->gedcomrecord); |
|
| 161 | - } |
|
| 162 | - return $this->sosa; |
|
| 158 | + if($this->sosa === null) { |
|
| 159 | + $provider = new SosaProvider($this->gedcomrecord->getTree()); |
|
| 160 | + $this->sosa = $provider->getSosaNumbers($this->gedcomrecord); |
|
| 161 | + } |
|
| 162 | + return $this->sosa; |
|
| 163 | 163 | } |
| 164 | 164 | |
| 165 | 165 | /** |
@@ -174,10 +174,10 @@ discard block |
||
| 174 | 174 | } |
| 175 | 175 | |
| 176 | 176 | /** |
| 177 | - * Check if this individual's death is sourced |
|
| 178 | - * |
|
| 179 | - * @return int Level of sources |
|
| 180 | - * */ |
|
| 177 | + * Check if this individual's death is sourced |
|
| 178 | + * |
|
| 179 | + * @return int Level of sources |
|
| 180 | + * */ |
|
| 181 | 181 | public function isDeathSourced(){ |
| 182 | 182 | if($this->is_death_sourced !== null) return $this->is_death_sourced; |
| 183 | 183 | $this->is_death_sourced = $this->isFactSourced(WT_EVENTS_DEAT); |
@@ -21,7 +21,7 @@ discard block |
||
| 21 | 21 | class Individual extends GedcomRecord { |
| 22 | 22 | |
| 23 | 23 | /** @var array|null List of titles the individal holds */ |
| 24 | - protected $titles=null; |
|
| 24 | + protected $titles = null; |
|
| 25 | 25 | |
| 26 | 26 | /** @var string|null Individual's primary surname, without any privacy applied to it */ |
| 27 | 27 | protected $unprotected_prim_surname = null; |
@@ -43,9 +43,9 @@ discard block |
||
| 43 | 43 | * @param null|string $gedcom |
| 44 | 44 | * @return null|Individual |
| 45 | 45 | */ |
| 46 | - public static function getIntance($xref, Tree $tree, $gedcom = null){ |
|
| 46 | + public static function getIntance($xref, Tree $tree, $gedcom = null) { |
|
| 47 | 47 | $indi = \Fisharebest\Webtrees\Individual::getInstance($xref, $tree, $gedcom); |
| 48 | - if($indi){ |
|
| 48 | + if ($indi) { |
|
| 49 | 49 | return new Individual($indi); |
| 50 | 50 | } |
| 51 | 51 | return null; |
@@ -56,18 +56,18 @@ discard block |
||
| 56 | 56 | * |
| 57 | 57 | * @return array Array of titles |
| 58 | 58 | */ |
| 59 | - public function getTitles(){ |
|
| 60 | - if(is_null($this->titles) && $module = Module::getModuleByName(Constants::MODULE_MAJ_MISC_NAME)){ |
|
| 59 | + public function getTitles() { |
|
| 60 | + if (is_null($this->titles) && $module = Module::getModuleByName(Constants::MODULE_MAJ_MISC_NAME)) { |
|
| 61 | 61 | $pattern = '/(.*) (('.$module->getSetting('MAJ_TITLE_PREFIX', '').')(.*))/'; |
| 62 | - $this->titles=array(); |
|
| 62 | + $this->titles = array(); |
|
| 63 | 63 | $titlefacts = $this->gedcomrecord->getFacts('TITL'); |
| 64 | - foreach($titlefacts as $titlefact){ |
|
| 64 | + foreach ($titlefacts as $titlefact) { |
|
| 65 | 65 | $ct2 = preg_match_all($pattern, $titlefact->getValue(), $match2); |
| 66 | - if($ct2>0){ |
|
| 67 | - $this->titles[$match2[1][0]][]= trim($match2[2][0]); |
|
| 66 | + if ($ct2 > 0) { |
|
| 67 | + $this->titles[$match2[1][0]][] = trim($match2[2][0]); |
|
| 68 | 68 | } |
| 69 | - else{ |
|
| 70 | - $this->titles[$titlefact->getValue()][]=''; |
|
| 69 | + else { |
|
| 70 | + $this->titles[$titlefact->getValue()][] = ''; |
|
| 71 | 71 | } |
| 72 | 72 | } |
| 73 | 73 | } |
@@ -81,8 +81,8 @@ discard block |
||
| 81 | 81 | * @return string Primary surname |
| 82 | 82 | */ |
| 83 | 83 | public function getUnprotectedPrimarySurname() { |
| 84 | - if(!$this->unprotected_prim_surname){ |
|
| 85 | - $tmp=$this->gedcomrecord->getAllNames(); |
|
| 84 | + if (!$this->unprotected_prim_surname) { |
|
| 85 | + $tmp = $this->gedcomrecord->getAllNames(); |
|
| 86 | 86 | $this->unprotected_prim_surname = $tmp[$this->gedcomrecord->getPrimaryName()]['surname']; |
| 87 | 87 | } |
| 88 | 88 | return $this->unprotected_prim_surname; |
@@ -94,12 +94,12 @@ discard block |
||
| 94 | 94 | * @param boolean $perc Should the coefficient of reliability be returned |
| 95 | 95 | * @return string|array Estimated birth place if found, null otherwise |
| 96 | 96 | */ |
| 97 | - public function getEstimatedBirthPlace($perc=false){ |
|
| 98 | - if($bplace = $this->gedcomrecord->getBirthPlace()){ |
|
| 99 | - if($perc){ |
|
| 100 | - return array ($bplace, 1); |
|
| 97 | + public function getEstimatedBirthPlace($perc = false) { |
|
| 98 | + if ($bplace = $this->gedcomrecord->getBirthPlace()) { |
|
| 99 | + if ($perc) { |
|
| 100 | + return array($bplace, 1); |
|
| 101 | 101 | } |
| 102 | - else{ |
|
| 102 | + else { |
|
| 103 | 103 | return $bplace; |
| 104 | 104 | } |
| 105 | 105 | } |
@@ -112,8 +112,8 @@ discard block |
||
| 112 | 112 | * @param boolean $perc Should the coefficient of reliability be returned |
| 113 | 113 | * @return string|array Estimated birth place if found, null otherwise |
| 114 | 114 | */ |
| 115 | - public function getSignificantPlace(){ |
|
| 116 | - if($bplace = $this->gedcomrecord->getBirthPlace()){ |
|
| 115 | + public function getSignificantPlace() { |
|
| 116 | + if ($bplace = $this->gedcomrecord->getBirthPlace()) { |
|
| 117 | 117 | return $bplace; |
| 118 | 118 | } |
| 119 | 119 | |
@@ -123,11 +123,11 @@ discard block |
||
| 123 | 123 | } |
| 124 | 124 | } |
| 125 | 125 | |
| 126 | - if($dplace = $this->gedcomrecord->getDeathPlace()){ |
|
| 126 | + if ($dplace = $this->gedcomrecord->getDeathPlace()) { |
|
| 127 | 127 | return $dplace; |
| 128 | 128 | } |
| 129 | 129 | |
| 130 | - foreach($this->gedcomrecord->getSpouseFamilies() as $fams) { |
|
| 130 | + foreach ($this->gedcomrecord->getSpouseFamilies() as $fams) { |
|
| 131 | 131 | foreach ($fams->getAllEventPlaces('RESI') as $rplace) { |
| 132 | 132 | if ($rplace) { |
| 133 | 133 | return $rplace; |
@@ -143,7 +143,7 @@ discard block |
||
| 143 | 143 | * |
| 144 | 144 | * @return boolean Is the individual a Sosa ancestor |
| 145 | 145 | */ |
| 146 | - public function isSosa(){ |
|
| 146 | + public function isSosa() { |
|
| 147 | 147 | return count($this->getSosaNumbers()) > 0; |
| 148 | 148 | } |
| 149 | 149 | |
@@ -154,8 +154,8 @@ discard block |
||
| 154 | 154 | * @uses \MyArtJaub\Webtrees\Functions\ModuleManager |
| 155 | 155 | * @return array List of Sosa numbers |
| 156 | 156 | */ |
| 157 | - public function getSosaNumbers(){ |
|
| 158 | - if($this->sosa === null) { |
|
| 157 | + public function getSosaNumbers() { |
|
| 158 | + if ($this->sosa === null) { |
|
| 159 | 159 | $provider = new SosaProvider($this->gedcomrecord->getTree()); |
| 160 | 160 | $this->sosa = $provider->getSosaNumbers($this->gedcomrecord); |
| 161 | 161 | } |
@@ -167,8 +167,8 @@ discard block |
||
| 167 | 167 | * |
| 168 | 168 | * @return int Level of sources |
| 169 | 169 | * */ |
| 170 | - public function isBirthSourced(){ |
|
| 171 | - if($this->is_birth_sourced !== null) return $this->is_birth_sourced; |
|
| 170 | + public function isBirthSourced() { |
|
| 171 | + if ($this->is_birth_sourced !== null) return $this->is_birth_sourced; |
|
| 172 | 172 | $this->is_birth_sourced = $this->isFactSourced(WT_EVENTS_BIRT); |
| 173 | 173 | return $this->is_birth_sourced; |
| 174 | 174 | } |
@@ -178,8 +178,8 @@ discard block |
||
| 178 | 178 | * |
| 179 | 179 | * @return int Level of sources |
| 180 | 180 | * */ |
| 181 | - public function isDeathSourced(){ |
|
| 182 | - if($this->is_death_sourced !== null) return $this->is_death_sourced; |
|
| 181 | + public function isDeathSourced() { |
|
| 182 | + if ($this->is_death_sourced !== null) return $this->is_death_sourced; |
|
| 183 | 183 | $this->is_death_sourced = $this->isFactSourced(WT_EVENTS_DEAT); |
| 184 | 184 | return $this->is_death_sourced; |
| 185 | 185 | } |
@@ -65,8 +65,7 @@ discard block |
||
| 65 | 65 | $ct2 = preg_match_all($pattern, $titlefact->getValue(), $match2); |
| 66 | 66 | if($ct2>0){ |
| 67 | 67 | $this->titles[$match2[1][0]][]= trim($match2[2][0]); |
| 68 | - } |
|
| 69 | - else{ |
|
| 68 | + } else{ |
|
| 70 | 69 | $this->titles[$titlefact->getValue()][]=''; |
| 71 | 70 | } |
| 72 | 71 | } |
@@ -98,8 +97,7 @@ discard block |
||
| 98 | 97 | if($bplace = $this->gedcomrecord->getBirthPlace()){ |
| 99 | 98 | if($perc){ |
| 100 | 99 | return array ($bplace, 1); |
| 101 | - } |
|
| 102 | - else{ |
|
| 100 | + } else{ |
|
| 103 | 101 | return $bplace; |
| 104 | 102 | } |
| 105 | 103 | } |
@@ -168,7 +166,9 @@ discard block |
||
| 168 | 166 | * @return int Level of sources |
| 169 | 167 | * */ |
| 170 | 168 | public function isBirthSourced(){ |
| 171 | - if($this->is_birth_sourced !== null) return $this->is_birth_sourced; |
|
| 169 | + if($this->is_birth_sourced !== null) { |
|
| 170 | + return $this->is_birth_sourced; |
|
| 171 | + } |
|
| 172 | 172 | $this->is_birth_sourced = $this->isFactSourced(WT_EVENTS_BIRT); |
| 173 | 173 | return $this->is_birth_sourced; |
| 174 | 174 | } |
@@ -179,7 +179,9 @@ discard block |
||
| 179 | 179 | * @return int Level of sources |
| 180 | 180 | * */ |
| 181 | 181 | public function isDeathSourced(){ |
| 182 | - if($this->is_death_sourced !== null) return $this->is_death_sourced; |
|
| 182 | + if($this->is_death_sourced !== null) { |
|
| 183 | + return $this->is_death_sourced; |
|
| 184 | + } |
|
| 183 | 185 | $this->is_death_sourced = $this->isFactSourced(WT_EVENTS_DEAT); |
| 184 | 186 | return $this->is_death_sourced; |
| 185 | 187 | } |
@@ -16,51 +16,51 @@ |
||
| 16 | 16 | */ |
| 17 | 17 | interface HookProviderInterface { |
| 18 | 18 | |
| 19 | - /** |
|
| 20 | - * Return an instance of the hook linked to the specifed function / context |
|
| 21 | - * |
|
| 22 | - * @param string $hook_function |
|
| 23 | - * @param string $hook_context |
|
| 24 | - * @return Hook |
|
| 25 | - */ |
|
| 26 | - public function get($hook_function, $hook_context = null); |
|
| 19 | + /** |
|
| 20 | + * Return an instance of the hook linked to the specifed function / context |
|
| 21 | + * |
|
| 22 | + * @param string $hook_function |
|
| 23 | + * @param string $hook_context |
|
| 24 | + * @return Hook |
|
| 25 | + */ |
|
| 26 | + public function get($hook_function, $hook_context = null); |
|
| 27 | 27 | |
| 28 | - /** |
|
| 29 | - * Return whether the Hook module is active and the table has been created. |
|
| 30 | - * |
|
| 31 | - * @uses \MyArtJaub\Webtrees\Module\ModuleManager to check if the module is operational |
|
| 32 | - * @return bool True if module active and table created, false otherwise |
|
| 33 | - */ |
|
| 34 | - public function isModuleOperational(); |
|
| 28 | + /** |
|
| 29 | + * Return whether the Hook module is active and the table has been created. |
|
| 30 | + * |
|
| 31 | + * @uses \MyArtJaub\Webtrees\Module\ModuleManager to check if the module is operational |
|
| 32 | + * @return bool True if module active and table created, false otherwise |
|
| 33 | + */ |
|
| 34 | + public function isModuleOperational(); |
|
| 35 | 35 | |
| 36 | - /** |
|
| 37 | - * Get the list of possible hooks in the list of modules files. |
|
| 38 | - * A hook will be registered: |
|
| 39 | - * - for all modules already registered in Webtrees |
|
| 40 | - * - if the module implements HookSubscriberInterface |
|
| 41 | - * - if the method exist within the module |
|
| 42 | - * |
|
| 43 | - * @return Array List of possible hooks, with the priority |
|
| 44 | - */ |
|
| 45 | - public function getPossibleHooks(); |
|
| 36 | + /** |
|
| 37 | + * Get the list of possible hooks in the list of modules files. |
|
| 38 | + * A hook will be registered: |
|
| 39 | + * - for all modules already registered in Webtrees |
|
| 40 | + * - if the module implements HookSubscriberInterface |
|
| 41 | + * - if the method exist within the module |
|
| 42 | + * |
|
| 43 | + * @return Array List of possible hooks, with the priority |
|
| 44 | + */ |
|
| 45 | + public function getPossibleHooks(); |
|
| 46 | 46 | |
| 47 | - /** |
|
| 48 | - * Get the list of hooks intalled in webtrees, with their id, status and priority. |
|
| 49 | - * |
|
| 50 | - * @return array List of installed hooks |
|
| 51 | - */ |
|
| 52 | - public function getRawInstalledHooks(); |
|
| 47 | + /** |
|
| 48 | + * Get the list of hooks intalled in webtrees, with their id, status and priority. |
|
| 49 | + * |
|
| 50 | + * @return array List of installed hooks |
|
| 51 | + */ |
|
| 52 | + public function getRawInstalledHooks(); |
|
| 53 | 53 | |
| 54 | - /** |
|
| 55 | - * Get the list of hooks intalled in webtrees, with their id, status and priority. |
|
| 56 | - * |
|
| 57 | - * @return Array List of installed hooks, with id, status and priority |
|
| 58 | - */ |
|
| 59 | - public function getInstalledHooks(); |
|
| 54 | + /** |
|
| 55 | + * Get the list of hooks intalled in webtrees, with their id, status and priority. |
|
| 56 | + * |
|
| 57 | + * @return Array List of installed hooks, with id, status and priority |
|
| 58 | + */ |
|
| 59 | + public function getInstalledHooks(); |
|
| 60 | 60 | |
| 61 | - /** |
|
| 62 | - * Update the list of hooks, identifying missing ones and removed ones. |
|
| 63 | - */ |
|
| 64 | - public function updateHooks(); |
|
| 61 | + /** |
|
| 62 | + * Update the list of hooks, identifying missing ones and removed ones. |
|
| 63 | + */ |
|
| 64 | + public function updateHooks(); |
|
| 65 | 65 | |
| 66 | 66 | } |
| 67 | 67 | \ No newline at end of file |
@@ -32,7 +32,7 @@ discard block |
||
| 32 | 32 | * |
| 33 | 33 | * @param \Fisharebest\Webtrees\Controller\IndividualController $ctrl_individual_in The Individual Controller to extend |
| 34 | 34 | */ |
| 35 | - public function __construct(fw\Controller\IndividualController $ctrl_individual_in){ |
|
| 35 | + public function __construct(fw\Controller\IndividualController $ctrl_individual_in) { |
|
| 36 | 36 | $this->ctrl_individual = $ctrl_individual_in; |
| 37 | 37 | $this->dindi = new mw\Individual($this->ctrl_individual->getSignificantIndividual()); |
| 38 | 38 | } |
@@ -43,7 +43,7 @@ discard block |
||
| 43 | 43 | * |
| 44 | 44 | * @uses \MyArtJaub\Webtrees\Hook\Hook |
| 45 | 45 | */ |
| 46 | - public function printHeaderExtensions(){ |
|
| 46 | + public function printHeaderExtensions() { |
|
| 47 | 47 | $hook_extend_indi_header_left = new mw\Hook\Hook('hExtendIndiHeaderLeft'); |
| 48 | 48 | $hook_extend_indi_header_right = new mw\Hook\Hook('hExtendIndiHeaderRight'); |
| 49 | 49 | $hook_extend_indi_header_left = $hook_extend_indi_header_left->execute($this->ctrl_individual); |
@@ -52,7 +52,7 @@ discard block |
||
| 52 | 52 | echo '<div id="indi_perso_header">', |
| 53 | 53 | '<div id="indi_perso_header_left">'; |
| 54 | 54 | foreach ($hook_extend_indi_header_left as $div) { |
| 55 | - if(count($div)==2){ |
|
| 55 | + if (count($div) == 2) { |
|
| 56 | 56 | echo '<div id="', $div[0], '" class="indi_perso_header_left_div">', |
| 57 | 57 | $div[1], '</div>'; |
| 58 | 58 | } |
@@ -60,7 +60,7 @@ discard block |
||
| 60 | 60 | echo '</div>', |
| 61 | 61 | '<div id="indi_perso_header_right">'; |
| 62 | 62 | foreach ($hook_extend_indi_header_right as $div) { |
| 63 | - if(count($div)==2){ |
|
| 63 | + if (count($div) == 2) { |
|
| 64 | 64 | echo '<div id="', $div[0], '" class="indi_perso_header_right_div">', |
| 65 | 65 | $div[1], '</div>'; |
| 66 | 66 | } |
@@ -75,7 +75,7 @@ discard block |
||
| 75 | 75 | * |
| 76 | 76 | * @uses \MyArtJaub\Webtrees\Hook\Hook |
| 77 | 77 | */ |
| 78 | - public function printHeaderExtraIcons(){ |
|
| 78 | + public function printHeaderExtraIcons() { |
|
| 79 | 79 | $hook_extend_indi_header_icons = new Hook('hExtendIndiHeaderIcons'); |
| 80 | 80 | $hook_extend_indi_header_icons = $hook_extend_indi_header_icons->execute($this->ctrl_individual); |
| 81 | 81 | |
@@ -18,35 +18,35 @@ discard block |
||
| 18 | 18 | */ |
| 19 | 19 | class Dispatcher implements DispatcherInterface { |
| 20 | 20 | |
| 21 | - /** |
|
| 22 | - * @var Dispatcher $instance Singleton pattern instance |
|
| 23 | - */ |
|
| 24 | - private static $instance = null; |
|
| 21 | + /** |
|
| 22 | + * @var Dispatcher $instance Singleton pattern instance |
|
| 23 | + */ |
|
| 24 | + private static $instance = null; |
|
| 25 | 25 | |
| 26 | - /** |
|
| 27 | - * Returns the *Dispatcher* instance of this class. |
|
| 28 | - * |
|
| 29 | - * @return Dispatcher The *Singleton* instance. |
|
| 30 | - */ |
|
| 31 | - public static function getInstance() |
|
| 32 | - { |
|
| 33 | - if (null === static::$instance) { |
|
| 34 | - static::$instance = new static(); |
|
| 35 | - } |
|
| 26 | + /** |
|
| 27 | + * Returns the *Dispatcher* instance of this class. |
|
| 28 | + * |
|
| 29 | + * @return Dispatcher The *Singleton* instance. |
|
| 30 | + */ |
|
| 31 | + public static function getInstance() |
|
| 32 | + { |
|
| 33 | + if (null === static::$instance) { |
|
| 34 | + static::$instance = new static(); |
|
| 35 | + } |
|
| 36 | 36 | |
| 37 | - return static::$instance; |
|
| 38 | - } |
|
| 37 | + return static::$instance; |
|
| 38 | + } |
|
| 39 | 39 | |
| 40 | 40 | /** |
| 41 | - * Protected constructor. |
|
| 42 | - */ |
|
| 43 | - protected function __construct() {} |
|
| 41 | + * Protected constructor. |
|
| 42 | + */ |
|
| 43 | + protected function __construct() {} |
|
| 44 | 44 | |
| 45 | - /** |
|
| 46 | - * {@inheritdoc } |
|
| 47 | - * @see \MyArtJaub\Webtrees\Mvc\DispatcherInterface::handle() |
|
| 48 | - */ |
|
| 49 | - public function handle(fw\Module\AbstractModule $module, $request) { |
|
| 45 | + /** |
|
| 46 | + * {@inheritdoc } |
|
| 47 | + * @see \MyArtJaub\Webtrees\Mvc\DispatcherInterface::handle() |
|
| 48 | + */ |
|
| 49 | + public function handle(fw\Module\AbstractModule $module, $request) { |
|
| 50 | 50 | |
| 51 | 51 | $fq_modclass_name = get_class($module); |
| 52 | 52 | $ctrl_namespace = substr($fq_modclass_name, 0, - strlen('Module')) . '\\'; |
@@ -66,18 +66,18 @@ discard block |
||
| 66 | 66 | |
| 67 | 67 | $ctrl_class = $ctrl_namespace . $ctrl_name . 'Controller'; |
| 68 | 68 | if(class_exists($ctrl_class) |
| 69 | - && is_subclass_of($ctrl_class, '\\MyArtJaub\\Webtrees\\Mvc\\Controller\\MvcController') |
|
| 69 | + && is_subclass_of($ctrl_class, '\\MyArtJaub\\Webtrees\\Mvc\\Controller\\MvcController') |
|
| 70 | 70 | && $ctrl = new $ctrl_class($module) ) { |
| 71 | 71 | if(method_exists($ctrl, $method)) { |
| 72 | - try { |
|
| 73 | - call_user_func_array(array($ctrl, $method), array()); |
|
| 74 | - } |
|
| 75 | - catch (MvcException $ex) { |
|
| 76 | - if(!headers_sent()) { |
|
| 77 | - http_response_code($ex->getHttpCode()); |
|
| 78 | - } |
|
| 79 | - echo $ex->getMessage(); |
|
| 80 | - } |
|
| 72 | + try { |
|
| 73 | + call_user_func_array(array($ctrl, $method), array()); |
|
| 74 | + } |
|
| 75 | + catch (MvcException $ex) { |
|
| 76 | + if(!headers_sent()) { |
|
| 77 | + http_response_code($ex->getHttpCode()); |
|
| 78 | + } |
|
| 79 | + echo $ex->getMessage(); |
|
| 80 | + } |
|
| 81 | 81 | } |
| 82 | 82 | else { |
| 83 | 83 | throw new \Exception('The page requested does not exist'); |
@@ -86,27 +86,27 @@ discard block |
||
| 86 | 86 | else { |
| 87 | 87 | throw new \Exception('The page requested does not exist'); |
| 88 | 88 | } |
| 89 | - } |
|
| 89 | + } |
|
| 90 | 90 | |
| 91 | - /** |
|
| 92 | - * Private clone method to prevent cloning of the instance of the |
|
| 93 | - * *Dispatcher* instance. |
|
| 94 | - * |
|
| 95 | - * @return void |
|
| 96 | - */ |
|
| 97 | - private function __clone() |
|
| 98 | - { |
|
| 99 | - } |
|
| 91 | + /** |
|
| 92 | + * Private clone method to prevent cloning of the instance of the |
|
| 93 | + * *Dispatcher* instance. |
|
| 94 | + * |
|
| 95 | + * @return void |
|
| 96 | + */ |
|
| 97 | + private function __clone() |
|
| 98 | + { |
|
| 99 | + } |
|
| 100 | 100 | |
| 101 | - /** |
|
| 102 | - * Private unserialize method to prevent unserializing of the *Dispatcher* |
|
| 103 | - * instance. |
|
| 104 | - * |
|
| 105 | - * @return void |
|
| 106 | - */ |
|
| 107 | - private function __wakeup() |
|
| 108 | - { |
|
| 109 | - } |
|
| 101 | + /** |
|
| 102 | + * Private unserialize method to prevent unserializing of the *Dispatcher* |
|
| 103 | + * instance. |
|
| 104 | + * |
|
| 105 | + * @return void |
|
| 106 | + */ |
|
| 107 | + private function __wakeup() |
|
| 108 | + { |
|
| 109 | + } |
|
| 110 | 110 | |
| 111 | 111 | } |
| 112 | 112 | |
@@ -49,10 +49,10 @@ discard block |
||
| 49 | 49 | public function handle(fw\Module\AbstractModule $module, $request) { |
| 50 | 50 | |
| 51 | 51 | $fq_modclass_name = get_class($module); |
| 52 | - $ctrl_namespace = substr($fq_modclass_name, 0, - strlen('Module')) . '\\'; |
|
| 52 | + $ctrl_namespace = substr($fq_modclass_name, 0, - strlen('Module')).'\\'; |
|
| 53 | 53 | |
| 54 | - $args = explode( '@', $request, 2); |
|
| 55 | - switch(count($args)) { |
|
| 54 | + $args = explode('@', $request, 2); |
|
| 55 | + switch (count($args)) { |
|
| 56 | 56 | case 1: |
| 57 | 57 | $ctrl_name = $args[0]; |
| 58 | 58 | $method = 'index'; |
@@ -64,16 +64,16 @@ discard block |
||
| 64 | 64 | break; |
| 65 | 65 | } |
| 66 | 66 | |
| 67 | - $ctrl_class = $ctrl_namespace . $ctrl_name . 'Controller'; |
|
| 68 | - if(class_exists($ctrl_class) |
|
| 67 | + $ctrl_class = $ctrl_namespace.$ctrl_name.'Controller'; |
|
| 68 | + if (class_exists($ctrl_class) |
|
| 69 | 69 | && is_subclass_of($ctrl_class, '\\MyArtJaub\\Webtrees\\Mvc\\Controller\\MvcController') |
| 70 | - && $ctrl = new $ctrl_class($module) ) { |
|
| 71 | - if(method_exists($ctrl, $method)) { |
|
| 70 | + && $ctrl = new $ctrl_class($module)) { |
|
| 71 | + if (method_exists($ctrl, $method)) { |
|
| 72 | 72 | try { |
| 73 | 73 | call_user_func_array(array($ctrl, $method), array()); |
| 74 | 74 | } |
| 75 | 75 | catch (MvcException $ex) { |
| 76 | - if(!headers_sent()) { |
|
| 76 | + if (!headers_sent()) { |
|
| 77 | 77 | http_response_code($ex->getHttpCode()); |
| 78 | 78 | } |
| 79 | 79 | echo $ex->getMessage(); |
@@ -71,19 +71,16 @@ |
||
| 71 | 71 | if(method_exists($ctrl, $method)) { |
| 72 | 72 | try { |
| 73 | 73 | call_user_func_array(array($ctrl, $method), array()); |
| 74 | - } |
|
| 75 | - catch (MvcException $ex) { |
|
| 74 | + } catch (MvcException $ex) { |
|
| 76 | 75 | if(!headers_sent()) { |
| 77 | 76 | http_response_code($ex->getHttpCode()); |
| 78 | 77 | } |
| 79 | 78 | echo $ex->getMessage(); |
| 80 | 79 | } |
| 81 | - } |
|
| 82 | - else { |
|
| 80 | + } else { |
|
| 83 | 81 | throw new \Exception('The page requested does not exist'); |
| 84 | 82 | } |
| 85 | - } |
|
| 86 | - else { |
|
| 83 | + } else { |
|
| 87 | 84 | throw new \Exception('The page requested does not exist'); |
| 88 | 85 | } |
| 89 | 86 | } |
@@ -16,52 +16,52 @@ |
||
| 16 | 16 | */ |
| 17 | 17 | class MvcException extends \Exception { |
| 18 | 18 | |
| 19 | - /** @var int[] $VALID_HTTP List of valid HTTP codes */ |
|
| 20 | - protected static $VALID_HTTP = array( |
|
| 21 | - 100, 101, |
|
| 22 | - 200, 201, 202, 203, 204, 205, 206, |
|
| 23 | - 300, 301, 302, 303, 304, 305, 306, 307, |
|
| 24 | - 400, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 412, 413, 414, 415, 416, 417, |
|
| 25 | - 500, 501, 502, 503, 504, 505 |
|
| 26 | - ); |
|
| 19 | + /** @var int[] $VALID_HTTP List of valid HTTP codes */ |
|
| 20 | + protected static $VALID_HTTP = array( |
|
| 21 | + 100, 101, |
|
| 22 | + 200, 201, 202, 203, 204, 205, 206, |
|
| 23 | + 300, 301, 302, 303, 304, 305, 306, 307, |
|
| 24 | + 400, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 412, 413, 414, 415, 416, 417, |
|
| 25 | + 500, 501, 502, 503, 504, 505 |
|
| 26 | + ); |
|
| 27 | 27 | |
| 28 | - /** @var int $http_code */ |
|
| 29 | - protected $http_code; |
|
| 28 | + /** @var int $http_code */ |
|
| 29 | + protected $http_code; |
|
| 30 | 30 | |
| 31 | - /** |
|
| 32 | - * Constructor for MvcException |
|
| 33 | - * |
|
| 34 | - * @param int $http_code |
|
| 35 | - * @param string $message |
|
| 36 | - * @param int $code |
|
| 37 | - * @param \Throwable $previous |
|
| 38 | - */ |
|
| 39 | - public function __construct($http_code = 500, $message = "", $code = 0, \Throwable $previous = null) { |
|
| 40 | - parent::__construct($message, $code, $previous); |
|
| 31 | + /** |
|
| 32 | + * Constructor for MvcException |
|
| 33 | + * |
|
| 34 | + * @param int $http_code |
|
| 35 | + * @param string $message |
|
| 36 | + * @param int $code |
|
| 37 | + * @param \Throwable $previous |
|
| 38 | + */ |
|
| 39 | + public function __construct($http_code = 500, $message = "", $code = 0, \Throwable $previous = null) { |
|
| 40 | + parent::__construct($message, $code, $previous); |
|
| 41 | 41 | |
| 42 | - $this->http_code = in_array($http_code, self::$VALID_HTTP) ? $http_code : 500; |
|
| 43 | - } |
|
| 42 | + $this->http_code = in_array($http_code, self::$VALID_HTTP) ? $http_code : 500; |
|
| 43 | + } |
|
| 44 | 44 | |
| 45 | - /** |
|
| 46 | - * Get the HTTP code |
|
| 47 | - * |
|
| 48 | - * @return int |
|
| 49 | - */ |
|
| 50 | - public function getHttpCode() { |
|
| 51 | - return $this->http_code; |
|
| 52 | - } |
|
| 45 | + /** |
|
| 46 | + * Get the HTTP code |
|
| 47 | + * |
|
| 48 | + * @return int |
|
| 49 | + */ |
|
| 50 | + public function getHttpCode() { |
|
| 51 | + return $this->http_code; |
|
| 52 | + } |
|
| 53 | 53 | |
| 54 | - /** |
|
| 55 | - * Set the HTTP code |
|
| 56 | - * |
|
| 57 | - * @param int $http_code |
|
| 58 | - * @throws InvalidArgumentException Thrown if not valid Http code |
|
| 59 | - */ |
|
| 60 | - public function setHttpCode($http_code) { |
|
| 61 | - if(!in_array($http_code, self::$VALID_HTTP)) |
|
| 62 | - throw new \InvalidArgumentException('Invalid HTTP code'); |
|
| 63 | - $this->http_code= $http_code; |
|
| 64 | - } |
|
| 54 | + /** |
|
| 55 | + * Set the HTTP code |
|
| 56 | + * |
|
| 57 | + * @param int $http_code |
|
| 58 | + * @throws InvalidArgumentException Thrown if not valid Http code |
|
| 59 | + */ |
|
| 60 | + public function setHttpCode($http_code) { |
|
| 61 | + if(!in_array($http_code, self::$VALID_HTTP)) |
|
| 62 | + throw new \InvalidArgumentException('Invalid HTTP code'); |
|
| 63 | + $this->http_code= $http_code; |
|
| 64 | + } |
|
| 65 | 65 | |
| 66 | 66 | } |
| 67 | 67 | |
@@ -17,7 +17,7 @@ discard block |
||
| 17 | 17 | class MvcException extends \Exception { |
| 18 | 18 | |
| 19 | 19 | /** @var int[] $VALID_HTTP List of valid HTTP codes */ |
| 20 | - protected static $VALID_HTTP = array( |
|
| 20 | + protected static $VALID_HTTP = array( |
|
| 21 | 21 | 100, 101, |
| 22 | 22 | 200, 201, 202, 203, 204, 205, 206, |
| 23 | 23 | 300, 301, 302, 303, 304, 305, 306, 307, |
@@ -58,9 +58,9 @@ discard block |
||
| 58 | 58 | * @throws InvalidArgumentException Thrown if not valid Http code |
| 59 | 59 | */ |
| 60 | 60 | public function setHttpCode($http_code) { |
| 61 | - if(!in_array($http_code, self::$VALID_HTTP)) |
|
| 61 | + if (!in_array($http_code, self::$VALID_HTTP)) |
|
| 62 | 62 | throw new \InvalidArgumentException('Invalid HTTP code'); |
| 63 | - $this->http_code= $http_code; |
|
| 63 | + $this->http_code = $http_code; |
|
| 64 | 64 | } |
| 65 | 65 | |
| 66 | 66 | } |
@@ -58,8 +58,9 @@ |
||
| 58 | 58 | * @throws InvalidArgumentException Thrown if not valid Http code |
| 59 | 59 | */ |
| 60 | 60 | public function setHttpCode($http_code) { |
| 61 | - if(!in_array($http_code, self::$VALID_HTTP)) |
|
| 62 | - throw new \InvalidArgumentException('Invalid HTTP code'); |
|
| 61 | + if(!in_array($http_code, self::$VALID_HTTP)) { |
|
| 62 | + throw new \InvalidArgumentException('Invalid HTTP code'); |
|
| 63 | + } |
|
| 63 | 64 | $this->http_code= $http_code; |
| 64 | 65 | } |
| 65 | 66 | |
@@ -19,59 +19,59 @@ |
||
| 19 | 19 | * Hooks Module. |
| 20 | 20 | */ |
| 21 | 21 | class HooksModule extends AbstractModule implements ModuleConfigInterface, DependentInterface { |
| 22 | - // How to update the database schema for this module |
|
| 23 | - const SCHEMA_TARGET_VERSION = 1; |
|
| 24 | - const SCHEMA_SETTING_NAME = 'MAJ_HOOKS_SCHEMA_VERSION'; |
|
| 25 | - const SCHEMA_MIGRATION_PREFIX = '\MyArtJaub\Webtrees\Module\Hooks\Schema'; |
|
| 22 | + // How to update the database schema for this module |
|
| 23 | + const SCHEMA_TARGET_VERSION = 1; |
|
| 24 | + const SCHEMA_SETTING_NAME = 'MAJ_HOOKS_SCHEMA_VERSION'; |
|
| 25 | + const SCHEMA_MIGRATION_PREFIX = '\MyArtJaub\Webtrees\Module\Hooks\Schema'; |
|
| 26 | 26 | |
| 27 | - /** @var string For custom modules - link for support, upgrades, etc. */ |
|
| 28 | - const CUSTOM_WEBSITE = 'https://github.com/jon48/webtrees-lib'; |
|
| 27 | + /** @var string For custom modules - link for support, upgrades, etc. */ |
|
| 28 | + const CUSTOM_WEBSITE = 'https://github.com/jon48/webtrees-lib'; |
|
| 29 | 29 | |
| 30 | - /** |
|
| 31 | - * {@inhericDoc} |
|
| 32 | - */ |
|
| 33 | - public function getTitle() { |
|
| 34 | - return /* I18N: Name of the “Hooks” module */ I18N::translate('Hooks'); |
|
| 35 | - } |
|
| 30 | + /** |
|
| 31 | + * {@inhericDoc} |
|
| 32 | + */ |
|
| 33 | + public function getTitle() { |
|
| 34 | + return /* I18N: Name of the “Hooks” module */ I18N::translate('Hooks'); |
|
| 35 | + } |
|
| 36 | 36 | |
| 37 | - /** |
|
| 38 | - * {@inhericDoc} |
|
| 39 | - */ |
|
| 40 | - public function getDescription() { |
|
| 41 | - return /* I18N: Description of the “Hooks” module */ I18N::translate('Implements hooks management.'); |
|
| 42 | - } |
|
| 37 | + /** |
|
| 38 | + * {@inhericDoc} |
|
| 39 | + */ |
|
| 40 | + public function getDescription() { |
|
| 41 | + return /* I18N: Description of the “Hooks” module */ I18N::translate('Implements hooks management.'); |
|
| 42 | + } |
|
| 43 | 43 | |
| 44 | - /** |
|
| 45 | - * {@inhericDoc} |
|
| 46 | - */ |
|
| 47 | - public function modAction($mod_action) { |
|
| 48 | - Database::updateSchema(self::SCHEMA_MIGRATION_PREFIX, self::SCHEMA_SETTING_NAME, self::SCHEMA_TARGET_VERSION); |
|
| 44 | + /** |
|
| 45 | + * {@inhericDoc} |
|
| 46 | + */ |
|
| 47 | + public function modAction($mod_action) { |
|
| 48 | + Database::updateSchema(self::SCHEMA_MIGRATION_PREFIX, self::SCHEMA_SETTING_NAME, self::SCHEMA_TARGET_VERSION); |
|
| 49 | 49 | |
| 50 | - \MyArtJaub\Webtrees\Mvc\Dispatcher::getInstance()->handle($this, $mod_action); |
|
| 51 | - } |
|
| 50 | + \MyArtJaub\Webtrees\Mvc\Dispatcher::getInstance()->handle($this, $mod_action); |
|
| 51 | + } |
|
| 52 | 52 | |
| 53 | - /** |
|
| 54 | - * {@inhericDoc} |
|
| 55 | - * @see \Fisharebest\Webtrees\Module\ModuleConfigInterface::getConfigLink() |
|
| 56 | - */ |
|
| 57 | - public function getConfigLink() { |
|
| 58 | - Database::updateSchema(self::SCHEMA_MIGRATION_PREFIX, self::SCHEMA_SETTING_NAME, self::SCHEMA_TARGET_VERSION); |
|
| 53 | + /** |
|
| 54 | + * {@inhericDoc} |
|
| 55 | + * @see \Fisharebest\Webtrees\Module\ModuleConfigInterface::getConfigLink() |
|
| 56 | + */ |
|
| 57 | + public function getConfigLink() { |
|
| 58 | + Database::updateSchema(self::SCHEMA_MIGRATION_PREFIX, self::SCHEMA_SETTING_NAME, self::SCHEMA_TARGET_VERSION); |
|
| 59 | 59 | |
| 60 | - return 'module.php?mod=' . $this->getName() . '&mod_action=AdminConfig'; |
|
| 61 | - } |
|
| 60 | + return 'module.php?mod=' . $this->getName() . '&mod_action=AdminConfig'; |
|
| 61 | + } |
|
| 62 | 62 | |
| 63 | - /** |
|
| 64 | - * {@inheritDoc} |
|
| 65 | - * @see \MyArtJaub\Webtrees\Module\DependentInterface::validatePrerequisites() |
|
| 66 | - */ |
|
| 67 | - public function validatePrerequisites() { |
|
| 68 | - try { |
|
| 69 | - Database::updateSchema(self::SCHEMA_MIGRATION_PREFIX, self::SCHEMA_SETTING_NAME, self::SCHEMA_TARGET_VERSION); |
|
| 70 | - return true; |
|
| 71 | - } |
|
| 72 | - catch (\Exception $ex) { } |
|
| 73 | - return false; |
|
| 74 | - } |
|
| 63 | + /** |
|
| 64 | + * {@inheritDoc} |
|
| 65 | + * @see \MyArtJaub\Webtrees\Module\DependentInterface::validatePrerequisites() |
|
| 66 | + */ |
|
| 67 | + public function validatePrerequisites() { |
|
| 68 | + try { |
|
| 69 | + Database::updateSchema(self::SCHEMA_MIGRATION_PREFIX, self::SCHEMA_SETTING_NAME, self::SCHEMA_TARGET_VERSION); |
|
| 70 | + return true; |
|
| 71 | + } |
|
| 72 | + catch (\Exception $ex) { } |
|
| 73 | + return false; |
|
| 74 | + } |
|
| 75 | 75 | |
| 76 | 76 | |
| 77 | 77 | } |
@@ -68,8 +68,7 @@ |
||
| 68 | 68 | try { |
| 69 | 69 | Database::updateSchema(self::SCHEMA_MIGRATION_PREFIX, self::SCHEMA_SETTING_NAME, self::SCHEMA_TARGET_VERSION); |
| 70 | 70 | return true; |
| 71 | - } |
|
| 72 | - catch (\Exception $ex) { } |
|
| 71 | + } catch (\Exception $ex) { } |
|
| 73 | 72 | return false; |
| 74 | 73 | } |
| 75 | 74 | |
@@ -57,7 +57,7 @@ |
||
| 57 | 57 | public function getConfigLink() { |
| 58 | 58 | Database::updateSchema(self::SCHEMA_MIGRATION_PREFIX, self::SCHEMA_SETTING_NAME, self::SCHEMA_TARGET_VERSION); |
| 59 | 59 | |
| 60 | - return 'module.php?mod=' . $this->getName() . '&mod_action=AdminConfig'; |
|
| 60 | + return 'module.php?mod='.$this->getName().'&mod_action=AdminConfig'; |
|
| 61 | 61 | } |
| 62 | 62 | |
| 63 | 63 | /** |
@@ -79,8 +79,7 @@ |
||
| 79 | 79 | Database::updateSchema(self::SCHEMA_MIGRATION_PREFIX, self::SCHEMA_SETTING_NAME, self::SCHEMA_TARGET_VERSION); |
| 80 | 80 | |
| 81 | 81 | return !is_null(Module::getModuleByName(Constants::MODULE_MAJ_SOSA_NAME)); |
| 82 | - } |
|
| 83 | - catch (\Exception $ex) { } |
|
| 82 | + } catch (\Exception $ex) { } |
|
| 84 | 83 | return false; |
| 85 | 84 | } |
| 86 | 85 | |
@@ -25,86 +25,86 @@ |
||
| 25 | 25 | class GeoDispersionModule extends AbstractModule implements ModuleConfigInterface, DependentInterface { |
| 26 | 26 | |
| 27 | 27 | // How to update the database schema for this module |
| 28 | - const SCHEMA_TARGET_VERSION = 1; |
|
| 29 | - const SCHEMA_SETTING_NAME = 'MAJ_GEODISP_SCHEMA_VERSION'; |
|
| 30 | - const SCHEMA_MIGRATION_PREFIX = '\MyArtJaub\Webtrees\Module\GeoDispersion\Schema'; |
|
| 28 | + const SCHEMA_TARGET_VERSION = 1; |
|
| 29 | + const SCHEMA_SETTING_NAME = 'MAJ_GEODISP_SCHEMA_VERSION'; |
|
| 30 | + const SCHEMA_MIGRATION_PREFIX = '\MyArtJaub\Webtrees\Module\GeoDispersion\Schema'; |
|
| 31 | 31 | |
| 32 | - /** @var string For custom modules - link for support, upgrades, etc. */ |
|
| 33 | - const CUSTOM_WEBSITE = 'https://github.com/jon48/webtrees-lib'; |
|
| 32 | + /** @var string For custom modules - link for support, upgrades, etc. */ |
|
| 33 | + const CUSTOM_WEBSITE = 'https://github.com/jon48/webtrees-lib'; |
|
| 34 | 34 | |
| 35 | - /** |
|
| 36 | - * GeoDispersion analysis provider |
|
| 37 | - * @var \MyArtJaub\Webtrees\Module\GeoDispersion\Model\GeoAnalysisProvider $provider |
|
| 38 | - */ |
|
| 39 | - protected $provider; |
|
| 35 | + /** |
|
| 36 | + * GeoDispersion analysis provider |
|
| 37 | + * @var \MyArtJaub\Webtrees\Module\GeoDispersion\Model\GeoAnalysisProvider $provider |
|
| 38 | + */ |
|
| 39 | + protected $provider; |
|
| 40 | 40 | |
| 41 | - /** |
|
| 42 | - * {@inhericDoc} |
|
| 43 | - */ |
|
| 44 | - public function getTitle() { |
|
| 45 | - return /* I18N: Name of the “Hooks” module */ I18N::translate('Geographical Dispersion'); |
|
| 46 | - } |
|
| 41 | + /** |
|
| 42 | + * {@inhericDoc} |
|
| 43 | + */ |
|
| 44 | + public function getTitle() { |
|
| 45 | + return /* I18N: Name of the “Hooks” module */ I18N::translate('Geographical Dispersion'); |
|
| 46 | + } |
|
| 47 | 47 | |
| 48 | - /** |
|
| 49 | - * {@inhericDoc} |
|
| 50 | - */ |
|
| 51 | - public function getDescription() { |
|
| 52 | - return /* I18N: Description of the “Hooks” module */ I18N::translate('Display the geographical dispersion of the root person’s Sosa ancestors.'); |
|
| 53 | - } |
|
| 48 | + /** |
|
| 49 | + * {@inhericDoc} |
|
| 50 | + */ |
|
| 51 | + public function getDescription() { |
|
| 52 | + return /* I18N: Description of the “Hooks” module */ I18N::translate('Display the geographical dispersion of the root person’s Sosa ancestors.'); |
|
| 53 | + } |
|
| 54 | 54 | |
| 55 | - /** |
|
| 56 | - * {@inhericDoc} |
|
| 57 | - */ |
|
| 58 | - public function modAction($mod_action) { |
|
| 59 | - Database::updateSchema(self::SCHEMA_MIGRATION_PREFIX, self::SCHEMA_SETTING_NAME, self::SCHEMA_TARGET_VERSION); |
|
| 55 | + /** |
|
| 56 | + * {@inhericDoc} |
|
| 57 | + */ |
|
| 58 | + public function modAction($mod_action) { |
|
| 59 | + Database::updateSchema(self::SCHEMA_MIGRATION_PREFIX, self::SCHEMA_SETTING_NAME, self::SCHEMA_TARGET_VERSION); |
|
| 60 | 60 | |
| 61 | - \MyArtJaub\Webtrees\Mvc\Dispatcher::getInstance()->handle($this, $mod_action); |
|
| 62 | - } |
|
| 61 | + \MyArtJaub\Webtrees\Mvc\Dispatcher::getInstance()->handle($this, $mod_action); |
|
| 62 | + } |
|
| 63 | 63 | |
| 64 | - /** |
|
| 65 | - * {@inhericDoc} |
|
| 66 | - * @see \Fisharebest\Webtrees\Module\ModuleConfigInterface::getConfigLink() |
|
| 67 | - */ |
|
| 68 | - public function getConfigLink() { |
|
| 69 | - Database::updateSchema(self::SCHEMA_MIGRATION_PREFIX, self::SCHEMA_SETTING_NAME, self::SCHEMA_TARGET_VERSION); |
|
| 64 | + /** |
|
| 65 | + * {@inhericDoc} |
|
| 66 | + * @see \Fisharebest\Webtrees\Module\ModuleConfigInterface::getConfigLink() |
|
| 67 | + */ |
|
| 68 | + public function getConfigLink() { |
|
| 69 | + Database::updateSchema(self::SCHEMA_MIGRATION_PREFIX, self::SCHEMA_SETTING_NAME, self::SCHEMA_TARGET_VERSION); |
|
| 70 | 70 | |
| 71 | - return 'module.php?mod=' . $this->getName() . '&mod_action=AdminConfig'; |
|
| 72 | - } |
|
| 71 | + return 'module.php?mod=' . $this->getName() . '&mod_action=AdminConfig'; |
|
| 72 | + } |
|
| 73 | 73 | |
| 74 | - /** |
|
| 75 | - * {@inhericDoc} |
|
| 76 | - * @see \MyArtJaub\Webtrees\Module\DependentInterface::validatePrerequisites() |
|
| 77 | - */ |
|
| 78 | - public function validatePrerequisites() { |
|
| 79 | - try { |
|
| 80 | - Database::updateSchema(self::SCHEMA_MIGRATION_PREFIX, self::SCHEMA_SETTING_NAME, self::SCHEMA_TARGET_VERSION); |
|
| 74 | + /** |
|
| 75 | + * {@inhericDoc} |
|
| 76 | + * @see \MyArtJaub\Webtrees\Module\DependentInterface::validatePrerequisites() |
|
| 77 | + */ |
|
| 78 | + public function validatePrerequisites() { |
|
| 79 | + try { |
|
| 80 | + Database::updateSchema(self::SCHEMA_MIGRATION_PREFIX, self::SCHEMA_SETTING_NAME, self::SCHEMA_TARGET_VERSION); |
|
| 81 | 81 | |
| 82 | - return !is_null(Module::getModuleByName(Constants::MODULE_MAJ_SOSA_NAME)); |
|
| 83 | - } |
|
| 84 | - catch (\Exception $ex) { } |
|
| 85 | - return false; |
|
| 86 | - } |
|
| 82 | + return !is_null(Module::getModuleByName(Constants::MODULE_MAJ_SOSA_NAME)); |
|
| 83 | + } |
|
| 84 | + catch (\Exception $ex) { } |
|
| 85 | + return false; |
|
| 86 | + } |
|
| 87 | 87 | |
| 88 | 88 | /** |
| 89 | 89 | * Get the GeoAnalysis Provider (initialise it if not done yet). |
| 90 | 90 | * |
| 91 | 91 | * @return \MyArtJaub\Webtrees\Module\GeoDispersion\Model\GeoAnalysisProvider |
| 92 | 92 | */ |
| 93 | - public function getProvider() { |
|
| 94 | - if(!$this->provider) { |
|
| 95 | - $this->provider = new GeoAnalysisProvider(Globals::getTree()); |
|
| 96 | - } |
|
| 97 | - return $this->provider; |
|
| 98 | - } |
|
| 93 | + public function getProvider() { |
|
| 94 | + if(!$this->provider) { |
|
| 95 | + $this->provider = new GeoAnalysisProvider(Globals::getTree()); |
|
| 96 | + } |
|
| 97 | + return $this->provider; |
|
| 98 | + } |
|
| 99 | 99 | |
| 100 | 100 | /** |
| 101 | 101 | * Set the GeoAnalysis Provider. |
| 102 | 102 | * |
| 103 | 103 | * @return \MyArtJaub\Webtrees\Module\GeoDispersion\Model\GeoAnalysisProvider |
| 104 | 104 | */ |
| 105 | - public function setProvider(GeoAnalysisProvider $provider) { |
|
| 106 | - $this->provider = $provider; |
|
| 107 | - } |
|
| 105 | + public function setProvider(GeoAnalysisProvider $provider) { |
|
| 106 | + $this->provider = $provider; |
|
| 107 | + } |
|
| 108 | 108 | |
| 109 | 109 | |
| 110 | 110 | } |
@@ -68,7 +68,7 @@ discard block |
||
| 68 | 68 | public function getConfigLink() { |
| 69 | 69 | Database::updateSchema(self::SCHEMA_MIGRATION_PREFIX, self::SCHEMA_SETTING_NAME, self::SCHEMA_TARGET_VERSION); |
| 70 | 70 | |
| 71 | - return 'module.php?mod=' . $this->getName() . '&mod_action=AdminConfig'; |
|
| 71 | + return 'module.php?mod='.$this->getName().'&mod_action=AdminConfig'; |
|
| 72 | 72 | } |
| 73 | 73 | |
| 74 | 74 | /** |
@@ -91,7 +91,7 @@ discard block |
||
| 91 | 91 | * @return \MyArtJaub\Webtrees\Module\GeoDispersion\Model\GeoAnalysisProvider |
| 92 | 92 | */ |
| 93 | 93 | public function getProvider() { |
| 94 | - if(!$this->provider) { |
|
| 94 | + if (!$this->provider) { |
|
| 95 | 95 | $this->provider = new GeoAnalysisProvider(Globals::getTree()); |
| 96 | 96 | } |
| 97 | 97 | return $this->provider; |
@@ -93,16 +93,14 @@ |
||
| 93 | 93 | if(is_int($key)) { |
| 94 | 94 | $hook_item = $value; |
| 95 | 95 | $priority = self::DEFAULT_PRIORITY; |
| 96 | - } |
|
| 97 | - else{ |
|
| 96 | + } else{ |
|
| 98 | 97 | $hook_item = explode('#', $key, 2); |
| 99 | 98 | $priority = $value; |
| 100 | 99 | } |
| 101 | 100 | if($hook_item && count($hook_item) == 2){ |
| 102 | 101 | $hook_func = $hook_item[0]; |
| 103 | 102 | $hook_cont = $hook_item[1]; |
| 104 | - } |
|
| 105 | - else{ |
|
| 103 | + } else{ |
|
| 106 | 104 | $hook_func = $hook_item[0]; |
| 107 | 105 | $hook_cont = 'all'; |
| 108 | 106 | } |
@@ -43,11 +43,11 @@ discard block |
||
| 43 | 43 | */ |
| 44 | 44 | public static function getInstance() |
| 45 | 45 | { |
| 46 | - if (null === static::$instance) { |
|
| 47 | - static::$instance = new static(); |
|
| 48 | - } |
|
| 46 | + if (null === static::$instance) { |
|
| 47 | + static::$instance = new static(); |
|
| 48 | + } |
|
| 49 | 49 | |
| 50 | - return static::$instance; |
|
| 50 | + return static::$instance; |
|
| 51 | 51 | } |
| 52 | 52 | |
| 53 | 53 | /** |
@@ -55,7 +55,7 @@ discard block |
||
| 55 | 55 | * @see \MyArtJaub\Webtrees\Hook\HookProviderInterface::get() |
| 56 | 56 | */ |
| 57 | 57 | public function get($hook_function, $hook_context = null) { |
| 58 | - return new Hook($hook_function, $hook_context); |
|
| 58 | + return new Hook($hook_function, $hook_context); |
|
| 59 | 59 | } |
| 60 | 60 | |
| 61 | 61 | /** |
@@ -73,20 +73,20 @@ discard block |
||
| 73 | 73 | public function getPossibleHooks() { |
| 74 | 74 | static $hooks=null; |
| 75 | 75 | if ($hooks === null) { |
| 76 | - $hooks = array(); |
|
| 76 | + $hooks = array(); |
|
| 77 | 77 | |
| 78 | - // Cannot use the same logic as the core Module loading, |
|
| 79 | - // as this forces a new include of the module.php file. |
|
| 80 | - // This causes issue when classes are defined in this file. |
|
| 81 | - // Cannot use Module::getActiveModules as well, as this is private. |
|
| 82 | - $module_names = Database::prepare( |
|
| 83 | - 'SELECT module_name FROM `##module`' |
|
| 84 | - )->fetchOneColumn(); |
|
| 78 | + // Cannot use the same logic as the core Module loading, |
|
| 79 | + // as this forces a new include of the module.php file. |
|
| 80 | + // This causes issue when classes are defined in this file. |
|
| 81 | + // Cannot use Module::getActiveModules as well, as this is private. |
|
| 82 | + $module_names = Database::prepare( |
|
| 83 | + 'SELECT module_name FROM `##module`' |
|
| 84 | + )->fetchOneColumn(); |
|
| 85 | 85 | |
| 86 | - foreach($module_names as $module_name) { |
|
| 87 | - $module = Module::getModuleByName($module_name); |
|
| 86 | + foreach($module_names as $module_name) { |
|
| 87 | + $module = Module::getModuleByName($module_name); |
|
| 88 | 88 | |
| 89 | - if($module instanceof HookSubscriberInterface){ |
|
| 89 | + if($module instanceof HookSubscriberInterface){ |
|
| 90 | 90 | $subscribedhooks = $module->getSubscribedHooks(); |
| 91 | 91 | if(is_array($subscribedhooks)){ |
| 92 | 92 | foreach($subscribedhooks as $key => $value){ |
@@ -111,7 +111,7 @@ discard block |
||
| 111 | 111 | } |
| 112 | 112 | } |
| 113 | 113 | } |
| 114 | - } |
|
| 114 | + } |
|
| 115 | 115 | } |
| 116 | 116 | } |
| 117 | 117 | return $hooks; |
@@ -153,33 +153,33 @@ discard block |
||
| 153 | 153 | */ |
| 154 | 154 | public function updateHooks() { |
| 155 | 155 | |
| 156 | - if(Auth::isAdmin()){ |
|
| 157 | - $ihooks = self::getInstalledHooks(); |
|
| 158 | - $phooks = self::getPossibleHooks(); |
|
| 156 | + if(Auth::isAdmin()){ |
|
| 157 | + $ihooks = self::getInstalledHooks(); |
|
| 158 | + $phooks = self::getPossibleHooks(); |
|
| 159 | 159 | |
| 160 | - // Insert hooks not existing yet in the DB |
|
| 161 | - if($phooks !== null){ |
|
| 162 | - foreach($phooks as $phook => $priority){ |
|
| 163 | - $array_hook = explode('#', $phook); |
|
| 164 | - if($ihooks === null || !array_key_exists($phook, $ihooks)){ |
|
| 165 | - $chook = new Hook($array_hook[1], $array_hook[2]); |
|
| 166 | - $chook->subscribe($array_hook[0]); |
|
| 167 | - $chook->setPriority($array_hook[0], $priority); |
|
| 168 | - } |
|
| 169 | - } |
|
| 170 | - } |
|
| 160 | + // Insert hooks not existing yet in the DB |
|
| 161 | + if($phooks !== null){ |
|
| 162 | + foreach($phooks as $phook => $priority){ |
|
| 163 | + $array_hook = explode('#', $phook); |
|
| 164 | + if($ihooks === null || !array_key_exists($phook, $ihooks)){ |
|
| 165 | + $chook = new Hook($array_hook[1], $array_hook[2]); |
|
| 166 | + $chook->subscribe($array_hook[0]); |
|
| 167 | + $chook->setPriority($array_hook[0], $priority); |
|
| 168 | + } |
|
| 169 | + } |
|
| 170 | + } |
|
| 171 | 171 | |
| 172 | - //Remove hooks not existing any more in the file system |
|
| 173 | - if($ihooks !== null){ |
|
| 174 | - foreach(array_keys($ihooks) as $ihook){ |
|
| 175 | - $array_hook = explode('#', $ihook); |
|
| 176 | - if($phooks === null || !array_key_exists($ihook, $phooks)){ |
|
| 177 | - $chook = new Hook($array_hook[1], $array_hook[2]); |
|
| 178 | - $chook->remove($array_hook[0]); |
|
| 179 | - } |
|
| 180 | - } |
|
| 181 | - } |
|
| 182 | - } |
|
| 172 | + //Remove hooks not existing any more in the file system |
|
| 173 | + if($ihooks !== null){ |
|
| 174 | + foreach(array_keys($ihooks) as $ihook){ |
|
| 175 | + $array_hook = explode('#', $ihook); |
|
| 176 | + if($phooks === null || !array_key_exists($ihook, $phooks)){ |
|
| 177 | + $chook = new Hook($array_hook[1], $array_hook[2]); |
|
| 178 | + $chook->remove($array_hook[0]); |
|
| 179 | + } |
|
| 180 | + } |
|
| 181 | + } |
|
| 182 | + } |
|
| 183 | 183 | } |
| 184 | 184 | |
| 185 | 185 | } |
| 186 | 186 | \ No newline at end of file |
@@ -71,7 +71,7 @@ discard block |
||
| 71 | 71 | * @see \MyArtJaub\Webtrees\Hook\HookProviderInterface::getPossibleHooks() |
| 72 | 72 | */ |
| 73 | 73 | public function getPossibleHooks() { |
| 74 | - static $hooks=null; |
|
| 74 | + static $hooks = null; |
|
| 75 | 75 | if ($hooks === null) { |
| 76 | 76 | $hooks = array(); |
| 77 | 77 | |
@@ -83,31 +83,31 @@ discard block |
||
| 83 | 83 | 'SELECT module_name FROM `##module`' |
| 84 | 84 | )->fetchOneColumn(); |
| 85 | 85 | |
| 86 | - foreach($module_names as $module_name) { |
|
| 86 | + foreach ($module_names as $module_name) { |
|
| 87 | 87 | $module = Module::getModuleByName($module_name); |
| 88 | 88 | |
| 89 | - if($module instanceof HookSubscriberInterface){ |
|
| 89 | + if ($module instanceof HookSubscriberInterface) { |
|
| 90 | 90 | $subscribedhooks = $module->getSubscribedHooks(); |
| 91 | - if(is_array($subscribedhooks)){ |
|
| 92 | - foreach($subscribedhooks as $key => $value){ |
|
| 93 | - if(is_int($key)) { |
|
| 91 | + if (is_array($subscribedhooks)) { |
|
| 92 | + foreach ($subscribedhooks as $key => $value) { |
|
| 93 | + if (is_int($key)) { |
|
| 94 | 94 | $hook_item = $value; |
| 95 | 95 | $priority = self::DEFAULT_PRIORITY; |
| 96 | 96 | } |
| 97 | - else{ |
|
| 97 | + else { |
|
| 98 | 98 | $hook_item = explode('#', $key, 2); |
| 99 | 99 | $priority = $value; |
| 100 | 100 | } |
| 101 | - if($hook_item && count($hook_item) == 2){ |
|
| 101 | + if ($hook_item && count($hook_item) == 2) { |
|
| 102 | 102 | $hook_func = $hook_item[0]; |
| 103 | 103 | $hook_cont = $hook_item[1]; |
| 104 | 104 | } |
| 105 | - else{ |
|
| 105 | + else { |
|
| 106 | 106 | $hook_func = $hook_item[0]; |
| 107 | 107 | $hook_cont = 'all'; |
| 108 | 108 | } |
| 109 | - if(method_exists($module, $hook_func)){ |
|
| 110 | - $hooks[$module->getName().'#'.$hook_func.'#'.$hook_cont]=$priority; |
|
| 109 | + if (method_exists($module, $hook_func)) { |
|
| 110 | + $hooks[$module->getName().'#'.$hook_func.'#'.$hook_cont] = $priority; |
|
| 111 | 111 | } |
| 112 | 112 | } |
| 113 | 113 | } |
@@ -121,8 +121,8 @@ discard block |
||
| 121 | 121 | * {@inheritDoc} |
| 122 | 122 | * @see \MyArtJaub\Webtrees\Hook\HookProviderInterface::getRawInstalledHooks() |
| 123 | 123 | */ |
| 124 | - public function getRawInstalledHooks(){ |
|
| 125 | - if(self::isModuleOperational()){ |
|
| 124 | + public function getRawInstalledHooks() { |
|
| 125 | + if (self::isModuleOperational()) { |
|
| 126 | 126 | return Database::prepare( |
| 127 | 127 | "SELECT majh_id AS id, majh_module_name AS module, majh_hook_function AS hook, majh_hook_context as context, majh_module_priority AS priority, majh_status AS status". |
| 128 | 128 | " FROM `##maj_hooks`". |
@@ -136,11 +136,11 @@ discard block |
||
| 136 | 136 | * {@inheritDoc} |
| 137 | 137 | * @see \MyArtJaub\Webtrees\Hook\HookProviderInterface::getInstalledHooks() |
| 138 | 138 | */ |
| 139 | - public function getInstalledHooks(){ |
|
| 140 | - static $installedhooks =null; |
|
| 141 | - if($installedhooks===null){ |
|
| 142 | - $dbhooks=self::getRawInstalledHooks(); |
|
| 143 | - foreach($dbhooks as $dbhook){ |
|
| 139 | + public function getInstalledHooks() { |
|
| 140 | + static $installedhooks = null; |
|
| 141 | + if ($installedhooks === null) { |
|
| 142 | + $dbhooks = self::getRawInstalledHooks(); |
|
| 143 | + foreach ($dbhooks as $dbhook) { |
|
| 144 | 144 | $installedhooks[($dbhook->module).'#'.($dbhook->hook).'#'.($dbhook->context)] = array('id' => $dbhook->id, 'status' => $dbhook->status, 'priority' => $dbhook->priority); |
| 145 | 145 | } |
| 146 | 146 | } |
@@ -153,15 +153,15 @@ discard block |
||
| 153 | 153 | */ |
| 154 | 154 | public function updateHooks() { |
| 155 | 155 | |
| 156 | - if(Auth::isAdmin()){ |
|
| 156 | + if (Auth::isAdmin()) { |
|
| 157 | 157 | $ihooks = self::getInstalledHooks(); |
| 158 | 158 | $phooks = self::getPossibleHooks(); |
| 159 | 159 | |
| 160 | 160 | // Insert hooks not existing yet in the DB |
| 161 | - if($phooks !== null){ |
|
| 162 | - foreach($phooks as $phook => $priority){ |
|
| 161 | + if ($phooks !== null) { |
|
| 162 | + foreach ($phooks as $phook => $priority) { |
|
| 163 | 163 | $array_hook = explode('#', $phook); |
| 164 | - if($ihooks === null || !array_key_exists($phook, $ihooks)){ |
|
| 164 | + if ($ihooks === null || !array_key_exists($phook, $ihooks)) { |
|
| 165 | 165 | $chook = new Hook($array_hook[1], $array_hook[2]); |
| 166 | 166 | $chook->subscribe($array_hook[0]); |
| 167 | 167 | $chook->setPriority($array_hook[0], $priority); |
@@ -170,10 +170,10 @@ discard block |
||
| 170 | 170 | } |
| 171 | 171 | |
| 172 | 172 | //Remove hooks not existing any more in the file system |
| 173 | - if($ihooks !== null){ |
|
| 174 | - foreach(array_keys($ihooks) as $ihook){ |
|
| 173 | + if ($ihooks !== null) { |
|
| 174 | + foreach (array_keys($ihooks) as $ihook) { |
|
| 175 | 175 | $array_hook = explode('#', $ihook); |
| 176 | - if($phooks === null || !array_key_exists($ihook, $phooks)){ |
|
| 176 | + if ($phooks === null || !array_key_exists($ihook, $phooks)) { |
|
| 177 | 177 | $chook = new Hook($array_hook[1], $array_hook[2]); |
| 178 | 178 | $chook->remove($array_hook[0]); |
| 179 | 179 | } |