external/aurweb
0
0
Fork 0
mirror of https://gitlab.archlinux.org/archlinux/aurweb.git synced 2025-02-03 10:43:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix whitespace and indenting in pkgsubmit.

Browse source 
Signed-off-by: Loui Chang <louipc.ist@gmail.com>
This commit is contained in:
Loui Chang 2008-09-13 15:35:32 -04:00
parent 52fb8550a2
commit 99881b31db
1 changed files with 113 additions and 118 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

83
web/html/pkgsubmit.php
View file

@ -213,18 +213,14 @@ if ($_COOKIE["AURSID"]):
} }
if (!@mkdir(INCOMING_DIR . $pkg_name)) { if (!@mkdir(INCOMING_DIR . $pkg_name)) {
$error = __( "Could not create directory %s." $error = __( "Could not create directory %s.",
, INCOMING_DIR . $pkg_name INCOMING_DIR . $pkg_name);
);
} }
rename($pkg_dir, INCOMING_DIR . $pkg_name . "/" . $pkg_name); rename($pkg_dir, INCOMING_DIR . $pkg_name . "/" . $pkg_name);
} else { } else {
$error = __( "You are not allowed to overwrite the %h%s%h package." $error = __( "You are not allowed to overwrite the %h%s%h package.",
, "<b>" "<b>", $pkg_name, "</b>");
, $pkg_name
, "</b>"
);
} }
} }
@ -273,37 +269,34 @@ if ($_COOKIE["AURSID"]):
# If the package was a dummy, undummy it # If the package was a dummy, undummy it
if ($pdata['DummyPkg']) { if ($pdata['DummyPkg']) {
$q = sprintf( "UPDATE Packages SET DummyPkg = 0, SubmitterUID = %d, MaintainerUID = %d, SubmittedTS = UNIX_TIMESTAMP() WHERE ID = %d" $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"]),
, uid_from_sid($_COOKIE["AURSID"]) uid_from_sid($_COOKIE["AURSID"]),
, $pdata["ID"] $pdata["ID"]);
);
db_query($q, $dbh); db_query($q, $dbh);
} }
# If a new category was chosen, change it to that # If a new category was chosen, change it to that
if ($_POST['category'] > 1) { if ($_POST['category'] > 1) {
$q = sprintf( "UPDATE Packages SET CategoryID = %d WHERE ID = %d" $q = sprintf( "UPDATE Packages SET CategoryID = %d WHERE ID = %d",
, mysql_real_escape_string($_REQUEST['category']) mysql_real_escape_string($_REQUEST['category']),
, $pdata["ID"] $pdata["ID"]);
);
db_query($q, $dbh); db_query($q, $dbh);
} }
# Update package data # 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" $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['pkgname']),
, mysql_real_escape_string($new_pkgbuild['pkgver']) mysql_real_escape_string($new_pkgbuild['pkgver']),
, mysql_real_escape_string($new_pkgbuild['pkgrel']) mysql_real_escape_string($new_pkgbuild['pkgrel']),
, mysql_real_escape_string($new_pkgbuild['license']) mysql_real_escape_string($new_pkgbuild['license']),
, mysql_real_escape_string($new_pkgbuild['pkgdesc']) mysql_real_escape_string($new_pkgbuild['pkgdesc']),
, mysql_real_escape_string($new_pkgbuild['url']) mysql_real_escape_string($new_pkgbuild['url']),
, mysql_real_escape_string(INCOMING_DIR . $pkg_name . "/" . $pkg_name . ".tar.gz") mysql_real_escape_string(INCOMING_DIR . $pkg_name . "/" . $pkg_name . ".tar.gz"),
, mysql_real_escape_string(URL_DIR . $pkg_name . "/" . $pkg_name . ".tar.gz") mysql_real_escape_string(URL_DIR . $pkg_name . "/" . $pkg_name . ".tar.gz"),
, $pdata["ID"] $pdata["ID"]);
);
db_query($q, $dbh); db_query($q, $dbh);
@ -314,7 +307,9 @@ if ($_COOKIE["AURSID"]):
$deppkgname = preg_replace("/[<>]?=.*/", "", $dep); $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']); $deppkgid = create_dummy($deppkgname, $_COOKIE['AURSID']);
$q .= $pdata["ID"] . ", " . $deppkgid . ", '" . mysql_real_escape_string($depcondition) . "')"; $q .= $pdata["ID"] . ", " . $deppkgid . ", '" . mysql_real_escape_string($depcondition) . "')";
@ -335,19 +330,18 @@ if ($_COOKIE["AURSID"]):
} else { } else {
# This is a brand new package # 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')" $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['pkgname']),
, mysql_real_escape_string($new_pkgbuild['license']) mysql_real_escape_string($new_pkgbuild['license']),
, mysql_real_escape_string($new_pkgbuild['pkgver']) mysql_real_escape_string($new_pkgbuild['pkgver']),
, mysql_real_escape_string($new_pkgbuild['pkgrel']) mysql_real_escape_string($new_pkgbuild['pkgrel']),
, mysql_real_escape_string($_REQUEST['category']) mysql_real_escape_string($_REQUEST['category']),
, mysql_real_escape_string($new_pkgbuild['pkgdesc']) mysql_real_escape_string($new_pkgbuild['pkgdesc']),
, mysql_real_escape_string($new_pkgbuild['url']) mysql_real_escape_string($new_pkgbuild['url']),
, uid_from_sid($_COOKIE["AURSID"]) uid_from_sid($_COOKIE["AURSID"]),
, 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(INCOMING_DIR . $pkg_name . "/" . $pkg_name . ".tar.gz"),
, mysql_real_escape_string(URL_DIR . $pkg_name . "/" . $pkg_name . ".tar.gz") mysql_real_escape_string(URL_DIR . $pkg_name . "/" . $pkg_name . ".tar.gz"));
);
$result = db_query($q, $dbh); $result = db_query($q, $dbh);
$packageID = mysql_insert_id($dbh); $packageID = mysql_insert_id($dbh);
@ -359,7 +353,9 @@ if ($_COOKIE["AURSID"]):
$deppkgname = preg_replace("/[<>]?=.*/", "", $dep); $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']); $deppkgid = create_dummy($deppkgname, $_COOKIE['AURSID']);
$q .= $packageID . ", " . $deppkgid . ", '" . mysql_real_escape_string($depcondition) . "')"; $q .= $packageID . ", " . $deppkgid . ", '" . mysql_real_escape_string($depcondition) . "')";
@ -474,4 +470,3 @@ endif;
<?php <?php
html_footer(AUR_VERSION); html_footer(AUR_VERSION);
?>