Merge branch 'maint'

3 files changed, 27 insertions, 25 deletions

diff --git a/web/lib/acctfuncs.inc.php b/web/lib/acctfuncs.inc.php
index 962ebb45..51ffec63 100644
--- a/web/lib/acctfuncs.inc.php
+++ b/web/lib/acctfuncs.inc.php
@@ -538,7 +538,7 @@ function valid_username($user) {
 	if (strlen($user) < USERNAME_MIN_LEN ||
 	    strlen($user) > USERNAME_MAX_LEN) {
 		return false;
-	} else if (!preg_match("/^[a-z0-9]+[.\-_]?[a-z0-9]+$/", $user)) {
+	} else if (!preg_match("/^[a-z0-9]+[.\-_]?[a-z0-9]+$/i", $user)) {
 		return false;
 	}
 
diff --git a/web/lib/aur.inc.php b/web/lib/aur.inc.php
index ff464558..99f5ae4a 100644
--- a/web/lib/aur.inc.php
+++ b/web/lib/aur.inc.php
@@ -550,30 +550,6 @@ function end_atomic_commit() {
 }
 
 /**
- * Determine package information for latest package
- *
- * @param int $numpkgs Number of packages to get information on
- *
- * @return array $packages Package info for the specified number of recent packages
- */
-function latest_pkgs($numpkgs) {
-	$dbh = DB::connect();
-
-	$q = "SELECT * FROM Packages ";
-	$q.= "ORDER BY SubmittedTS DESC ";
-	$q.= "LIMIT " .intval($numpkgs);
-	$result = $dbh->query($q);
-
-	if ($result) {
-		while ($row = $result->fetch(PDO::FETCH_ASSOC)) {
-			$packages[] = $row;
-		}
-	}
-
-	return $packages;
-}
-
-/**
  * Merge pkgbase and package options
  *
  * Merges entries of the first and the second array. If any key appears in both
diff --git a/web/lib/pkgfuncs.inc.php b/web/lib/pkgfuncs.inc.php
index c35147fb..3bbf1a1e 100644
--- a/web/lib/pkgfuncs.inc.php
+++ b/web/lib/pkgfuncs.inc.php
@@ -942,3 +942,29 @@ function pkg_add_lic($pkgid, $licid) {
 	);
 	$dbh->exec($q);
 }
+
+/**
+ * Determine package information for latest package
+ *
+ * @param int $numpkgs Number of packages to get information on
+ *
+ * @return array $packages Package info for the specified number of recent packages
+ */
+function latest_pkgs($numpkgs) {
+	$dbh = DB::connect();
+
+	$q = "SELECT * FROM Packages LEFT JOIN PackageBases ON ";
+	$q.= "PackageBases.ID = Packages.PackageBaseID ";
+	$q.= "ORDER BY SubmittedTS DESC ";
+	$q.= "LIMIT " . intval($numpkgs);
+	$result = $dbh->query($q);
+
+	$packages = array();
+	if ($result) {
+		while ($row = $result->fetch(PDO::FETCH_ASSOC)) {
+			$packages[] = $row;
+		}
+	}
+
+	return $packages;
+}