From 75aa76cd837d77366a62c8a836255c41b60f2e1e Mon Sep 17 00:00:00 2001 From: Callan Barrett Date: Sun, 8 Jun 2008 22:02:42 +0800 Subject: [PATCH] Fix FS#8622 Previous fix for this was only half implemented, links now work with both a new package and an updated one Signed-off-by: Callan Barrett --- web/html/pkgsubmit.php | 42 ++++++++++++++++++++++++------------------ 1 files changed, 24 insertions(+), 18 deletions(-) diff --git a/web/html/pkgsubmit.php b/web/html/pkgsubmit.php index 38e8cca..00ac861 100644 --- a/web/html/pkgsubmit.php +++ b/web/html/pkgsubmit.php @@ -396,22 +396,22 @@ if ($_COOKIE["AURSID"]) { # $depends = explode(" ", $new_pkgbuild['depends']); - while (list($k, $v) = each($depends)) { + while (list($k, $v) = each($depends)) { $q = "INSERT INTO PackageDepends (PackageID, DepPkgID, DepCondition) VALUES ("; $deppkgname = preg_replace("/[<>]?=.*/", "", $v); - $depcondition = str_replace($deppkgname, "", $v); + $depcondition = str_replace($deppkgname, "", $v); - # Solve the problem with comments and deps - # added by: dsa - if ($deppkgname == "#") - break; + # Solve the problem with comments and deps + # added by: dsa + if ($deppkgname == "#") { break; } $deppkgid = create_dummy($deppkgname, $_COOKIE['AURSID']); - if(!empty($depcondition)) - $q .= $pdata["ID"].", ".$deppkgid.", '".$depcondition."')"; - else - $q .= $pdata["ID"].", ".$deppkgid.", '')"; + if(!empty($depcondition)) { + $q .= $pdata["ID"].", ".$deppkgid.", '".$depcondition."')"; + } else { + $q .= $pdata["ID"].", ".$deppkgid.", '')"; + } db_query($q, $dbh); } @@ -469,16 +469,22 @@ if ($_COOKIE["AURSID"]) { # $depends = explode(" ", $new_pkgbuild['depends']); while (list($k, $v) = each($depends)) { - $q = "INSERT INTO PackageDepends (PackageID, DepPkgID) VALUES ("; + $q = "INSERT INTO PackageDepends (PackageID, DepPkgID, DepCondition) VALUES ("; $deppkgname = preg_replace("/[<>]?=.*/", "", $v); + $depcondition = str_replace($deppkgname, "", $v); - # Solve the problem with comments and deps - # added by: dsa - if ($deppkgname == "#") - break; - - $deppkgid = create_dummy($deppkgname, $_COOKIE['AURSID']); - $q .= $packageID.", ".$deppkgid.")"; + # Solve the problem with comments and deps + # added by: dsa + if ($deppkgname == "#") { break; } + + $deppkgid = create_dummy($deppkgname, $_COOKIE['AURSID']); + + if(!empty($depcondition)) { + $q .= $packageID.", ".$deppkgid.", '".$depcondition."')"; + } else { + $q .= $packageID.", ".$deppkgid.", '')"; + } + db_query($q, $dbh); } -- 1.5.5.3