summaryrefslogtreecommitdiffstats
path: root/web
diff options
context:
space:
mode:
Diffstat (limited to 'web')
-rw-r--r--web/html/pkgsubmit.php2
-rw-r--r--web/lib/pkgfuncs.inc2
-rw-r--r--web/lib/stats.inc4
-rw-r--r--web/template/stats/updates_table.php7
4 files changed, 6 insertions, 9 deletions
diff --git a/web/html/pkgsubmit.php b/web/html/pkgsubmit.php
index 131bf37a..3eb60c5e 100644
--- a/web/html/pkgsubmit.php
+++ b/web/html/pkgsubmit.php
@@ -347,7 +347,7 @@ if ($_COOKIE["AURSID"]):
$uid = uid_from_sid($_COOKIE["AURSID"]);
# This is a brand new package
- $q = sprintf("INSERT INTO Packages (Name, License, Version, CategoryID, Description, URL, SubmittedTS, SubmitterUID, MaintainerUID) VALUES ('%s', '%s', '%s-%s', %d, '%s', '%s', UNIX_TIMESTAMP(), %d, %d)",
+ $q = sprintf("INSERT INTO Packages (Name, License, Version, CategoryID, Description, URL, SubmittedTS, ModifiedTS, SubmitterUID, MaintainerUID) VALUES ('%s', '%s', '%s-%s', %d, '%s', '%s', UNIX_TIMESTAMP(), UNIX_TIMESTAMP(), %d, %d)",
mysql_real_escape_string($new_pkgbuild['pkgname']),
mysql_real_escape_string($new_pkgbuild['license']),
mysql_real_escape_string($new_pkgbuild['pkgver']),
diff --git a/web/lib/pkgfuncs.inc b/web/lib/pkgfuncs.inc
index b38c7da5..699a3a9a 100644
--- a/web/lib/pkgfuncs.inc
+++ b/web/lib/pkgfuncs.inc
@@ -525,7 +525,7 @@ function pkg_search_page($SID="") {
$q_sort = "ORDER BY Maintainer ".$order.", Name ASC ";
break;
case 'a':
- $q_sort = "ORDER BY GREATEST(SubmittedTS,ModifiedTS) ".$order.", Name ASC ";
+ $q_sort = "ORDER BY ModifiedTS ".$order.", Name ASC ";
break;
default:
break;
diff --git a/web/lib/stats.inc b/web/lib/stats.inc
index f42e4177..f924fb57 100644
--- a/web/lib/stats.inc
+++ b/web/lib/stats.inc
@@ -36,7 +36,7 @@ function updates_table($dbh)
global $apc_prefix, $apc_ttl;
$key = $apc_prefix . 'recent_updates';
if(!(EXTENSION_LOADED_APC && ($newest_packages = apc_fetch($key)))) {
- $q = 'SELECT * FROM Packages WHERE DummyPkg != 1 ORDER BY GREATEST(SubmittedTS,ModifiedTS) DESC LIMIT 0 , 10';
+ $q = 'SELECT * FROM Packages WHERE DummyPkg != 1 ORDER BY ModifiedTS DESC LIMIT 0 , 10';
$result = db_query($q, $dbh);
$newest_packages = new ArrayObject();
@@ -84,7 +84,7 @@ function general_stats_table($dbh)
$tu_count = db_cache_value($q, $dbh, $apc_prefix . 'tu_count');
$targstamp = intval(strtotime("-7 days"));
- $q = "SELECT count(*) from Packages WHERE (Packages.SubmittedTS >= $targstamp OR Packages.ModifiedTS >= $targstamp)";
+ $q = "SELECT count(*) from Packages WHERE Packages.ModifiedTS >= $targstamp";
$update_count = db_cache_value($q, $dbh, $apc_prefix . 'update_count');
include('stats/general_stats_table.php');
diff --git a/web/template/stats/updates_table.php b/web/template/stats/updates_table.php
index b9f6d6dc..a8cdf5aa 100644
--- a/web/template/stats/updates_table.php
+++ b/web/template/stats/updates_table.php
@@ -20,12 +20,10 @@
$mod_int = intval($row["ModifiedTS"]);
$sub_int = intval($row["SubmittedTS"]);
-if ($mod_int != 0):
- $modstring = gmdate("r", $mod_int);
-elseif ($sub_int != 0):
+if ($mod_int == $sub_int):
$modstring = '<img src="images/new.gif" alt="New!" /> ' . gmdate("r", $sub_int);
else:
- $modstring = '(unknown)';
+ $modstring = gmdate("r", $mod_int);
endif;
?>
@@ -36,4 +34,3 @@ endif;
<?php endforeach; ?>
</table>
-