@@ -26,7 +26,7 @@ |
||
26 | 26 | /** |
27 | 27 | * Contructor for the decorator |
28 | 28 | * |
29 | - * @param \Fisharebest\Webtrees\Place $place_in The Place to extend |
|
29 | + * @param \Fisharebest\Webtrees\Place $place The Place to extend |
|
30 | 30 | */ |
31 | 31 | public function __construct(\Fisharebest\Webtrees\Place $place){ |
32 | 32 | $this->_place = $place; |
@@ -77,8 +77,7 @@ |
||
77 | 77 | $index = str_replace('%', '', $match2); |
78 | 78 | if(is_numeric($index) && $index >0 && $index <= $nbLevels){ |
79 | 79 | $displayPlace = str_replace($match2, $levels[$index-1] , $displayPlace); |
80 | - } |
|
81 | - else{ |
|
80 | + } else{ |
|
82 | 81 | $displayPlace = str_replace($match2, '' , $displayPlace); |
83 | 82 | } |
84 | 83 | } |
@@ -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 | } |
@@ -14,17 +14,17 @@ discard block |
||
14 | 14 | */ |
15 | 15 | class Constants { |
16 | 16 | |
17 | - const LIB_NAMESPACE = __NAMESPACE__; |
|
17 | + const LIB_NAMESPACE = __NAMESPACE__; |
|
18 | 18 | |
19 | - /** Internal name of the Certificates Module |
|
20 | - * @var string |
|
21 | - */ |
|
22 | - const MODULE_MAJ_CERTIF_NAME = 'myartjaub_certificates'; |
|
19 | + /** Internal name of the Certificates Module |
|
20 | + * @var string |
|
21 | + */ |
|
22 | + const MODULE_MAJ_CERTIF_NAME = 'myartjaub_certificates'; |
|
23 | 23 | |
24 | - /** Internal name of the GeoDispersion Module |
|
25 | - * @var string |
|
26 | - */ |
|
27 | - const MODULE_MAJ_GEODISP_NAME = 'myartjaub_geodispersion'; |
|
24 | + /** Internal name of the GeoDispersion Module |
|
25 | + * @var string |
|
26 | + */ |
|
27 | + const MODULE_MAJ_GEODISP_NAME = 'myartjaub_geodispersion'; |
|
28 | 28 | |
29 | 29 | /** Internal name of the Hooks Module |
30 | 30 | * @var string |
@@ -61,7 +61,7 @@ discard block |
||
61 | 61 | * @return string $WT_RAPHAEL_JS_URL |
62 | 62 | */ |
63 | 63 | public static function WT_RAPHAEL_JS_URL() { |
64 | - return WT_STATIC_URL . 'packages/raphael-2.1.4/raphael-min.js'; |
|
64 | + return WT_STATIC_URL . 'packages/raphael-2.1.4/raphael-min.js'; |
|
65 | 65 | } |
66 | 66 | |
67 | 67 | } |
68 | 68 | \ No newline at end of file |
@@ -61,7 +61,7 @@ |
||
61 | 61 | * @return string $WT_RAPHAEL_JS_URL |
62 | 62 | */ |
63 | 63 | public static function WT_RAPHAEL_JS_URL() { |
64 | - return WT_STATIC_URL . 'packages/raphael-2.1.4/raphael-min.js'; |
|
64 | + return WT_STATIC_URL.'packages/raphael-2.1.4/raphael-min.js'; |
|
65 | 65 | } |
66 | 66 | |
67 | 67 | } |
68 | 68 | \ No newline at end of file |
@@ -30,11 +30,16 @@ |
||
30 | 30 | $place_id = 0; |
31 | 31 | for ($i=0; $i<count($parent); $i++) { |
32 | 32 | $parent[$i] = trim($parent[$i]); |
33 | - if (empty($parent[$i])) $parent[$i]='unknown';// GoogleMap module uses "unknown" while GEDCOM uses , , |
|
33 | + if (empty($parent[$i])) { |
|
34 | + $parent[$i]='unknown'; |
|
35 | + } |
|
36 | + // GoogleMap module uses "unknown" while GEDCOM uses , , |
|
34 | 37 | $pl_id=Database::prepare('SELECT pl_id FROM `##placelocation` WHERE pl_level=? AND pl_parent_id=? AND pl_place LIKE ? ORDER BY pl_place') |
35 | 38 | ->execute(array($i, $place_id, $parent[$i])) |
36 | 39 | ->fetchOne(); |
37 | - if (empty($pl_id)) break; |
|
40 | + if (empty($pl_id)) { |
|
41 | + break; |
|
42 | + } |
|
38 | 43 | $place_id = $pl_id; |
39 | 44 | } |
40 | 45 | return $place_id; |
@@ -25,14 +25,14 @@ discard block |
||
25 | 25 | * @see \MyArtJaub\Webtrees\Map\MapProviderInterface::getProviderPlaceId() |
26 | 26 | */ |
27 | 27 | public function getProviderPlaceId(\Fisharebest\Webtrees\Place $place) { |
28 | - if(!$place->isEmpty()) { |
|
29 | - $parent = explode (',', $place->getGedcomName()); |
|
28 | + if (!$place->isEmpty()) { |
|
29 | + $parent = explode(',', $place->getGedcomName()); |
|
30 | 30 | $place_id = 0; |
31 | 31 | $nb_levels = count($parent); |
32 | - for ($i=0; $i < $nb_levels; $i++) { |
|
32 | + for ($i = 0; $i < $nb_levels; $i++) { |
|
33 | 33 | $parent[$i] = trim($parent[$i]); |
34 | - if (empty($parent[$i])) $parent[$i]='unknown';// GoogleMap module uses "unknown" while GEDCOM uses , , |
|
35 | - $pl_id=Database::prepare('SELECT pl_id FROM `##placelocation` WHERE pl_level=? AND pl_parent_id=? AND pl_place LIKE ? ORDER BY pl_place') |
|
34 | + if (empty($parent[$i])) $parent[$i] = 'unknown'; // GoogleMap module uses "unknown" while GEDCOM uses , , |
|
35 | + $pl_id = Database::prepare('SELECT pl_id FROM `##placelocation` WHERE pl_level=? AND pl_parent_id=? AND pl_place LIKE ? ORDER BY pl_place') |
|
36 | 36 | ->execute(array($i, $place_id, $parent[$i])) |
37 | 37 | ->fetchOne(); |
38 | 38 | if (empty($pl_id)) break; |
@@ -48,12 +48,12 @@ discard block |
||
48 | 48 | * @see \MyArtJaub\Webtrees\Map\MapProviderInterface::getPlaceIcon() |
49 | 49 | */ |
50 | 50 | public function getPlaceIcon(\Fisharebest\Webtrees\Place $place) { |
51 | - if(!$place->isEmpty()){ |
|
51 | + if (!$place->isEmpty()) { |
|
52 | 52 | $place_details = |
53 | 53 | Database::prepare("SELECT SQL_CACHE pl_icon FROM `##placelocation` WHERE pl_id=? ORDER BY pl_place") |
54 | 54 | ->execute(array($this->getProviderPlaceId($place))) |
55 | 55 | ->fetchOneRow(); |
56 | - if($place_details){ |
|
56 | + if ($place_details) { |
|
57 | 57 | return WT_MODULES_DIR.'googlemap/'.$place_details->pl_icon; |
58 | 58 | } |
59 | 59 | } |
@@ -61,7 +61,7 @@ discard block |
||
61 | 61 | * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\IndividualHeaderExtender::hExtendIndiHeaderIcons() |
62 | 62 | */ |
63 | 63 | public function hExtendIndiHeaderIcons(IndividualController $ctrlIndi) { |
64 | - if($ctrlIndi){ |
|
64 | + if ($ctrlIndi) { |
|
65 | 65 | $dindi = new Individual($ctrlIndi->getSignificantIndividual()); |
66 | 66 | if ($dindi->canDisplayIsSourced()) |
67 | 67 | return FunctionsPrint::formatIsSourcedIcon('R', $dindi->isSourced(), 'INDI', 1, 'large'); |
@@ -85,19 +85,19 @@ discard block |
||
85 | 85 | * {@inheritDoc} |
86 | 86 | * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\RecordNameTextExtender::hRecordNamePrepend() |
87 | 87 | */ |
88 | - public function hRecordNamePrepend(GedcomRecord $grec){ } |
|
88 | + public function hRecordNamePrepend(GedcomRecord $grec) { } |
|
89 | 89 | |
90 | 90 | /** |
91 | 91 | * {@inheritDoc} |
92 | 92 | * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\RecordNameTextExtender::hRecordNameAppend() |
93 | 93 | */ |
94 | - public function hRecordNameAppend(GedcomRecord $grec){ |
|
94 | + public function hRecordNameAppend(GedcomRecord $grec) { |
|
95 | 95 | $html = ''; |
96 | - if($grec instanceof \Fisharebest\Webtrees\Individual){ |
|
96 | + if ($grec instanceof \Fisharebest\Webtrees\Individual) { |
|
97 | 97 | $dindi = new Individual($grec); |
98 | 98 | $html .= FunctionsPrint::formatIsSourcedIcon('R', $dindi->isSourced(), 'INDI', 1, 'small'); |
99 | 99 | $html .= FunctionsPrint::formatIsSourcedIcon('E', $dindi->isBirthSourced(), 'BIRT', 1, 'small'); |
100 | - if($grec->isDead()) |
|
100 | + if ($grec->isDead()) |
|
101 | 101 | $html .= FunctionsPrint::formatIsSourcedIcon('E', $dindi->isDeathSourced(), 'DEAT', 1, 'small'); |
102 | 102 | } |
103 | 103 | return $html; |
@@ -115,7 +115,7 @@ discard block |
||
115 | 115 | * {@inheritDoc} |
116 | 116 | * @see \Fisharebest\Webtrees\Module\ModuleSidebarInterface::hasSidebarContent() |
117 | 117 | */ |
118 | - public function hasSidebarContent(){ |
|
118 | + public function hasSidebarContent() { |
|
119 | 119 | return true; |
120 | 120 | } |
121 | 121 | |
@@ -145,24 +145,24 @@ discard block |
||
145 | 145 | echo ' |
146 | 146 | <table class="issourcedtable"> |
147 | 147 | <tr> |
148 | - <td class="slabel"> ' . GedcomTag::getLabel('INDI') . '</td> |
|
148 | + <td class="slabel"> ' . GedcomTag::getLabel('INDI').'</td> |
|
149 | 149 | <td class="svalue">' . FunctionsPrint::formatIsSourcedIcon('R', $dindi->isSourced(), 'INDI', 1).'</td> |
150 | 150 | </tr> |
151 | 151 | <tr> |
152 | - <td class="slabel">' . GedcomTag::getLabel('BIRT') . '</td> |
|
152 | + <td class="slabel">' . GedcomTag::getLabel('BIRT').'</td> |
|
153 | 153 | <td class="svalue">' . FunctionsPrint::formatIsSourcedIcon('E', $dindi->isBirthSourced(), 'BIRT', 1).'</td> |
154 | 154 | </tr>'; |
155 | 155 | |
156 | 156 | $fams = $root->getSpouseFamilies(); |
157 | - ($ct = count($fams)) > 1 ? $nb=1 : $nb=' '; |
|
158 | - foreach($fams as $fam){ |
|
157 | + ($ct = count($fams)) > 1 ? $nb = 1 : $nb = ' '; |
|
158 | + foreach ($fams as $fam) { |
|
159 | 159 | $dfam = new Family($fam); |
160 | 160 | echo ' |
161 | 161 | <tr> |
162 | 162 | <td class="slabel right"> |
163 | - <a href="' . $fam->getHtmlUrl() . '"> '. GedcomTag::getLabel('MARR'); |
|
164 | - if($ct > 1){ |
|
165 | - echo ' ',$nb; |
|
163 | + <a href="' . $fam->getHtmlUrl().'"> '.GedcomTag::getLabel('MARR'); |
|
164 | + if ($ct > 1) { |
|
165 | + echo ' ', $nb; |
|
166 | 166 | $nb++; |
167 | 167 | } |
168 | 168 | echo ' </a> |
@@ -171,10 +171,10 @@ discard block |
||
171 | 171 | </tr>'; |
172 | 172 | } |
173 | 173 | |
174 | - if( $root->isDead() ) |
|
174 | + if ($root->isDead()) |
|
175 | 175 | echo ' |
176 | 176 | <tr> |
177 | - <td class="slabel">' . GedcomTag::getLabel('DEAT') . '</td> |
|
177 | + <td class="slabel">' . GedcomTag::getLabel('DEAT').'</td> |
|
178 | 178 | <td class="svalue">' . FunctionsPrint::formatIsSourcedIcon('E', $dindi->isDeathSourced(), 'DEAT', 1).'</td> |
179 | 179 | </tr>'; |
180 | 180 |
@@ -63,8 +63,9 @@ discard block |
||
63 | 63 | public function hExtendIndiHeaderIcons(IndividualController $ctrlIndi) { |
64 | 64 | if($ctrlIndi){ |
65 | 65 | $dindi = new Individual($ctrlIndi->getSignificantIndividual()); |
66 | - if ($dindi->canDisplayIsSourced()) |
|
67 | - return FunctionsPrint::formatIsSourcedIcon('R', $dindi->isSourced(), 'INDI', 1, 'large'); |
|
66 | + if ($dindi->canDisplayIsSourced()) { |
|
67 | + return FunctionsPrint::formatIsSourcedIcon('R', $dindi->isSourced(), 'INDI', 1, 'large'); |
|
68 | + } |
|
68 | 69 | } |
69 | 70 | return ''; |
70 | 71 | } |
@@ -97,8 +98,9 @@ discard block |
||
97 | 98 | $dindi = new Individual($grec); |
98 | 99 | $html .= FunctionsPrint::formatIsSourcedIcon('R', $dindi->isSourced(), 'INDI', 1, 'small'); |
99 | 100 | $html .= FunctionsPrint::formatIsSourcedIcon('E', $dindi->isBirthSourced(), 'BIRT', 1, 'small'); |
100 | - if($grec->isDead()) |
|
101 | - $html .= FunctionsPrint::formatIsSourcedIcon('E', $dindi->isDeathSourced(), 'DEAT', 1, 'small'); |
|
101 | + if($grec->isDead()) { |
|
102 | + $html .= FunctionsPrint::formatIsSourcedIcon('E', $dindi->isDeathSourced(), 'DEAT', 1, 'small'); |
|
103 | + } |
|
102 | 104 | } |
103 | 105 | return $html; |
104 | 106 | } |
@@ -171,12 +173,13 @@ discard block |
||
171 | 173 | </tr>'; |
172 | 174 | } |
173 | 175 | |
174 | - if( $root->isDead() ) |
|
175 | - echo ' |
|
176 | + if( $root->isDead() ) { |
|
177 | + echo ' |
|
176 | 178 | <tr> |
177 | 179 | <td class="slabel">' . GedcomTag::getLabel('DEAT') . '</td> |
178 | 180 | <td class="svalue">' . FunctionsPrint::formatIsSourcedIcon('E', $dindi->isDeathSourced(), 'DEAT', 1).'</td> |
179 | 181 | </tr>'; |
182 | + } |
|
180 | 183 | |
181 | 184 | echo '</table>'; |
182 | 185 | } |
@@ -28,29 +28,29 @@ discard block |
||
28 | 28 | class IsSourcedModule extends AbstractModule |
29 | 29 | implements ModuleSidebarInterface, HookSubscriberInterface, IndividualHeaderExtenderInterface, RecordNameTextExtenderInterface |
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 | - * {@inheritDoc} |
|
36 | - * @see \Fisharebest\Webtrees\Module\AbstractModule::getTitle() |
|
37 | - */ |
|
38 | - public function getTitle() { |
|
39 | - return I18N::translate('Sourced events'); |
|
40 | - } |
|
34 | + /** |
|
35 | + * {@inheritDoc} |
|
36 | + * @see \Fisharebest\Webtrees\Module\AbstractModule::getTitle() |
|
37 | + */ |
|
38 | + public function getTitle() { |
|
39 | + return I18N::translate('Sourced events'); |
|
40 | + } |
|
41 | 41 | |
42 | 42 | /** |
43 | 43 | * {@inheritDoc} |
44 | 44 | * @see \Fisharebest\Webtrees\Module\AbstractModule::getDescription() |
45 | 45 | */ |
46 | - public function getDescription() { |
|
47 | - return I18N::translate('Indicate if events related to an record are sourced.'); |
|
48 | - } |
|
46 | + public function getDescription() { |
|
47 | + return I18N::translate('Indicate if events related to an record are sourced.'); |
|
48 | + } |
|
49 | 49 | |
50 | - /** |
|
51 | - * {@inheritDoc} |
|
52 | - * @see \MyArtJaub\Webtrees\Hook\HookSubscriberInterface::getSubscribedHooks() |
|
53 | - */ |
|
50 | + /** |
|
51 | + * {@inheritDoc} |
|
52 | + * @see \MyArtJaub\Webtrees\Hook\HookSubscriberInterface::getSubscribedHooks() |
|
53 | + */ |
|
54 | 54 | public function getSubscribedHooks() { |
55 | 55 | return array( |
56 | 56 | 'hExtendIndiHeaderIcons' => 10, |
@@ -63,12 +63,12 @@ discard block |
||
63 | 63 | * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\IndividualHeaderExtenderInterface::hExtendIndiHeaderIcons() |
64 | 64 | */ |
65 | 65 | public function hExtendIndiHeaderIcons(IndividualController $ctrlIndi) { |
66 | - if($ctrlIndi){ |
|
67 | - $dindi = new Individual($ctrlIndi->getSignificantIndividual()); |
|
68 | - if ($dindi->canDisplayIsSourced()) |
|
69 | - return FunctionsPrint::formatIsSourcedIcon('R', $dindi->isSourced(), 'INDI', 1, 'large'); |
|
70 | - } |
|
71 | - return ''; |
|
66 | + if($ctrlIndi){ |
|
67 | + $dindi = new Individual($ctrlIndi->getSignificantIndividual()); |
|
68 | + if ($dindi->canDisplayIsSourced()) |
|
69 | + return FunctionsPrint::formatIsSourcedIcon('R', $dindi->isSourced(), 'INDI', 1, 'large'); |
|
70 | + } |
|
71 | + return ''; |
|
72 | 72 | } |
73 | 73 | |
74 | 74 | /** |
@@ -94,15 +94,15 @@ discard block |
||
94 | 94 | * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\RecordNameTextExtenderInterface::hRecordNameAppend() |
95 | 95 | */ |
96 | 96 | public function hRecordNameAppend(GedcomRecord $grec){ |
97 | - $html = ''; |
|
98 | - if($grec instanceof \Fisharebest\Webtrees\Individual){ |
|
99 | - $dindi = new Individual($grec); |
|
100 | - $html .= FunctionsPrint::formatIsSourcedIcon('R', $dindi->isSourced(), 'INDI', 1, 'small'); |
|
101 | - $html .= FunctionsPrint::formatIsSourcedIcon('E', $dindi->isBirthSourced(), 'BIRT', 1, 'small'); |
|
102 | - if($grec->isDead()) |
|
103 | - $html .= FunctionsPrint::formatIsSourcedIcon('E', $dindi->isDeathSourced(), 'DEAT', 1, 'small'); |
|
104 | - } |
|
105 | - return $html; |
|
97 | + $html = ''; |
|
98 | + if($grec instanceof \Fisharebest\Webtrees\Individual){ |
|
99 | + $dindi = new Individual($grec); |
|
100 | + $html .= FunctionsPrint::formatIsSourcedIcon('R', $dindi->isSourced(), 'INDI', 1, 'small'); |
|
101 | + $html .= FunctionsPrint::formatIsSourcedIcon('E', $dindi->isBirthSourced(), 'BIRT', 1, 'small'); |
|
102 | + if($grec->isDead()) |
|
103 | + $html .= FunctionsPrint::formatIsSourcedIcon('E', $dindi->isDeathSourced(), 'DEAT', 1, 'small'); |
|
104 | + } |
|
105 | + return $html; |
|
106 | 106 | } |
107 | 107 | |
108 | 108 | /** |
@@ -110,7 +110,7 @@ discard block |
||
110 | 110 | * @see \Fisharebest\Webtrees\Module\ModuleSidebarInterface::defaultSidebarOrder() |
111 | 111 | */ |
112 | 112 | public function defaultSidebarOrder() { |
113 | - return 15; |
|
113 | + return 15; |
|
114 | 114 | } |
115 | 115 | |
116 | 116 | /** |
@@ -118,7 +118,7 @@ discard block |
||
118 | 118 | * @see \Fisharebest\Webtrees\Module\ModuleSidebarInterface::hasSidebarContent() |
119 | 119 | */ |
120 | 120 | public function hasSidebarContent(){ |
121 | - return true; |
|
121 | + return true; |
|
122 | 122 | } |
123 | 123 | |
124 | 124 | /** |
@@ -126,7 +126,7 @@ discard block |
||
126 | 126 | * @see \Fisharebest\Webtrees\Module\ModuleSidebarInterface::getSidebarAjaxContent() |
127 | 127 | */ |
128 | 128 | public function getSidebarAjaxContent() { |
129 | - return ''; |
|
129 | + return ''; |
|
130 | 130 | } |
131 | 131 | |
132 | 132 | /** |
@@ -134,17 +134,17 @@ discard block |
||
134 | 134 | * @see \Fisharebest\Webtrees\Module\ModuleSidebarInterface::getSidebarContent() |
135 | 135 | */ |
136 | 136 | public function getSidebarContent() { |
137 | - global $controller; |
|
137 | + global $controller; |
|
138 | 138 | |
139 | - ob_start(); |
|
140 | - $root = $controller->getSignificantIndividual(); |
|
141 | - if ($root) { |
|
142 | - $dindi = new Individual($root); |
|
139 | + ob_start(); |
|
140 | + $root = $controller->getSignificantIndividual(); |
|
141 | + if ($root) { |
|
142 | + $dindi = new Individual($root); |
|
143 | 143 | |
144 | - if (!$dindi->canDisplayIsSourced()) { |
|
145 | - echo '<div class="error">', I18N::translate('This information is private and cannot be shown.'), '</div>'; |
|
146 | - } else { |
|
147 | - echo ' |
|
144 | + if (!$dindi->canDisplayIsSourced()) { |
|
145 | + echo '<div class="error">', I18N::translate('This information is private and cannot be shown.'), '</div>'; |
|
146 | + } else { |
|
147 | + echo ' |
|
148 | 148 | <table class="issourcedtable"> |
149 | 149 | <tr> |
150 | 150 | <td class="slabel"> ' . GedcomTag::getLabel('INDI') . '</td> |
@@ -155,35 +155,35 @@ discard block |
||
155 | 155 | <td class="svalue">' . FunctionsPrint::formatIsSourcedIcon('E', $dindi->isBirthSourced(), 'BIRT', 1).'</td> |
156 | 156 | </tr>'; |
157 | 157 | |
158 | - $fams = $root->getSpouseFamilies(); |
|
159 | - ($ct = count($fams)) > 1 ? $nb=1 : $nb=' '; |
|
160 | - foreach($fams as $fam){ |
|
161 | - $dfam = new Family($fam); |
|
162 | - echo ' |
|
158 | + $fams = $root->getSpouseFamilies(); |
|
159 | + ($ct = count($fams)) > 1 ? $nb=1 : $nb=' '; |
|
160 | + foreach($fams as $fam){ |
|
161 | + $dfam = new Family($fam); |
|
162 | + echo ' |
|
163 | 163 | <tr> |
164 | 164 | <td class="slabel right"> |
165 | 165 | <a href="' . $fam->getHtmlUrl() . '"> '. GedcomTag::getLabel('MARR'); |
166 | - if($ct > 1){ |
|
167 | - echo ' ',$nb; |
|
168 | - $nb++; |
|
169 | - } |
|
170 | - echo ' </a> |
|
166 | + if($ct > 1){ |
|
167 | + echo ' ',$nb; |
|
168 | + $nb++; |
|
169 | + } |
|
170 | + echo ' </a> |
|
171 | 171 | </td> |
172 | 172 | <td class="svalue">' . FunctionsPrint::formatIsSourcedIcon('E', $dfam->isMarriageSourced(), 'MARR', 1).'</td> |
173 | 173 | </tr>'; |
174 | - } |
|
174 | + } |
|
175 | 175 | |
176 | - if( $root->isDead() ) |
|
177 | - echo ' |
|
176 | + if( $root->isDead() ) |
|
177 | + echo ' |
|
178 | 178 | <tr> |
179 | 179 | <td class="slabel">' . GedcomTag::getLabel('DEAT') . '</td> |
180 | 180 | <td class="svalue">' . FunctionsPrint::formatIsSourcedIcon('E', $dindi->isDeathSourced(), 'DEAT', 1).'</td> |
181 | 181 | </tr>'; |
182 | 182 | |
183 | - echo '</table>'; |
|
184 | - } |
|
185 | - } |
|
186 | - return ob_get_clean(); |
|
183 | + echo '</table>'; |
|
184 | + } |
|
185 | + } |
|
186 | + return ob_get_clean(); |
|
187 | 187 | } |
188 | 188 | |
189 | 189 |
@@ -15,11 +15,11 @@ |
||
15 | 15 | */ |
16 | 16 | interface ModuleMenuItemInterface |
17 | 17 | { |
18 | - /** |
|
19 | - * Returns a menu item for the module. |
|
20 | - * |
|
21 | - * @param \Fisharebest\Webtrees\Tree|null $tree |
|
22 | - * @param mixed $reference |
|
23 | - */ |
|
24 | - public function getMenu(\Fisharebest\Webtrees\Tree $tree, $reference); |
|
18 | + /** |
|
19 | + * Returns a menu item for the module. |
|
20 | + * |
|
21 | + * @param \Fisharebest\Webtrees\Tree|null $tree |
|
22 | + * @param mixed $reference |
|
23 | + */ |
|
24 | + public function getMenu(\Fisharebest\Webtrees\Tree $tree, $reference); |
|
25 | 25 | } |
26 | 26 | \ No newline at end of file |
@@ -35,25 +35,25 @@ discard block |
||
35 | 35 | */ |
36 | 36 | class TaskController extends MvcController |
37 | 37 | { |
38 | - /** |
|
39 | - * Tasks Provider |
|
40 | - * @var TaskProviderInterface $provider |
|
41 | - */ |
|
42 | - protected $provider; |
|
38 | + /** |
|
39 | + * Tasks Provider |
|
40 | + * @var TaskProviderInterface $provider |
|
41 | + */ |
|
42 | + protected $provider; |
|
43 | 43 | |
44 | - /** |
|
45 | - * Constructor for Admin Config controller |
|
46 | - * @param AbstractModule $module |
|
47 | - */ |
|
48 | - public function __construct(AbstractModule $module) { |
|
49 | - parent::__construct($module); |
|
44 | + /** |
|
45 | + * Constructor for Admin Config controller |
|
46 | + * @param AbstractModule $module |
|
47 | + */ |
|
48 | + public function __construct(AbstractModule $module) { |
|
49 | + parent::__construct($module); |
|
50 | 50 | |
51 | - $this->provider = $this->module->getProvider(); |
|
52 | - } |
|
51 | + $this->provider = $this->module->getProvider(); |
|
52 | + } |
|
53 | 53 | |
54 | - /** |
|
55 | - * Pages |
|
56 | - */ |
|
54 | + /** |
|
55 | + * Pages |
|
56 | + */ |
|
57 | 57 | |
58 | 58 | /** |
59 | 59 | * Task@trigger |
@@ -77,35 +77,35 @@ discard block |
||
77 | 77 | /** |
78 | 78 | * Task@setStatus |
79 | 79 | */ |
80 | - public function setStatus() { |
|
81 | - $controller = new JsonController(); |
|
80 | + public function setStatus() { |
|
81 | + $controller = new JsonController(); |
|
82 | 82 | |
83 | - $task_name = Filter::get('task'); |
|
84 | - $task = $this->provider->getTask($task_name, false); |
|
83 | + $task_name = Filter::get('task'); |
|
84 | + $task = $this->provider->getTask($task_name, false); |
|
85 | 85 | |
86 | - $controller->restrictAccess( |
|
87 | - true // Filter::checkCsrf() -- Cannot use CSRF on a GET request (modules can only work with GET requests) |
|
88 | - && Auth::isAdmin() |
|
89 | - && $task |
|
90 | - ); |
|
86 | + $controller->restrictAccess( |
|
87 | + true // Filter::checkCsrf() -- Cannot use CSRF on a GET request (modules can only work with GET requests) |
|
88 | + && Auth::isAdmin() |
|
89 | + && $task |
|
90 | + ); |
|
91 | 91 | |
92 | - $status = Filter::getBool('status'); |
|
93 | - $res = array('task' => $task->getName() , 'error' => null); |
|
94 | - try{ |
|
95 | - $this->provider->setTaskStatus($task, $status); |
|
96 | - $res['status'] = $status; |
|
92 | + $status = Filter::getBool('status'); |
|
93 | + $res = array('task' => $task->getName() , 'error' => null); |
|
94 | + try{ |
|
95 | + $this->provider->setTaskStatus($task, $status); |
|
96 | + $res['status'] = $status; |
|
97 | 97 | Log::addConfigurationLog('Module '.$this->module->getName().' : Admin Task "'.$task->getName().'" has been '. ($status ? 'enabled' : 'disabled') .'.'); |
98 | - } |
|
99 | - catch (\Exception $ex) { |
|
100 | - $res['error'] = $ex->getMessage(); |
|
98 | + } |
|
99 | + catch (\Exception $ex) { |
|
100 | + $res['error'] = $ex->getMessage(); |
|
101 | 101 | Log::addErrorLog('Module '.$this->module->getName().' : Admin Task "'.$task->getName().'" could not be ' . ($status ? 'enabled' : 'disabled') .'. Error: '. $ex->getMessage()); |
102 | - } |
|
102 | + } |
|
103 | 103 | |
104 | - $controller->pageHeader(); |
|
105 | - if($res['error']) http_response_code(500); |
|
104 | + $controller->pageHeader(); |
|
105 | + if($res['error']) http_response_code(500); |
|
106 | 106 | |
107 | - echo \Zend_Json::encode($res); |
|
108 | - } |
|
107 | + echo \Zend_Json::encode($res); |
|
108 | + } |
|
109 | 109 | |
110 | 110 | /** |
111 | 111 | * Task@edit |
@@ -113,15 +113,15 @@ discard block |
||
113 | 113 | public function edit() { |
114 | 114 | global $WT_TREE; |
115 | 115 | |
116 | - $task_name = Filter::get('task'); |
|
117 | - $task = $this->provider->getTask($task_name, false); |
|
116 | + $task_name = Filter::get('task'); |
|
117 | + $task = $this->provider->getTask($task_name, false); |
|
118 | 118 | |
119 | - Theme::theme(new AdministrationTheme)->init($WT_TREE); |
|
120 | - $controller = new PageController(); |
|
121 | - $controller |
|
122 | - ->restrictAccess(Auth::isAdmin() && $task) |
|
119 | + Theme::theme(new AdministrationTheme)->init($WT_TREE); |
|
120 | + $controller = new PageController(); |
|
121 | + $controller |
|
122 | + ->restrictAccess(Auth::isAdmin() && $task) |
|
123 | 123 | ->setPageTitle(I18N::translate('Edit the administrative task')) |
124 | - ->addInlineJavascript(' |
|
124 | + ->addInlineJavascript(' |
|
125 | 125 | function toggleRemainingOccurrences() { |
126 | 126 | if($("input:radio[name=\'is_limited\']:checked").val() == 1) { |
127 | 127 | $("#nb_occurences").show(); |
@@ -134,39 +134,39 @@ discard block |
||
134 | 134 | $("[name=\'is_limited\']").on("change", toggleRemainingOccurrences); |
135 | 135 | toggleRemainingOccurrences(); |
136 | 136 | ') |
137 | - ; |
|
137 | + ; |
|
138 | 138 | |
139 | 139 | |
140 | - $data = new ViewBag(); |
|
141 | - $data->set('title', $controller->getPageTitle()); |
|
140 | + $data = new ViewBag(); |
|
141 | + $data->set('title', $controller->getPageTitle()); |
|
142 | 142 | $data->set('admin_config_url', 'module.php?mod=' . $this->module->getName() . '&mod_action=AdminConfig&ged=' . $WT_TREE->getNameUrl()); |
143 | - $data->set('module_title', $this->module->getTitle()); |
|
143 | + $data->set('module_title', $this->module->getTitle()); |
|
144 | 144 | $data->set('save_url', 'module.php?mod=' . $this->module->getName() . '&mod_action=Task@save&ged=' . $WT_TREE->getNameUrl()); |
145 | 145 | $data->set('task', $task); |
146 | 146 | |
147 | - ViewFactory::make('TaskEdit', $this, $controller, $data)->render(); |
|
147 | + ViewFactory::make('TaskEdit', $this, $controller, $data)->render(); |
|
148 | 148 | } |
149 | 149 | |
150 | 150 | /** |
151 | 151 | * Task@save |
152 | 152 | */ |
153 | 153 | public function save() { |
154 | - $tmp_contrl = new PageController(); |
|
154 | + $tmp_contrl = new PageController(); |
|
155 | 155 | |
156 | - $tmp_contrl->restrictAccess( |
|
157 | - Auth::isAdmin() |
|
158 | - && Filter::checkCsrf() |
|
159 | - ); |
|
156 | + $tmp_contrl->restrictAccess( |
|
157 | + Auth::isAdmin() |
|
158 | + && Filter::checkCsrf() |
|
159 | + ); |
|
160 | 160 | |
161 | 161 | $task_name = Filter::post('task'); |
162 | - $frequency = Filter::postInteger('frequency'); |
|
163 | - $is_limited = Filter::postInteger('is_limited', 0, 1); |
|
164 | - $nb_occur = Filter::postInteger('nb_occur'); |
|
162 | + $frequency = Filter::postInteger('frequency'); |
|
163 | + $is_limited = Filter::postInteger('is_limited', 0, 1); |
|
164 | + $nb_occur = Filter::postInteger('nb_occur'); |
|
165 | 165 | |
166 | 166 | $task = $this->provider->getTask($task_name, false); |
167 | 167 | |
168 | - $success = false; |
|
169 | - if($task) { |
|
168 | + $success = false; |
|
169 | + if($task) { |
|
170 | 170 | $task->setFrequency($frequency); |
171 | 171 | if($is_limited == 1) { |
172 | 172 | $task->setRemainingOccurrences($nb_occur); |
@@ -198,13 +198,13 @@ discard block |
||
198 | 198 | Log::addConfigurationLog('Module '.$this->module->getName().' : AdminTask “'. $task->getName() .'” could not be updated. See error log.'); |
199 | 199 | } |
200 | 200 | |
201 | - } |
|
201 | + } |
|
202 | 202 | |
203 | - $redirection_url = 'module.php?mod=' . $this->module->getName() . '&mod_action=AdminConfig'; |
|
204 | - if(!$success) { |
|
203 | + $redirection_url = 'module.php?mod=' . $this->module->getName() . '&mod_action=AdminConfig'; |
|
204 | + if(!$success) { |
|
205 | 205 | $redirection_url = 'module.php?mod=' . $this->module->getName() . '&mod_action=Task@edit&task='. $task->getName(); |
206 | - } |
|
207 | - header('Location: ' . WT_BASE_URL . $redirection_url); |
|
206 | + } |
|
207 | + header('Location: ' . WT_BASE_URL . $redirection_url); |
|
208 | 208 | } |
209 | 209 | |
210 | 210 | } |
211 | 211 | \ No newline at end of file |
@@ -69,7 +69,7 @@ discard block |
||
69 | 69 | |
70 | 70 | $tasks = $this->provider->getTasksToRun($token == $token_submitted, $task_name); |
71 | 71 | |
72 | - foreach($tasks as $task) { |
|
72 | + foreach ($tasks as $task) { |
|
73 | 73 | $task->execute(); |
74 | 74 | } |
75 | 75 | } |
@@ -90,19 +90,19 @@ discard block |
||
90 | 90 | ); |
91 | 91 | |
92 | 92 | $status = Filter::getBool('status'); |
93 | - $res = array('task' => $task->getName() , 'error' => null); |
|
94 | - try{ |
|
93 | + $res = array('task' => $task->getName(), 'error' => null); |
|
94 | + try { |
|
95 | 95 | $this->provider->setTaskStatus($task, $status); |
96 | 96 | $res['status'] = $status; |
97 | - Log::addConfigurationLog('Module '.$this->module->getName().' : Admin Task "'.$task->getName().'" has been '. ($status ? 'enabled' : 'disabled') .'.'); |
|
97 | + Log::addConfigurationLog('Module '.$this->module->getName().' : Admin Task "'.$task->getName().'" has been '.($status ? 'enabled' : 'disabled').'.'); |
|
98 | 98 | } |
99 | 99 | catch (\Exception $ex) { |
100 | 100 | $res['error'] = $ex->getMessage(); |
101 | - Log::addErrorLog('Module '.$this->module->getName().' : Admin Task "'.$task->getName().'" could not be ' . ($status ? 'enabled' : 'disabled') .'. Error: '. $ex->getMessage()); |
|
101 | + Log::addErrorLog('Module '.$this->module->getName().' : Admin Task "'.$task->getName().'" could not be '.($status ? 'enabled' : 'disabled').'. Error: '.$ex->getMessage()); |
|
102 | 102 | } |
103 | 103 | |
104 | 104 | $controller->pageHeader(); |
105 | - if($res['error']) http_response_code(500); |
|
105 | + if ($res['error']) http_response_code(500); |
|
106 | 106 | |
107 | 107 | echo \Zend_Json::encode($res); |
108 | 108 | } |
@@ -139,9 +139,9 @@ discard block |
||
139 | 139 | |
140 | 140 | $data = new ViewBag(); |
141 | 141 | $data->set('title', $controller->getPageTitle()); |
142 | - $data->set('admin_config_url', 'module.php?mod=' . $this->module->getName() . '&mod_action=AdminConfig&ged=' . $WT_TREE->getNameUrl()); |
|
142 | + $data->set('admin_config_url', 'module.php?mod='.$this->module->getName().'&mod_action=AdminConfig&ged='.$WT_TREE->getNameUrl()); |
|
143 | 143 | $data->set('module_title', $this->module->getTitle()); |
144 | - $data->set('save_url', 'module.php?mod=' . $this->module->getName() . '&mod_action=Task@save&ged=' . $WT_TREE->getNameUrl()); |
|
144 | + $data->set('save_url', 'module.php?mod='.$this->module->getName().'&mod_action=Task@save&ged='.$WT_TREE->getNameUrl()); |
|
145 | 145 | $data->set('task', $task); |
146 | 146 | |
147 | 147 | ViewFactory::make('TaskEdit', $this, $controller, $data)->render(); |
@@ -158,17 +158,17 @@ discard block |
||
158 | 158 | && Filter::checkCsrf() |
159 | 159 | ); |
160 | 160 | |
161 | - $task_name = Filter::post('task'); |
|
162 | - $frequency = Filter::postInteger('frequency'); |
|
163 | - $is_limited = Filter::postInteger('is_limited', 0, 1); |
|
164 | - $nb_occur = Filter::postInteger('nb_occur'); |
|
161 | + $task_name = Filter::post('task'); |
|
162 | + $frequency = Filter::postInteger('frequency'); |
|
163 | + $is_limited = Filter::postInteger('is_limited', 0, 1); |
|
164 | + $nb_occur = Filter::postInteger('nb_occur'); |
|
165 | 165 | |
166 | 166 | $task = $this->provider->getTask($task_name, false); |
167 | 167 | |
168 | 168 | $success = false; |
169 | - if($task) { |
|
169 | + if ($task) { |
|
170 | 170 | $task->setFrequency($frequency); |
171 | - if($is_limited == 1) { |
|
171 | + if ($is_limited == 1) { |
|
172 | 172 | $task->setRemainingOccurrences($nb_occur); |
173 | 173 | } |
174 | 174 | else { |
@@ -177,34 +177,34 @@ discard block |
||
177 | 177 | |
178 | 178 | $res = $task->save(); |
179 | 179 | |
180 | - if($res) { |
|
181 | - if($task instanceof MyArtJaub\Webtrees\Module\AdminTasks\Model\ConfigurableTaskInterface) { |
|
180 | + if ($res) { |
|
181 | + if ($task instanceof MyArtJaub\Webtrees\Module\AdminTasks\Model\ConfigurableTaskInterface) { |
|
182 | 182 | $res = $task->saveConfig(); |
183 | 183 | |
184 | - if(!$res) { |
|
184 | + if (!$res) { |
|
185 | 185 | FlashMessages::addMessage(I18N::translate('An error occured while updating the specific settings of administrative task “%s”', $task->getTitle()), 'danger'); |
186 | - Log::addConfigurationLog('Module '.$this->module->getName().' : AdminTask “'. $task->getName() .'” specific settings could not be updated. See error log.'); |
|
186 | + Log::addConfigurationLog('Module '.$this->module->getName().' : AdminTask “'.$task->getName().'” specific settings could not be updated. See error log.'); |
|
187 | 187 | } |
188 | 188 | } |
189 | 189 | |
190 | - if($res) { |
|
190 | + if ($res) { |
|
191 | 191 | FlashMessages::addMessage(I18N::translate('The administrative task “%s” has been successfully updated', $task->getTitle()), 'success'); |
192 | - Log::addConfigurationLog('Module '.$this->module->getName().' : AdminTask “'.$task->getName() .'” has been updated.'); |
|
192 | + Log::addConfigurationLog('Module '.$this->module->getName().' : AdminTask “'.$task->getName().'” has been updated.'); |
|
193 | 193 | $success = true; |
194 | 194 | } |
195 | 195 | } |
196 | 196 | else { |
197 | 197 | FlashMessages::addMessage(I18N::translate('An error occured while updating the administrative task “%s”', $task->getTitle()), 'danger'); |
198 | - Log::addConfigurationLog('Module '.$this->module->getName().' : AdminTask “'. $task->getName() .'” could not be updated. See error log.'); |
|
198 | + Log::addConfigurationLog('Module '.$this->module->getName().' : AdminTask “'.$task->getName().'” could not be updated. See error log.'); |
|
199 | 199 | } |
200 | 200 | |
201 | 201 | } |
202 | 202 | |
203 | - $redirection_url = 'module.php?mod=' . $this->module->getName() . '&mod_action=AdminConfig'; |
|
204 | - if(!$success) { |
|
205 | - $redirection_url = 'module.php?mod=' . $this->module->getName() . '&mod_action=Task@edit&task='. $task->getName(); |
|
203 | + $redirection_url = 'module.php?mod='.$this->module->getName().'&mod_action=AdminConfig'; |
|
204 | + if (!$success) { |
|
205 | + $redirection_url = 'module.php?mod='.$this->module->getName().'&mod_action=Task@edit&task='.$task->getName(); |
|
206 | 206 | } |
207 | - header('Location: ' . WT_BASE_URL . $redirection_url); |
|
207 | + header('Location: '.WT_BASE_URL.$redirection_url); |
|
208 | 208 | } |
209 | 209 | |
210 | 210 | } |
211 | 211 | \ No newline at end of file |
@@ -95,14 +95,15 @@ discard block |
||
95 | 95 | $this->provider->setTaskStatus($task, $status); |
96 | 96 | $res['status'] = $status; |
97 | 97 | Log::addConfigurationLog('Module '.$this->module->getName().' : Admin Task "'.$task->getName().'" has been '. ($status ? 'enabled' : 'disabled') .'.'); |
98 | - } |
|
99 | - catch (\Exception $ex) { |
|
98 | + } catch (\Exception $ex) { |
|
100 | 99 | $res['error'] = $ex->getMessage(); |
101 | 100 | Log::addErrorLog('Module '.$this->module->getName().' : Admin Task "'.$task->getName().'" could not be ' . ($status ? 'enabled' : 'disabled') .'. Error: '. $ex->getMessage()); |
102 | 101 | } |
103 | 102 | |
104 | 103 | $controller->pageHeader(); |
105 | - if($res['error']) http_response_code(500); |
|
104 | + if($res['error']) { |
|
105 | + http_response_code(500); |
|
106 | + } |
|
106 | 107 | |
107 | 108 | echo \Zend_Json::encode($res); |
108 | 109 | } |
@@ -170,8 +171,7 @@ discard block |
||
170 | 171 | $task->setFrequency($frequency); |
171 | 172 | if($is_limited == 1) { |
172 | 173 | $task->setRemainingOccurrences($nb_occur); |
173 | - } |
|
174 | - else { |
|
174 | + } else { |
|
175 | 175 | $task->setRemainingOccurrences(0); |
176 | 176 | } |
177 | 177 | |
@@ -192,8 +192,7 @@ discard block |
||
192 | 192 | Log::addConfigurationLog('Module '.$this->module->getName().' : AdminTask “'.$task->getName() .'” has been updated.'); |
193 | 193 | $success = true; |
194 | 194 | } |
195 | - } |
|
196 | - else { |
|
195 | + } else { |
|
197 | 196 | FlashMessages::addMessage(I18N::translate('An error occured while updating the administrative task “%s”', $task->getTitle()), 'danger'); |
198 | 197 | Log::addConfigurationLog('Module '.$this->module->getName().' : AdminTask “'. $task->getName() .'” could not be updated. See error log.'); |
199 | 198 | } |
@@ -15,11 +15,11 @@ |
||
15 | 15 | */ |
16 | 16 | interface ConfigurableTaskInterface { |
17 | 17 | |
18 | - /** |
|
19 | - * Returns the HTML code to display the specific task configuration. |
|
20 | - * |
|
21 | - * @return string HTML code |
|
22 | - */ |
|
18 | + /** |
|
19 | + * Returns the HTML code to display the specific task configuration. |
|
20 | + * |
|
21 | + * @return string HTML code |
|
22 | + */ |
|
23 | 23 | function htmlConfigForm(); |
24 | 24 | |
25 | 25 | /** |
@@ -20,32 +20,32 @@ discard block |
||
20 | 20 | */ |
21 | 21 | class TaskProvider implements TaskProviderInterface { |
22 | 22 | |
23 | - /** |
|
24 | - * Root path of thr folder containing the tasks |
|
25 | - * @var string $root_path |
|
26 | - */ |
|
27 | - protected $root_path; |
|
23 | + /** |
|
24 | + * Root path of thr folder containing the tasks |
|
25 | + * @var string $root_path |
|
26 | + */ |
|
27 | + protected $root_path; |
|
28 | 28 | |
29 | - /** |
|
30 | - * Constructor for the Task provider |
|
31 | - * @param string $root_path |
|
32 | - */ |
|
33 | - public function __construct($root_path) { |
|
34 | - $this->root_path = $root_path; |
|
29 | + /** |
|
30 | + * Constructor for the Task provider |
|
31 | + * @param string $root_path |
|
32 | + */ |
|
33 | + public function __construct($root_path) { |
|
34 | + $this->root_path = $root_path; |
|
35 | 35 | $this->all_tasks = null; |
36 | - } |
|
36 | + } |
|
37 | 37 | |
38 | - /** |
|
39 | - * Load a task object from a file. |
|
40 | - * |
|
41 | - * @param string $task_name Name of the task to load. |
|
42 | - */ |
|
38 | + /** |
|
39 | + * Load a task object from a file. |
|
40 | + * |
|
41 | + * @param string $task_name Name of the task to load. |
|
42 | + */ |
|
43 | 43 | protected function loadTask($task_name) { |
44 | 44 | try { |
45 | 45 | if (file_exists($this->root_path . $task_name .'.php')) { |
46 | 46 | $task = include $this->root_path . $task_name .'.php'; |
47 | 47 | if($task instanceof AbstractTask) { |
48 | - $task->setProvider($this); |
|
48 | + $task->setProvider($this); |
|
49 | 49 | return $task; |
50 | 50 | } |
51 | 51 | } |
@@ -55,22 +55,22 @@ discard block |
||
55 | 55 | return null; |
56 | 56 | } |
57 | 57 | |
58 | - /** |
|
59 | - * Creates and returns a Task object from a data row. |
|
60 | - * The row data is expected to be an array with the indexes: |
|
61 | - * - majat_name: task name |
|
62 | - * - majat_status: task status |
|
63 | - * - majat_last_run: last run time |
|
64 | - * - majat_last_result: last run result |
|
65 | - * - majat_frequency: run frequency |
|
66 | - * - majat_nb_occur: remaining running occurrences |
|
67 | - * - majat_running: is task running |
|
68 | - * |
|
69 | - * @param array $row |
|
70 | - * @return AbstractTask|null |
|
71 | - */ |
|
72 | - protected function loadTaskFromRow($row) { |
|
73 | - $task = $this->loadTask($row['majat_name']); |
|
58 | + /** |
|
59 | + * Creates and returns a Task object from a data row. |
|
60 | + * The row data is expected to be an array with the indexes: |
|
61 | + * - majat_name: task name |
|
62 | + * - majat_status: task status |
|
63 | + * - majat_last_run: last run time |
|
64 | + * - majat_last_result: last run result |
|
65 | + * - majat_frequency: run frequency |
|
66 | + * - majat_nb_occur: remaining running occurrences |
|
67 | + * - majat_running: is task running |
|
68 | + * |
|
69 | + * @param array $row |
|
70 | + * @return AbstractTask|null |
|
71 | + */ |
|
72 | + protected function loadTaskFromRow($row) { |
|
73 | + $task = $this->loadTask($row['majat_name']); |
|
74 | 74 | |
75 | 75 | if($task) { |
76 | 76 | $task->setParameters( |
@@ -85,99 +85,99 @@ discard block |
||
85 | 85 | return $task; |
86 | 86 | } |
87 | 87 | else { |
88 | - $this->deleteTask($row['majat_name']); |
|
88 | + $this->deleteTask($row['majat_name']); |
|
89 | 89 | } |
90 | 90 | return null; |
91 | - } |
|
91 | + } |
|
92 | 92 | |
93 | - /** |
|
94 | - * {@inheritDoc} |
|
95 | - * @see \MyArtJaub\Webtrees\Module\AdminTasks\Model\TaskProviderInterface::getTask() |
|
96 | - */ |
|
97 | - public function getTask($task_name, $only_enabled = true) { |
|
98 | - $args = array ( |
|
99 | - 'task_name' => $task_name |
|
100 | - ); |
|
93 | + /** |
|
94 | + * {@inheritDoc} |
|
95 | + * @see \MyArtJaub\Webtrees\Module\AdminTasks\Model\TaskProviderInterface::getTask() |
|
96 | + */ |
|
97 | + public function getTask($task_name, $only_enabled = true) { |
|
98 | + $args = array ( |
|
99 | + 'task_name' => $task_name |
|
100 | + ); |
|
101 | 101 | |
102 | - $sql = 'SELECT majat_name, majat_status, majat_last_run, majat_last_result, majat_frequency, majat_nb_occur, majat_running' . |
|
103 | - ' FROM `##maj_admintasks`' . |
|
104 | - ' WHERE majat_name = :task_name'; |
|
105 | - if($only_enabled) { |
|
106 | - $sql .= ' AND majat_status = :status'; |
|
107 | - $args['status'] = 'enabled'; |
|
108 | - } |
|
102 | + $sql = 'SELECT majat_name, majat_status, majat_last_run, majat_last_result, majat_frequency, majat_nb_occur, majat_running' . |
|
103 | + ' FROM `##maj_admintasks`' . |
|
104 | + ' WHERE majat_name = :task_name'; |
|
105 | + if($only_enabled) { |
|
106 | + $sql .= ' AND majat_status = :status'; |
|
107 | + $args['status'] = 'enabled'; |
|
108 | + } |
|
109 | 109 | |
110 | - $task_array = Database::prepare($sql)->execute($args)->fetchOneRow(\PDO::FETCH_ASSOC); |
|
110 | + $task_array = Database::prepare($sql)->execute($args)->fetchOneRow(\PDO::FETCH_ASSOC); |
|
111 | 111 | |
112 | - if($task_array) { |
|
113 | - return $this->loadTaskFromRow($task_array); |
|
114 | - } |
|
112 | + if($task_array) { |
|
113 | + return $this->loadTaskFromRow($task_array); |
|
114 | + } |
|
115 | 115 | |
116 | - return null; |
|
117 | - } |
|
116 | + return null; |
|
117 | + } |
|
118 | 118 | |
119 | 119 | /** |
120 | 120 | * {@inheritDoc} |
121 | 121 | * @see \MyArtJaub\Webtrees\Module\AdminTasks\Model\TaskProviderInterface::setTaskStatus() |
122 | 122 | */ |
123 | - public function setTaskStatus(AbstractTask $task, $status) { |
|
124 | - Database::prepare( |
|
125 | - 'UPDATE `##maj_admintasks`'. |
|
126 | - ' SET majat_status = :status'. |
|
127 | - ' WHERE majat_name = :name' |
|
128 | - )->execute(array( |
|
129 | - 'name' => $task->getName(), |
|
123 | + public function setTaskStatus(AbstractTask $task, $status) { |
|
124 | + Database::prepare( |
|
125 | + 'UPDATE `##maj_admintasks`'. |
|
126 | + ' SET majat_status = :status'. |
|
127 | + ' WHERE majat_name = :name' |
|
128 | + )->execute(array( |
|
129 | + 'name' => $task->getName(), |
|
130 | 130 | 'status' => $status ? 'enabled' : 'disabled' |
131 | - )); |
|
132 | - } |
|
131 | + )); |
|
132 | + } |
|
133 | 133 | |
134 | 134 | /** |
135 | 135 | * {@inheritDoc} |
136 | 136 | * @see \MyArtJaub\Webtrees\Module\AdminTasks\Model\TaskProviderInterface::updateTask() |
137 | 137 | */ |
138 | - public function updateTask(AbstractTask $task) { |
|
139 | - try{ |
|
140 | - Database::prepare( |
|
141 | - 'UPDATE `##maj_admintasks`'. |
|
142 | - ' SET majat_status = :status,'. |
|
143 | - ' majat_last_run = :last_run,'. |
|
144 | - ' majat_last_result = :last_result,'. |
|
145 | - ' majat_frequency = :frequency,'. |
|
146 | - ' majat_nb_occur = :nb_occurrences,'. |
|
147 | - ' majat_running = :is_running'. |
|
148 | - ' WHERE majat_name = :name' |
|
149 | - )->execute(array( |
|
150 | - 'name' => $task->getName(), |
|
151 | - 'status' => $task->isEnabled() ? 'enabled' : 'disabled', |
|
152 | - 'last_run' => $task->getLastUpdated()->format('Y-m-d H:i:s'), |
|
153 | - 'last_result' => $task->isLastRunSuccess() ? 1 : 0, |
|
154 | - 'frequency' => $task->getFrequency(), |
|
155 | - 'nb_occurrences' => $task->getRemainingOccurrences(), |
|
156 | - 'is_running' => $task->isRunning() ? 1 : 0 |
|
157 | - )); |
|
158 | - return true; |
|
159 | - } |
|
160 | - catch (\Exception $ex) { |
|
161 | - Log::addErrorLog(sprintf('Error while updating the Admin Task %s. Exception: %s', $task->getName(), $ex->getMessage())); |
|
162 | - return false; |
|
163 | - } |
|
164 | - } |
|
138 | + public function updateTask(AbstractTask $task) { |
|
139 | + try{ |
|
140 | + Database::prepare( |
|
141 | + 'UPDATE `##maj_admintasks`'. |
|
142 | + ' SET majat_status = :status,'. |
|
143 | + ' majat_last_run = :last_run,'. |
|
144 | + ' majat_last_result = :last_result,'. |
|
145 | + ' majat_frequency = :frequency,'. |
|
146 | + ' majat_nb_occur = :nb_occurrences,'. |
|
147 | + ' majat_running = :is_running'. |
|
148 | + ' WHERE majat_name = :name' |
|
149 | + )->execute(array( |
|
150 | + 'name' => $task->getName(), |
|
151 | + 'status' => $task->isEnabled() ? 'enabled' : 'disabled', |
|
152 | + 'last_run' => $task->getLastUpdated()->format('Y-m-d H:i:s'), |
|
153 | + 'last_result' => $task->isLastRunSuccess() ? 1 : 0, |
|
154 | + 'frequency' => $task->getFrequency(), |
|
155 | + 'nb_occurrences' => $task->getRemainingOccurrences(), |
|
156 | + 'is_running' => $task->isRunning() ? 1 : 0 |
|
157 | + )); |
|
158 | + return true; |
|
159 | + } |
|
160 | + catch (\Exception $ex) { |
|
161 | + Log::addErrorLog(sprintf('Error while updating the Admin Task %s. Exception: %s', $task->getName(), $ex->getMessage())); |
|
162 | + return false; |
|
163 | + } |
|
164 | + } |
|
165 | 165 | |
166 | 166 | /** |
167 | 167 | * {@inheritDoc} |
168 | 168 | * @see \MyArtJaub\Webtrees\Module\AdminTasks\Model\TaskProviderInterface::getTasksCount() |
169 | 169 | */ |
170 | - public function getTasksCount() { |
|
171 | - return Database::prepare( |
|
172 | - 'SELECT COUNT(majat_name)' . |
|
173 | - ' FROM `##maj_admintasks`' |
|
174 | - )->execute()->fetchOne(); |
|
175 | - } |
|
170 | + public function getTasksCount() { |
|
171 | + return Database::prepare( |
|
172 | + 'SELECT COUNT(majat_name)' . |
|
173 | + ' FROM `##maj_admintasks`' |
|
174 | + )->execute()->fetchOne(); |
|
175 | + } |
|
176 | 176 | |
177 | - /** |
|
178 | - * {@inheritDoc} |
|
179 | - * @see \MyArtJaub\Webtrees\Module\AdminTasks\Model\TaskProviderInterface::getTasksToRun() |
|
180 | - */ |
|
177 | + /** |
|
178 | + * {@inheritDoc} |
|
179 | + * @see \MyArtJaub\Webtrees\Module\AdminTasks\Model\TaskProviderInterface::getTasksToRun() |
|
180 | + */ |
|
181 | 181 | public function getTasksToRun($force = false, $task_name = null) |
182 | 182 | { |
183 | 183 | $res = array(); |
@@ -206,12 +206,12 @@ discard block |
||
206 | 206 | $data = Database::prepare($sql)->execute($args)->fetchAll(\PDO::FETCH_ASSOC); |
207 | 207 | |
208 | 208 | foreach($data as $task_row) { |
209 | - $task = $this->loadTaskFromRow($task_row); |
|
209 | + $task = $this->loadTaskFromRow($task_row); |
|
210 | 210 | if($task) |
211 | 211 | { |
212 | 212 | $res[] = $task; |
213 | 213 | } |
214 | - } |
|
214 | + } |
|
215 | 215 | |
216 | 216 | return $res; |
217 | 217 | } |
@@ -220,69 +220,69 @@ discard block |
||
220 | 220 | * {@inheritDoc} |
221 | 221 | * @see \MyArtJaub\Webtrees\Module\AdminTasks\Model\TaskProviderInterface::getFilteredTasksList() |
222 | 222 | */ |
223 | - public function getFilteredTasksList($search = null, $order_by = null, $start = 0, $limit = null){ |
|
224 | - $res = array(); |
|
223 | + public function getFilteredTasksList($search = null, $order_by = null, $start = 0, $limit = null){ |
|
224 | + $res = array(); |
|
225 | 225 | |
226 | - $sql = 'SELECT majat_name, majat_status, majat_last_run, majat_last_result, majat_frequency, majat_nb_occur, majat_running' . |
|
227 | - ' FROM `##maj_admintasks`'; |
|
226 | + $sql = 'SELECT majat_name, majat_status, majat_last_run, majat_last_result, majat_frequency, majat_nb_occur, majat_running' . |
|
227 | + ' FROM `##maj_admintasks`'; |
|
228 | 228 | |
229 | - $args = array(); |
|
229 | + $args = array(); |
|
230 | 230 | |
231 | - if ($order_by) { |
|
232 | - $sql .= ' ORDER BY '; |
|
233 | - $i = 0; |
|
234 | - foreach ($order_by as $key => $value) { |
|
235 | - if ($i > 0) { |
|
236 | - $sql .= ','; |
|
237 | - } |
|
231 | + if ($order_by) { |
|
232 | + $sql .= ' ORDER BY '; |
|
233 | + $i = 0; |
|
234 | + foreach ($order_by as $key => $value) { |
|
235 | + if ($i > 0) { |
|
236 | + $sql .= ','; |
|
237 | + } |
|
238 | 238 | |
239 | - switch ($value['dir']) { |
|
240 | - case 'asc': |
|
241 | - $sql .= $value['column'] . ' ASC '; |
|
242 | - break; |
|
243 | - case 'desc': |
|
244 | - $sql .= $value['column'] . ' DESC '; |
|
245 | - break; |
|
246 | - } |
|
247 | - $i++; |
|
248 | - } |
|
249 | - } else { |
|
250 | - $sql .= ' ORDER BY majat_name ASC'; |
|
251 | - } |
|
239 | + switch ($value['dir']) { |
|
240 | + case 'asc': |
|
241 | + $sql .= $value['column'] . ' ASC '; |
|
242 | + break; |
|
243 | + case 'desc': |
|
244 | + $sql .= $value['column'] . ' DESC '; |
|
245 | + break; |
|
246 | + } |
|
247 | + $i++; |
|
248 | + } |
|
249 | + } else { |
|
250 | + $sql .= ' ORDER BY majat_name ASC'; |
|
251 | + } |
|
252 | 252 | |
253 | - if ($limit) { |
|
254 | - $sql .= ' LIMIT :limit OFFSET :offset'; |
|
255 | - $args['limit'] = $limit; |
|
256 | - $args['offset'] = $start; |
|
257 | - } |
|
253 | + if ($limit) { |
|
254 | + $sql .= ' LIMIT :limit OFFSET :offset'; |
|
255 | + $args['limit'] = $limit; |
|
256 | + $args['offset'] = $start; |
|
257 | + } |
|
258 | 258 | |
259 | - $data = Database::prepare($sql)->execute($args)->fetchAll(\PDO::FETCH_ASSOC); |
|
259 | + $data = Database::prepare($sql)->execute($args)->fetchAll(\PDO::FETCH_ASSOC); |
|
260 | 260 | |
261 | - foreach($data as $ga) { |
|
262 | - $task = $this->loadTaskFromRow($ga); |
|
261 | + foreach($data as $ga) { |
|
262 | + $task = $this->loadTaskFromRow($ga); |
|
263 | 263 | if($task && (empty($search) || ($search && strpos($task->getTitle(), $search) !== false))) |
264 | 264 | { |
265 | 265 | $res[] = $task; |
266 | 266 | } |
267 | - } |
|
267 | + } |
|
268 | 268 | |
269 | - return $res; |
|
270 | - } |
|
269 | + return $res; |
|
270 | + } |
|
271 | 271 | |
272 | 272 | |
273 | - /** |
|
274 | - * {inhericDoc} |
|
275 | - * @see \MyArtJaub\Webtrees\Module\AdminTasks\Model\TaskProviderInterface::getInstalledTasks() |
|
276 | - */ |
|
273 | + /** |
|
274 | + * {inhericDoc} |
|
275 | + * @see \MyArtJaub\Webtrees\Module\AdminTasks\Model\TaskProviderInterface::getInstalledTasks() |
|
276 | + */ |
|
277 | 277 | public function getInstalledTasks() { |
278 | 278 | $tasks=array(); |
279 | 279 | $dir=opendir($this->root_path); |
280 | 280 | while (($file=readdir($dir))!==false){ |
281 | 281 | try { |
282 | - if($file == '.' || $file == '..') continue; |
|
282 | + if($file == '.' || $file == '..') continue; |
|
283 | 283 | $task = include $this->root_path . $file; |
284 | 284 | if($task ) { |
285 | - $task->setProvider($this); |
|
285 | + $task->setProvider($this); |
|
286 | 286 | Database::prepare( |
287 | 287 | 'INSERT IGNORE INTO `##maj_admintasks`'. |
288 | 288 | ' (majat_name, majat_status, majat_frequency)'. |
@@ -42,15 +42,15 @@ discard block |
||
42 | 42 | */ |
43 | 43 | protected function loadTask($task_name) { |
44 | 44 | try { |
45 | - if (file_exists($this->root_path . $task_name .'.php')) { |
|
46 | - $task = include $this->root_path . $task_name .'.php'; |
|
47 | - if($task instanceof AbstractTask) { |
|
45 | + if (file_exists($this->root_path.$task_name.'.php')) { |
|
46 | + $task = include $this->root_path.$task_name.'.php'; |
|
47 | + if ($task instanceof AbstractTask) { |
|
48 | 48 | $task->setProvider($this); |
49 | 49 | return $task; |
50 | 50 | } |
51 | 51 | } |
52 | 52 | } |
53 | - catch(\Exception $ex) { } |
|
53 | + catch (\Exception $ex) { } |
|
54 | 54 | |
55 | 55 | return null; |
56 | 56 | } |
@@ -72,7 +72,7 @@ discard block |
||
72 | 72 | protected function loadTaskFromRow($row) { |
73 | 73 | $task = $this->loadTask($row['majat_name']); |
74 | 74 | |
75 | - if($task) { |
|
75 | + if ($task) { |
|
76 | 76 | $task->setParameters( |
77 | 77 | $row['majat_status'] == 'enabled', |
78 | 78 | new \DateTime($row['majat_last_run']), |
@@ -95,21 +95,21 @@ discard block |
||
95 | 95 | * @see \MyArtJaub\Webtrees\Module\AdminTasks\Model\TaskProviderInterface::getTask() |
96 | 96 | */ |
97 | 97 | public function getTask($task_name, $only_enabled = true) { |
98 | - $args = array ( |
|
98 | + $args = array( |
|
99 | 99 | 'task_name' => $task_name |
100 | 100 | ); |
101 | 101 | |
102 | - $sql = 'SELECT majat_name, majat_status, majat_last_run, majat_last_result, majat_frequency, majat_nb_occur, majat_running' . |
|
103 | - ' FROM `##maj_admintasks`' . |
|
102 | + $sql = 'SELECT majat_name, majat_status, majat_last_run, majat_last_result, majat_frequency, majat_nb_occur, majat_running'. |
|
103 | + ' FROM `##maj_admintasks`'. |
|
104 | 104 | ' WHERE majat_name = :task_name'; |
105 | - if($only_enabled) { |
|
105 | + if ($only_enabled) { |
|
106 | 106 | $sql .= ' AND majat_status = :status'; |
107 | 107 | $args['status'] = 'enabled'; |
108 | 108 | } |
109 | 109 | |
110 | 110 | $task_array = Database::prepare($sql)->execute($args)->fetchOneRow(\PDO::FETCH_ASSOC); |
111 | 111 | |
112 | - if($task_array) { |
|
112 | + if ($task_array) { |
|
113 | 113 | return $this->loadTaskFromRow($task_array); |
114 | 114 | } |
115 | 115 | |
@@ -136,7 +136,7 @@ discard block |
||
136 | 136 | * @see \MyArtJaub\Webtrees\Module\AdminTasks\Model\TaskProviderInterface::updateTask() |
137 | 137 | */ |
138 | 138 | public function updateTask(AbstractTask $task) { |
139 | - try{ |
|
139 | + try { |
|
140 | 140 | Database::prepare( |
141 | 141 | 'UPDATE `##maj_admintasks`'. |
142 | 142 | ' SET majat_status = :status,'. |
@@ -169,7 +169,7 @@ discard block |
||
169 | 169 | */ |
170 | 170 | public function getTasksCount() { |
171 | 171 | return Database::prepare( |
172 | - 'SELECT COUNT(majat_name)' . |
|
172 | + 'SELECT COUNT(majat_name)'. |
|
173 | 173 | ' FROM `##maj_admintasks`' |
174 | 174 | )->execute()->fetchOne(); |
175 | 175 | } |
@@ -194,20 +194,20 @@ discard block |
||
194 | 194 | 'time_out' => AbstractTask::TASK_TIME_OUT |
195 | 195 | ); |
196 | 196 | |
197 | - if(!$force) { |
|
197 | + if (!$force) { |
|
198 | 198 | $sql .= ' AND (DATE_ADD(majat_last_run, INTERVAL majat_frequency MINUTE) <= NOW() OR majat_last_result = 0)'; |
199 | 199 | } |
200 | 200 | |
201 | - if($task_name) { |
|
201 | + if ($task_name) { |
|
202 | 202 | $sql .= ' AND majat_name = :task_name'; |
203 | 203 | $args['task_name'] = $task_name; |
204 | 204 | } |
205 | 205 | |
206 | 206 | $data = Database::prepare($sql)->execute($args)->fetchAll(\PDO::FETCH_ASSOC); |
207 | 207 | |
208 | - foreach($data as $task_row) { |
|
208 | + foreach ($data as $task_row) { |
|
209 | 209 | $task = $this->loadTaskFromRow($task_row); |
210 | - if($task) |
|
210 | + if ($task) |
|
211 | 211 | { |
212 | 212 | $res[] = $task; |
213 | 213 | } |
@@ -220,10 +220,10 @@ discard block |
||
220 | 220 | * {@inheritDoc} |
221 | 221 | * @see \MyArtJaub\Webtrees\Module\AdminTasks\Model\TaskProviderInterface::getFilteredTasksList() |
222 | 222 | */ |
223 | - public function getFilteredTasksList($search = null, $order_by = null, $start = 0, $limit = null){ |
|
223 | + public function getFilteredTasksList($search = null, $order_by = null, $start = 0, $limit = null) { |
|
224 | 224 | $res = array(); |
225 | 225 | |
226 | - $sql = 'SELECT majat_name, majat_status, majat_last_run, majat_last_result, majat_frequency, majat_nb_occur, majat_running' . |
|
226 | + $sql = 'SELECT majat_name, majat_status, majat_last_run, majat_last_result, majat_frequency, majat_nb_occur, majat_running'. |
|
227 | 227 | ' FROM `##maj_admintasks`'; |
228 | 228 | |
229 | 229 | $args = array(); |
@@ -238,10 +238,10 @@ discard block |
||
238 | 238 | |
239 | 239 | switch ($value['dir']) { |
240 | 240 | case 'asc': |
241 | - $sql .= $value['column'] . ' ASC '; |
|
241 | + $sql .= $value['column'].' ASC '; |
|
242 | 242 | break; |
243 | 243 | case 'desc': |
244 | - $sql .= $value['column'] . ' DESC '; |
|
244 | + $sql .= $value['column'].' DESC '; |
|
245 | 245 | break; |
246 | 246 | } |
247 | 247 | $i++; |
@@ -258,9 +258,9 @@ discard block |
||
258 | 258 | |
259 | 259 | $data = Database::prepare($sql)->execute($args)->fetchAll(\PDO::FETCH_ASSOC); |
260 | 260 | |
261 | - foreach($data as $ga) { |
|
261 | + foreach ($data as $ga) { |
|
262 | 262 | $task = $this->loadTaskFromRow($ga); |
263 | - if($task && (empty($search) || ($search && strpos($task->getTitle(), $search) !== false))) |
|
263 | + if ($task && (empty($search) || ($search && strpos($task->getTitle(), $search) !== false))) |
|
264 | 264 | { |
265 | 265 | $res[] = $task; |
266 | 266 | } |
@@ -275,13 +275,13 @@ discard block |
||
275 | 275 | * @see \MyArtJaub\Webtrees\Module\AdminTasks\Model\TaskProviderInterface::getInstalledTasks() |
276 | 276 | */ |
277 | 277 | public function getInstalledTasks() { |
278 | - $tasks=array(); |
|
279 | - $dir=opendir($this->root_path); |
|
280 | - while (($file=readdir($dir))!==false){ |
|
278 | + $tasks = array(); |
|
279 | + $dir = opendir($this->root_path); |
|
280 | + while (($file = readdir($dir)) !== false) { |
|
281 | 281 | try { |
282 | - if($file == '.' || $file == '..') continue; |
|
283 | - $task = include $this->root_path . $file; |
|
284 | - if($task ) { |
|
282 | + if ($file == '.' || $file == '..') continue; |
|
283 | + $task = include $this->root_path.$file; |
|
284 | + if ($task) { |
|
285 | 285 | $task->setProvider($this); |
286 | 286 | Database::prepare( |
287 | 287 | 'INSERT IGNORE INTO `##maj_admintasks`'. |
@@ -300,7 +300,7 @@ discard block |
||
300 | 300 | } |
301 | 301 | } |
302 | 302 | catch (\Exception $ex) { |
303 | - Log::addErrorLog('An error occured while trying to load the task in file ' . $file . '. Exception: ' . $ex->getMessage()); |
|
303 | + Log::addErrorLog('An error occured while trying to load the task in file '.$file.'. Exception: '.$ex->getMessage()); |
|
304 | 304 | } |
305 | 305 | } |
306 | 306 | return $tasks; |
@@ -311,14 +311,14 @@ discard block |
||
311 | 311 | * {inhericDoc} |
312 | 312 | * @see \MyArtJaub\Webtrees\Module\AdminTasks\Model\TaskProviderInterface::deleteTask() |
313 | 313 | */ |
314 | - public function deleteTask($task_name){ |
|
315 | - try{ |
|
314 | + public function deleteTask($task_name) { |
|
315 | + try { |
|
316 | 316 | Database::beginTransaction(); |
317 | 317 | |
318 | 318 | Database::prepare('DELETE FROM `##maj_admintasks` WHERE majat_name= :task_name') |
319 | 319 | ->execute(array('task_name' => $task_name)); |
320 | 320 | Database::prepare('DELETE FROM `##gedcom_setting` WHERE setting_name LIKE :setting_name') |
321 | - ->execute(array('setting_name' => 'MAJ_AT_' . $task_name .'%')); |
|
321 | + ->execute(array('setting_name' => 'MAJ_AT_'.$task_name.'%')); |
|
322 | 322 | |
323 | 323 | Database::commit(); |
324 | 324 | |
@@ -326,10 +326,10 @@ discard block |
||
326 | 326 | |
327 | 327 | return true; |
328 | 328 | } |
329 | - catch(\Exception $ex) { |
|
329 | + catch (\Exception $ex) { |
|
330 | 330 | Database::rollback(); |
331 | 331 | |
332 | - Log::addErrorLog('An error occurred while deleting Admin Task '.$task_name.'. Exception: '. $ex->getMessage()); |
|
332 | + Log::addErrorLog('An error occurred while deleting Admin Task '.$task_name.'. Exception: '.$ex->getMessage()); |
|
333 | 333 | return false; |
334 | 334 | } |
335 | 335 | } |
@@ -49,8 +49,7 @@ discard block |
||
49 | 49 | return $task; |
50 | 50 | } |
51 | 51 | } |
52 | - } |
|
53 | - catch(\Exception $ex) { } |
|
52 | + } catch(\Exception $ex) { } |
|
54 | 53 | |
55 | 54 | return null; |
56 | 55 | } |
@@ -83,8 +82,7 @@ discard block |
||
83 | 82 | ); |
84 | 83 | |
85 | 84 | return $task; |
86 | - } |
|
87 | - else { |
|
85 | + } else { |
|
88 | 86 | $this->deleteTask($row['majat_name']); |
89 | 87 | } |
90 | 88 | return null; |
@@ -156,8 +154,7 @@ discard block |
||
156 | 154 | 'is_running' => $task->isRunning() ? 1 : 0 |
157 | 155 | )); |
158 | 156 | return true; |
159 | - } |
|
160 | - catch (\Exception $ex) { |
|
157 | + } catch (\Exception $ex) { |
|
161 | 158 | Log::addErrorLog(sprintf('Error while updating the Admin Task %s. Exception: %s', $task->getName(), $ex->getMessage())); |
162 | 159 | return false; |
163 | 160 | } |
@@ -279,7 +276,9 @@ discard block |
||
279 | 276 | $dir=opendir($this->root_path); |
280 | 277 | while (($file=readdir($dir))!==false){ |
281 | 278 | try { |
282 | - if($file == '.' || $file == '..') continue; |
|
279 | + if($file == '.' || $file == '..') { |
|
280 | + continue; |
|
281 | + } |
|
283 | 282 | $task = include $this->root_path . $file; |
284 | 283 | if($task ) { |
285 | 284 | $task->setProvider($this); |
@@ -294,12 +293,10 @@ discard block |
||
294 | 293 | )); |
295 | 294 | |
296 | 295 | $tasks[] = $task; |
297 | - } |
|
298 | - else { |
|
296 | + } else { |
|
299 | 297 | throw new \Exception; |
300 | 298 | } |
301 | - } |
|
302 | - catch (\Exception $ex) { |
|
299 | + } catch (\Exception $ex) { |
|
303 | 300 | Log::addErrorLog('An error occured while trying to load the task in file ' . $file . '. Exception: ' . $ex->getMessage()); |
304 | 301 | } |
305 | 302 | } |
@@ -325,8 +322,7 @@ discard block |
||
325 | 322 | Log::addConfigurationLog('Admin Task '.$task_name.' has been deleted from disk - deleting it from DB'); |
326 | 323 | |
327 | 324 | return true; |
328 | - } |
|
329 | - catch(\Exception $ex) { |
|
325 | + } catch(\Exception $ex) { |
|
330 | 326 | Database::rollback(); |
331 | 327 | |
332 | 328 | Log::addErrorLog('An error occurred while deleting Admin Task '.$task_name.'. Exception: '. $ex->getMessage()); |
@@ -185,8 +185,7 @@ discard block |
||
185 | 185 | I18N::translate('Error').Mail::EOL. |
186 | 186 | str_repeat('-', $nb_char_count_title)."\t".str_repeat('-', $nb_char_type)."\t".str_repeat('-', 20)."\t".str_repeat('-', strlen(I18N::translate('Error'))).Mail::EOL. |
187 | 187 | $tmp_message.Mail::EOL; |
188 | - } |
|
189 | - else{ |
|
188 | + } else{ |
|
190 | 189 | $message .= I18N::translate('No errors', $nb_errors).Mail::EOL.Mail::EOL; |
191 | 190 | } |
192 | 191 | |
@@ -251,8 +250,7 @@ discard block |
||
251 | 250 | } |
252 | 251 | } |
253 | 252 | return true; |
254 | - } |
|
255 | - catch (\Exception $ex) { |
|
253 | + } catch (\Exception $ex) { |
|
256 | 254 | Log::addErrorLog(sprintf('Error while updating the Admin Task "%s". Exception: %s', $this->getName(), $ex->getMessage())); |
257 | 255 | return false; |
258 | 256 | } |
@@ -29,11 +29,11 @@ discard block |
||
29 | 29 | */ |
30 | 30 | class HealthCheckEmailTask extends AbstractTask implements ConfigurableTaskInterface { |
31 | 31 | |
32 | - /** |
|
33 | - * {@inheritDoc} |
|
34 | - * @see \MyArtJaub\Webtrees\Module\AdminTasks\Model\AbstractTask::getTitle() |
|
35 | - */ |
|
36 | - public function getTitle() { |
|
32 | + /** |
|
33 | + * {@inheritDoc} |
|
34 | + * @see \MyArtJaub\Webtrees\Module\AdminTasks\Model\AbstractTask::getTitle() |
|
35 | + */ |
|
36 | + public function getTitle() { |
|
37 | 37 | return I18N::translate('Healthcheck Email'); |
38 | 38 | } |
39 | 39 | |
@@ -41,7 +41,7 @@ discard block |
||
41 | 41 | * {@inheritDoc} |
42 | 42 | * @see \MyArtJaub\Webtrees\Module\AdminTasks\Model\AbstractTask::getDefaultFrequency() |
43 | 43 | */ |
44 | - public function getDefaultFrequency() { |
|
44 | + public function getDefaultFrequency() { |
|
45 | 45 | return 10080; // = 1 week = 7 * 24 * 60 min |
46 | 46 | } |
47 | 47 | |
@@ -49,7 +49,7 @@ discard block |
||
49 | 49 | * {@inheritDoc} |
50 | 50 | * @see \MyArtJaub\Webtrees\Module\AdminTasks\Model\AbstractTask::executeSteps() |
51 | 51 | */ |
52 | - protected function executeSteps() { |
|
52 | + protected function executeSteps() { |
|
53 | 53 | |
54 | 54 | $res = false; |
55 | 55 | |
@@ -63,14 +63,14 @@ discard block |
||
63 | 63 | $interval = max($this->frequency, $interval_sincelast); |
64 | 64 | $nbdays = ceil($interval / (24 * 60)); |
65 | 65 | |
66 | - // Check for updates |
|
67 | - $latest_version_txt = Functions::fetchLatestVersion(); |
|
68 | - if (preg_match('/^[0-9.]+\|[0-9.]+\|/', $latest_version_txt)) { |
|
69 | - list($latest_version, , $download_url) = explode('|', $latest_version_txt); |
|
70 | - } else { |
|
71 | - // Cannot determine the latest version |
|
72 | - list($latest_version, , $download_url) = explode('|', '||'); |
|
73 | - } |
|
66 | + // Check for updates |
|
67 | + $latest_version_txt = Functions::fetchLatestVersion(); |
|
68 | + if (preg_match('/^[0-9.]+\|[0-9.]+\|/', $latest_version_txt)) { |
|
69 | + list($latest_version, , $download_url) = explode('|', $latest_version_txt); |
|
70 | + } else { |
|
71 | + // Cannot determine the latest version |
|
72 | + list($latest_version, , $download_url) = explode('|', '||'); |
|
73 | + } |
|
74 | 74 | |
75 | 75 | // Users statistics |
76 | 76 | $warnusers = 0; |
@@ -213,15 +213,15 @@ discard block |
||
213 | 213 | $html = ' |
214 | 214 | <div class="form-group"> |
215 | 215 | <label class="control-label col-sm-3"> '. |
216 | - I18N::translate('Enable healthcheck emails for') . |
|
217 | - '</label> |
|
216 | + I18N::translate('Enable healthcheck emails for') . |
|
217 | + '</label> |
|
218 | 218 | <div class="col-sm-9">'; |
219 | 219 | |
220 | 220 | foreach(Tree::getAll() as $tree){ |
221 | 221 | if(Auth::isManager($tree)){ |
222 | - $html .= '<div class="form-group row"> |
|
222 | + $html .= '<div class="form-group row"> |
|
223 | 223 | <span class="col-sm-3 control-label">' . |
224 | - $tree->getTitle() . |
|
224 | + $tree->getTitle() . |
|
225 | 225 | '</span> |
226 | 226 | <div class="col-sm-2">'; |
227 | 227 | $html .= FunctionsEdit::editFieldYesNo('HEALTHCHECK_ENABLED_' . $tree->getTreeId(), $tree->getPreference('MAJ_AT_'.$this->getName().'_ENABLED', 1), 'class="radio-inline"'); |
@@ -230,8 +230,8 @@ discard block |
||
230 | 230 | } |
231 | 231 | |
232 | 232 | $html .= ' <p class="small text-muted">'. |
233 | - I18N::translate('Enable the health check emails for each of the selected trees.') . |
|
234 | - '</p> |
|
233 | + I18N::translate('Enable the health check emails for each of the selected trees.') . |
|
234 | + '</p> |
|
235 | 235 | </div> |
236 | 236 | </div>'; |
237 | 237 |
@@ -42,7 +42,7 @@ discard block |
||
42 | 42 | * @see \MyArtJaub\Webtrees\Module\AdminTasks\Model\AbstractTask::getDefaultFrequency() |
43 | 43 | */ |
44 | 44 | public function getDefaultFrequency() { |
45 | - return 10080; // = 1 week = 7 * 24 * 60 min |
|
45 | + return 10080; // = 1 week = 7 * 24 * 60 min |
|
46 | 46 | } |
47 | 47 | |
48 | 48 | /** |
@@ -55,9 +55,9 @@ discard block |
||
55 | 55 | |
56 | 56 | // Get the number of days to take into account, either last 7 days or since last check |
57 | 57 | $interval_sincelast = 0; |
58 | - if($this->last_updated){ |
|
58 | + if ($this->last_updated) { |
|
59 | 59 | $tmpInt = $this->last_updated->diff(new \DateTime('now'), true); |
60 | - $interval_sincelast = ( $tmpInt->days * 24 + $tmpInt->h ) * 60 + $tmpInt->i; |
|
60 | + $interval_sincelast = ($tmpInt->days * 24 + $tmpInt->h) * 60 + $tmpInt->i; |
|
61 | 61 | } |
62 | 62 | |
63 | 63 | $interval = max($this->frequency, $interval_sincelast); |
@@ -66,17 +66,17 @@ discard block |
||
66 | 66 | // Check for updates |
67 | 67 | $latest_version_txt = Functions::fetchLatestVersion(); |
68 | 68 | if (preg_match('/^[0-9.]+\|[0-9.]+\|/', $latest_version_txt)) { |
69 | - list($latest_version, , $download_url) = explode('|', $latest_version_txt); |
|
69 | + list($latest_version,, $download_url) = explode('|', $latest_version_txt); |
|
70 | 70 | } else { |
71 | 71 | // Cannot determine the latest version |
72 | - list($latest_version, , $download_url) = explode('|', '||'); |
|
72 | + list($latest_version,, $download_url) = explode('|', '||'); |
|
73 | 73 | } |
74 | 74 | |
75 | 75 | // Users statistics |
76 | 76 | $warnusers = 0; |
77 | 77 | $nverusers = 0; |
78 | 78 | $applusers = 0; |
79 | - foreach(User::all() as $user) { |
|
79 | + foreach (User::all() as $user) { |
|
80 | 80 | if (((date("U") - (int)$user->getPreference('reg_timestamp')) > 604800) && !$user->getPreference('verified')) { |
81 | 81 | $warnusers++; |
82 | 82 | } |
@@ -90,20 +90,20 @@ discard block |
||
90 | 90 | |
91 | 91 | // Tree specifics checks |
92 | 92 | $one_tree_done = false; |
93 | - foreach(Tree::getAll() as $tree){ |
|
93 | + foreach (Tree::getAll() as $tree) { |
|
94 | 94 | $isTreeEnabled = $tree->getPreference('MAJ_AT_'.$this->getName().'_ENABLED'); |
95 | - if((is_null($isTreeEnabled) || $isTreeEnabled) && $webmaster = User::find($tree->getPreference('WEBMASTER_USER_ID'))){ |
|
95 | + if ((is_null($isTreeEnabled) || $isTreeEnabled) && $webmaster = User::find($tree->getPreference('WEBMASTER_USER_ID'))) { |
|
96 | 96 | I18N::init($webmaster->getPreference('language')); |
97 | 97 | |
98 | 98 | $subject = I18N::translate('Health Check Report').' - '.I18N::translate('Tree %s', $tree->getTitle()); |
99 | 99 | $message = |
100 | - I18N::translate('Health Check Report for the last %d days', $nbdays). Mail::EOL. Mail::EOL. |
|
100 | + I18N::translate('Health Check Report for the last %d days', $nbdays).Mail::EOL.Mail::EOL. |
|
101 | 101 | I18N::translate('Tree %s', $tree->getTitle()).Mail::EOL. |
102 | 102 | '=========================================='.Mail::EOL.Mail::EOL; |
103 | 103 | |
104 | 104 | // News |
105 | 105 | $message_version = ''; |
106 | - if($latest_version && version_compare(WT_VERSION, $latest_version)<0){ |
|
106 | + if ($latest_version && version_compare(WT_VERSION, $latest_version) < 0) { |
|
107 | 107 | $message_version = I18N::translate('News').Mail::EOL. |
108 | 108 | '-------------'.Mail::EOL. |
109 | 109 | I18N::translate('A new version of *webtrees* is available: %s. Upgrade as soon as possible.', $latest_version).Mail::EOL. |
@@ -119,7 +119,7 @@ discard block |
||
119 | 119 | I18N::translate('Not verified by the user')."\t\t".$applusers.Mail::EOL. |
120 | 120 | I18N::translate('Not approved by an administrator')."\t".$nverusers.Mail::EOL. |
121 | 121 | Mail::EOL; |
122 | - $message .= $message_users; |
|
122 | + $message .= $message_users; |
|
123 | 123 | |
124 | 124 | // Statistics tree: |
125 | 125 | $stats = new Stats($tree); |
@@ -159,7 +159,7 @@ discard block |
||
159 | 159 | ' AND log_time >= DATE_ADD( NOW(), INTERVAL - :nb_days DAY)'. |
160 | 160 | ' GROUP BY log_message, gedcom_id'. |
161 | 161 | ' ORDER BY lastoccurred DESC'; |
162 | - $errors=Database::prepare($sql)->execute(array( |
|
162 | + $errors = Database::prepare($sql)->execute(array( |
|
163 | 163 | 'log_type' => Log::TYPE_ERROR, |
164 | 164 | 'gedcom_id' => $tree->getTreeId(), |
165 | 165 | 'nb_days' => $nbdays |
@@ -175,7 +175,7 @@ discard block |
||
175 | 175 | $tmp_message .= str_replace("\n", "\n\t\t\t\t\t\t", $error->log_message).Mail::EOL; |
176 | 176 | $nb_errors += $error->nblogs; |
177 | 177 | } |
178 | - if($nb_errors > 0){ |
|
178 | + if ($nb_errors > 0) { |
|
179 | 179 | $message .= I18N::translate('Errors [%d]', $nb_errors).Mail::EOL. |
180 | 180 | '-------------'.Mail::EOL. |
181 | 181 | WT_BASE_URL.'admin_site_logs.php'.Mail::EOL. |
@@ -186,12 +186,12 @@ discard block |
||
186 | 186 | str_repeat('-', $nb_char_count_title)."\t".str_repeat('-', $nb_char_type)."\t".str_repeat('-', 20)."\t".str_repeat('-', strlen(I18N::translate('Error'))).Mail::EOL. |
187 | 187 | $tmp_message.Mail::EOL; |
188 | 188 | } |
189 | - else{ |
|
189 | + else { |
|
190 | 190 | $message .= I18N::translate('No errors', $nb_errors).Mail::EOL.Mail::EOL; |
191 | 191 | } |
192 | 192 | |
193 | 193 | $tmpres = true; |
194 | - if($webmaster->getPreference('contactmethod') !== 'messaging' |
|
194 | + if ($webmaster->getPreference('contactmethod') !== 'messaging' |
|
195 | 195 | && $webmaster->getPreference('contactmethod') !== 'none') { |
196 | 196 | $tmpres = Mail::systemMessage($tree, $webmaster, $subject, $message); |
197 | 197 | } |
@@ -213,24 +213,24 @@ discard block |
||
213 | 213 | $html = ' |
214 | 214 | <div class="form-group"> |
215 | 215 | <label class="control-label col-sm-3"> '. |
216 | - I18N::translate('Enable healthcheck emails for') . |
|
216 | + I18N::translate('Enable healthcheck emails for'). |
|
217 | 217 | '</label> |
218 | 218 | <div class="col-sm-9">'; |
219 | 219 | |
220 | - foreach(Tree::getAll() as $tree){ |
|
221 | - if(Auth::isManager($tree)){ |
|
220 | + foreach (Tree::getAll() as $tree) { |
|
221 | + if (Auth::isManager($tree)) { |
|
222 | 222 | $html .= '<div class="form-group row"> |
223 | 223 | <span class="col-sm-3 control-label">' . |
224 | - $tree->getTitle() . |
|
224 | + $tree->getTitle(). |
|
225 | 225 | '</span> |
226 | 226 | <div class="col-sm-2">'; |
227 | - $html .= FunctionsEdit::editFieldYesNo('HEALTHCHECK_ENABLED_' . $tree->getTreeId(), $tree->getPreference('MAJ_AT_'.$this->getName().'_ENABLED', 1), 'class="radio-inline"'); |
|
227 | + $html .= FunctionsEdit::editFieldYesNo('HEALTHCHECK_ENABLED_'.$tree->getTreeId(), $tree->getPreference('MAJ_AT_'.$this->getName().'_ENABLED', 1), 'class="radio-inline"'); |
|
228 | 228 | $html .= '</div></div>'; |
229 | 229 | } |
230 | 230 | } |
231 | 231 | |
232 | 232 | $html .= ' <p class="small text-muted">'. |
233 | - I18N::translate('Enable the health check emails for each of the selected trees.') . |
|
233 | + I18N::translate('Enable the health check emails for each of the selected trees.'). |
|
234 | 234 | '</p> |
235 | 235 | </div> |
236 | 236 | </div>'; |
@@ -244,9 +244,9 @@ discard block |
||
244 | 244 | */ |
245 | 245 | public function saveConfig() { |
246 | 246 | try { |
247 | - foreach(Tree::getAll() as $tree){ |
|
248 | - if(Auth::isManager($tree)){ |
|
249 | - $tree_enabled = Filter::postInteger('HEALTHCHECK_ENABLED_' . $tree->getTreeId(), 0, 1); |
|
247 | + foreach (Tree::getAll() as $tree) { |
|
248 | + if (Auth::isManager($tree)) { |
|
249 | + $tree_enabled = Filter::postInteger('HEALTHCHECK_ENABLED_'.$tree->getTreeId(), 0, 1); |
|
250 | 250 | $tree->setPreference('MAJ_AT_'.$this->getName().'_ENABLED', $tree_enabled); |
251 | 251 | } |
252 | 252 | } |