@@ -27,7 +27,7 @@ discard block |
||
| 27 | 27 | * |
| 28 | 28 | * @param \Fisharebest\Webtrees\Place $place_in The Place to extend |
| 29 | 29 | */ |
| 30 | - public function __construct(\Fisharebest\Webtrees\Place $place){ |
|
| 30 | + public function __construct(\Fisharebest\Webtrees\Place $place) { |
|
| 31 | 31 | $this->place = $place; |
| 32 | 32 | } |
| 33 | 33 | |
@@ -39,9 +39,9 @@ discard block |
||
| 39 | 39 | * @param \Fisharebest\Webtrees\Tree $tree |
| 40 | 40 | * @return \MyArtJaub\Webtrees\Place|null Instance of \MyArtJaub\Webtrees\Place, if relevant |
| 41 | 41 | */ |
| 42 | - public static function getIntance($place_str, Tree $tree){ |
|
| 42 | + public static function getIntance($place_str, Tree $tree) { |
|
| 43 | 43 | $dplace = null; |
| 44 | - if(is_string($place_str) && strlen($place_str) > 0){ |
|
| 44 | + if (is_string($place_str) && strlen($place_str) > 0) { |
|
| 45 | 45 | $dplace = new Place(new \Fisharebest\Webtrees\Place($place_str, $tree)); |
| 46 | 46 | } |
| 47 | 47 | return $dplace; |
@@ -52,7 +52,7 @@ discard block |
||
| 52 | 52 | * |
| 53 | 53 | * @return \Fisharebest\Webtrees\Place Embedded place record |
| 54 | 54 | */ |
| 55 | - public function getDerivedPlace(){ |
|
| 55 | + public function getDerivedPlace() { |
|
| 56 | 56 | return $this->place; |
| 57 | 57 | } |
| 58 | 58 | |
@@ -65,8 +65,8 @@ discard block |
||
| 65 | 65 | * @param bool $anchor Option to print a link to placelist |
| 66 | 66 | * @return string HTML code for formatted place |
| 67 | 67 | */ |
| 68 | - public function htmlFormattedName($format, $anchor = false){ |
|
| 69 | - $html=''; |
|
| 68 | + public function htmlFormattedName($format, $anchor = false) { |
|
| 69 | + $html = ''; |
|
| 70 | 70 | |
| 71 | 71 | $levels = array_map('trim', explode(',', $this->place->getGedcomName())); |
| 72 | 72 | $nbLevels = count($levels); |
@@ -74,15 +74,15 @@ discard block |
||
| 74 | 74 | preg_match_all('/%[^%]/', $displayPlace, $matches); |
| 75 | 75 | foreach ($matches[0] as $match2) { |
| 76 | 76 | $index = str_replace('%', '', $match2); |
| 77 | - if(is_numeric($index) && $index >0 && $index <= $nbLevels){ |
|
| 78 | - $displayPlace = str_replace($match2, $levels[$index-1] , $displayPlace); |
|
| 77 | + if (is_numeric($index) && $index > 0 && $index <= $nbLevels) { |
|
| 78 | + $displayPlace = str_replace($match2, $levels[$index - 1], $displayPlace); |
|
| 79 | 79 | } |
| 80 | - else{ |
|
| 81 | - $displayPlace = str_replace($match2, '' , $displayPlace); |
|
| 80 | + else { |
|
| 81 | + $displayPlace = str_replace($match2, '', $displayPlace); |
|
| 82 | 82 | } |
| 83 | 83 | } |
| 84 | 84 | if ($anchor && !Auth::isSearchEngine()) { |
| 85 | - $html .='<a href="' . $this->place->getURL() . '">' . $displayPlace . '</a>'; |
|
| 85 | + $html .= '<a href="'.$this->place->getURL().'">'.$displayPlace.'</a>'; |
|
| 86 | 86 | } else { |
| 87 | 87 | $html .= $displayPlace; |
| 88 | 88 | } |
@@ -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 | } |
@@ -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 | } |
@@ -80,7 +80,7 @@ discard block |
||
| 80 | 80 | * @param string $file Filename containing the task object |
| 81 | 81 | * @param TaskProviderInterface $provider Provider for tasks |
| 82 | 82 | */ |
| 83 | - public function __construct($file, TaskProviderInterface $provider = null){ |
|
| 83 | + public function __construct($file, TaskProviderInterface $provider = null) { |
|
| 84 | 84 | $this->name = trim(basename($file, '.php')); |
| 85 | 85 | $this->provider = $provider; |
| 86 | 86 | } |
@@ -90,7 +90,7 @@ discard block |
||
| 90 | 90 | * |
| 91 | 91 | * @return TaskProviderInterface |
| 92 | 92 | */ |
| 93 | - public function getProvider(){ |
|
| 93 | + public function getProvider() { |
|
| 94 | 94 | return $this->provider; |
| 95 | 95 | } |
| 96 | 96 | |
@@ -100,7 +100,7 @@ discard block |
||
| 100 | 100 | * @param TaskProviderInterface $provider |
| 101 | 101 | * @return self Enable method-chaining |
| 102 | 102 | */ |
| 103 | - public function setProvider(TaskProviderInterface $provider){ |
|
| 103 | + public function setProvider(TaskProviderInterface $provider) { |
|
| 104 | 104 | $this->provider = $provider; |
| 105 | 105 | return $this; |
| 106 | 106 | } |
@@ -115,7 +115,7 @@ discard block |
||
| 115 | 115 | * @param int $nb_occur Number of remaining occurrences, 0 for tasks not limited |
| 116 | 116 | * @param bool $is_running Indicates if the task is currently running |
| 117 | 117 | */ |
| 118 | - public function setParameters($is_enabled, \DateTime $last_updated, $last_result, $frequency, $nb_occur, $is_running){ |
|
| 118 | + public function setParameters($is_enabled, \DateTime $last_updated, $last_result, $frequency, $nb_occur, $is_running) { |
|
| 119 | 119 | $this->is_enabled = $is_enabled; |
| 120 | 120 | $this->last_updated = $last_updated; |
| 121 | 121 | $this->last_result = $last_result; |
@@ -129,7 +129,7 @@ discard block |
||
| 129 | 129 | * |
| 130 | 130 | * @return string |
| 131 | 131 | */ |
| 132 | - public function getName(){ |
|
| 132 | + public function getName() { |
|
| 133 | 133 | return $this->name; |
| 134 | 134 | } |
| 135 | 135 | |
@@ -139,7 +139,7 @@ discard block |
||
| 139 | 139 | * |
| 140 | 140 | * @return boolean True if enabled |
| 141 | 141 | */ |
| 142 | - public function isEnabled(){ |
|
| 142 | + public function isEnabled() { |
|
| 143 | 143 | return $this->is_enabled; |
| 144 | 144 | } |
| 145 | 145 | |
@@ -148,7 +148,7 @@ discard block |
||
| 148 | 148 | * |
| 149 | 149 | * @return \DateTime |
| 150 | 150 | */ |
| 151 | - public function getLastUpdated(){ |
|
| 151 | + public function getLastUpdated() { |
|
| 152 | 152 | return $this->last_updated; |
| 153 | 153 | } |
| 154 | 154 | |
@@ -157,7 +157,7 @@ discard block |
||
| 157 | 157 | * |
| 158 | 158 | * @return bool |
| 159 | 159 | */ |
| 160 | - public function isLastRunSuccess(){ |
|
| 160 | + public function isLastRunSuccess() { |
|
| 161 | 161 | return $this->last_result; |
| 162 | 162 | } |
| 163 | 163 | |
@@ -166,7 +166,7 @@ discard block |
||
| 166 | 166 | * |
| 167 | 167 | * @return int |
| 168 | 168 | */ |
| 169 | - public function getFrequency(){ |
|
| 169 | + public function getFrequency() { |
|
| 170 | 170 | return $this->frequency; |
| 171 | 171 | } |
| 172 | 172 | |
@@ -176,7 +176,7 @@ discard block |
||
| 176 | 176 | * @param int $frequency |
| 177 | 177 | * @return self Enable method-chaining |
| 178 | 178 | */ |
| 179 | - public function setFrequency($frequency){ |
|
| 179 | + public function setFrequency($frequency) { |
|
| 180 | 180 | $this->frequency = $frequency; |
| 181 | 181 | return $this; |
| 182 | 182 | } |
@@ -186,7 +186,7 @@ discard block |
||
| 186 | 186 | * |
| 187 | 187 | * @return int |
| 188 | 188 | */ |
| 189 | - public function getRemainingOccurrences(){ |
|
| 189 | + public function getRemainingOccurrences() { |
|
| 190 | 190 | return $this->nb_occurrences; |
| 191 | 191 | } |
| 192 | 192 | |
@@ -196,7 +196,7 @@ discard block |
||
| 196 | 196 | * @param int $nb_occur |
| 197 | 197 | * @return self Enable method-chaining |
| 198 | 198 | */ |
| 199 | - public function setRemainingOccurrences($nb_occur){ |
|
| 199 | + public function setRemainingOccurrences($nb_occur) { |
|
| 200 | 200 | $this->nb_occurrences = $nb_occur; |
| 201 | 201 | return $this; |
| 202 | 202 | } |
@@ -206,7 +206,7 @@ discard block |
||
| 206 | 206 | * |
| 207 | 207 | * @return bool |
| 208 | 208 | */ |
| 209 | - public function isRunning(){ |
|
| 209 | + public function isRunning() { |
|
| 210 | 210 | return $this->is_running; |
| 211 | 211 | } |
| 212 | 212 | |
@@ -235,7 +235,7 @@ discard block |
||
| 235 | 235 | * @return bool |
| 236 | 236 | */ |
| 237 | 237 | public function save() { |
| 238 | - if(!$this->provider) throw new \Exception('The task has not been initialised with a provider.'); |
|
| 238 | + if (!$this->provider) throw new \Exception('The task has not been initialised with a provider.'); |
|
| 239 | 239 | return $this->provider->updateTask($this); |
| 240 | 240 | } |
| 241 | 241 | |
@@ -243,23 +243,23 @@ discard block |
||
| 243 | 243 | * Execute the task, default skeleton |
| 244 | 244 | * |
| 245 | 245 | */ |
| 246 | - public function execute(){ |
|
| 246 | + public function execute() { |
|
| 247 | 247 | |
| 248 | - if($this->last_updated->add(new \DateInterval('PT'.self::TASK_TIME_OUT.'S')) < new \DateTime()) |
|
| 248 | + if ($this->last_updated->add(new \DateInterval('PT'.self::TASK_TIME_OUT.'S')) < new \DateTime()) |
|
| 249 | 249 | $this->is_running = false; |
| 250 | 250 | |
| 251 | - if(!$this->is_running){ |
|
| 251 | + if (!$this->is_running) { |
|
| 252 | 252 | $this->last_result = false; |
| 253 | 253 | $this->is_running = true; |
| 254 | 254 | $this->save(); |
| 255 | 255 | |
| 256 | 256 | Log::addDebugLog('Start execution of Admin task: '.$this->getTitle()); |
| 257 | 257 | $this->last_result = $this->executeSteps(); |
| 258 | - if($this->last_result){ |
|
| 258 | + if ($this->last_result) { |
|
| 259 | 259 | $this->last_updated = new \DateTime(); |
| 260 | - if($this->nb_occurrences > 0){ |
|
| 260 | + if ($this->nb_occurrences > 0) { |
|
| 261 | 261 | $this->nb_occurrences--; |
| 262 | - if($this->nb_occurrences == 0) $this->is_enabled = false; |
|
| 262 | + if ($this->nb_occurrences == 0) $this->is_enabled = false; |
|
| 263 | 263 | } |
| 264 | 264 | } |
| 265 | 265 | $this->is_running = false; |
@@ -70,34 +70,34 @@ discard block |
||
| 70 | 70 | * @see \MyArtJaub\Webtrees\Hook\HookProviderInterface::getPossibleHooks() |
| 71 | 71 | */ |
| 72 | 72 | public function getPossibleHooks() { |
| 73 | - static $hooks=null; |
|
| 73 | + static $hooks = null; |
|
| 74 | 74 | if ($hooks === null) { |
| 75 | 75 | $hooks = array(); |
| 76 | - foreach (glob(WT_ROOT . WT_MODULES_DIR . '*/module.php') as $file) { |
|
| 76 | + foreach (glob(WT_ROOT.WT_MODULES_DIR.'*/module.php') as $file) { |
|
| 77 | 77 | try { |
| 78 | 78 | $module = include $file; |
| 79 | - if($module instanceof HookSubscriberInterface){ |
|
| 79 | + if ($module instanceof HookSubscriberInterface) { |
|
| 80 | 80 | $subscribedhooks = $module->getSubscribedHooks(); |
| 81 | - if(is_array($subscribedhooks)){ |
|
| 82 | - foreach($subscribedhooks as $key => $value){ |
|
| 83 | - if(is_int($key)) { |
|
| 81 | + if (is_array($subscribedhooks)) { |
|
| 82 | + foreach ($subscribedhooks as $key => $value) { |
|
| 83 | + if (is_int($key)) { |
|
| 84 | 84 | $hook_item = $value; |
| 85 | 85 | $priority = self::DEFAULT_PRIORITY; |
| 86 | 86 | } |
| 87 | - else{ |
|
| 87 | + else { |
|
| 88 | 88 | $hook_item = explode('#', $key, 2); |
| 89 | 89 | $priority = $value; |
| 90 | 90 | } |
| 91 | - if($hook_item && count($hook_item) == 2){ |
|
| 91 | + if ($hook_item && count($hook_item) == 2) { |
|
| 92 | 92 | $hook_func = $hook_item[0]; |
| 93 | 93 | $hook_cont = $hook_item[1]; |
| 94 | 94 | } |
| 95 | - else{ |
|
| 95 | + else { |
|
| 96 | 96 | $hook_func = $hook_item[0]; |
| 97 | 97 | $hook_cont = 'all'; |
| 98 | 98 | } |
| 99 | - if(method_exists($module, $hook_func)){ |
|
| 100 | - $hooks[$module->getName().'#'.$hook_func.'#'.$hook_cont]=$priority; |
|
| 99 | + if (method_exists($module, $hook_func)) { |
|
| 100 | + $hooks[$module->getName().'#'.$hook_func.'#'.$hook_cont] = $priority; |
|
| 101 | 101 | } |
| 102 | 102 | } |
| 103 | 103 | } |
@@ -114,8 +114,8 @@ discard block |
||
| 114 | 114 | * {@inheritDoc} |
| 115 | 115 | * @see \MyArtJaub\Webtrees\Hook\HookProviderInterface::getRawInstalledHooks() |
| 116 | 116 | */ |
| 117 | - public function getRawInstalledHooks(){ |
|
| 118 | - if(self::isModuleOperational()){ |
|
| 117 | + public function getRawInstalledHooks() { |
|
| 118 | + if (self::isModuleOperational()) { |
|
| 119 | 119 | return fw\Database::prepare( |
| 120 | 120 | "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". |
| 121 | 121 | " FROM `##maj_hooks`". |
@@ -129,11 +129,11 @@ discard block |
||
| 129 | 129 | * {@inheritDoc} |
| 130 | 130 | * @see \MyArtJaub\Webtrees\Hook\HookProviderInterface::getInstalledHooks() |
| 131 | 131 | */ |
| 132 | - public function getInstalledHooks(){ |
|
| 133 | - static $installedhooks =null; |
|
| 134 | - if($installedhooks===null){ |
|
| 135 | - $dbhooks=self::getRawInstalledHooks(); |
|
| 136 | - foreach($dbhooks as $dbhook){ |
|
| 132 | + public function getInstalledHooks() { |
|
| 133 | + static $installedhooks = null; |
|
| 134 | + if ($installedhooks === null) { |
|
| 135 | + $dbhooks = self::getRawInstalledHooks(); |
|
| 136 | + foreach ($dbhooks as $dbhook) { |
|
| 137 | 137 | $installedhooks[($dbhook->module).'#'.($dbhook->hook).'#'.($dbhook->context)] = array('id' => $dbhook->id, 'status' => $dbhook->status, 'priority' => $dbhook->priority); |
| 138 | 138 | } |
| 139 | 139 | } |
@@ -146,15 +146,15 @@ discard block |
||
| 146 | 146 | */ |
| 147 | 147 | public function updateHooks() { |
| 148 | 148 | |
| 149 | - if(Auth::isAdmin()){ |
|
| 149 | + if (Auth::isAdmin()) { |
|
| 150 | 150 | $ihooks = self::getInstalledHooks(); |
| 151 | 151 | $phooks = self::getPossibleHooks(); |
| 152 | 152 | |
| 153 | 153 | // Insert hooks not existing yet in the DB |
| 154 | - if($phooks !== null){ |
|
| 155 | - foreach($phooks as $phook => $priority){ |
|
| 154 | + if ($phooks !== null) { |
|
| 155 | + foreach ($phooks as $phook => $priority) { |
|
| 156 | 156 | $array_hook = explode('#', $phook); |
| 157 | - if($ihooks === null || !array_key_exists($phook, $ihooks)){ |
|
| 157 | + if ($ihooks === null || !array_key_exists($phook, $ihooks)) { |
|
| 158 | 158 | $chook = new Hook($array_hook[1], $array_hook[2]); |
| 159 | 159 | $chook->subscribe($array_hook[0]); |
| 160 | 160 | $chook->setPriority($array_hook[0], $priority); |
@@ -163,10 +163,10 @@ discard block |
||
| 163 | 163 | } |
| 164 | 164 | |
| 165 | 165 | //Remove hooks not existing any more in the file system |
| 166 | - if($ihooks !== null){ |
|
| 167 | - foreach($ihooks as $ihook => $status){ |
|
| 166 | + if ($ihooks !== null) { |
|
| 167 | + foreach ($ihooks as $ihook => $status) { |
|
| 168 | 168 | $array_hook = explode('#', $ihook); |
| 169 | - if($phooks === null || !array_key_exists($ihook, $phooks)){ |
|
| 169 | + if ($phooks === null || !array_key_exists($ihook, $phooks)) { |
|
| 170 | 170 | $chook = new Hook($array_hook[1], $array_hook[2]); |
| 171 | 171 | $chook->remove($array_hook[0]); |
| 172 | 172 | } |
@@ -30,7 +30,7 @@ discard block |
||
| 30 | 30 | * @param string $hook_function_in Hook function to be subscribed or executed |
| 31 | 31 | * @param string $hook_context_in Hook context to be subscribed or executed |
| 32 | 32 | */ |
| 33 | - public function __construct($hook_function_in, $hook_context_in = 'all'){ |
|
| 33 | + public function __construct($hook_function_in, $hook_context_in = 'all') { |
|
| 34 | 34 | $this->hook_function = $hook_function_in; |
| 35 | 35 | $this->hook_context = $hook_context_in; |
| 36 | 36 | } |
@@ -46,8 +46,8 @@ discard block |
||
| 46 | 46 | * |
| 47 | 47 | * @param string $hsubscriber Name of the subscriber module |
| 48 | 48 | */ |
| 49 | - public function subscribe($hsubscriber){ |
|
| 50 | - if(HookProvider::getInstance()->isModuleOperational()){ |
|
| 49 | + public function subscribe($hsubscriber) { |
|
| 50 | + if (HookProvider::getInstance()->isModuleOperational()) { |
|
| 51 | 51 | $statement = fw\Database::prepare( |
| 52 | 52 | "INSERT IGNORE INTO `##maj_hooks` (majh_hook_function, majh_hook_context, majh_module_name)". |
| 53 | 53 | " VALUES (?, ?, ?)" |
@@ -61,8 +61,8 @@ discard block |
||
| 61 | 61 | * @param string $hsubscriber Name of the subscriber module |
| 62 | 62 | * @param int $priority Priority of execution |
| 63 | 63 | */ |
| 64 | - public function setPriority($hsubscriber, $priority){ |
|
| 65 | - if(HookProvider::getInstance()->isModuleOperational()){ |
|
| 64 | + public function setPriority($hsubscriber, $priority) { |
|
| 65 | + if (HookProvider::getInstance()->isModuleOperational()) { |
|
| 66 | 66 | fw\Database::prepare( |
| 67 | 67 | "UPDATE `##maj_hooks`". |
| 68 | 68 | " SET majh_module_priority=?". |
@@ -78,8 +78,8 @@ discard block |
||
| 78 | 78 | * |
| 79 | 79 | * @param string $hsubscriber Name of the subscriber module |
| 80 | 80 | */ |
| 81 | - public function enable($hsubscriber){ |
|
| 82 | - if(HookProvider::getInstance()->isModuleOperational()){ |
|
| 81 | + public function enable($hsubscriber) { |
|
| 82 | + if (HookProvider::getInstance()->isModuleOperational()) { |
|
| 83 | 83 | fw\Database::prepare( |
| 84 | 84 | "UPDATE `##maj_hooks`". |
| 85 | 85 | " SET majh_status='enabled'". |
@@ -95,8 +95,8 @@ discard block |
||
| 95 | 95 | * |
| 96 | 96 | * @param string $hsubscriber Name of the subscriber module |
| 97 | 97 | */ |
| 98 | - public function disable($hsubscriber){ |
|
| 99 | - if(HookProvider::getInstance()->isModuleOperational()){ |
|
| 98 | + public function disable($hsubscriber) { |
|
| 99 | + if (HookProvider::getInstance()->isModuleOperational()) { |
|
| 100 | 100 | fw\Database::prepare( |
| 101 | 101 | "UPDATE `##maj_hooks`". |
| 102 | 102 | " SET majh_status='disabled'". |
@@ -112,8 +112,8 @@ discard block |
||
| 112 | 112 | * |
| 113 | 113 | * @param string $hsubscriber Name of the subscriber module |
| 114 | 114 | */ |
| 115 | - public function remove($hsubscriber){ |
|
| 116 | - if(HookProvider::getInstance()->isModuleOperational()){ |
|
| 115 | + public function remove($hsubscriber) { |
|
| 116 | + if (HookProvider::getInstance()->isModuleOperational()) { |
|
| 117 | 117 | fw\Database::prepare( |
| 118 | 118 | "DELETE FROM `##maj_hooks`". |
| 119 | 119 | " WHERE majh_hook_function=?". |
@@ -135,24 +135,24 @@ discard block |
||
| 135 | 135 | * |
| 136 | 136 | * @return array Results of the hook executions |
| 137 | 137 | */ |
| 138 | - public function execute(){ |
|
| 138 | + public function execute() { |
|
| 139 | 139 | $result = array(); |
| 140 | - if(HookProvider::getInstance()->isModuleOperational()){ |
|
| 140 | + if (HookProvider::getInstance()->isModuleOperational()) { |
|
| 141 | 141 | $params = func_get_args(); |
| 142 | 142 | $sqlquery = ''; |
| 143 | 143 | $sqlparams = array($this->hook_function); |
| 144 | - if($this->hook_context != 'all') { |
|
| 144 | + if ($this->hook_context != 'all') { |
|
| 145 | 145 | $sqlparams = array($this->hook_function, $this->hook_context); |
| 146 | 146 | $sqlquery = " OR majh_hook_context=?"; |
| 147 | 147 | } |
| 148 | - $module_names=fw\Database::prepare( |
|
| 148 | + $module_names = fw\Database::prepare( |
|
| 149 | 149 | "SELECT majh_module_name AS module, majh_module_priority AS priority FROM `##maj_hooks`". |
| 150 | 150 | " WHERE majh_hook_function = ? AND (majh_hook_context='all'".$sqlquery.") AND majh_status='enabled'". |
| 151 | 151 | " ORDER BY majh_module_priority ASC, module ASC" |
| 152 | 152 | )->execute($sqlparams)->fetchAssoc(); |
| 153 | 153 | asort($module_names); |
| 154 | 154 | foreach ($module_names as $module_name => $module_priority) { |
| 155 | - $module = include WT_ROOT . WT_MODULES_DIR . $module_name . '/module.php'; |
|
| 155 | + $module = include WT_ROOT.WT_MODULES_DIR.$module_name.'/module.php'; |
|
| 156 | 156 | $result[] = call_user_func_array(array($module, $this->hook_function), $params); |
| 157 | 157 | } |
| 158 | 158 | } |
@@ -164,15 +164,15 @@ discard block |
||
| 164 | 164 | * |
| 165 | 165 | * @return int Number of active modules |
| 166 | 166 | */ |
| 167 | - public function getNumberActiveModules(){ |
|
| 168 | - if(HookProvider::getInstance()->isModuleOperational()){ |
|
| 167 | + public function getNumberActiveModules() { |
|
| 168 | + if (HookProvider::getInstance()->isModuleOperational()) { |
|
| 169 | 169 | $sqlquery = ''; |
| 170 | 170 | $sqlparams = array($this->hook_function); |
| 171 | - if($this->hook_context != 'all') { |
|
| 171 | + if ($this->hook_context != 'all') { |
|
| 172 | 172 | $sqlparams = array($this->hook_function, $this->hook_context); |
| 173 | 173 | $sqlquery = " OR majh_hook_context=?"; |
| 174 | 174 | } |
| 175 | - $module_names=fw\Database::prepare( |
|
| 175 | + $module_names = fw\Database::prepare( |
|
| 176 | 176 | "SELECT majh_module_name AS modules FROM `##maj_hooks`". |
| 177 | 177 | " WHERE majh_hook_function = ? AND (majh_hook_context='all'".$sqlquery.") AND majh_status='enabled'" |
| 178 | 178 | )->execute($sqlparams)->fetchOneColumn(); |
@@ -186,8 +186,8 @@ discard block |
||
| 186 | 186 | * |
| 187 | 187 | * @return bool True is active modules exist, false otherwise |
| 188 | 188 | */ |
| 189 | - public function hasAnyActiveModule(){ |
|
| 190 | - return ($this->getNumberActiveModules()>0); |
|
| 189 | + public function hasAnyActiveModule() { |
|
| 190 | + return ($this->getNumberActiveModules() > 0); |
|
| 191 | 191 | } |
| 192 | 192 | |
| 193 | 193 | } |
@@ -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 | |