mirror of
https://gitlab.archlinux.org/archlinux/aurweb.git
synced 2025-02-03 09:43:03 +00:00
Merge branch 'maint'
This commit is contained in:
commit
675b7e3d02
3 changed files with 28 additions and 11 deletions
|
@ -311,6 +311,18 @@ if ($uid):
|
|||
$pkg_version = sprintf('%s-%s', $new_pkgbuild['pkgver'], $new_pkgbuild['pkgrel']);
|
||||
}
|
||||
|
||||
# Check the category to use, "1" meaning "none" (or "keep category" for
|
||||
# existing packages).
|
||||
if (isset($_POST['category'])) {
|
||||
$category_id = intval($_POST['category']);
|
||||
if ($category_id <= 0) {
|
||||
$category_id = 1;
|
||||
}
|
||||
}
|
||||
else {
|
||||
$category_id = 1;
|
||||
}
|
||||
|
||||
if ($pdata) {
|
||||
# This is an overwrite of an existing package, the database ID
|
||||
# needs to be preserved so that any votes are retained. However,
|
||||
|
@ -324,9 +336,9 @@ if ($uid):
|
|||
db_query($q, $dbh);
|
||||
|
||||
# If a new category was chosen, change it to that
|
||||
if ($_POST['category'] > 1) {
|
||||
if ($category_id > 1) {
|
||||
$q = sprintf( "UPDATE Packages SET CategoryID = %d WHERE ID = %d",
|
||||
mysql_real_escape_string($_REQUEST['category']),
|
||||
$category_id,
|
||||
$packageID);
|
||||
|
||||
db_query($q, $dbh);
|
||||
|
@ -350,7 +362,7 @@ if ($uid):
|
|||
mysql_real_escape_string($new_pkgbuild['pkgname']),
|
||||
mysql_real_escape_string($new_pkgbuild['license']),
|
||||
mysql_real_escape_string($pkg_version),
|
||||
mysql_real_escape_string($_REQUEST['category']),
|
||||
$category_id,
|
||||
mysql_real_escape_string($new_pkgbuild['pkgdesc']),
|
||||
mysql_real_escape_string($new_pkgbuild['url']),
|
||||
$uid,
|
||||
|
|
|
@ -11,7 +11,7 @@ elseif (!$DISABLE_HTTP_LOGIN || (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS']))
|
|||
print "<span class='error'>" . $login_error . "</span><br />\n";
|
||||
}
|
||||
?>
|
||||
<form method="post" action="<?php echo $_SERVER['REQUEST_URI'] ?>">
|
||||
<form method="post" action="<?php echo htmlspecialchars($_SERVER['REQUEST_URI'], ENT_QUOTES) ?>">
|
||||
<div>
|
||||
<label for="user"><?php print __('Username') . ':'; ?></label>
|
||||
<input type="text" name="user" id="user" size="30" maxlength="<?php print USERNAME_MAX_LEN; ?>" value="<?php
|
||||
|
@ -31,8 +31,8 @@ elseif (!$DISABLE_HTTP_LOGIN || (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS']))
|
|||
else {
|
||||
?>
|
||||
<span class='error'>
|
||||
<?php echo __("HTTP login is disabled. Please switch to HTTPs if you want to login: "); ?>
|
||||
<a href="https://aur.archlinux.org/">https://aur.archlinux.org/</a>
|
||||
<?php printf(__("HTTP login is disabled. Please %sswitch to HTTPs%s if you want to login."),
|
||||
'<a href="https://aur.archlinux.org' . htmlspecialchars($_SERVER['REQUEST_URI'], ENT_QUOTES) . '">', '</a>'); ?>
|
||||
</span>
|
||||
<?php } ?>
|
||||
</div>
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue