From 5d4303d0b6afacb2b3a8731bdb9fdbd6c40f5c0e Mon Sep 17 00:00:00 2001
From: Callan Barrett <wizzomafizzo@gmail.com>
Date: Sun, 5 Oct 2008 02:13:35 +0800
Subject: Convert package adoption/disowning to a function

Signed-off-by: Callan Barrett <wizzomafizzo@gmail.com>
Signed-off-by: Loui Chang <louipc.ist@gmail.com>
---
 web/html/packages.php | 100 +++-----------------------------------------------
 web/lib/pkgfuncs.inc  |  58 +++++++++++++++++++++++++++++
 2 files changed, 64 insertions(+), 94 deletions(-)

diff --git a/web/html/packages.php b/web/html/packages.php
index bc3ed188..5935ebd3 100644
--- a/web/html/packages.php
+++ b/web/html/packages.php
@@ -49,105 +49,17 @@ if ($_POST['action'] == "do_Flag" || isset($_POST['do_Flag'])) {
 	print pkg_flag($atype, $ids, False);
 	print "</p>";
 } elseif ($_POST['action'] == "do_Disown" || isset($_POST['do_Disown'])) {
-	if (!$atype) {
-		print __("You must be logged in before you can disown packages.");
-		print "<br />\n";
-
-	} else {
-		# Disown the packages in $ids array
-		#
-		if (!empty($ids)) {
-			$dbh = db_connect();
-
-			# Disown the packages in $ids array
-			#
-			$first = 1;
-			while (list($pid, $v) = each($ids)) {
-				if ($first) {
-					$first = 0;
-					$disown = $pid;
-				} else {
-					$disown .= ", ".$pid;
-				}
-			}
-
-			$field = "MaintainerUID";
-			$q = "UPDATE Packages ";
-			$q.= "SET ".$field." = 0 ";
-			$q.= "WHERE ID IN (" . $disown . ") ";
-			# If a user is a TU or dev they can disown any package
-      if ($atype == "User") {
-				$q.= "AND ".$field." = ".uid_from_sid($_COOKIE["AURSID"]);
-			}
-		  db_query($q, $dbh);
-
-			print "<p>\n";
-			print __("The selected packages have been disowned.");
-			print "</p>\n";
-		} else {
-			print "<p>\n";
-			print __("You did not select any packages to disown.");
-			print "</p>\n";
-		}
-
-
-	}
-
-
+	print "<p>";
+	print pkg_adopt($atype, $ids, False);
+	print "</p>";
 } elseif ($_POST['action'] == "do_Delete" || isset($_POST['do_Delete'])) {
 	print "<p>";
 	print pkg_delete($atype, $ids, False);
 	print "</p>";
 } elseif ($_POST['action'] == "do_Adopt" || isset($_POST['do_Adopt'])) {
-	if (!$atype) {
-		print __("You must be logged in before you can adopt packages.");
-		print "<br />\n";
-
-	} else {
-		# Adopt the packages in $ids array
-		#
-		if (!empty($ids)) {
-			$dbh = db_connect();
-
-			# Adopt the packages in $ids array
-			#
-			$first = 1;
-			while (list($pid, $v) = each($ids)) {
-				if ($first) {
-					$first = 0;
-					$adopt = $pid;
-				} else {
-					$adopt .= ", ".$pid;
-				}
-			}
-
-		  $field = "MaintainerUID";
-			# NOTE: Only "orphaned" packages can be adopted at a particular
-			#       user class (TU/Dev or User).
-			#
-			$q = "UPDATE Packages ";
-			$q.= "SET ".$field." = ".uid_from_sid($_COOKIE["AURSID"])." ";
-			$q.= "WHERE ID IN (" . $adopt . ") ";
-			if ($atype == "User")
-			{
-				# Regular users may only adopt orphan packages from unsupported
-				# FIXME: We assume that LocationID for unsupported is "2"
-				$q.= "AND ".$field." = 0";
-				$q.= " AND LocationID = 2";
-			}
-			db_query($q, $dbh);
-
-			print "<p>\n";
-			print __("The selected packages have been adopted.");
-			print "</p>\n";
-		} else {
-			print "<p>\n";
-			print __("You did not select any packages to adopt.");
-			print "</p>\n";
-		}
-	}
-
-
+	print "<p>";
+	print pkg_adopt($atype, $ids, True);
+	print "</p>";
 } elseif ($_POST['action'] == "do_Vote" || isset($_POST['do_Vote'])) {
 	if (!$atype) {
 		print __("You must be logged in before you can vote for packages.");
diff --git a/web/lib/pkgfuncs.inc b/web/lib/pkgfuncs.inc
index c952b85d..415f3e71 100644
--- a/web/lib/pkgfuncs.inc
+++ b/web/lib/pkgfuncs.inc
@@ -1131,3 +1131,61 @@ function pkg_delete ($atype, $ids) {
 
 	return __("The selected packages have been deleted.");
 }
+
+function pkg_adopt ($atype, $ids, $action = True) {
+	if (!$atype) {
+		if ($action) {
+			return __("You must be logged in before you can adopt packages.");
+		} else {
+			return __("You must be logged in before you can disown packages.");
+		}
+	}
+
+	if (empty($ids)) {
+		if ($action) {
+			return __("You did not select any packages to adopt.");
+		} else {
+			return __("You did not select any packages to disown.");
+		}
+	}
+
+	$dbh = db_connect();
+
+	$first = 1;
+	foreach ($ids as $pid => $v) {
+		if ($first) {
+			$first = 0;
+			$pkg = $pid;
+		} else {
+			$pkg .= ", ".$pid;
+		}
+	}
+
+	$field = "MaintainerUID";
+	$q = "UPDATE Packages ";
+
+	if ($action) {
+		$user = uid_from_sid($_COOKIE["AURSID"]);
+	} else {
+		$user = 0;
+	}
+
+	$q.= "SET $field = $user ";
+	$q.= "WHERE ID IN ($pkg) ";
+
+	if ($action && $atype == "User") {
+		# Regular users may only adopt orphan packages from unsupported
+		$q.= "AND $field = 0 ";
+		$q.= "AND LocationID = 2 ";
+	} else if ($atype == "User") {
+		$q.= "AND $field = " . uid_from_sid($_COOKIE["AURSID"]);
+	}
+
+	db_query($q, $dbh);
+
+	if ($action) {
+		return __("The selected packages have been adopted.");
+	} else {
+		return __("The selected packages have been disowned.");
+	}
+}
-- 
cgit v1.2.3-24-g4f1b