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

Merge branch 'maint'

Browse source
This commit is contained in:
Lukas Fleischer 2011-09-05 17:09:03 +02:00
commit 675b7e3d02
3 changed files with 28 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
po/aur.pot
View file

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: AUR v1.9.0\n" "Project-Id-Version: AUR v1.9.0\n"
"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n" "Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n"
"POT-Creation-Date: 2011-08-13 12:46+0200\n" "POT-Creation-Date: 2011-09-05 17:02+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -536,6 +536,12 @@ msgstr ""
msgid "Bad username or password." msgid "Bad username or password."
msgstr "" msgstr ""
msgid "Category"
msgstr ""
msgid "Change category"
msgstr ""
msgid "Votes" msgid "Votes"
msgstr "" msgstr ""
@ -700,7 +706,9 @@ msgstr ""
msgid "Forgot Password" msgid "Forgot Password"
msgstr "" msgstr ""
msgid "HTTP login is disabled. Please switch to HTTPs if you want to login: " #, php-format
msgid ""
"HTTP login is disabled. Please %sswitch to HTTPs%s if you want to login."
msgstr "" msgstr ""
msgid "Recent Updates" msgid "Recent Updates"
@ -748,9 +756,6 @@ msgstr ""
msgid "Package Listing" msgid "Package Listing"
msgstr "" msgstr ""
msgid "Category"
msgstr ""
msgid "Name" msgid "Name"
msgstr "" msgstr ""

18
web/html/pkgsubmit.php
View file

@ -311,6 +311,18 @@ if ($uid):
$pkg_version = sprintf('%s-%s', $new_pkgbuild['pkgver'], $new_pkgbuild['pkgrel']); $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) { if ($pdata) {
# This is an overwrite of an existing package, the database ID # 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,
@ -324,9 +336,9 @@ if ($uid):
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 ($category_id > 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']), $category_id,
$packageID); $packageID);
db_query($q, $dbh); db_query($q, $dbh);
@ -350,7 +362,7 @@ if ($uid):
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($pkg_version), 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['pkgdesc']),
mysql_real_escape_string($new_pkgbuild['url']), mysql_real_escape_string($new_pkgbuild['url']),
$uid, $uid,

6
web/template/login_form.php
View file

@ -11,7 +11,7 @@ elseif (!$DISABLE_HTTP_LOGIN || (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS']))
print "<span class='error'>" . $login_error . "</span><br />\n"; 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> <div>
<label for="user"><?php print __('Username') . ':'; ?></label> <label for="user"><?php print __('Username') . ':'; ?></label>
<input type="text" name="user" id="user" size="30" maxlength="<?php print USERNAME_MAX_LEN; ?>" value="<?php <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 { else {
?> ?>
<span class='error'> <span class='error'>
<?php echo __("HTTP login is disabled. Please switch to HTTPs if you want to login: "); ?> <?php printf(__("HTTP login is disabled. Please %sswitch to HTTPs%s if you want to login."),
<a href="https://aur.archlinux.org/">https://aur.archlinux.org/</a> '<a href="https://aur.archlinux.org' . htmlspecialchars($_SERVER['REQUEST_URI'], ENT_QUOTES) . '">', '</a>'); ?>
</span> </span>
<?php } ?> <?php } ?>
</div> </div>