@@ -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 |
@@ -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 |
@@ -22,18 +22,18 @@ |
||
22 | 22 | public function upgrade() { |
23 | 23 | |
24 | 24 | Database::exec( |
25 | - 'CREATE TABLE IF NOT EXISTS `##maj_sosa` (' . |
|
26 | - ' majs_gedcom_id INTEGER NOT NULL,' . |
|
27 | - ' majs_user_id INTEGER NOT NULL DEFAULT -1,' . |
|
28 | - ' majs_sosa BIGINT UNSIGNED NOT NULL,' . // Allow to calculate sosa on 64 generations |
|
29 | - ' majs_i_id VARCHAR(20) NOT NULL,' . |
|
30 | - ' majs_gen TINYINT NULL,' . |
|
31 | - ' majs_birth_year SMALLINT NULL,' . |
|
32 | - ' majs_death_year SMALLINT NULL,' . |
|
33 | - ' PRIMARY KEY (majs_gedcom_id, majs_user_id, majs_sosa),' . |
|
34 | - ' FOREIGN KEY `##gedcom_id_fk1` (majs_gedcom_id) REFERENCES `##gedcom` (gedcom_id) ON DELETE CASCADE,' . |
|
35 | - ' FOREIGN KEY `##user_id_fk1` (majs_user_id) REFERENCES `##user` (user_id) ON DELETE CASCADE' . |
|
36 | - ') COLLATE utf8_unicode_ci ENGINE=InnoDB' |
|
25 | + 'CREATE TABLE IF NOT EXISTS `##maj_sosa` (' . |
|
26 | + ' majs_gedcom_id INTEGER NOT NULL,' . |
|
27 | + ' majs_user_id INTEGER NOT NULL DEFAULT -1,' . |
|
28 | + ' majs_sosa BIGINT UNSIGNED NOT NULL,' . // Allow to calculate sosa on 64 generations |
|
29 | + ' majs_i_id VARCHAR(20) NOT NULL,' . |
|
30 | + ' majs_gen TINYINT NULL,' . |
|
31 | + ' majs_birth_year SMALLINT NULL,' . |
|
32 | + ' majs_death_year SMALLINT NULL,' . |
|
33 | + ' PRIMARY KEY (majs_gedcom_id, majs_user_id, majs_sosa),' . |
|
34 | + ' FOREIGN KEY `##gedcom_id_fk1` (majs_gedcom_id) REFERENCES `##gedcom` (gedcom_id) ON DELETE CASCADE,' . |
|
35 | + ' FOREIGN KEY `##user_id_fk1` (majs_user_id) REFERENCES `##user` (user_id) ON DELETE CASCADE' . |
|
36 | + ') COLLATE utf8_unicode_ci ENGINE=InnoDB' |
|
37 | 37 | ); |
38 | 38 | } |
39 | 39 | } |
@@ -23,17 +23,17 @@ discard block |
||
23 | 23 | * {@inhericDoc} |
24 | 24 | * @see \MyArtJaub\Webtrees\Mvc\View\AbstractView::renderContent() |
25 | 25 | */ |
26 | - protected function renderContent() { |
|
27 | - ?> |
|
26 | + protected function renderContent() { |
|
27 | + ?> |
|
28 | 28 | <div id="maj-sosa-list-page" class="center"> |
29 | 29 | <h2><?php echo $this->data->get('title'); ?></h2> |
30 | 30 | |
31 | 31 | <?php if($this->data->get('is_setup')) { |
32 | - $selectedgen = $this->data->get('generation'); |
|
33 | - $this->renderSosaHeader(); |
|
34 | - if($this->data->get('has_sosa') ) { |
|
35 | - if($selectedgen > 0) { |
|
36 | - ?> |
|
32 | + $selectedgen = $this->data->get('generation'); |
|
33 | + $this->renderSosaHeader(); |
|
34 | + if($this->data->get('has_sosa') ) { |
|
35 | + if($selectedgen > 0) { |
|
36 | + ?> |
|
37 | 37 | <div id="sosalist-tabs"> |
38 | 38 | <ul> |
39 | 39 | <li><a href="#sosalist-indi"><?php echo I18N::translate('Individuals'); ?></a></li> |
@@ -53,7 +53,7 @@ discard block |
||
53 | 53 | <?php } else { ?> |
54 | 54 | <p class="warning"><?php echo I18N::translate('No ancestor has been found for generation %d', $selectedgen); ?></p> |
55 | 55 | <?php } |
56 | - } |
|
56 | + } |
|
57 | 57 | } else { ?> |
58 | 58 | <p class="warning"><?php echo I18N::translate('The list could not be displayed. Reasons might be:'); ?><br/> |
59 | 59 | <ul> |
@@ -64,15 +64,15 @@ discard block |
||
64 | 64 | <?php } ?> |
65 | 65 | </div> |
66 | 66 | <?php |
67 | - } |
|
67 | + } |
|
68 | 68 | |
69 | - /** |
|
70 | - * Render the common header to Sosa Lists, made of the generation selector, and the generation navigator |
|
71 | - */ |
|
72 | - protected function renderSosaHeader() { |
|
73 | - $selectedgen = $this->data->get('generation'); |
|
74 | - $max_gen = $this->data->get('max_gen'); |
|
75 | - ?> |
|
69 | + /** |
|
70 | + * Render the common header to Sosa Lists, made of the generation selector, and the generation navigator |
|
71 | + */ |
|
72 | + protected function renderSosaHeader() { |
|
73 | + $selectedgen = $this->data->get('generation'); |
|
74 | + $max_gen = $this->data->get('max_gen'); |
|
75 | + ?> |
|
76 | 76 | |
77 | 77 | <form method="get" name="setgen" action="module.php"> |
78 | 78 | <input type="hidden" name="mod" value="<?php echo $this->data->get('url_module');?>"> |
@@ -117,7 +117,7 @@ discard block |
||
117 | 117 | |
118 | 118 | <?php |
119 | 119 | } |
120 | - } |
|
120 | + } |
|
121 | 121 | |
122 | 122 | } |
123 | 123 | |
124 | 124 | \ No newline at end of file |
@@ -23,18 +23,18 @@ |
||
23 | 23 | * {@inhericDoc} |
24 | 24 | * @see \MyArtJaub\Webtrees\Mvc\View\AbstractView::renderContent() |
25 | 25 | */ |
26 | - protected function renderContent() { |
|
26 | + protected function renderContent() { |
|
27 | 27 | |
28 | - if($this->data->get('is_success', false)) { |
|
29 | - ?> |
|
28 | + if($this->data->get('is_success', false)) { |
|
29 | + ?> |
|
30 | 30 | <i class="icon-maj-success" title="<?php echo I18N::translate('Success'); ?>"></i> |
31 | 31 | <?php echo I18N::translate('Success'); ?> |
32 | 32 | <?php } else { ?> |
33 | 33 | <i class="icon-maj-error" title="<?php echo I18N::translate('Error'); ?>"></i> |
34 | 34 | <?php echo I18N::translate('Error'); ?> |
35 | 35 | <?php if($error = $this->data->get('error')) { echo ' - ' . $error; } |
36 | - } |
|
37 | - } |
|
36 | + } |
|
37 | + } |
|
38 | 38 | |
39 | 39 | } |
40 | 40 | |
41 | 41 | \ No newline at end of file |
@@ -23,17 +23,17 @@ |
||
23 | 23 | |
24 | 24 | Database::exec( |
25 | 25 | "CREATE TABLE IF NOT EXISTS `##maj_hooks` (". |
26 | - " majh_id INTEGER AUTO_INCREMENT NOT NULL,". |
|
27 | - " majh_hook_function VARCHAR(32) NOT NULL,". |
|
26 | + " majh_id INTEGER AUTO_INCREMENT NOT NULL,". |
|
27 | + " majh_hook_function VARCHAR(32) NOT NULL,". |
|
28 | 28 | " majh_hook_context VARCHAR(32) NOT NULL DEFAULT 'all',". |
29 | - " majh_module_name VARCHAR(32) NOT NULL,". |
|
30 | - " majh_module_priority INTEGER NOT NULL DEFAULT 99,". |
|
31 | - " majh_status ENUM('enabled', 'disabled') NOT NULL DEFAULT 'enabled',". |
|
32 | - " PRIMARY KEY (majh_id),". |
|
33 | - " UNIQUE KEY `##maj_hooks_uk` (majh_hook_function, majh_hook_context, majh_module_name),". |
|
34 | - " FOREIGN KEY `##module_name_fk1` (majh_module_name)". |
|
29 | + " majh_module_name VARCHAR(32) NOT NULL,". |
|
30 | + " majh_module_priority INTEGER NOT NULL DEFAULT 99,". |
|
31 | + " majh_status ENUM('enabled', 'disabled') NOT NULL DEFAULT 'enabled',". |
|
32 | + " PRIMARY KEY (majh_id),". |
|
33 | + " UNIQUE KEY `##maj_hooks_uk` (majh_hook_function, majh_hook_context, majh_module_name),". |
|
34 | + " FOREIGN KEY `##module_name_fk1` (majh_module_name)". |
|
35 | 35 | " REFERENCES `##module` (module_name) ON DELETE CASCADE ON UPDATE CASCADE". |
36 | - ") COLLATE utf8_unicode_ci ENGINE=InnoDB" |
|
36 | + ") COLLATE utf8_unicode_ci ENGINE=InnoDB" |
|
37 | 37 | ); |
38 | 38 | } |
39 | 39 | } |
@@ -25,11 +25,11 @@ discard block |
||
25 | 25 | * {@inhericDoc} |
26 | 26 | * @see \MyArtJaub\Webtrees\Mvc\View\AbstractView::renderContent() |
27 | 27 | */ |
28 | - protected function renderContent() { |
|
28 | + protected function renderContent() { |
|
29 | 29 | |
30 | - $table_id = $this->data->get('table_id'); |
|
30 | + $table_id = $this->data->get('table_id'); |
|
31 | 31 | |
32 | - ?> |
|
32 | + ?> |
|
33 | 33 | <ol class="breadcrumb small"> |
34 | 34 | <li><a href="admin.php"><?php echo I18N::translate('Control panel'); ?></a></li> |
35 | 35 | <li><a href="admin_modules.php"><?php echo I18N::translate('Module administration'); ?></a></li> |
@@ -79,7 +79,7 @@ discard block |
||
79 | 79 | </div> |
80 | 80 | |
81 | 81 | <?php |
82 | - } |
|
82 | + } |
|
83 | 83 | |
84 | 84 | } |
85 | 85 | |
86 | 86 | \ No newline at end of file |
@@ -49,62 +49,62 @@ |
||
49 | 49 | } |
50 | 50 | |
51 | 51 | /** |
52 | - * Protected constructor. |
|
53 | - */ |
|
54 | - protected function __construct() |
|
55 | - { |
|
56 | - $this->modules_list = array(); |
|
57 | - } |
|
52 | + * Protected constructor. |
|
53 | + */ |
|
54 | + protected function __construct() |
|
55 | + { |
|
56 | + $this->modules_list = array(); |
|
57 | + } |
|
58 | 58 | |
59 | - /** |
|
60 | - * {@inheritDoc} |
|
61 | - * @see \MyArtJaub\Webtrees\Module\ModuleManagerInterface::isOperational() |
|
62 | - */ |
|
63 | - public function isOperational($moduleName) { |
|
64 | - if(!array_key_exists($moduleName, $this->modules_list)) { |
|
65 | - if($module = fw\Module::getModuleByName($moduleName)) { |
|
66 | - if($module instanceof DependentInterface) { |
|
67 | - if($module->validatePrerequisites()) { |
|
68 | - $this->modules_list[$moduleName] = TRUE; |
|
69 | - return true; |
|
70 | - } else { |
|
71 | - // Do not cache the result, |
|
72 | - // as they could change by the next call to the method |
|
73 | - return false; |
|
74 | - } |
|
75 | - } |
|
76 | - else { |
|
77 | - $this->modules_list[$moduleName] = TRUE; |
|
78 | - return true; |
|
79 | - } |
|
80 | - } |
|
81 | - else { |
|
82 | - $this->modules_list[$moduleName] = FALSE; |
|
83 | - } |
|
84 | - } |
|
85 | - return $this->modules_list[$moduleName]; |
|
59 | + /** |
|
60 | + * {@inheritDoc} |
|
61 | + * @see \MyArtJaub\Webtrees\Module\ModuleManagerInterface::isOperational() |
|
62 | + */ |
|
63 | + public function isOperational($moduleName) { |
|
64 | + if(!array_key_exists($moduleName, $this->modules_list)) { |
|
65 | + if($module = fw\Module::getModuleByName($moduleName)) { |
|
66 | + if($module instanceof DependentInterface) { |
|
67 | + if($module->validatePrerequisites()) { |
|
68 | + $this->modules_list[$moduleName] = TRUE; |
|
69 | + return true; |
|
70 | + } else { |
|
71 | + // Do not cache the result, |
|
72 | + // as they could change by the next call to the method |
|
73 | + return false; |
|
74 | + } |
|
75 | + } |
|
76 | + else { |
|
77 | + $this->modules_list[$moduleName] = TRUE; |
|
78 | + return true; |
|
79 | + } |
|
80 | + } |
|
81 | + else { |
|
82 | + $this->modules_list[$moduleName] = FALSE; |
|
83 | + } |
|
84 | + } |
|
85 | + return $this->modules_list[$moduleName]; |
|
86 | 86 | |
87 | - } |
|
87 | + } |
|
88 | 88 | |
89 | 89 | |
90 | - /** |
|
91 | - * Private clone method to prevent cloning of the instance of the |
|
92 | - * *ModuleManager* instance. |
|
93 | - * |
|
94 | - * @return void |
|
95 | - */ |
|
96 | - private function __clone() |
|
97 | - { |
|
98 | - } |
|
90 | + /** |
|
91 | + * Private clone method to prevent cloning of the instance of the |
|
92 | + * *ModuleManager* instance. |
|
93 | + * |
|
94 | + * @return void |
|
95 | + */ |
|
96 | + private function __clone() |
|
97 | + { |
|
98 | + } |
|
99 | 99 | |
100 | - /** |
|
101 | - * Private unserialize method to prevent unserializing of the *ModuleManager* |
|
102 | - * instance. |
|
103 | - * |
|
104 | - * @return void |
|
105 | - */ |
|
106 | - private function __wakeup() |
|
107 | - { |
|
108 | - } |
|
100 | + /** |
|
101 | + * Private unserialize method to prevent unserializing of the *ModuleManager* |
|
102 | + * instance. |
|
103 | + * |
|
104 | + * @return void |
|
105 | + */ |
|
106 | + private function __wakeup() |
|
107 | + { |
|
108 | + } |
|
109 | 109 | |
110 | 110 | } |
@@ -28,15 +28,15 @@ discard block |
||
28 | 28 | * {@inhericDoc} |
29 | 29 | * @see \MyArtJaub\Webtrees\Mvc\View\AbstractView::renderContent() |
30 | 30 | */ |
31 | - protected function renderContent() { |
|
31 | + protected function renderContent() { |
|
32 | 32 | |
33 | - if (Module::getModuleByName('ckeditor')) { |
|
34 | - CkeditorModule::enableEditor($this->ctrl); |
|
35 | - } |
|
33 | + if (Module::getModuleByName('ckeditor')) { |
|
34 | + CkeditorModule::enableEditor($this->ctrl); |
|
35 | + } |
|
36 | 36 | |
37 | - /** @var AbstractModule $module */ |
|
38 | - $module = $this->data->get('module'); |
|
39 | - ?> |
|
37 | + /** @var AbstractModule $module */ |
|
38 | + $module = $this->data->get('module'); |
|
39 | + ?> |
|
40 | 40 | <ol class="breadcrumb small"> |
41 | 41 | <li><a href="admin.php"><?php echo I18N::translate('Control panel'); ?></a></li> |
42 | 42 | <li><a href="admin_modules.php"><?php echo I18N::translate('Module administration'); ?></a></li> |
@@ -187,7 +187,7 @@ discard block |
||
187 | 187 | </form> |
188 | 188 | |
189 | 189 | <?php |
190 | - } |
|
190 | + } |
|
191 | 191 | |
192 | 192 | } |
193 | 193 | |
194 | 194 | \ No newline at end of file |