diff options
| author | Lukas Fleischer <archlinux@cryptocrack.de> | 2011-07-31 19:04:59 +0200 |
|---|---|---|
| committer | Lukas Fleischer <archlinux@cryptocrack.de> | 2011-08-11 16:17:07 +0200 |
| commit | 0ac8970b62ad728bc0988e7e0a7f16efe78ea6cd (patch) | |
| tree | 031ca86c87168d2439d3daba78bf405ae5b03f55 /web | |
| parent | 6ae2bc514f61d3e56d008cd1901d91bdbc6752d2 (diff) | |
| download | aur-0ac8970b62ad728bc0988e7e0a7f16efe78ea6cd.tar.gz aur-0ac8970b62ad728bc0988e7e0a7f16efe78ea6cd.tar.xz | |
Rename package_exists() to pkgid_from_name()
Describe what this function actually does: Return the ID of a package
with a given name and return NULL if such a package doesn't exist.
The function name is chosen in a fashion similar to other functions from
"pkgfuncs.inc.php" (pkgname_from_id(), pkgnotify_from_sid(), ...).
Signed-off-by: Lukas Fleischer <archlinux@cryptocrack.de>
Diffstat (limited to 'web')
| -rw-r--r-- | web/html/pkgsubmit.php | 4 | ||||
| -rw-r--r-- | web/lib/pkgfuncs.inc.php | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/web/html/pkgsubmit.php b/web/html/pkgsubmit.php index d21e6ae3..f7f0dd43 100644 --- a/web/html/pkgsubmit.php +++ b/web/html/pkgsubmit.php @@ -261,7 +261,7 @@ if ($uid): if (!$error) { # First, see if this package already exists, and if it can be overwritten - $pkg_exists = package_exists($pkg_name); + $pkg_id = pkgid_from_name($pkg_name); if (can_submit_pkg($pkg_name, $_COOKIE["AURSID"])) { if (file_exists($incoming_pkgdir)) { # Blow away the existing file/dir and contents @@ -278,7 +278,7 @@ if ($uid): if (!$error) { # Check if package name is blacklisted. - if (!$pkg_exists && pkgname_is_blacklisted($pkg_name)) { + if (!$pkg_id && pkgname_is_blacklisted($pkg_name)) { if (!canSubmitBlacklisted(account_from_sid($_COOKIE["AURSID"]))) { $error = __( "%s is on the package blacklist, please check if it's available in the official repos.", $pkg_name); } diff --git a/web/lib/pkgfuncs.inc.php b/web/lib/pkgfuncs.inc.php index 8cd1c611..bb5a592c 100644 --- a/web/lib/pkgfuncs.inc.php +++ b/web/lib/pkgfuncs.inc.php @@ -90,7 +90,7 @@ function pkgCategories() { # check to see if the package name exists # -function package_exists($name="") { +function pkgid_from_name($name="") { if (!$name) {return NULL;} $dbh = db_connect(); $q = "SELECT ID FROM Packages "; |