From 7a5be5456dee0130146bc5818f9be93570937f5c Mon Sep 17 00:00:00 2001 From: "Michael Kaufmann (d00p)" Date: Tue, 17 Dec 2013 09:59:11 +0100 Subject: [PATCH 1/2] categorize cronjob on cronjob-overview Signed-off-by: Michael Kaufmann (d00p) --- admin_cronjobs.php | 11 +++++++---- .../Froxlor/admin/cronjobs/cronjobs_cronjobmodule.tpl | 3 +++ .../Sparkle/admin/cronjobs/cronjobs_cronjobmodule.tpl | 3 +++ 3 files changed, 13 insertions(+), 4 deletions(-) create mode 100644 templates/Froxlor/admin/cronjobs/cronjobs_cronjobmodule.tpl create mode 100644 templates/Sparkle/admin/cronjobs/cronjobs_cronjobmodule.tpl diff --git a/admin_cronjobs.php b/admin_cronjobs.php index 4ccf0d78..4c48e211 100644 --- a/admin_cronjobs.php +++ b/admin_cronjobs.php @@ -35,11 +35,8 @@ if ($page == 'cronjobs' || $page == 'overview') { ); $paging = new paging($userinfo, TABLE_PANEL_CRONRUNS, $fields, $settings['panel']['paging'], $settings['panel']['natsorting']); - /* - * @TODO Fix sorting - */ $crons = ''; - $result_stmt = Database::prepare("SELECT `c`.* FROM `" . TABLE_PANEL_CRONRUNS . "` `c` ORDER BY `cronfile` ASC"); + $result_stmt = Database::prepare("SELECT `c`.* FROM `" . TABLE_PANEL_CRONRUNS . "` `c` ORDER BY `module` ASC, `cronfile` ASC"); Database::pexecute($result_stmt); $paging->setEntries(Database::num_rows()); $sortcode = $paging->getHtmlSortCode($lng); @@ -49,8 +46,14 @@ if ($page == 'cronjobs' || $page == 'overview') { $i = 0; $count = 0; + $cmod = ''; while ($row = $result_stmt->fetch(PDO::FETCH_ASSOC)) { + if ($cmod != $row['module']) { + $module = ucfirst(explode("/", $row['module'])[1]); + eval("\$crons.=\"" . getTemplate('cronjobs/cronjobs_cronjobmodule') . "\";"); + $cmod = $row['module']; + } if ($paging->checkDisplay($i)) { $row = htmlentities_array($row); diff --git a/templates/Froxlor/admin/cronjobs/cronjobs_cronjobmodule.tpl b/templates/Froxlor/admin/cronjobs/cronjobs_cronjobmodule.tpl new file mode 100644 index 00000000..ddf741d8 --- /dev/null +++ b/templates/Froxlor/admin/cronjobs/cronjobs_cronjobmodule.tpl @@ -0,0 +1,3 @@ + + {$module} + diff --git a/templates/Sparkle/admin/cronjobs/cronjobs_cronjobmodule.tpl b/templates/Sparkle/admin/cronjobs/cronjobs_cronjobmodule.tpl new file mode 100644 index 00000000..ddf741d8 --- /dev/null +++ b/templates/Sparkle/admin/cronjobs/cronjobs_cronjobmodule.tpl @@ -0,0 +1,3 @@ + + {$module} + From 23a1a55bf20b78ac4fc4b473fded02aacd1b3628 Mon Sep 17 00:00:00 2001 From: "Michael Kaufmann (d00p)" Date: Wed, 18 Dec 2013 09:40:48 +0100 Subject: [PATCH 2/2] set version to 0.9.31 for upcoming release Signed-off-by: Michael Kaufmann (d00p) --- install/froxlor.sql | 2 +- install/updates/froxlor/0.9/update_0.9.inc.php | 6 ++++++ lib/tables.inc.php | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/install/froxlor.sql b/install/froxlor.sql index a9348199..72b2f948 100644 --- a/install/froxlor.sql +++ b/install/froxlor.sql @@ -553,7 +553,7 @@ INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('panel', 'phpconfigs_hidestdsubdomain', '0'), ('panel', 'allow_theme_change_admin', '1'), ('panel', 'allow_theme_change_customer', '1'), - ('panel', 'version', '0.9.31-rc3'); + ('panel', 'version', '0.9.31'); DROP TABLE IF EXISTS `panel_tasks`; diff --git a/install/updates/froxlor/0.9/update_0.9.inc.php b/install/updates/froxlor/0.9/update_0.9.inc.php index 5aa9e3af..cb2121aa 100644 --- a/install/updates/froxlor/0.9/update_0.9.inc.php +++ b/install/updates/froxlor/0.9/update_0.9.inc.php @@ -2564,3 +2564,9 @@ if (isFroxlorVersion('0.9.31-rc2')) { updateToVersion('0.9.31-rc3'); } + +if (isFroxlorVersion('0.9.31-rc3')) { + showUpdateStep("Updating from 0.9.31-rc3 to 0.9.31 final", true); + lastStepStatus(0); + updateToVersion('0.9.31'); +} diff --git a/lib/tables.inc.php b/lib/tables.inc.php index b5c3ed7f..acbf71e6 100644 --- a/lib/tables.inc.php +++ b/lib/tables.inc.php @@ -72,6 +72,6 @@ define('PACKAGE_LOCKED', 1); define('PACKAGE_ENABLED', 2); // VERSION INFO -$version = '0.9.31-rc3'; +$version = '0.9.31'; $dbversion = '2'; $branding = '';