diff options
| -rwxr-xr-x | scripts/cleanup | 2 | ||||
| -rw-r--r-- | web/html/pkgsubmit.php | 4 | ||||
| -rw-r--r-- | web/lib/pkgfuncs.inc.php | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/scripts/cleanup b/scripts/cleanup index d3ba3f9..7999429 100755 --- a/scripts/cleanup +++ b/scripts/cleanup @@ -34,7 +34,7 @@ foreach ($buckets as $bucket) { continue; } $fullpath = INCOMING_DIR . $bucket . "/" . $pkgname; - if (!package_exists($pkgname) && is_dir($fullpath)) { + if (!pkgid_from_name($pkgname) && is_dir($fullpath)) { echo 'Removing ' . $fullpath . "\n"; rm_tree($fullpath); $count++; diff --git a/web/html/pkgsubmit.php b/web/html/pkgsubmit.php index d21e6ae..f7f0dd4 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 8cd1c61..bb5a592 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 "; |