maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

Merge remote-tracking branch 'origin/0.9.31'

Browse Source
This commit is contained in:
Michael Kaufmann (d00p)
2013-12-18 09:58:38 +01:00
parent 6902868e58 23a1a55bf2
commit 7267c2dec9
4 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
admin_cronjobs.php
View File

@@ -35,11 +35,8 @@ if ($page == 'cronjobs' || $page == 'overview') {
);
$paging = new paging($userinfo, TABLE_PANEL_CRONRUNS, $fields);
/*
* @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);

8
install/updates/froxlor/0.9/update_0.9.inc.php
View File

@@ -2561,8 +2561,14 @@ 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');
}
if (isFroxlorVersion('0.9.31')) {
showUpdateStep("Updating from 0.9.31 to 0.9.32-dev1");
lastStepStatus(0);

3
templates/Froxlor/admin/cronjobs/cronjobs_cronjobmodule.tpl Normal file
View File

@@ -0,0 +1,3 @@
<tr>
<td colspan="5"><b>{$module}</b></td>
</tr>

3
templates/Sparkle/admin/cronjobs/cronjobs_cronjobmodule.tpl vendored Normal file
View File

@@ -0,0 +1,3 @@
<tr>
<td colspan="5"><b>{$module}</b></td>
</tr>