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

Add a new AUR_LOCATION setting

Browse source 
This should be set to something like 'http://localhost' for development
or 'https://aur.archlinux.org' in production. It ensures all links in
the site stay in the development site and there is no sudden jump from
development to production environments.

Signed-off-by: Dan McGee <dan@archlinux.org>
Signed-off-by: Lukas Fleischer <archlinux@cryptocrack.de>
This commit is contained in:
Dan McGee 2011-10-21 15:15:55 -05:00 • committed by Lukas Fleischer
parent fe90b4bc3e
commit e571a694d6
7 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
web/html/passreset.php
View file

@ -67,7 +67,7 @@ if (isset($_GET['resetkey'], $_POST['email'], $_POST['password'], $_POST['confir
'your password follow the link below, otherwise ignore '. 'your password follow the link below, otherwise ignore '.
'this message and nothing will happen.'). 'this message and nothing will happen.').
"\n\n". "\n\n".
'https://aur.archlinux.org/passreset.php?'. "{$AUR_LOCATION}/passreset.php?".
"resetkey={$resetkey}"; "resetkey={$resetkey}";
$body = wordwrap($body, 70); $body = wordwrap($body, 70);
$headers = "To: {$email}\nReply-to: nobody@archlinux.org\nFrom:aur-notify@archlinux.org\nX-Mailer: PHP\nX-MimeOLE: Produced By AUR"; $headers = "To: {$email}\nReply-to: nobody@archlinux.org\nFrom:aur-notify@archlinux.org\nX-Mailer: PHP\nX-MimeOLE: Produced By AUR";

1
web/lib/aur.inc.php
View file

@ -281,6 +281,7 @@ function html_header($title="") {
global $LANG; global $LANG;
global $SUPPORTED_LANGS; global $SUPPORTED_LANGS;
global $DISABLE_HTTP_LOGIN; global $DISABLE_HTTP_LOGIN;
global $AUR_LOCATION;
if (!$DISABLE_HTTP_LOGIN || (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'])) { if (!$DISABLE_HTTP_LOGIN || (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'])) {
$login = try_login(); $login = try_login();

3
web/lib/config.inc.php.proto
View file

@ -49,3 +49,6 @@ $MAX_FILESIZE_UNCOMPRESSED = 1024 * 1024 * 8;
# Allow HTTPs logins only # Allow HTTPs logins only
$DISABLE_HTTP_LOGIN = true; $DISABLE_HTTP_LOGIN = true;
# Web URL used in email links and absolute redirects, no trailing slash
$AUR_LOCATION = "http://localhost";

6
web/lib/pkgfuncs.inc.php
View file

@ -301,6 +301,8 @@ function pkgname_is_blacklisted($name, $dbh=NULL) {
# display package details # display package details
# #
function package_details($id=0, $SID="", $dbh=NULL) { function package_details($id=0, $SID="", $dbh=NULL) {
global $AUR_LOCATION;
if(!$dbh) { if(!$dbh) {
$dbh = db_connect(); $dbh = db_connect();
} }
@ -618,6 +620,8 @@ function sanitize_ids($ids) {
* @return string Translated success or error messages * @return string Translated success or error messages
*/ */
function pkg_flag ($atype, $ids, $action=true, $dbh=NULL) { function pkg_flag ($atype, $ids, $action=true, $dbh=NULL) {
global $AUR_LOCATION;
if (!$atype) { if (!$atype) {
if ($action) { if ($action) {
return __("You must be logged in before you can flag packages."); return __("You must be logged in before you can flag packages.");
@ -664,7 +668,7 @@ function pkg_flag ($atype, $ids, $action=true, $dbh=NULL) {
if (mysql_num_rows($result)) { if (mysql_num_rows($result)) {
while ($row = mysql_fetch_assoc($result)) { while ($row = mysql_fetch_assoc($result)) {
# construct email # construct email
$body = "Your package " . $row['Name'] . " has been flagged out of date by " . $f_name . " [1]. You may view your package at:\nhttps://aur.archlinux.org/packages.php?ID=" . $row['ID'] . "\n\n[1] - https://aur.archlinux.org/account.php?Action=AccountInfo&ID=" . $f_uid; $body = "Your package " . $row['Name'] . " has been flagged out of date by " . $f_name . " [1]. You may view your package at:\n" . $AUR_LOCATION . "/packages.php?ID=" . $row['ID'] . "\n\n[1] - " . $AUR_LOCATION . "/account.php?Action=AccountInfo&ID=" . $f_uid;
$body = wordwrap($body, 70); $body = wordwrap($body, 70);
$headers = "Reply-to: nobody@archlinux.org\nFrom:aur-notify@archlinux.org\nX-Mailer: PHP\nX-MimeOLE: Produced By AUR\n"; $headers = "Reply-to: nobody@archlinux.org\nFrom:aur-notify@archlinux.org\nX-Mailer: PHP\nX-MimeOLE: Produced By AUR\n";
@mail($row['Email'], "AUR Out-of-date Notification for ".$row['Name'], $body, $headers); @mail($row['Email'], "AUR Out-of-date Notification for ".$row['Name'], $body, $headers);

2
web/template/header.php
View file

@ -23,7 +23,7 @@
<li id="anb-forums"><a href="https://bbs.archlinux.org/" title="Community forums">Forums</a></li> <li id="anb-forums"><a href="https://bbs.archlinux.org/" title="Community forums">Forums</a></li>
<li id="anb-wiki"><a href="https://wiki.archlinux.org/" title="Community documentation">Wiki</a></li> <li id="anb-wiki"><a href="https://wiki.archlinux.org/" title="Community documentation">Wiki</a></li>
<li id="anb-bugs"><a href="https://bugs.archlinux.org/" title="Report and track bugs">Bugs</a></li> <li id="anb-bugs"><a href="https://bugs.archlinux.org/" title="Report and track bugs">Bugs</a></li>
<li id="anb-aur"><a href="https://aur.archlinux.org/" title="Arch Linux User Repository">AUR</a></li> <li id="anb-aur"><a href="/" title="Arch Linux User Repository">AUR</a></li>
<li id="anb-download"><a href="http://www.archlinux.org/download/" title="Get Arch Linux">Download</a></li> <li id="anb-download"><a href="http://www.archlinux.org/download/" title="Get Arch Linux">Download</a></li>
</ul> </ul>
</div> </div>

2
web/template/login_form.php
View file

@ -32,7 +32,7 @@ else {
?> ?>
<span class='error'> <span class='error'>
<?php printf(__("HTTP login is disabled. Please %sswitch to HTTPs%s 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' . htmlspecialchars($_SERVER['REQUEST_URI'], ENT_QUOTES) . '">', '</a>'); ?> '<a href="' . $AUR_LOCATION . htmlspecialchars($_SERVER['REQUEST_URI'], ENT_QUOTES) . '">', '</a>'); ?>
</span> </span>
<?php } ?> <?php } ?>
</div> </div>

4
web/template/pkg_comment_form.php
View file

@ -35,9 +35,9 @@ if (isset($_REQUEST['comment'])) {
# Simply making these strings translatable won't work, users would be # Simply making these strings translatable won't work, users would be
# getting emails in the language that the user who posted the comment was in # getting emails in the language that the user who posted the comment was in
$body = $body =
'from https://aur.archlinux.org/packages.php?ID=' 'from ' . $AUR_LOCATION . '/packages.php?ID='
. $_REQUEST['ID'] . "\n" . $_REQUEST['ID'] . "\n"
. username_from_sid($_COOKIE['AURSID']) . " wrote:\n\n" . username_from_sid($_COOKIE['AURSID'], $dbh) . " wrote:\n\n"
. $_POST['comment'] . $_POST['comment']
. "\n\n---\nIf you no longer wish to receive notifications about this package, please go the the above package page and click the UnNotify button."; . "\n\n---\nIf you no longer wish to receive notifications about this package, please go the the above package page and click the UnNotify button.";
$body = wordwrap($body, 70); $body = wordwrap($body, 70);