mirror of
https://gitlab.archlinux.org/archlinux/aurweb.git
synced 2025-02-03 10:43:03 +01:00
Fix whitespace and indenting in pkgsubmit.
Signed-off-by: Loui Chang <louipc.ist@gmail.com>
This commit is contained in:
Loui Chang
parent
52fb8550a2
commit
99881b31db
1 changed files with 113 additions and 118 deletions
|
|
@ -35,30 +35,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 ($_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 (!$extract) {
|
||||
$error = __("Unknown file format for uploaded file.");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
# Find the PKGBUILD
|
||||
if (!$error) {
|
||||
$pkgbuild = File_Find::search('PKGBUILD', $tempdir);
|
||||
$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 (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
|
||||
|
|
@ -108,7 +108,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;
|
||||
|
|
@ -123,13 +123,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]);
|
||||
|
|
@ -153,14 +153,14 @@ if ($_COOKIE["AURSID"]):
|
|||
|
||||
$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?
|
||||
#
|
||||
|
||||
|
|
@ -213,18 +213,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>");
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -237,8 +233,8 @@ if ($_COOKIE["AURSID"]):
|
|||
}
|
||||
|
||||
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");
|
||||
|
|
@ -256,7 +252,7 @@ if ($_COOKIE["AURSID"]):
|
|||
$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']) . "'";
|
||||
|
|
@ -273,53 +269,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"]
|
||||
);
|
||||
$q = sprintf( "UPDATE Packages SET CategoryID = %d WHERE ID = %d",
|
||||
mysql_real_escape_string($_REQUEST['category']),
|
||||
$pdata["ID"]);
|
||||
|
||||
db_query($q, $dbh);
|
||||
}
|
||||
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);
|
||||
$depcondition = str_replace($deppkgname, "", $dep);
|
||||
|
||||
if ($deppkgname == "#") { break; }
|
||||
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
|
||||
|
|
@ -328,26 +323,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);
|
||||
|
|
@ -359,10 +353,12 @@ if ($_COOKIE["AURSID"]):
|
|||
$deppkgname = preg_replace("/[<>]?=.*/", "", $dep);
|
||||
$depcondition = str_replace($deppkgname, "", $dep);
|
||||
|
||||
if ($deppkgname == "#") { break; }
|
||||
if ($deppkgname == "#") {
|
||||
break;
|
||||
}
|
||||
|
||||
$deppkgid = create_dummy($deppkgname, $_COOKIE['AURSID']);
|
||||
$q .= $packageID . ", " . $deppkgid . ", '" . mysql_real_escape_string($depcondition) . "')";
|
||||
$deppkgid = create_dummy($deppkgname, $_COOKIE['AURSID']);
|
||||
$q .= $packageID . ", " . $deppkgid . ", '" . mysql_real_escape_string($depcondition) . "')";
|
||||
|
||||
db_query($q, $dbh);
|
||||
}
|
||||
|
|
@ -373,7 +369,7 @@ 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);
|
||||
|
||||
|
|
@ -390,10 +386,10 @@ html_header("Submit");
|
|||
?>
|
||||
|
||||
<div class="pgbox">
|
||||
<div class="pgboxtitle">
|
||||
<span class="f3"><?php print __("Submit"); ?></span>
|
||||
</div>
|
||||
<div class="pgboxbody">
|
||||
<div class="pgboxtitle">
|
||||
<span class="f3"><?php print __("Submit"); ?></span>
|
||||
</div>
|
||||
<div class="pgboxbody">
|
||||
|
||||
<?php
|
||||
if (!$_REQUEST["pkgsubmit"] || $error):
|
||||
|
|
@ -468,10 +464,9 @@ else:
|
|||
endif;
|
||||
?>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<?php
|
||||
html_footer(AUR_VERSION);
|
||||
|
||||
?>
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue