@@ -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 |
@@ -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 |
@@ -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 |
@@ -60,13 +60,13 @@ |
||
60 | 60 | ?> |
61 | 61 | <tr> |
62 | 62 | <td> |
63 | - <input type="hidden" name="hook-<?php echo $hook->id;?>" value="yes" > |
|
64 | - <?php echo FunctionsEdit::twoStateCheckbox('status-'.($hook->id), ($hook->status)=='enabled'); ?> |
|
63 | + <input type="hidden" name="hook-<?php echo $hook->id; ?>" value="yes" > |
|
64 | + <?php echo FunctionsEdit::twoStateCheckbox('status-'.($hook->id), ($hook->status) == 'enabled'); ?> |
|
65 | 65 | </td> |
66 | - <td><?php echo (($hook->status)=='enabled'); ?></td> |
|
66 | + <td><?php echo (($hook->status) == 'enabled'); ?></td> |
|
67 | 67 | <td><?php echo $hook->hook; ?></td> |
68 | 68 | <td><?php echo $hook->context; ?></td> |
69 | - <td><?php if($mod = Module::getModuleByName($hook->module)) echo $mod->getTitle(); ?></td> |
|
69 | + <td><?php if ($mod = Module::getModuleByName($hook->module)) echo $mod->getTitle(); ?></td> |
|
70 | 70 | <td><input type="text" class="center" size="2" value="<?php echo $hook->priority; ?>" name="moduleorder-<?php echo $hook->id; ?>" /></td> |
71 | 71 | <td><?php echo $hook->priority; ?></td> |
72 | 72 | </tr> |
@@ -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 | } |
@@ -61,10 +61,10 @@ |
||
61 | 61 | * @see \MyArtJaub\Webtrees\Module\ModuleManagerInterface::isOperational() |
62 | 62 | */ |
63 | 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()) { |
|
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 | 68 | $this->modules_list[$moduleName] = TRUE; |
69 | 69 | return true; |
70 | 70 | } else { |
@@ -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 |
@@ -44,7 +44,7 @@ discard block |
||
44 | 44 | * |
45 | 45 | * @return (OutlineMap|null) |
46 | 46 | */ |
47 | - public function getMap(){ |
|
47 | + public function getMap() { |
|
48 | 48 | return $this->map; |
49 | 49 | } |
50 | 50 | |
@@ -64,7 +64,7 @@ discard block |
||
64 | 64 | * |
65 | 65 | * @return int |
66 | 66 | */ |
67 | - public function getMapLevel(){ |
|
67 | + public function getMapLevel() { |
|
68 | 68 | return $this->map_level; |
69 | 69 | } |
70 | 70 | |
@@ -84,7 +84,7 @@ discard block |
||
84 | 84 | * |
85 | 85 | * @return bool |
86 | 86 | */ |
87 | - public function isUsingFlags(){ |
|
87 | + public function isUsingFlags() { |
|
88 | 88 | return $this->use_flags; |
89 | 89 | } |
90 | 90 | |
@@ -104,7 +104,7 @@ discard block |
||
104 | 104 | * |
105 | 105 | * @return int |
106 | 106 | */ |
107 | - public function getMaxDetailsInGen(){ |
|
107 | + public function getMaxDetailsInGen() { |
|
108 | 108 | return $this->max_details_in_gen; |
109 | 109 | } |
110 | 110 |
@@ -15,58 +15,58 @@ discard block |
||
15 | 15 | */ |
16 | 16 | class GeoDisplayOptions { |
17 | 17 | |
18 | - /** |
|
18 | + /** |
|
19 | 19 | * Outline map to be used for diaplay |
20 | - * @var (null|OutlineMap) $map |
|
21 | - */ |
|
22 | - protected $map; |
|
20 | + * @var (null|OutlineMap) $map |
|
21 | + */ |
|
22 | + protected $map; |
|
23 | 23 | |
24 | 24 | /** |
25 | 25 | * Level in the Gedcom hierarchy of the parent level of the outline map. |
26 | 26 | * @var int $map_level |
27 | 27 | */ |
28 | - protected $map_level; |
|
28 | + protected $map_level; |
|
29 | 29 | |
30 | 30 | /** |
31 | 31 | * Option to use flags in places display, instead of or in addition to the name. |
32 | 32 | * @var bool $use_flags |
33 | 33 | */ |
34 | - protected $use_flags; |
|
34 | + protected $use_flags; |
|
35 | 35 | |
36 | 36 | /** |
37 | 37 | * Option to define the number of top places to display in the generation view. |
38 | 38 | * @var int $max_details_in_gen |
39 | 39 | */ |
40 | - protected $max_details_in_gen; |
|
40 | + protected $max_details_in_gen; |
|
41 | 41 | |
42 | - /** |
|
42 | + /** |
|
43 | 43 | * Get the outline map to use for display. |
44 | 44 | * |
45 | - * @return (OutlineMap|null) |
|
46 | - */ |
|
47 | - public function getMap(){ |
|
48 | - return $this->map; |
|
49 | - } |
|
45 | + * @return (OutlineMap|null) |
|
46 | + */ |
|
47 | + public function getMap(){ |
|
48 | + return $this->map; |
|
49 | + } |
|
50 | 50 | |
51 | 51 | /** |
52 | 52 | * Set the outline map to use for display. |
53 | 53 | * |
54 | - * @param (OutlineMap|null) $map |
|
54 | + * @param (OutlineMap|null) $map |
|
55 | 55 | * @return self Enable method-chaining |
56 | - */ |
|
57 | - public function setMap(OutlineMap $map = null) { |
|
58 | - $this->map = $map; |
|
59 | - return $this; |
|
60 | - } |
|
56 | + */ |
|
57 | + public function setMap(OutlineMap $map = null) { |
|
58 | + $this->map = $map; |
|
59 | + return $this; |
|
60 | + } |
|
61 | 61 | |
62 | 62 | /** |
63 | 63 | * Get the level of the map parent place |
64 | 64 | * |
65 | 65 | * @return int |
66 | 66 | */ |
67 | - public function getMapLevel(){ |
|
68 | - return $this->map_level; |
|
69 | - } |
|
67 | + public function getMapLevel(){ |
|
68 | + return $this->map_level; |
|
69 | + } |
|
70 | 70 | |
71 | 71 | /** |
72 | 72 | * Set the level of the map parent place |
@@ -74,19 +74,19 @@ discard block |
||
74 | 74 | * @param int $maplevel |
75 | 75 | * @return self Enable method-chaining |
76 | 76 | */ |
77 | - public function setMapLevel($maplevel) { |
|
78 | - $this->map_level = $maplevel; |
|
79 | - return $this; |
|
80 | - } |
|
77 | + public function setMapLevel($maplevel) { |
|
78 | + $this->map_level = $maplevel; |
|
79 | + return $this; |
|
80 | + } |
|
81 | 81 | |
82 | 82 | /** |
83 | 83 | * Get whether flags should be used in places display |
84 | 84 | * |
85 | 85 | * @return bool |
86 | 86 | */ |
87 | - public function isUsingFlags(){ |
|
88 | - return $this->use_flags; |
|
89 | - } |
|
87 | + public function isUsingFlags(){ |
|
88 | + return $this->use_flags; |
|
89 | + } |
|
90 | 90 | |
91 | 91 | /** |
92 | 92 | * Set whether flags should be used in places display |
@@ -94,19 +94,19 @@ discard block |
||
94 | 94 | * @param bool $use_flags |
95 | 95 | * @return self Enable method-chaining |
96 | 96 | */ |
97 | - public function setUsingFlags($use_flags) { |
|
98 | - $this->use_flags = $use_flags; |
|
99 | - return $this; |
|
100 | - } |
|
97 | + public function setUsingFlags($use_flags) { |
|
98 | + $this->use_flags = $use_flags; |
|
99 | + return $this; |
|
100 | + } |
|
101 | 101 | |
102 | 102 | /** |
103 | 103 | * Get the number of Top Places in the generation view |
104 | 104 | * |
105 | 105 | * @return int |
106 | 106 | */ |
107 | - public function getMaxDetailsInGen(){ |
|
108 | - return $this->max_details_in_gen; |
|
109 | - } |
|
107 | + public function getMaxDetailsInGen(){ |
|
108 | + return $this->max_details_in_gen; |
|
109 | + } |
|
110 | 110 | |
111 | 111 | /** |
112 | 112 | * Set the number of Top Places in the generation view |
@@ -114,10 +114,10 @@ discard block |
||
114 | 114 | * @param int $max_details_in_gen |
115 | 115 | * @return self Enable method-chaining |
116 | 116 | */ |
117 | - public function setMaxDetailsInGen($max_details_in_gen) { |
|
118 | - $this->max_details_in_gen = $max_details_in_gen; |
|
119 | - return $this; |
|
120 | - } |
|
117 | + public function setMaxDetailsInGen($max_details_in_gen) { |
|
118 | + $this->max_details_in_gen = $max_details_in_gen; |
|
119 | + return $this; |
|
120 | + } |
|
121 | 121 | |
122 | 122 | } |
123 | 123 | |
124 | 124 | \ No newline at end of file |
@@ -19,49 +19,49 @@ discard block |
||
19 | 19 | * Width of the map (in pixels). |
20 | 20 | * @var int $width |
21 | 21 | */ |
22 | - public $width; |
|
22 | + public $width; |
|
23 | 23 | |
24 | 24 | /** |
25 | 25 | * Height of the map (in pixels). |
26 | 26 | * @var int $height |
27 | 27 | */ |
28 | - public $height; |
|
28 | + public $height; |
|
29 | 29 | |
30 | 30 | /** |
31 | 31 | * Background color for the map shapes with values (when no transparency if applied). |
32 | 32 | * @var string $max_color |
33 | 33 | */ |
34 | - public $max_color; |
|
34 | + public $max_color; |
|
35 | 35 | |
36 | 36 | /** |
37 | 37 | * Background color for the map shapes when hovered. |
38 | 38 | * @var string $hover_color |
39 | 39 | */ |
40 | - public $hover_color; |
|
40 | + public $hover_color; |
|
41 | 41 | |
42 | 42 | /** |
43 | 43 | * Background color for the map. |
44 | 44 | * @var string $background_color |
45 | 45 | */ |
46 | - public $background_color; |
|
46 | + public $background_color; |
|
47 | 47 | |
48 | 48 | /** |
49 | 49 | * Border color for the map. |
50 | 50 | * @var string $background_stroke |
51 | 51 | */ |
52 | - public $background_stroke; |
|
52 | + public $background_stroke; |
|
53 | 53 | |
54 | 54 | /** |
55 | 55 | * Default color for the shapes (without any value). |
56 | 56 | * @var string $default_color |
57 | 57 | */ |
58 | - public $default_color; |
|
58 | + public $default_color; |
|
59 | 59 | |
60 | 60 | /** |
61 | 61 | * Default border color for the shapes. |
62 | 62 | * @var string $default_stroke |
63 | 63 | */ |
64 | - public $default_stroke; |
|
64 | + public $default_stroke; |
|
65 | 65 | |
66 | 66 | /** |
67 | 67 | * Constructor for OutlineMapCanvas. |
@@ -75,25 +75,25 @@ discard block |
||
75 | 75 | * @param string $default_color Default background color for the shapes |
76 | 76 | * @param string $default_stroke Default border color for the shapes |
77 | 77 | */ |
78 | - public function __construct( |
|
79 | - $width, |
|
80 | - $height, |
|
81 | - $max_color, |
|
82 | - $hover_color, |
|
83 | - $background_color, |
|
84 | - $background_stroke, |
|
85 | - $default_color, |
|
86 | - $default_stroke |
|
87 | - ) { |
|
88 | - $this->width = $width; |
|
89 | - $this->height = $height; |
|
90 | - $this->max_color = $max_color; |
|
91 | - $this->hover_color = $hover_color; |
|
92 | - $this->background_color = $background_color; |
|
93 | - $this->background_stroke = $background_stroke; |
|
94 | - $this->default_color = $default_color; |
|
95 | - $this->default_stroke = $default_stroke; |
|
96 | - } |
|
78 | + public function __construct( |
|
79 | + $width, |
|
80 | + $height, |
|
81 | + $max_color, |
|
82 | + $hover_color, |
|
83 | + $background_color, |
|
84 | + $background_stroke, |
|
85 | + $default_color, |
|
86 | + $default_stroke |
|
87 | + ) { |
|
88 | + $this->width = $width; |
|
89 | + $this->height = $height; |
|
90 | + $this->max_color = $max_color; |
|
91 | + $this->hover_color = $hover_color; |
|
92 | + $this->background_color = $background_color; |
|
93 | + $this->background_stroke = $background_stroke; |
|
94 | + $this->default_color = $default_color; |
|
95 | + $this->default_stroke = $default_stroke; |
|
96 | + } |
|
97 | 97 | |
98 | 98 | |
99 | 99 | } |
@@ -24,18 +24,18 @@ |
||
24 | 24 | */ |
25 | 25 | public function upgrade() { |
26 | 26 | Database::exec( |
27 | - 'CREATE TABLE IF NOT EXISTS `##maj_geodispersion` ('. |
|
28 | - ' majgd_id INTEGER AUTO_INCREMENT NOT NULL,'. |
|
29 | - ' majgd_file INTEGER NOT NULL,'. |
|
30 | - ' majgd_descr VARCHAR(70) NOT NULL,'. |
|
31 | - ' majgd_sublevel TINYINT NOT NULL,'. |
|
32 | - ' majgd_map VARCHAR(70) NULL,'. |
|
33 | - ' majgd_toplevel TINYINT NULL,'. |
|
34 | - ' majgd_status ENUM(\'enabled\', \'disabled\') NOT NULL DEFAULT \'enabled\','. |
|
35 | - ' majgd_useflagsgen ENUM(\'yes\', \'no\') NOT NULL DEFAULT \'no\','. |
|
36 | - ' majgd_detailsgen TINYINT NOT NULL DEFAULT 0,'. |
|
37 | - ' PRIMARY KEY (majgd_id)'. |
|
38 | - ') COLLATE utf8_unicode_ci ENGINE=InnoDB' |
|
27 | + 'CREATE TABLE IF NOT EXISTS `##maj_geodispersion` ('. |
|
28 | + ' majgd_id INTEGER AUTO_INCREMENT NOT NULL,'. |
|
29 | + ' majgd_file INTEGER NOT NULL,'. |
|
30 | + ' majgd_descr VARCHAR(70) NOT NULL,'. |
|
31 | + ' majgd_sublevel TINYINT NOT NULL,'. |
|
32 | + ' majgd_map VARCHAR(70) NULL,'. |
|
33 | + ' majgd_toplevel TINYINT NULL,'. |
|
34 | + ' majgd_status ENUM(\'enabled\', \'disabled\') NOT NULL DEFAULT \'enabled\','. |
|
35 | + ' majgd_useflagsgen ENUM(\'yes\', \'no\') NOT NULL DEFAULT \'no\','. |
|
36 | + ' majgd_detailsgen TINYINT NOT NULL DEFAULT 0,'. |
|
37 | + ' PRIMARY KEY (majgd_id)'. |
|
38 | + ') COLLATE utf8_unicode_ci ENGINE=InnoDB' |
|
39 | 39 | ); |
40 | 40 | } |
41 | 41 | } |