external/aurweb
0
0
Fork 0
mirror of https://gitlab.archlinux.org/archlinux/aurweb.git synced 2025-02-03 10:43:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Submission process code refactor

Browse source 
We had a ton of duplicate code shared between the insert and update
cases. Do a refactor so we can pull this stuff out below the if/else
block and only need it there once, saving some headaches.

Signed-off-by: Dan McGee <dan@archlinux.org>
Signed-off-by: Lukas Fleischer <archlinux@cryptocrack.de>
This commit is contained in:
Dan McGee 2011-03-30 20:48:07 -05:00 • committed by Lukas Fleischer
parent a427bd72a7
commit 1128489bd0
1 changed files with 37 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
web/html/pkgsubmit.php
View file

@ -303,11 +303,12 @@ if ($_COOKIE["AURSID"]):
# This is an overwrite of an existing package, the database ID # This is an overwrite of an existing package, the database ID
# needs to be preserved so that any votes are retained. However, # needs to be preserved so that any votes are retained. However,
# PackageDepends and PackageSources can be purged. # PackageDepends and PackageSources can be purged.
$packageID = $pdata["ID"];
# Flush out old data that will be replaced with new data # Flush out old data that will be replaced with new data
$q = "DELETE FROM PackageDepends WHERE PackageID = " . $pdata["ID"]; $q = "DELETE FROM PackageDepends WHERE PackageID = " . $packageID;
db_query($q, $dbh); db_query($q, $dbh);
$q = "DELETE FROM PackageSources WHERE PackageID = " . $pdata["ID"]; $q = "DELETE FROM PackageSources WHERE PackageID = " . $packageID;
db_query($q, $dbh); db_query($q, $dbh);
# If the package was a dummy, undummy it # If the package was a dummy, undummy it
@ -315,7 +316,7 @@ if ($_COOKIE["AURSID"]):
$q = sprintf( "UPDATE Packages SET DummyPkg = 0, SubmitterUID = %d, MaintainerUID = %d, SubmittedTS = UNIX_TIMESTAMP() WHERE ID = %d", $q = sprintf( "UPDATE Packages SET DummyPkg = 0, SubmitterUID = %d, MaintainerUID = %d, SubmittedTS = UNIX_TIMESTAMP() WHERE ID = %d",
$uid, $uid,
$uid, $uid,
$pdata["ID"]); $packageID);
db_query($q, $dbh); db_query($q, $dbh);
} }
@ -324,7 +325,7 @@ if ($_COOKIE["AURSID"]):
if ($_POST['category'] > 1) { if ($_POST['category'] > 1) {
$q = sprintf( "UPDATE Packages SET CategoryID = %d WHERE ID = %d", $q = sprintf( "UPDATE Packages SET CategoryID = %d WHERE ID = %d",
mysql_real_escape_string($_REQUEST['category']), mysql_real_escape_string($_REQUEST['category']),
$pdata["ID"]); $packageID);
db_query($q, $dbh); db_query($q, $dbh);
} }
@ -338,41 +339,10 @@ if ($_COOKIE["AURSID"]):
mysql_real_escape_string($new_pkgbuild['pkgdesc']), mysql_real_escape_string($new_pkgbuild['pkgdesc']),
mysql_real_escape_string($new_pkgbuild['url']), mysql_real_escape_string($new_pkgbuild['url']),
uid_from_sid($_COOKIE["AURSID"]), uid_from_sid($_COOKIE["AURSID"]),
$pdata["ID"]); $packageID);
db_query($q, $dbh); db_query($q, $dbh);
# Update package depends
$depends = explode(" ", $new_pkgbuild['depends']);
foreach ($depends as $dep) {
$q = "INSERT INTO PackageDepends (PackageID, DepPkgID, DepCondition) VALUES (";
$deppkgname = preg_replace("/(<|<=|=|>=|>).*/", "", $dep);
$depcondition = str_replace($deppkgname, "", $dep);
if ($deppkgname == "#") {
break;
}
$deppkgid = create_dummy($deppkgname, $_COOKIE['AURSID']);
$q .= $pdata["ID"] . ", " . $deppkgid . ", '" . mysql_real_escape_string($depcondition) . "')";
db_query($q, $dbh);
}
# Insert sources
$sources = explode(" ", $new_pkgbuild['source']);
foreach ($sources as $src) {
if ($src != "" ) {
$q = "INSERT INTO PackageSources (PackageID, Source) VALUES (";
$q .= $pdata["ID"] . ", '" . mysql_real_escape_string($src) . "')";
db_query($q, $dbh);
}
}
if ($pdata["MaintainerUID"] === NULL) pkg_notify(account_from_sid($_COOKIE["AURSID"]), array($pdata["ID"]));
header('Location: packages.php?ID=' . $pdata['ID']);
} else { } else {
$uid = uid_from_sid($_COOKIE["AURSID"]); $uid = uid_from_sid($_COOKIE["AURSID"]);
@ -388,9 +358,11 @@ if ($_COOKIE["AURSID"]):
$uid, $uid,
$uid); $uid);
$result = db_query($q, $dbh); db_query($q, $dbh);
$packageID = mysql_insert_id($dbh); $packageID = mysql_insert_id($dbh);
}
# Update package depends # Update package depends
$depends = explode(" ", $new_pkgbuild['depends']); $depends = explode(" ", $new_pkgbuild['depends']);
foreach ($depends as $dep) { foreach ($depends as $dep) {
@ -418,11 +390,13 @@ if ($_COOKIE["AURSID"]):
} }
} }
# If we just created this package, or it was an orphan and we
# auto-adopted, add submitting user to the notification list.
if (!$pdata || $pdata["MaintainerUID"] === NULL) {
pkg_notify(account_from_sid($_COOKIE["AURSID"]), array($packageID)); pkg_notify(account_from_sid($_COOKIE["AURSID"]), array($packageID));
}
header('Location: packages.php?ID=' . $packageID); header('Location: packages.php?ID=' . $packageID);
}
} }
chdir($cwd); chdir($cwd);