From e12a8ad3da6fdec073e099438a69f745f5b9faf5 Mon Sep 17 00:00:00 2001
From: Callan Barrett <wizzomafizzo@gmail.com>
Date: Sat, 20 Dec 2008 19:37:19 +0900
Subject: Remove success messages after package functions

Just displays message at the top of the page of what happened (errors or not) and goes back to the same page

Signed-off-by: Callan Barrett <wizzomafizzo@gmail.com>
Signed-off-by: Loui Chang <louipc.ist@gmail.com>
---
 web/html/css/fonts.css |  4 ++++
 web/html/packages.php  | 53 ++++++++++++++++++++------------------------------
 web/lib/pkgfuncs.inc   | 14 ++++++-------
 3 files changed, 32 insertions(+), 39 deletions(-)

diff --git a/web/html/css/fonts.css b/web/html/css/fonts.css
index baa7560..bf5268f 100644
--- a/web/html/css/fonts.css
+++ b/web/html/css/fonts.css
@@ -104,4 +104,8 @@ h1, h2, h3, h4 {
 	font-weight: bold;
 	color: #f00;
 }
+.pkgoutput {
+	font-weight: bold;
+	text-align: center;
+}
 
diff --git a/web/html/packages.php b/web/html/packages.php
index eb5f664..2452991 100644
--- a/web/html/packages.php
+++ b/web/html/packages.php
@@ -32,54 +32,43 @@ if (isset($_POST['IDs'])) {
 	}
 }
 
-html_header($title);
-
 # Determine what action to do
+$output = "";
 if ($_POST['action'] == "do_Flag" || isset($_POST['do_Flag'])) {
-	print "<p>";
-	print pkg_flag($atype, $ids, True);
-	print "</p>";
+	$output = pkg_flag($atype, $ids, True);
 } elseif ($_POST['action'] == "do_UnFlag" || isset($_POST['do_UnFlag'])) {
-	print "<p>";
-	print pkg_flag($atype, $ids, False);
-	print "</p>";
+	$output = pkg_flag($atype, $ids, False);
 } elseif ($_POST['action'] == "do_Adopt" || isset($_POST['do_Adopt'])) {
-	print "<p>";
-	print pkg_adopt($atype, $ids, True);
-	print "</p>";
+	$output = pkg_adopt($atype, $ids, True);
 } elseif ($_POST['action'] == "do_Disown" || isset($_POST['do_Disown'])) {
-	print "<p>";
-	print pkg_adopt($atype, $ids, False);
-	print "</p>";
+	$output = pkg_adopt($atype, $ids, False);
 } elseif ($_POST['action'] == "do_Vote" || isset($_POST['do_Vote'])) {
-	print "<p>";
-	print pkg_vote($atype, $ids, True);
-	print "</p>";
+	$output = pkg_vote($atype, $ids, True);
 } elseif ($_POST['action'] == "do_UnVote" || isset($_POST['do_UnVote'])) {
-	print "<p>";
-	print pkg_vote($atype, $ids, False);
-	print "</p>";
+	$output = pkg_vote($atype, $ids, False);
 } elseif ($_POST['action'] == "do_Delete" || isset($_POST['do_Delete'])) {
-	print "<p>";
-	print pkg_delete($atype, $ids);
-	print "</p>";
+	$output = pkg_delete($atype, $ids);
+	unset($_GET['ID']);
 } elseif ($_POST['action'] == "do_Notify" || isset($_POST['do_Notify'])) {
-	print "<p>";
-	print pkg_notify($atype, $ids);
-	print "</p>";
+	$output = pkg_notify($atype, $ids);
 } elseif ($_POST['action'] == "do_UnNotify" || isset($_POST['do_UnNotify'])) {
-	print "<p>";
-	print pkg_notify($atype, $ids, False);
-	print "</p>";
-} elseif (isset($_GET["ID"])) {
+	$output = pkg_notify($atype, $ids, False);
+}
+
+html_header($title);
+
+if ($output):
+?>
+<div class="pkgoutput"><?php print $output ?></div><br />
+<?php
+endif;
 
+if (isset($_GET["ID"])) {
 	if (!intval($_GET["ID"])) {
 		print __("Error trying to retrieve package details.")."<br />\n";
-		
 	} else {
 		package_details($_GET["ID"], $_COOKIE["AURSID"]);
 	}
-
 } else {
 	pkg_search_page($_COOKIE["AURSID"]);
 }
diff --git a/web/lib/pkgfuncs.inc b/web/lib/pkgfuncs.inc
index 2b3cece..f99810a 100644
--- a/web/lib/pkgfuncs.inc
+++ b/web/lib/pkgfuncs.inc
@@ -290,9 +290,9 @@ function package_details($id=0, $SID="") {
 
 			# print out package details
 			#
-      echo "<div class=\"pgbox\">\n";
-      echo "  <div class=\"pgboxtitle\"><span class=\"f3\">".__("Package Details")."</span></div>\n";
-      echo "  <div class=\"pgboxbody\">\n";
+			echo "<div class=\"pgbox\">\n";
+			echo "  <div class=\"pgboxtitle\"><span class=\"f3\">".__("Package Details")."</span></div>\n";
+			echo "  <div class=\"pgboxbody\">\n";
 			echo "    <table>\n";
 			echo "      <tr><td class='boxSoft' colspan='2'><span class='f2'>";
 			echo $row["Name"] . " " . $row["Version"]."</span></td></tr>\n";
@@ -364,8 +364,8 @@ function package_details($id=0, $SID="") {
 			$deps = package_dependencies($row["ID"]); # $deps[0] = array('id','name', 'dummy');
 			if (count($deps) > 0) {
 			
-        echo "      <tr>\n";
-        echo "        <td valign='top' style='padding-right: 10'>\n";   
+			echo "      <tr>\n";
+			echo "        <td valign='top' style='padding-right: 10'>\n";
   			echo "          <table class='boxSoft' style='width: 200px'>\n";
   			echo "            <tr><td class='boxSoftTitle'><span class='f3'>";
   			echo __("Dependencies")."</span></td></tr>\n";
@@ -473,7 +473,7 @@ function package_details($id=0, $SID="") {
                 echo "<div class=\"pgbox\">\n";
                 echo "  <div class=\"pgboxtitle\"><span class=\"f3\">".__("Actions")."</span></div>\n";
                 echo "  <div class=\"pgboxbody\">\n";
-                echo "    <form action='/packages.php' method='post'>\n";
+                echo "    <form action='/packages.php?ID=".$row['ID']."' method='post'>\n";
 				echo "      <input type='hidden' name='IDs[".$row["ID"]."]' value='1'>\n";
 				echo "      <input type='hidden' name='ID' value='".$row["ID"]."'>\n";
 				# Voting Button
@@ -767,7 +767,7 @@ function pkg_search_page($SID="") {
     $result = db_query($q, $dbh);
     $total = mysql_result(db_query('SELECT FOUND_ROWS() AS Total', $dbh), 0);
 
-    print "<form action='/packages.php' method='post'>\n";
+    print "<form action='/packages.php?".$_SERVER['QUERY_STRING']."' method='post'>\n";
     print "<center>\n";
     print "<table cellspacing='3' class='boxSoft'>\n";
     print "<tr>\n";
-- 
cgit v1.2.3-70-g09d2