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
|
|
@ -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);
|
||||
} 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>");
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -273,37 +269,34 @@ 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);
|
||||
}
|
||||
|
||||
# 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);
|
||||
}
|
||||
|
||||
# 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);
|
||||
|
||||
|
|
@ -314,7 +307,9 @@ 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 .= $pdata["ID"] . ", " . $deppkgid . ", '" . mysql_real_escape_string($depcondition) . "')";
|
||||
|
|
@ -335,19 +330,18 @@ if ($_COOKIE["AURSID"]):
|
|||
} 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,7 +353,9 @@ 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) . "')";
|
||||
|
|
@ -474,4 +470,3 @@ endif;
|
|||
<?php
|
||||
html_footer(AUR_VERSION);
|
||||
|
||||
?>
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue