@@ -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 |
@@ -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 | /** |
@@ -37,47 +37,47 @@ |
||
| 37 | 37 | */ |
| 38 | 38 | public function setTaskStatus(AbstractTask $task, $status); |
| 39 | 39 | |
| 40 | - /** |
|
| 41 | - * Update an Admin Task in the database. |
|
| 42 | - * |
|
| 43 | - * @param AbstractTask $task Task to update |
|
| 44 | - * @return bool |
|
| 45 | - */ |
|
| 46 | - function updateTask(AbstractTask $task); |
|
| 40 | + /** |
|
| 41 | + * Update an Admin Task in the database. |
|
| 42 | + * |
|
| 43 | + * @param AbstractTask $task Task to update |
|
| 44 | + * @return bool |
|
| 45 | + */ |
|
| 46 | + function updateTask(AbstractTask $task); |
|
| 47 | 47 | |
| 48 | - /** |
|
| 49 | - * Delete the task from the database, in a transactional manner. |
|
| 50 | - * |
|
| 51 | - * @param string $task_name Task to delete |
|
| 52 | - */ |
|
| 53 | - public function deleteTask($task_name); |
|
| 48 | + /** |
|
| 49 | + * Delete the task from the database, in a transactional manner. |
|
| 50 | + * |
|
| 51 | + * @param string $task_name Task to delete |
|
| 52 | + */ |
|
| 53 | + public function deleteTask($task_name); |
|
| 54 | 54 | |
| 55 | 55 | |
| 56 | - /** |
|
| 57 | - * Returns the number of Admin Tasks (active and inactive). |
|
| 58 | - * |
|
| 59 | - * @return int |
|
| 60 | - */ |
|
| 61 | - public function getTasksCount(); |
|
| 56 | + /** |
|
| 57 | + * Returns the number of Admin Tasks (active and inactive). |
|
| 58 | + * |
|
| 59 | + * @return int |
|
| 60 | + */ |
|
| 61 | + public function getTasksCount(); |
|
| 62 | 62 | |
| 63 | - /** |
|
| 64 | - * Return the list of Admin Tasks matching specified criterias. |
|
| 65 | - * |
|
| 66 | - * @param string $search Search criteria in analysis description |
|
| 67 | - * @param array $order_by Columns to order by |
|
| 68 | - * @param int $start Offset to start with (for pagination) |
|
| 69 | - * @param int|null $limit Max number of items to return (for pagination) |
|
| 70 | - * @return \MyArtJaub\Webtrees\Module\GeoDispersion\Model\GeoAnalysis[] |
|
| 71 | - */ |
|
| 72 | - function getFilteredTasksList($search = null, $order_by = null, $start = 0, $limit = null); |
|
| 63 | + /** |
|
| 64 | + * Return the list of Admin Tasks matching specified criterias. |
|
| 65 | + * |
|
| 66 | + * @param string $search Search criteria in analysis description |
|
| 67 | + * @param array $order_by Columns to order by |
|
| 68 | + * @param int $start Offset to start with (for pagination) |
|
| 69 | + * @param int|null $limit Max number of items to return (for pagination) |
|
| 70 | + * @return \MyArtJaub\Webtrees\Module\GeoDispersion\Model\GeoAnalysis[] |
|
| 71 | + */ |
|
| 72 | + function getFilteredTasksList($search = null, $order_by = null, $start = 0, $limit = null); |
|
| 73 | 73 | |
| 74 | - /** |
|
| 75 | - * Returns the list of tasks that are currently meant to run. |
|
| 76 | - * Tasks to run can be forced, or can be limited to only one. |
|
| 77 | - * |
|
| 78 | - * @param string|null $force Force the enabled tasks to run. |
|
| 79 | - * @param string|null $task_name Name of the specific task to run |
|
| 80 | - */ |
|
| 74 | + /** |
|
| 75 | + * Returns the list of tasks that are currently meant to run. |
|
| 76 | + * Tasks to run can be forced, or can be limited to only one. |
|
| 77 | + * |
|
| 78 | + * @param string|null $force Force the enabled tasks to run. |
|
| 79 | + * @param string|null $task_name Name of the specific task to run |
|
| 80 | + */ |
|
| 81 | 81 | function getTasksToRun($force = false, $task_name = null); |
| 82 | 82 | |
| 83 | 83 | /** |
@@ -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)'. |
@@ -26,11 +26,11 @@ discard block |
||
| 26 | 26 | * {@inhericDoc} |
| 27 | 27 | * @see \MyArtJaub\Webtrees\Mvc\View\AbstractView::renderContent() |
| 28 | 28 | */ |
| 29 | - protected function renderContent() { |
|
| 29 | + protected function renderContent() { |
|
| 30 | 30 | |
| 31 | - /** @var AbstractTask $task */ |
|
| 32 | - $task = $this->data->get('task'); |
|
| 33 | - ?> |
|
| 31 | + /** @var AbstractTask $task */ |
|
| 32 | + $task = $this->data->get('task'); |
|
| 33 | + ?> |
|
| 34 | 34 | <ol class="breadcrumb small"> |
| 35 | 35 | <li><a href="admin.php"><?php echo I18N::translate('Control panel'); ?></a></li> |
| 36 | 36 | <li><a href="admin_modules.php"><?php echo I18N::translate('Module administration'); ?></a></li> |
@@ -122,7 +122,7 @@ discard block |
||
| 122 | 122 | </form> |
| 123 | 123 | |
| 124 | 124 | <?php |
| 125 | - } |
|
| 125 | + } |
|
| 126 | 126 | |
| 127 | 127 | } |
| 128 | 128 | |
| 129 | 129 | \ No newline at end of file |
@@ -22,10 +22,10 @@ discard block |
||
| 22 | 22 | * {@inhericDoc} |
| 23 | 23 | * @see \MyArtJaub\Webtrees\Mvc\View\AbstractView::renderContent() |
| 24 | 24 | */ |
| 25 | - protected function renderContent() { |
|
| 25 | + protected function renderContent() { |
|
| 26 | 26 | |
| 27 | - $table_id = $this->data->get('table_id'); |
|
| 28 | - ?> |
|
| 27 | + $table_id = $this->data->get('table_id'); |
|
| 28 | + ?> |
|
| 29 | 29 | <ol class="breadcrumb small"> |
| 30 | 30 | <li><a href="admin.php"><?php echo I18N::translate('Control panel'); ?></a></li> |
| 31 | 31 | <li><a href="admin_modules.php"><?php echo I18N::translate('Module administration'); ?></a></li> |
@@ -68,7 +68,7 @@ discard block |
||
| 68 | 68 | </table> |
| 69 | 69 | |
| 70 | 70 | <?php |
| 71 | - } |
|
| 71 | + } |
|
| 72 | 72 | |
| 73 | 73 | } |
| 74 | 74 | |
| 75 | 75 | \ 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 |