Merge branch 'testing'

Conflicts:
	web/html/pkgsubmit.php

Signed-off-by: Loui Chang <louipc.ist@gmail.com>

1 files changed, 123 insertions, 142 deletions

diff --git a/web/html/pkgsubmit.php b/web/html/pkgsubmit.php
index abd66140..c38e224d 100644
--- a/web/html/pkgsubmit.php
+++ b/web/html/pkgsubmit.php
@@ -12,25 +12,14 @@ include("pkgfuncs.inc");    # package functions
 
 set_lang();                 # this sets up the visitor's language
 check_sid();                # see if they're still logged in
-html_header("Submit");
-
-?>
-
-<div class="pgbox">
-  <div class="pgboxtitle">
-    <span class="f3"><?php print __("Submit"); ?></span>
-  </div>
-  <div class="pgboxbody">
-
-<?php
 
 if ($_COOKIE["AURSID"]):
-  
+
 	# Track upload errors
 	$error = "";
 
 	if ($_REQUEST["pkgsubmit"]) {
-	  
+
 		# Before processing, make sure we even have a file
 		if ($_FILES['pfile']['size'] == 0){
 			$error = __("Error - No file uploaded");
@@ -48,30 +37,30 @@ if ($_COOKIE["AURSID"]):
 					$error = __("Could not change directory to %s.",
 						array($tempdir));
 				} else {
-				  if ($_FILES['pfile']['name'] == "PKGBUILD") {
-				    move_uploaded_file($_FILES['pfile']['tmp_name'], $tempdir . "/PKGBUILD");
-				  } else {
-  					$tar = new Archive_Tar($_FILES['pfile']['tmp_name']);
-  					$extract = $tar->extract();
-  					
-  					if (!$extract) {
-  						$error = __("Unknown file format for uploaded file.");
-  					}
-				  }
+					if ($_FILES['pfile']['name'] == "PKGBUILD") {
+						move_uploaded_file($_FILES['pfile']['tmp_name'], $tempdir . "/PKGBUILD");
+					} else {
+						$tar = new Archive_Tar($_FILES['pfile']['tmp_name']);
+						$extract = $tar->extract();
+
+						if (!$extract) {
+							$error = __("Unknown file format for uploaded file.");
+						}
+					}
 				}
 			}
 		}
 
 		# Find the PKGBUILD
 		if (!$error) {
-		  $pkgbuild = File_Find::search('PKGBUILD', $tempdir);
-		  
-		  if (count($pkgbuild)) {
-		    $pkgbuild = $pkgbuild[0];
-		    $pkg_dir = dirname($pkgbuild);
-		  } else {
-		    $error = __("Error trying to unpack upload - PKGBUILD does not exist.");
-		  }
+			$pkgbuild = File_Find::search('PKGBUILD', $tempdir);
+
+			if (count($pkgbuild)) {
+				$pkgbuild = $pkgbuild[0];
+				$pkg_dir = dirname($pkgbuild);
+			} else {
+				$error = __("Error trying to unpack upload - PKGBUILD does not exist.");
+			}
 		}
 
 		# if no error, get list of directory contents and process PKGBUILD
@@ -121,7 +110,7 @@ if ($_COOKIE["AURSID"]):
 			fclose($fp);
 
 			# Now process the lines and put any var=val lines into the
-			# 'pkgbuild' array.	Also check to make sure it has the build()
+			# 'pkgbuild' array. Also check to make sure it has the build()
 			# function.
 			#
 			$seen_build_function = 0;
@@ -136,13 +125,13 @@ if ($_COOKIE["AURSID"]):
 								$lparts[1]{strlen($lparts[1])-1} == '"') {
 							$pkgbuild[$lparts[0]] = substr($lparts[1], 1, -1);
 						}
-					 	elseif 
+						elseif 
 							($lparts[1]{0} == "'" && 
 							 $lparts[1]{strlen($lparts[1])-1} == "'") {
 							$pkgbuild[$lparts[0]] = substr($lparts[1], 1, -1);
 						} else { 
 							$pkgbuild[$lparts[0]] = $lparts[1];
-					 	}
+						}
 					} else {
 						$pkgbuild[$lparts[0]] = str_replace(array("(",")","\"","'"), "",
 								$lparts[1]);
@@ -163,20 +152,20 @@ if ($_COOKIE["AURSID"]):
 			if (!$seen_build_function) {
 				$error = __("Missing build function in PKGBUILD.");
 			}
-			
+
 			$req_vars = array("md5sums", "source", "url", "pkgdesc", "license", "pkgrel", "pkgver", "arch", "pkgname");
 			foreach ($req_vars as $var) {
-  			if (!array_key_exists($var, $pkgbuild)) {
-  				$error = __("Missing " . $var . " variable in PKGBUILD.");
-  			}
-		  }
+				if (!array_key_exists($var, $pkgbuild)) {
+					$error = __("Missing " . $var . " variable in PKGBUILD.");
+				}
+			}
 		}
 
 		# TODO This is where other additional error checking can be
-		# performed.	Examples: #md5sums == #sources?, md5sums of any
+		# performed. Examples: #md5sums == #sources?, md5sums of any
 		# included files match?, install scriptlet file exists?
 		#
-		
+
 		# Check for http:// or other protocol in url
 		# 
 		if (!$error) {
@@ -185,7 +174,7 @@ if ($_COOKIE["AURSID"]):
 				$error = __("Package URL is missing a protocol (ie. http:// ,ftp://)");
 			}
 		}
-			
+
 		# Now, run through the pkgbuild array and do any $pkgname/$pkgver
 		# substituions.
 		#
@@ -208,9 +197,9 @@ if ($_COOKIE["AURSID"]):
 			$pkg_name = str_replace("'", "", $pkgbuild['pkgname']);
 			$pkg_name = escapeshellarg($pkg_name);
 			$pkg_name = str_replace("'", "", $pkg_name);
-            
+
 			$presult = preg_match("/^[a-z0-9][a-z0-9\.+_-]*$/", $pkg_name);
-			
+
 			if (!$presult) {
 				$error = __("Invalid name: only lowercase letters are allowed.");
 			}
@@ -226,18 +215,14 @@ if ($_COOKIE["AURSID"]):
 				}
 
 				if (!@mkdir(INCOMING_DIR . $pkg_name)) {
-					$error = __( "Could not create directory %s."
-						         , INCOMING_DIR . $pkg_name
-						         );
+					$error = __( "Could not create directory %s.",
+						INCOMING_DIR . $pkg_name);
 				}
 
-        rename($pkg_dir, INCOMING_DIR . $pkg_name . "/" . $pkg_name);
+				rename($pkg_dir, INCOMING_DIR . $pkg_name . "/" . $pkg_name);
 			} else {
-				$error = __( "You are not allowed to overwrite the %h%s%h package."
-					         , "<b>"
-					         , $pkg_name
-					         , "</b>"
-					         );
+				$error = __( "You are not allowed to overwrite the %h%s%h package.",
+					"<b>", $pkg_name, "</b>");
 			}
 		}
 
@@ -248,16 +233,16 @@ if ($_COOKIE["AURSID"]):
 					array(INCOMING_DIR . $pkg_name));
 			}
 		}
-		
+
 		if (!$error) {
-		  $tar = new Archive_Tar($pkg_name . '.tar.gz');
-		  $create = $tar->create(array($pkg_name));
-		  
+			$tar = new Archive_Tar($pkg_name . '.tar.gz');
+			$create = $tar->create(array($pkg_name));
+
 			if (!$create) {
 				$error = __("Could not re-tar");
 			}
 		}
-		
+
 		# Whether it failed or not we can clean this out
 		if (file_exists($tempdir)) {
 			rm_rf($tempdir);
@@ -265,13 +250,13 @@ if ($_COOKIE["AURSID"]):
 
 		# Update the backend database
 		if (!$error) {
-		  
+
 			$dbh = db_connect();
-			
+
 			# 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.
-			
+
 			$q = "SELECT * FROM Packages WHERE Name = '" . mysql_real_escape_string($new_pkgbuild['pkgname']) . "'";
 			$result = db_query($q, $dbh);
 			$pdata = mysql_fetch_assoc($result);
@@ -286,53 +271,52 @@ if ($_COOKIE["AURSID"]):
 
 				# If the package was a dummy, undummy it
 				if ($pdata['DummyPkg']) {
-				  $q = sprintf( "UPDATE Packages SET DummyPkg = 0, SubmitterUID = %d, MaintainerUID = %d, SubmittedTS = UNIX_TIMESTAMP() WHERE ID = %d"
-				              , uid_from_sid($_COOKIE["AURSID"])
-				              , uid_from_sid($_COOKIE["AURSID"])
-				              , $pdata["ID"]
-				              );
+					$q = sprintf( "UPDATE Packages SET DummyPkg = 0, SubmitterUID = %d, MaintainerUID = %d, SubmittedTS = UNIX_TIMESTAMP() WHERE ID = %d",
+						uid_from_sid($_COOKIE["AURSID"]),
+						uid_from_sid($_COOKIE["AURSID"]),
+						$pdata["ID"]);
 
-          db_query($q, $dbh);
+					db_query($q, $dbh);
 				}
-				
+
 				# If a new category was chosen, change it to that
 				if ($_POST['category'] > 1) {
-				  $q = sprintf( "UPDATE Packages SET CategoryID = %d WHERE ID = %d"
-				              , mysql_real_escape_string($_REQUEST['category'])
-				              , $pdata["ID"]
-				              );
-				  
-				  db_query($q, $dbh);
-			  }
-				
+					$q = sprintf( "UPDATE Packages SET CategoryID = %d WHERE ID = %d",
+						mysql_real_escape_string($_REQUEST['category']),
+						$pdata["ID"]);
+
+					db_query($q, $dbh);
+				}
+
 				# Update package data
-				$q = sprintf( "UPDATE Packages SET ModifiedTS = UNIX_TIMESTAMP(), Name = '%s', Version = '%s-%s', License = '%s', Description = '%s', URL = '%s', LocationID = 2, FSPath = '%s', URLPath = '%s', OutOfDate = 0 WHERE ID = %d"
-				            , mysql_real_escape_string($new_pkgbuild['pkgname'])
-				            , mysql_real_escape_string($new_pkgbuild['pkgver'])
-				            , mysql_real_escape_string($new_pkgbuild['pkgrel'])
-				            , mysql_real_escape_string($new_pkgbuild['license'])
-				            , mysql_real_escape_string($new_pkgbuild['pkgdesc'])
-				            , mysql_real_escape_string($new_pkgbuild['url'])
-				            , mysql_real_escape_string(INCOMING_DIR . $pkg_name . "/" . $pkg_name . ".tar.gz")
-				            , mysql_real_escape_string(URL_DIR . $pkg_name . "/" . $pkg_name . ".tar.gz")
-				            , $pdata["ID"]
-				            );
-				
+				$q = sprintf("UPDATE Packages SET ModifiedTS = UNIX_TIMESTAMP(), Name = '%s', Version = '%s-%s', License = '%s', Description = '%s', URL = '%s', LocationID = 2, FSPath = '%s', URLPath = '%s', OutOfDate = 0 WHERE ID = %d",
+					mysql_real_escape_string($new_pkgbuild['pkgname']),
+					mysql_real_escape_string($new_pkgbuild['pkgver']),
+					mysql_real_escape_string($new_pkgbuild['pkgrel']),
+					mysql_real_escape_string($new_pkgbuild['license']),
+					mysql_real_escape_string($new_pkgbuild['pkgdesc']),
+					mysql_real_escape_string($new_pkgbuild['url']),
+					mysql_real_escape_string(INCOMING_DIR . $pkg_name . "/" . $pkg_name . ".tar.gz"),
+					mysql_real_escape_string(URL_DIR . $pkg_name . "/" . $pkg_name . ".tar.gz"),
+					$pdata["ID"]);
+
 				db_query($q, $dbh);
 
 				# Update package depends
 				$depends = explode(" ", $new_pkgbuild['depends']);
-        foreach ($depends as $dep) {
+				foreach ($depends as $dep) {
 					$q = "INSERT INTO PackageDepends (PackageID, DepPkgID, DepCondition) VALUES (";
 					$deppkgname = preg_replace("/[<>]?=.*/", "", $dep);
-          $depcondition = str_replace($deppkgname, "", $dep);
-                    
-          if ($deppkgname == "#") { break; }
-                    
+					$depcondition = str_replace($deppkgname, "", $dep);
+
+					if ($deppkgname == "#") {
+						break;
+					}
+
 					$deppkgid = create_dummy($deppkgname, $_COOKIE['AURSID']);
-          $q .= $pdata["ID"] . ", " . $deppkgid . ", '" . mysql_real_escape_string($depcondition) . "')";
+					$q .= $pdata["ID"] . ", " . $deppkgid . ", '" . mysql_real_escape_string($depcondition) . "')";
 
-        	db_query($q, $dbh);
+					db_query($q, $dbh);
 				}
 
 				# Insert sources
@@ -341,24 +325,25 @@ if ($_COOKIE["AURSID"]):
 					$q = "INSERT INTO PackageSources (PackageID, Source) VALUES (";
 					$q .= $pdata["ID"] . ", '" . mysql_real_escape_string($src) . "')";
 					db_query($q, $dbh);
-			  }
-			  
+				}
+
+				header('Location: packages.php?ID=' . $pdata['ID']);
+
 			} else {
-			  
+
 				# This is a brand new package
-				$q = sprintf( "INSERT INTO Packages (Name, License, Version, CategoryID, Description, URL, LocationID, SubmittedTS, SubmitterUID, MaintainerUID, FSPath, URLPath) VALUES ('%s', '%s', '%s-%s', %d, '%s', '%s', 2, UNIX_TIMESTAMP(), %d, %d, '%s', '%s')"
-				            , mysql_real_escape_string($new_pkgbuild['pkgname'])
-				            , mysql_real_escape_string($new_pkgbuild['license'])
-				            , mysql_real_escape_string($new_pkgbuild['pkgver'])
-				            , mysql_real_escape_string($new_pkgbuild['pkgrel'])
-				            , mysql_real_escape_string($_REQUEST['category'])
-				            , mysql_real_escape_string($new_pkgbuild['pkgdesc'])
-				            , mysql_real_escape_string($new_pkgbuild['url'])
-				            , uid_from_sid($_COOKIE["AURSID"])
-				            , uid_from_sid($_COOKIE["AURSID"])
-				            , mysql_real_escape_string(INCOMING_DIR . $pkg_name . "/" . $pkg_name . ".tar.gz")
-				            , mysql_real_escape_string(URL_DIR . $pkg_name . "/" . $pkg_name . ".tar.gz")
-				            );
+				$q = sprintf("INSERT INTO Packages (Name, License, Version, CategoryID, Description, URL, LocationID, SubmittedTS, SubmitterUID, MaintainerUID, FSPath, URLPath) VALUES ('%s', '%s', '%s-%s', %d, '%s', '%s', 2, UNIX_TIMESTAMP(), %d, %d, '%s', '%s')",
+					mysql_real_escape_string($new_pkgbuild['pkgname']),
+					mysql_real_escape_string($new_pkgbuild['license']),
+					mysql_real_escape_string($new_pkgbuild['pkgver']),
+					mysql_real_escape_string($new_pkgbuild['pkgrel']),
+					mysql_real_escape_string($_REQUEST['category']),
+					mysql_real_escape_string($new_pkgbuild['pkgdesc']),
+					mysql_real_escape_string($new_pkgbuild['url']),
+					uid_from_sid($_COOKIE["AURSID"]),
+					uid_from_sid($_COOKIE["AURSID"]),
+					mysql_real_escape_string(INCOMING_DIR . $pkg_name . "/" . $pkg_name . ".tar.gz"),
+					mysql_real_escape_string(URL_DIR . $pkg_name . "/" . $pkg_name . ".tar.gz"));
 
 				$result = db_query($q, $dbh);
 				$packageID = mysql_insert_id($dbh);
@@ -369,12 +354,14 @@ if ($_COOKIE["AURSID"]):
 					$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 .= $packageID . ", " . $deppkgid . ", '" . mysql_real_escape_string($depcondition) . "')";
-        
+
+					if ($deppkgname == "#") {
+						break;
+					}
+
+					$deppkgid = create_dummy($deppkgname, $_COOKIE['AURSID']);
+					$q .= $packageID . ", " . $deppkgid . ", '" . mysql_real_escape_string($depcondition) . "')";
+
 					db_query($q, $dbh);
 				}
 
@@ -384,15 +371,29 @@ if ($_COOKIE["AURSID"]):
 					$q = "INSERT INTO PackageSources (PackageID, Source) VALUES (";
 					$q .= $packageID . ", '" . mysql_real_escape_string($src) . "')";
 					db_query($q, $dbh);
-			  }
-			  
+				}
+
+				header('Location: packages.php?ID=' . $packageID);
+
 			}
 		}
 
 		chdir($_SERVER['DOCUMENT_ROOT']);
 	}
 
+# Logic over, let's do some output
+
+html_header("Submit");
 
+?>
+
+<div class="pgbox">
+	<div class="pgboxtitle">
+		<span class="f3"><?php print __("Submit"); ?></span>
+	</div>
+	<div class="pgboxbody">
+
+<?php
 	if (!$_REQUEST["pkgsubmit"] || $error):
 		# User is not uploading, or there were errors uploading - then
 		# give the visitor the default upload form
@@ -405,15 +406,7 @@ if ($_COOKIE["AURSID"]):
 
 <?php
 			endif;
-			if ($warning):
-?>
-
-<br><span class='error'><?php print $warning; ?></span><br />
-<br />
 
-<?php
-			endif;
-            
 			$pkg_categories = pkgCategories();
 			$pkg_locations = pkgLocations();
 ?>
@@ -461,17 +454,6 @@ if ($_COOKIE["AURSID"]):
 
 <?php
 		endif;
-	else:
-		print __("Package upload successful.");
-
-    if ($warning):
-?>
-
-<span class='warning'><?php print $warning; ?></span><br />
-<br />
-
-<?php
-    endif;
 	endif;
 else:
 	# Visitor is not logged in
@@ -479,15 +461,14 @@ else:
 ?>
 
 <br />
-	
+
 <?php
 endif;
 ?>
 
-  </div>
+	</div>
 </div>
 
 <?php
 html_footer(AUR_VERSION);
 
-?>