December 2008 - Aur-dev - lists.archlinux.org

[aur-dev] [PATCH] Add function to generate clean urls
by Callan Barrett 22 Dec '08

22 Dec '08

Signed-off-by: Callan Barrett <wizzomafizzo(a)gmail.com> --- web/lib/aur.inc | 34 ++++++++++++++++++++++++++++++++++ 1 files changed, 34 insertions(+), 0 deletions(-) diff --git a/web/lib/aur.inc b/web/lib/aur.inc index e82f0ea..c62f5fb 100644 --- a/web/lib/aur.inc +++ b/web/lib/aur.inc @@ -438,3 +438,37 @@ function uid_from_username($username="") return $row[0]; } +/** + * Generate clean url with edited/added user values + * + * Makes a clean string of variables for use in URLs based on current $_GET and + * list of values to edit/add to that. Any empty variables are discarded. + * + * ex. print "http://example.com/test.php?" . mkurl("foo=bar&bar=baz") + * + * @param string $append string of variables and values formatted as in URLs + * ex. mkurl("foo=bar&bar=baz") + * @return string clean string of variables to append to URL, urlencoded + * @author Callan Barrett + */ +function mkurl($append) { + $get = $_GET; + $append = explode('&', $append); + $uservars = array(); + $out = ''; + + foreach ($append as $i) { + $ex = explode('=', $i); + $uservars[$ex[0]] = $ex[1]; + } + + foreach ($uservars as $k => $v) { $get[$k] = $v; } + + foreach ($get as $k => $v) { + if ($v !== '') { + $out .= '&' . urlencode($k) . '=' . urlencode($v); + } + } + + return substr($out, 5); +} -- 1.6.0.2

1 0

[aur-dev] [PATCH] Don't require login to see out of date packages from package search.
by Loui Chang 22 Dec '08

22 Dec '08

Signed-off-by: Loui Chang <louipc.ist(a)gmail.com> --- web/template/pkg_search_results.php | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/web/template/pkg_search_results.php b/web/template/pkg_search_results.php index 2087abc..12b32a1 100644 --- a/web/template/pkg_search_results.php +++ b/web/template/pkg_search_results.php @@ -47,9 +47,13 @@ $K = urlencode($K); </span></th> </tr> -<?php for ($i=0; $row = mysql_fetch_assoc($result); $i++) { (($i % 2) == 0) ? $c = "data1" : $c = "data2"; ?> +<?php +for ($i = 0; $row = mysql_fetch_assoc($result); $i++) { + (($i % 2) == 0) ? $c = "data1" : $c = "data2"; + if ($row["OutOfDate"]): $c = "outofdate"; endif; +?> <tr> - <?php if ($SID): if ($row["OutOfDate"]): $c = "outofdate"; endif; ?> + <?php if ($SID): ?> <td class='<?php print $c ?>'><input type='checkbox' name='IDs[<?php print $row["ID"] ?>]' value='1'></td> <?php endif; ?> <td class='<?php print $c ?>'><span class='f5'><span class='blue'><?php print $row["Location"] ?></span></span></td> @@ -114,10 +118,9 @@ $K = urlencode($K); <?php print __("Showing results %s - %s of %s", $first, $last, $total) ?> </span></span></td></tr> <td colspan='2' align='center'> - <span class='f5'> - <?php if ($SID): ?> - <span class="outofdate"><?php print __("Out of Date") ?></span>     - <?php endif; ?> + <span class='f3'> + <?php echo __('Legend') ?> + <span class="outofdate"><?php print __('Out of Date') ?></span> </span></td> </tr> <tr> -- 1.6.0.5

2 3

[aur-dev] [PATCH] Encode search string for use in anchor tags.
by Loui Chang 22 Dec '08

22 Dec '08

Sorting, and viewing more results resets the search if you search for '#' in 1.5.3. This should fix that bug. Signed-off-by: Loui Chang <louipc.ist(a)gmail.com> --- web/template/pkg_search_results.php | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/web/template/pkg_search_results.php b/web/template/pkg_search_results.php index 5af02ef..2087abc 100644 --- a/web/template/pkg_search_results.php +++ b/web/template/pkg_search_results.php @@ -1,3 +1,7 @@ +<?php +# Encode search string +$K = urlencode($K); +?> <form action='packages.php?<?php print $_SERVER['QUERY_STRING'] ?>' method='post'> <center> -- 1.6.0.5

2 3

[aur-dev] [PATCH] Make some translatable strings friendlier to common usage.
by Loui Chang 22 Dec '08

22 Dec '08

Removing trailing colons and whitespace makes them more usable. Signed-off-by: Loui Chang <louipc.ist(a)gmail.com> --- web/html/addvote.php | 6 +++--- web/template/tu_details.php | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/web/html/addvote.php b/web/html/addvote.php index a31a1ff..5c1ff33 100644 --- a/web/html/addvote.php +++ b/web/html/addvote.php @@ -68,15 +68,15 @@ if ($atype == "Trusted User" OR $atype == "Developer") { <p><?php print __("Submit a proposal to vote on.") ?></p> <?php if (!empty($error)) { print $error . "<br />"; } ?> <form action='addvote.php' method='post'> -<b><?php print __("Applicant/TU:") ?></b> +<b><?php print __('Applicant/TU') ?></b> <input type='text' name='user' value='<?php if (!empty($_POST['user'])) { print htmlentities($_POST['user'], ENT_QUOTES); } ?>'> <?php print __("(empty if not applicable)") ?> <br /> -<b><?php print __("Length in days:") ?></b> +<b><?php print __('Length in days') ?></b> <input type='text' name='length' value='<?php if (!empty($_POST['length'])) { print htmlentities($_POST['length'], ENT_QUOTES); } ?>'> <?php print __("(defaults to 7 if empty)") ?> <br /> -<b><?php print __("Proposal:") ?></b><br /> +<b><?php print __('Proposal') ?></b><br /> <textarea name='agenda' rows='10' cols='50'><?php if (!empty($_POST['agenda'])) { print htmlentities($_POST['agenda']); } ?></textarea><br /> <input type='hidden' name='addVote' value='1'> <input type='submit' class='button' value='Submit'> diff --git a/web/template/tu_details.php b/web/template/tu_details.php index b1d69f6..7fc9f09 100644 --- a/web/template/tu_details.php +++ b/web/template/tu_details.php @@ -4,8 +4,8 @@ <?php if ($isrunning == 1) { ?> <div style='text-align: center; font-weight: bold; color: red'><?php print __("This vote is still running.") ?></div> <br /> -<?php } ?> -User: <b> +<?php } +echo __('User') ?>: <b> <?php if (!empty($row['User'])) { ?> <a href='packages.php?K=<?php print $row['User'] ?>&SeB=m'><?php print $row['User'] ?></a> <?php } else { ?> @@ -13,7 +13,7 @@ N/A <?php } ?> </b><br /> <?php print __("Submitted: %s by %s", "<b>" . gmdate("r", $row['Submitted']) . "</b>", "<b>" . username_from_id($row['SubmitterID']) . "</b>") ?><br /> -<?php print __("End: ") ?><b><?php print gmdate("r", $row['End']) ?></b><br /><br /> +<?php print __('End') ?>: <b><?php print gmdate("r", $row['End']) ?></b><br /><br /> <?php print str_replace("\n", "<br />\n", htmlentities($row['Agenda'])) ?><br /><br /> <center> <table cellspacing='3' class='boxSoft' style='width: 50%'> @@ -26,7 +26,7 @@ N/A <th style='border-bottom: #666 1px solid; vertical-align: bottom'><span class='f2'><?php print __("No") ?></span></th> <th style='border-bottom: #666 1px solid; vertical-align: bottom'><span class='f2'><?php print __("Abstain") ?></span></th> <th style='border-bottom: #666 1px solid; vertical-align: bottom'><span class='f2'><?php print __("Total") ?></span></th> -<th style='border-bottom: #666 1px solid; vertical-align: bottom'><span class='f2'><?php print __("Voted?") ?></span></th> +<th style='border-bottom: #666 1px solid; vertical-align: bottom'><span class='f2'><?php print __('Voted') ?></span></th> </tr> <tr> <td class='data1'><span class='f5'><span class='blue'><?php print $row['Yes'] ?></span></span></td> -- 1.6.0.5

3 3

[aur-dev] [PATCH] Really make all web paths relative.
by Loui Chang 22 Dec '08

22 Dec '08

I forgot about the forms. Signed-off-by: Loui Chang <louipc.ist(a)gmail.com> --- web/html/pkgedit.php | 6 ++---- web/html/pkgsubmit.php | 2 +- web/lib/acctfuncs.inc | 8 ++++---- web/template/pkg_search_form.php | 2 +- 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/web/html/pkgedit.php b/web/html/pkgedit.php index ff82663..2296470 100644 --- a/web/html/pkgedit.php +++ b/web/html/pkgedit.php @@ -8,7 +8,6 @@ include_lang("pkgedit_po.inc"); # i18n translations for this script set_lang(); # this sets up the visitor's language check_sid(); # see if they're still logged in html_header(); # print out the HTML header -$svn_idstr = "\$Id$"; # Make sure this visitor is logged in # @@ -102,7 +101,7 @@ if ($_REQUEST["add_Comment"]) { # Prompt visitor for comment # print "<div align='center'>\n"; - print "<form action='/pkgedit.php' method='post'>\n"; + print "<form action='pkgedit.php' method='post'>\n"; print "<input type='hidden' name='add_Comment' value='1'>\n"; print "<input type='hidden' name='ID' value=\"".$_REQUEST["ID"]."\">\n"; print __("Enter your comment below.")."<br /> <br />\n"; @@ -143,7 +142,7 @@ if ($_REQUEST["change_Category"]) { if ($result != NULL) { $catid = mysql_fetch_row($result); } - print "<form action='/pkgedit.php' method='post'>\n"; + print "<form action='pkgedit.php' method='post'>\n"; print "<input type='hidden' name='change_Category' value='1'>\n"; print "<input type='hidden' name='ID' value=\"".$_REQUEST["ID"]."\">\n"; print __("Select new category").": \n"; @@ -170,4 +169,3 @@ print __("You've found a bug if you see this....")."<br />\n"; html_footer(AUR_VERSION); -?> diff --git a/web/html/pkgsubmit.php b/web/html/pkgsubmit.php index a3949ed..257e3b5 100644 --- a/web/html/pkgsubmit.php +++ b/web/html/pkgsubmit.php @@ -415,7 +415,7 @@ html_header("Submit"); $pkg_locations = pkgLocations(); ?> -<form action='/pkgsubmit.php' method='post' enctype='multipart/form-data'> +<form action='pkgsubmit.php' method='post' enctype='multipart/form-data'> <input type='hidden' name='pkgsubmit' value='1' /> <table border='0' cellspacing='5'> <tr> diff --git a/web/lib/acctfuncs.inc b/web/lib/acctfuncs.inc index 959ae4a..1ee2d9e 100644 --- a/web/lib/acctfuncs.inc +++ b/web/lib/acctfuncs.inc @@ -21,7 +21,7 @@ function display_account_form($UTYPE,$A,$U="",$T="",$S="", global $SUPPORTED_LANGS; - print "<form action='/account.php' method='post'>\n"; + print "<form action='account.php' method='post'>\n"; print "<input type='hidden' name='Action' value='".$A."'>\n"; if ($UID) { print "<input type='hidden' name='ID' value='".$UID."'>\n"; @@ -491,7 +491,7 @@ function search_results_page($UTYPE,$O=0,$SB="",$U="",$T="", # print " </span></td>"; } else { - $edit_url = "/account.php?Action=DisplayAccount&ID=".$row["ID"]; + $edit_url = "account.php?Action=DisplayAccount&ID=".$row["ID"]; print "<a href='".$edit_url . "'>"; print "Edit</a></span></td>"; } @@ -503,7 +503,7 @@ function search_results_page($UTYPE,$O=0,$SB="",$U="",$T="", print "<tr>"; print "<td align='left'>"; - print "<form action='/account.php' method='post'>\n"; + print "<form action='account.php' method='post'>\n"; print "<input type='hidden' name='Action' value='SearchAccounts'>\n"; print "<input type='hidden' name='O'"; print " value='".($OFFSET-$HITS_PER_PAGE)."'>\n"; @@ -517,7 +517,7 @@ function search_results_page($UTYPE,$O=0,$SB="",$U="",$T="", print "</form>\n"; print "</td>"; print "<td align='right'>"; - print "<form action='/account.php' method='post'>\n"; + print "<form action='account.php' method='post'>\n"; print "<input type='hidden' name='Action' value='SearchAccounts'>\n"; print "<input type='hidden' name='O'"; print " value='".($OFFSET+$HITS_PER_PAGE)."'>\n"; diff --git a/web/template/pkg_search_form.php b/web/template/pkg_search_form.php index 5478cdb..f74e736 100644 --- a/web/template/pkg_search_form.php +++ b/web/template/pkg_search_form.php @@ -1,4 +1,4 @@ -<form action='/packages.php' method='get'> +<form action='packages.php' method='get'> <input type='hidden' name='O' value='0'> <center> -- 1.6.0.5

2 1

[aur-dev] [PATCH] Modify and fix typos in comment notification email.
by Loui Chang 22 Dec '08

22 Dec '08

Signed-off-by: Loui Chang <louipc.ist(a)gmail.com> --- web/html/pkgedit.php | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/web/html/pkgedit.php b/web/html/pkgedit.php index ff82663..3c61a59 100644 --- a/web/html/pkgedit.php +++ b/web/html/pkgedit.php @@ -91,11 +91,14 @@ if ($_REQUEST["add_Comment"]) { #TODO: native language emails for users, based on their prefs # 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 - $body = "A comment has been added to ".$row['Name']." by " . username_from_sid($_COOKIE["AURSID"]) . ", you may view it at:\nhttp://aur.archlinux.org/packages.php?ID=".$_REQUEST["ID"]."\n\n\"" . $_POST['comment'] . "\"\n\n---\nYou received this e-mail because you chose to receive notifications of new comments on this package, if you no longer wish to recieve notifications about this package, please go the the above package page and click the UnNotify button."; + $body = "\nAuthor: " . username_from_sid($_COOKIE["AURSID"]) + . "\nFrom http://aur.archlinux.org/packages.php?ID=" + . $_REQUEST["ID"]."\n\n" . $_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."; $body = wordwrap($body, 70); $bcc = implode(', ', $bcc); - $headers = "Bcc: $bcc\nReply-to: nobody@archlinux.org\nFrom:aur-notify@archlinux.org\nX-Mailer: PHP\nX-MimeOLE: Produced By AUR\n"; - @mail(' ', "AUR Comment Notification for ".$row['Name'], $body, $headers); + $headers = "Bcc: $bcc\nReply-to: nobody@archlinux.org\nFrom:aur-notify@archlinux.org\nX-Mailer: AUR\n"; + @mail(' ', "AUR Comment for ".$row['Name'], $body, $headers); } } else { -- 1.6.0.5

2 1

[aur-dev] [PATCH] Move package search results to a template
by Callan Barrett 21 Dec '08

21 Dec '08

Logic is separated from html as much as possible, all html in a template Signed-off-by: Callan Barrett <wizzomafizzo(a)gmail.com> --- web/lib/pkgfuncs.inc | 229 +++-------------------------------- web/template/pkg_search_results.php | 142 ++++++++++++++++++++++ 2 files changed, 160 insertions(+), 211 deletions(-) create mode 100644 web/template/pkg_search_results.php diff --git a/web/lib/pkgfuncs.inc b/web/lib/pkgfuncs.inc index dfda0e8..9551135 100644 --- a/web/lib/pkgfuncs.inc +++ b/web/lib/pkgfuncs.inc @@ -767,219 +767,26 @@ function pkg_search_page($SID="") { $result = db_query($q, $dbh); $total = mysql_result(db_query('SELECT FOUND_ROWS() AS Total', $dbh), 0); - print "<form action='packages.php?".$_SERVER['QUERY_STRING']."' method='post'>\n"; - print "<center>\n"; - print "<table cellspacing='3' class='boxSoft'>\n"; - print "<tr>\n"; - print " <td class='boxSoftTitle' align='right'>\n"; - print " <span class='f3'>".__("Package Listing")."</span>\n"; - print " </td>\n"; - print "</tr>\n"; - print "<tr>\n"; - print " <td class='boxSoft'>\n"; - print "<table width='100%' cellspacing='0' cellpadding='2'>\n"; - - if (!$result) { - print "<div class='pgboxbody'>"; - print __("Error retrieving package list."); - print "</div>"; - } elseif ($total == 0) { - print "<div class='pgboxbody'>"; - print __("No packages matched your search criteria."); - print "</div>"; - } else { - // print out package search results - // - - // SO_next used to change sort order on header click - if ($_REQUEST["SO"] == "d"){ - $SO_next="a"; - $SO = 'd'; - } else { - $SO_next="d"; - $SO = 'a'; - } - print "<tr>\n"; - if ($SID) { - print " <th style='border-bottom: #666 1px solid; vertical-align:"; - print " bottom'> </th>\n"; - } - print " <th style='border-bottom: #666 1px solid; vertical-align:"; - print " bottom'><span class='f2'>"; - print "<a href='?O=$O&L=".intval($_REQUEST["L"])."&C=".intval($_REQUEST["C"])."&K=$K&SB=l&SO=$SO_next&PP=$PP&SeB=".$_REQUEST["SeB"]."&do_Orphans=".$_REQUEST["do_Orphans"]."'>".__("Location")."</a>"; - print "</span></th>\n"; - print " <th style='border-bottom: #666 1px solid; vertical-align:"; - print " bottom'><span class='f2'>"; - print "<a href='?O=$O&L=".intval($_REQUEST["L"])."&C=".intval($_REQUEST["C"])."&K=$K&SB=c&SO=$SO_next&PP=$PP&SeB=".$_REQUEST["SeB"]."&do_Orphans=".$_REQUEST["do_Orphans"]."'>".__("Category")."</a>"; - print "</span></th>\n"; - print " <th style='border-bottom: #666 1px solid; vertical-align:"; - print " bottom'><span class='f2'>"; - print "<a href='?O=$O&L=".intval($_REQUEST["L"])."&C=".intval($_REQUEST["C"])."&K=$K&SB=n&SO=$SO_next&PP=$PP&SeB=".$_REQUEST["SeB"]."&do_Orphans=".$_REQUEST["do_Orphans"]."'>".__("Name")."</a>"; - print "</span></th>\n"; - print " <th style='border-bottom: #666 1px solid; vertical-align:"; - print " bottom'><span class='f2'>"; - print "<a href='?O=$O&L=".intval($_REQUEST["L"])."&C=".intval($_REQUEST["C"])."&K=$K&SB=v&SO=$SO_next&PP=$PP&SeB=".$_REQUEST["SeB"]."&do_Orphans=".$_REQUEST["do_Orphans"]."'>".__("Votes")."</a>"; - print "</span></th>\n"; - if ($SID) { - print " <th style='border-bottom: #666 1px solid; vertical-align:"; - print " bottom'><span class='f2'>".__("Voted")."</span></th>\n"; - } - if ($SID) { - print " <th style='border-bottom: #666 1px solid; vertical-align:"; - print " bottom'><span class='f2'>".__("Notify")."</span></th>\n"; - } - print " <th style='border-bottom: #666 1px solid; vertical-align:"; - print " bottom'><span class='f2'>".__("Description")."</a>"; - print "</span></th>\n"; - print " <th style='border-bottom: #666 1px solid; vertical-align:"; - print " bottom'><span class='f2'>"; - print "<a href='?O=$O&L=".intval($_REQUEST["L"])."&C=".intval($_REQUEST["C"])."&K=$K&SB=m&SO=$SO_next&PP=$PP&SeB=".$_REQUEST["SeB"]."&do_Orphans=".$_REQUEST["do_Orphans"]."'>".__("Maintainer")."</a>"; - print "</span></th>\n"; - print "</tr>\n"; - - for ($i=0; $row = mysql_fetch_assoc($result); $i++) { - (($i % 2) == 0) ? $c = "data1" : $c = "data2"; - print "<tr>\n"; - if ($SID) { - if ($row["OutOfDate"]) { - $c = "outofdate"; - } - print " <td class='".$c."'>"; - print "<input type='checkbox' name='IDs[".$row["ID"]."]' value='1'>"; - if ($row["OutOfDate"]) { - print "</span>"; - } - print "</td>\n"; - } - print " <td class='".$c."'><span class='f5'><span class='blue'>"; - print $row["Location"]."</span></span></td>\n"; - print " <td class='".$c."'><span class='f5'><span class='blue'>"; - print $row["Category"]."</span></span></td>\n"; - print " <td class='".$c."'><span class='f4'>"; - $url = "<a href='packages.php?"; - $url .= "ID="; - $url .= $row["ID"]; - $url.= "'>"; - $url.="<span class='black'>"; - $url.=$row["Name"]; - $url.= " ".$row["Version"]."</span></a>"; - print $url."</span></td>\n"; - print " <td class='".$c."'><span class='f5'><span class='blue'>"; - print "   ".$row["NumVotes"]."</span></span></td>\n"; - if ($SID) { - print " <td class='".$c."'><span class='f5'><span class='blue'>"; - if (isset($row["Voted"])) { - print "  ".__("Yes")."</span></td>\n"; - } else { - print " </span></td>\n"; - } - print " <td class='".$c."'><span class='f5'><span class='blue'>"; - if (isset($row["Notify"])) { - print "  ".__("Yes")."</span></td>\n"; - } else { - print " </span></td>\n"; - } - } - print " <td class='".$c."'><span class='f4'><span class='blue'>"; - print $row["Description"]."</span></span></td>\n"; - print " <td class='".$c."'><span class='f5'><span class='blue'>"; - - if (isset($row["Maintainer"])) { - print "<a href='packages.php?K=".$row['Maintainer']."&SeB=m'>".$row['Maintainer']."</a>"; - } else { - print "<span style='color: blue; font-style: italic;'>"; - print __("orphan"); - print "</span>"; - } - print "</span></span></td>\n"; - print "</tr>\n"; - - } - print "</table>\n"; - print " </td>\n"; - print "</tr>\n"; - print "</table>\n"; - - if ($SID) { - // The 'Actions' box - // - print "<div style='text-align: right; padding: 5px 5% 5px 0'>"; - print "<select name='action'>"; - print "<option>" . __("Actions") . "</option>"; - print "<option value='do_Flag'>".__("Flag Out-of-date")."</option>\n"; - print "<option value='do_UnFlag'>".__("Unflag Out-of-date")."</option>\n"; - print "<option value='do_Adopt'>".__("Adopt Packages")."</option>\n"; - print "<option value='do_Disown'>".__("Disown Packages")."</option>\n"; - if (account_from_sid($SID) == "Trusted User" || account_from_sid($SID) == "Developer") { - print "<option value='do_Delete'>".__("Delete Packages")."</option>\n"; - } - print "<option value='do_Notify'>".__("Notify")."</option>\n"; - print "<option value='do_UnNotify'>".__("UnNotify")."</option>\n"; - print "</select>"; - print "<input type='submit' class='button' style='width: 80px' value='" . __("Go") . "' />"; - print "</div>"; - } - - print "<table width='90%' cellspacing='0' cellpadding='2'>\n"; - print "<tr>\n"; - print " <td>\n"; - print " <table border='0' cellpadding='0' cellspacing='0' width='100%'>\n"; - print " <tr>\n"; - - // figure out the results to use - $first = $O + 1; - - if (($PP+$O) > $total) { - $last = $total; - } else { - $last = $PP + $O; - } + if ($result && $total > 0) { + if ($_REQUEST["SO"] == "d"){ + $SO_next="a"; + $SO = 'd'; + } else { + $SO_next="d"; + $SO = 'a'; + } + } + + // figure out the results to use + $first = $O + 1; - // print number of results - // ok this styling sucks - // patches welcome! - print "<tr><td align='center' colspan='0'><span class='f4'><span class='blue'>"; - print __("Showing results %s - %s of %s", array($first, $last, $total)); - print "</span></span></td></tr>"; - - // first print the legend - print " <td colspan='2' align='center'>"; - print " <span class='f5'>\n"; - if ($SID) { - print ' <span class="outofdate">'.__("Out of Date").' </span>'."    "; - } - print " </span></td>\n"; - print " </tr>"; - - - // now print the forward and back buttons on the bottom - // LEFT - print " <tr>"; - print " <td align='left'>"; - if (($O-$PP) >= 0) { - print "<a href='packages.php?O=" . ($O - $PP) . "&L=".intval($_REQUEST["L"])."&C=".intval($_REQUEST["C"])."&K=$K&SB=$SB&SO=$SO&PP=$PP&SeB=".$_REQUEST["SeB"]."&do_Orphans=".$_REQUEST["do_Orphans"]. "'>" . __("Less") . "</a>"; - } else if ($O<$PP && $O>0) { - print "<a href='packages.php?O=0&L=".intval($_REQUEST["L"])."&C=".intval($_REQUEST["C"])."&K=$K&SB=$SB&SO=$SO&PP=$PP&SeB=".$_REQUEST["SeB"]."&do_Orphans=".$_REQUEST["do_Orphans"]. "'>" . __("Less") . "</a>"; - } - print " </td>"; - // RIGHT - print " <td align='right'>"; - if ($total - $PP - $O > 0) { - print "<a href='packages.php?O=" . ($O + $PP) . - "&L=".intval($_REQUEST["L"])."&C=".intval($_REQUEST["C"]) . - "&K=$K&SB=$SB&SO=$SO&PP=$PP&SeB=".$_REQUEST["SeB"] . - "&do_Orphans=".$_REQUEST["do_Orphans"]."'>" . - __("More") . "</a>"; - } - print " </td>\n"; - print " </tr>\n"; + if (($PP+$O) > $total) { + $last = $total; + } else { + $last = $PP + $O; } - print " </table>\n"; - print " </td>\n"; - print "</tr>\n"; - print "</table>\n"; - print "</center>\n"; - print "</form>\n"; + + include('pkg_search_results.php'); return; } diff --git a/web/template/pkg_search_results.php b/web/template/pkg_search_results.php new file mode 100644 index 0000000..5af02ef --- /dev/null +++ b/web/template/pkg_search_results.php @@ -0,0 +1,142 @@ +<form action='packages.php?<?php print $_SERVER['QUERY_STRING'] ?>' method='post'> +<center> + +<table cellspacing='3' class='boxSoft'> + <tr> + <td class='boxSoftTitle' align='right'> + <span class='f3'><?php print __("Package Listing") ?></span> + </td> + </tr> + <tr> + <td class='boxSoft'> + <table width='100%' cellspacing='0' cellpadding='2'> + +<?php if (!$result) { ?> +<div class='pgboxbody'><?php print __("Error retrieving package list.") ?></div> +<?php } elseif ($total == 0) { ?> +<div class='pgboxbody'><?php print __("No packages matched your search criteria.") ?></div> +<?php } else { ?> + +<tr> + <?php if ($SID): ?> + <th style='border-bottom: #666 1px solid; vertical-align: bottom'> </th> + <?php endif; ?> + <th style='border-bottom: #666 1px solid; vertical-align: bottom'><span class='f2'> + <?php print "<a href='?O=$O&L=".intval($_REQUEST["L"])."&C=".intval($_REQUEST["C"])."&K=$K&SB=l&SO=$SO_next&PP=$PP&SeB=".$_REQUEST["SeB"]."&do_Orphans=".$_REQUEST["do_Orphans"]."'>".__("Location")."</a>"; ?> + </span></th> + <th style='border-bottom: #666 1px solid; vertical-align: bottom'><span class='f2'> + <?php print "<a href='?O=$O&L=".intval($_REQUEST["L"])."&C=".intval($_REQUEST["C"])."&K=$K&SB=c&SO=$SO_next&PP=$PP&SeB=".$_REQUEST["SeB"]."&do_Orphans=".$_REQUEST["do_Orphans"]."'>".__("Category")."</a>"; ?> + </span></th> + <th style='border-bottom: #666 1px solid; vertical-align: bottom'><span class='f2'> + <?php print "<a href='?O=$O&L=".intval($_REQUEST["L"])."&C=".intval($_REQUEST["C"])."&K=$K&SB=n&SO=$SO_next&PP=$PP&SeB=".$_REQUEST["SeB"]."&do_Orphans=".$_REQUEST["do_Orphans"]."'>".__("Name")."</a>"; ?> + </span></th> + <th style='border-bottom: #666 1px solid; vertical-align: bottom'><span class='f2'> + <?php print "<a href='?O=$O&L=".intval($_REQUEST["L"])."&C=".intval($_REQUEST["C"])."&K=$K&SB=v&SO=$SO_next&PP=$PP&SeB=".$_REQUEST["SeB"]."&do_Orphans=".$_REQUEST["do_Orphans"]."'>".__("Votes")."</a>"; ?> + </span></th> + <?php if ($SID): ?> + <th style='border-bottom: #666 1px solid; vertical-align: bottom'><span class='f2'><?php print __("Voted") ?></span></th> + <th style='border-bottom: #666 1px solid; vertical-align: bottom'><span class='f2'><?php print __("Notify") ?></span></th> + <?php endif; ?> + <th style='border-bottom: #666 1px solid; vertical-align: bottom'><span class='f2'><?php print __("Description") ?></a></span></th> + <th style='border-bottom: #666 1px solid; vertical-align: bottom'><span class='f2'> + <?php print "<a href='?O=$O&L=".intval($_REQUEST["L"])."&C=".intval($_REQUEST["C"])."&K=$K&SB=m&SO=$SO_next&PP=$PP&SeB=".$_REQUEST["SeB"]."&do_Orphans=".$_REQUEST["do_Orphans"]."'>".__("Maintainer")."</a>"; ?> + </span></th> +</tr> + +<?php for ($i=0; $row = mysql_fetch_assoc($result); $i++) { (($i % 2) == 0) ? $c = "data1" : $c = "data2"; ?> +<tr> + <?php if ($SID): if ($row["OutOfDate"]): $c = "outofdate"; endif; ?> + <td class='<?php print $c ?>'><input type='checkbox' name='IDs[<?php print $row["ID"] ?>]' value='1'></td> + <?php endif; ?> + <td class='<?php print $c ?>'><span class='f5'><span class='blue'><?php print $row["Location"] ?></span></span></td> + <td class='<?php print $c ?>'><span class='f5'><span class='blue'><?php print $row["Category"] ?></span></span></td> + <td class='<?php print $c ?>'><span class='f4'><a href='packages.php?ID=<?php print $row["ID"] ?>'><span class='black'><?php print $row["Name"] ?> <?php print $row["Version"] ?></span></a></span></td> + <td class='<?php print $c ?>'><span class='f5'><span class='blue'>   <?php print $row["NumVotes"] ?></span></span></td> + <?php if ($SID): ?> + <td class='<?php print $c ?>'><span class='f5'><span class='blue'> + <?php if (isset($row["Voted"])): ?> +   <?php print __("Yes") ?></span></td> + <?php else: ?> +  </span></td> + <?php endif; ?> + <td class='<?php print $c ?>'><span class='f5'><span class='blue'> + <?php if (isset($row["Notify"])): ?> +   <?php print __("Yes") ?></span></td> + <?php else: ?> +  </span></td> + <?php endif; ?> + <?php endif; ?> + <td class='<?php print $c ?>'><span class='f4'><span class='blue'> + <?php print $row["Description"] ?></span></span></td> + <td class='<?php print $c ?>'><span class='f5'><span class='blue'> + <?php if (isset($row["Maintainer"])): ?> + <a href='packages.php?K=<?php print $row['Maintainer'] ?>&SeB=m'><?php print $row['Maintainer'] ?></a> + <?php else: ?> + <span style='color: blue; font-style: italic;'><?php print __("orphan") ?></span> + <?php endif; ?> + </span></span></td> +</tr> +<?php } ?> + + </table> + </td> + </tr> +</table> + +<?php if ($SID): ?> +<div style='text-align: right; padding: 5px 5% 5px 0'> + <select name='action'> + <option><?php print __("Actions") ?></option> + <option value='do_Flag'><?php print __("Flag Out-of-date") ?></option> + <option value='do_UnFlag'><?php print __("Unflag Out-of-date") ?></option> + <option value='do_Adopt'><?php print __("Adopt Packages") ?></option> + <option value='do_Disown'><?php print __("Disown Packages") ?></option> + <?php if (account_from_sid($SID) == "Trusted User" || account_from_sid($SID) == "Developer"): ?> + <option value='do_Delete'><?php print __("Delete Packages") ?></option> + <?php endif; ?> + <option value='do_Notify'><?php print __("Notify") ?></option> + <option value='do_UnNotify'><?php print __("UnNotify") ?></option> + </select> + <input type='submit' class='button' style='width: 80px' value='<?php print __("Go") ?>' /> +</div> +<?php endif; ?> + +<table width='90%' cellspacing='0' cellpadding='2'> + <tr> + <td> + <table border='0' cellpadding='0' cellspacing='0' width='100%'> + <tr> + <tr><td align='center' colspan='0'><span class='f4'><span class='blue'> + <?php print __("Showing results %s - %s of %s", $first, $last, $total) ?> + </span></span></td></tr> + <td colspan='2' align='center'> + <span class='f5'> + <?php if ($SID): ?> + <span class="outofdate"><?php print __("Out of Date") ?></span>     + <?php endif; ?> + </span></td> + </tr> + <tr> + <td align='left'> + <?php if (($O-$PP) >= 0): ?> + <?php print "<a href='packages.php?O=" . ($O - $PP) . "&L=".intval($_REQUEST["L"])."&C=".intval($_REQUEST["C"])."&K=$K&SB=$SB&SO=$SO&PP=$PP&SeB=".$_REQUEST["SeB"]."&do_Orphans=".$_REQUEST["do_Orphans"]. "'>" . __("Less") . "</a>" ?> + <?php elseif ($O<$PP && $O>0): ?> + <?php print "<a href='packages.php?O=0&L=".intval($_REQUEST["L"])."&C=".intval($_REQUEST["C"])."&K=$K&SB=$SB&SO=$SO&PP=$PP&SeB=".$_REQUEST["SeB"]."&do_Orphans=".$_REQUEST["do_Orphans"]. "'>" . __("Less") . "</a>" ?> + <?php endif; ?> + </td> + <td align='right'> + <?php if ($total - $PP - $O > 0): ?> + <?php print "<a href='packages.php?O=" . ($O + $PP) . "&L=".intval($_REQUEST["L"])."&C=".intval($_REQUEST["C"]) . "&K=$K&SB=$SB&SO=$SO&PP=$PP&SeB=".$_REQUEST["SeB"] . "&do_Orphans=".$_REQUEST["do_Orphans"]."'>" . __("More") . "</a>" ?> + <?php endif; ?> + </td> + </tr> + +<?php } ?> + + </table> + </td> + </tr> +</table> + +</center> +</form> -- 1.6.0.2

2 1

[aur-dev] [PATCH] Fix up valid email function, FS#12269
by Callan Barrett 21 Dec '08

21 Dec '08

All we're looking for now is an @ in any email address to fix problem with not being able to have + in addresses and just because I see no advantage to having any sort of stringent validation Signed-off-by: Callan Barrett <wizzomafizzo(a)gmail.com> --- web/lib/aur.inc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/lib/aur.inc b/web/lib/aur.inc index 121c692..e82f0ea 100644 --- a/web/lib/aur.inc +++ b/web/lib/aur.inc @@ -132,7 +132,7 @@ function check_sid() { # verify that an email address looks like it is legitimate # function valid_email($addy) { - return eregi("^[a-z0-9\._-]+(a)+[a-z0-9\._-]+\.+[a-z]{2,4}$", $addy); + return strpos($addy, '@'); } # a new seed value for mt_srand() -- 1.6.0.2

2 1

[aur-dev] [PATCH] Introduce function include_lang for translations.
by Loui Chang 21 Dec '08

21 Dec '08

This includes only the requested language for each page and makes top level language include files obsolete. Signed-off-by: Loui Chang <louipc.ist(a)gmail.com> --- web/html/account.php | 13 +++++++------ web/html/addvote.php | 4 ++-- web/html/index.php | 10 +++++----- web/html/logout.php | 5 ++--- web/html/packages.php | 6 +++--- web/html/pkgedit.php | 4 ++-- web/html/pkgsubmit.php | 4 ++-- web/html/tu.php | 4 ++-- web/lang/account_po.inc | 28 ---------------------------- web/lang/acctfuncs_po.inc | 32 -------------------------------- web/lang/aur_po.inc | 32 -------------------------------- web/lang/common_po.inc | 32 -------------------------------- web/lang/index_po.inc | 30 ------------------------------ web/lang/logout_po.inc | 30 ------------------------------ web/lang/pkgedit_po.inc | 32 -------------------------------- web/lang/pkgfuncs_po.inc | 32 -------------------------------- web/lang/search_po.inc | 32 -------------------------------- web/lang/submit_po.inc | 32 -------------------------------- web/lang/tu_po.inc | 11 ----------- web/lib/acctfuncs.inc | 2 +- web/lib/aur.inc | 15 ++++++++------- web/lib/pkgfuncs.inc | 2 +- web/lib/translator.inc | 18 ++++++++++++++---- web/template/template.phps | 4 ++-- 24 files changed, 51 insertions(+), 363 deletions(-) delete mode 100644 web/lang/account_po.inc delete mode 100644 web/lang/acctfuncs_po.inc delete mode 100644 web/lang/aur_po.inc delete mode 100644 web/lang/common_po.inc delete mode 100644 web/lang/index_po.inc delete mode 100644 web/lang/logout_po.inc delete mode 100644 web/lang/pkgedit_po.inc delete mode 100644 web/lang/pkgfuncs_po.inc delete mode 100644 web/lang/search_po.inc delete mode 100644 web/lang/submit_po.inc delete mode 100644 web/lang/tu_po.inc diff --git a/web/html/account.php b/web/html/account.php index 5efc401..d0273dd 100644 --- a/web/html/account.php +++ b/web/html/account.php @@ -1,15 +1,16 @@ <?php -set_include_path(get_include_path() . PATH_SEPARATOR . '../lib' . PATH_SEPARATOR . '../lang'); +set_include_path(get_include_path() . PATH_SEPARATOR . '../lib'); -include("aur.inc"); # access AUR common functions -include_once("acctfuncs.inc"); # access Account specific functions -include("pkgfuncs_po.inc"); # Add to handle the i18n of My Packages -include("account_po.inc"); # use some form of this for i18n support +include('aur.inc'); # access AUR common functions +include_once('acctfuncs.inc'); # access Account specific functions set_lang(); # this sets up the visitor's language check_sid(); # see if they're still logged in -html_header(__("Accounts")); # print out the HTML header +include_lang('pkgfuncs_po.inc'); # Add to handle the i18n of My Packages +include_lang('account_po.inc'); # use some form of this for i18n support + +html_header(__('Accounts')); # Main page processing here # diff --git a/web/html/addvote.php b/web/html/addvote.php index 6b30e49..a31a1ff 100644 --- a/web/html/addvote.php +++ b/web/html/addvote.php @@ -1,9 +1,9 @@ <?php -set_include_path(get_include_path() . PATH_SEPARATOR . '../lib' . PATH_SEPARATOR . '../lang'); +set_include_path(get_include_path() . PATH_SEPARATOR . '../lib'); -include("tu_po.inc"); include("aur.inc"); +include_lang('tu_po.inc'); set_lang(); check_sid(); html_header(); diff --git a/web/html/index.php b/web/html/index.php index d664086..e2c840a 100644 --- a/web/html/index.php +++ b/web/html/index.php @@ -1,15 +1,15 @@ <?php -set_include_path(get_include_path() . PATH_SEPARATOR . '../lib' . PATH_SEPARATOR . '../lang'); +set_include_path(get_include_path() . PATH_SEPARATOR . '../lib'); -include('index_po.inc'); -include("pkgfuncs_po.inc"); include("aur.inc"); -include('stats.inc'); - set_lang(); check_sid(); +include('stats.inc'); +include_lang('index_po.inc'); +include_lang('pkgfuncs_po.inc'); + html_header( __("Home") ); $dbh = db_connect(); diff --git a/web/html/logout.php b/web/html/logout.php index 41dedc3..88a1e26 100644 --- a/web/html/logout.php +++ b/web/html/logout.php @@ -1,11 +1,10 @@ <?php -set_include_path(get_include_path() . PATH_SEPARATOR . '../lib' . PATH_SEPARATOR . '../lang'); +set_include_path(get_include_path() . PATH_SEPARATOR . '../lib'); include("aur.inc"); # access AUR common functions include_once("acctfuncs.inc"); # access AUR common functions -include("logout_po.inc"); # use some form of this for i18n support -set_lang(); # this sets up the visitor's language + # if they've got a cookie, log them out - need to do this before # sending any HTML output. diff --git a/web/html/packages.php b/web/html/packages.php index 2452991..90ab72c 100644 --- a/web/html/packages.php +++ b/web/html/packages.php @@ -1,11 +1,11 @@ <?php -set_include_path(get_include_path() . PATH_SEPARATOR . '../lib' . PATH_SEPARATOR . '../lang'); +set_include_path(get_include_path() . PATH_SEPARATOR . '../lib'); include("aur.inc"); # access AUR common functions -include("pkgfuncs.inc"); # package specific functions -include("search_po.inc"); # use some form of this for i18n support set_lang(); # this sets up the visitor's language +include('pkgfuncs.inc'); # package specific functions +include_lang('search_po.inc'); # use some form of this for i18n support check_sid(); # see if they're still logged in # Set the title to the current query if required diff --git a/web/html/pkgedit.php b/web/html/pkgedit.php index 974f14b..ff82663 100644 --- a/web/html/pkgedit.php +++ b/web/html/pkgedit.php @@ -1,10 +1,10 @@ <?php -set_include_path(get_include_path() . PATH_SEPARATOR . '../lib' . PATH_SEPARATOR . '../lang'); +set_include_path(get_include_path() . PATH_SEPARATOR . '../lib'); include("aur.inc"); # access AUR common functions include("pkgfuncs.inc"); # use some form of this for i18n support -include("pkgedit_po.inc"); # i18n translations for this script +include_lang("pkgedit_po.inc"); # i18n translations for this script set_lang(); # this sets up the visitor's language check_sid(); # see if they're still logged in html_header(); # print out the HTML header diff --git a/web/html/pkgsubmit.php b/web/html/pkgsubmit.php index 0e4f448..a3949ed 100644 --- a/web/html/pkgsubmit.php +++ b/web/html/pkgsubmit.php @@ -1,15 +1,15 @@ <?php -set_include_path(get_include_path() . PATH_SEPARATOR . '../lib' . PATH_SEPARATOR . '../lang'); +set_include_path(get_include_path() . PATH_SEPARATOR . '../lib'); include("config.inc"); require('Archive/Tar.php'); require('Find.php'); include("aur.inc"); # access AUR common functions -include("submit_po.inc"); # use some form of this for i18n support include("pkgfuncs.inc"); # package functions +include_lang('submit_po.inc'); # use some form of this for i18n support set_lang(); # this sets up the visitor's language check_sid(); # see if they're still logged in diff --git a/web/html/tu.php b/web/html/tu.php index 0b8b5c7..2d1eaf3 100644 --- a/web/html/tu.php +++ b/web/html/tu.php @@ -1,9 +1,9 @@ <?php -set_include_path(get_include_path() . PATH_SEPARATOR . '../lib' . PATH_SEPARATOR . '../lang'); +set_include_path(get_include_path() . PATH_SEPARATOR . '../lib'); -include("tu_po.inc"); include("aur.inc"); +include_lang('tu_po.inc'); set_lang(); check_sid(); html_header(); diff --git a/web/lang/account_po.inc b/web/lang/account_po.inc deleted file mode 100644 index fc23194..0000000 --- a/web/lang/account_po.inc +++ /dev/null @@ -1,28 +0,0 @@ -<?php -# INSTRUCTIONS TO TRANSLATORS -# -# This file contains the i18n translations for a subset of the -# Arch Linux User-community Repository (AUR). This is a PHP -# script, and as such, you MUST pay great attention to the syntax. -# If your text contains any double-quotes ("), you MUST escape -# them with the backslash character (\). -# - -include_once("translator.inc"); -global $_t; - -include_once("pl/account_po.inc"); - -include_once("it/account_po.inc"); - -include_once("ca/account_po.inc"); - -include_once("pt/account_po.inc"); - -include_once("es/account_po.inc"); - -include_once("de/account_po.inc"); - -include_once("ru/account_po.inc"); -include_once("tr/account_po.inc"); - diff --git a/web/lang/acctfuncs_po.inc b/web/lang/acctfuncs_po.inc deleted file mode 100644 index 5bfbf0a..0000000 --- a/web/lang/acctfuncs_po.inc +++ /dev/null @@ -1,32 +0,0 @@ -<?php -# INSTRUCTIONS TO TRANSLATORS -# -# This file contains the i18n translations for a subset of the -# Arch Linux User-community Repository (AUR). This is a PHP -# script, and as such, you MUST pay great attention to the syntax. -# If your text contains any double-quotes ("), you MUST escape -# them with the backslash character (\). -# - -include_once("translator.inc"); -global $_t; - -include_once("pl/acctfuncs_po.inc"); - -include_once("it/acctfuncs_po.inc"); - -include_once("ca/acctfuncs_po.inc"); - -include_once("pt/acctfuncs_po.inc"); - -include_once("es/acctfuncs_po.inc"); - -include_once("de/acctfuncs_po.inc"); - -include_once("ru/acctfuncs_po.inc"); - -include_once("fr/acctfuncs_po.inc"); -include_once("tr/acctfuncs_po.inc"); - -include_once("uk/acctfuncs_po.inc"); - diff --git a/web/lang/aur_po.inc b/web/lang/aur_po.inc deleted file mode 100644 index b08e241..0000000 --- a/web/lang/aur_po.inc +++ /dev/null @@ -1,32 +0,0 @@ -<?php -# INSTRUCTIONS TO TRANSLATORS -# -# This file contains the i18n translations for a subset of the -# Arch Linux User-community Repository (AUR). This is a PHP -# script, and as such, you MUST pay great attention to the syntax. -# If your text contains any double-quotes ("), you MUST escape -# them with the backslash character (\). -# - -include_once("translator.inc"); -global $_t; - -include_once("pl/aur_po.inc"); - -include_once("it/aur_po.inc"); - -include_once("ca/aur_po.inc"); - -include_once("pt/aur_po.inc"); - -include_once("es/aur_po.inc"); - -include_once("de/aur_po.inc"); - -include_once("ru/aur_po.inc"); - -include_once("fr/aur_po.inc"); -include_once("tr/aur_po.inc"); - -include_once("uk/aur_po.inc"); - diff --git a/web/lang/common_po.inc b/web/lang/common_po.inc deleted file mode 100644 index 43237c2..0000000 --- a/web/lang/common_po.inc +++ /dev/null @@ -1,32 +0,0 @@ -<?php -# INSTRUCTIONS TO TRANSLATORS -# -# This file contains the i18n translations for a subset of the -# Arch Linux User-community Repository (AUR). This is a PHP -# script, and as such, you MUST pay great attention to the syntax. -# If your text contains any double-quotes ("), you MUST escape -# them with the backslash character (\). -# - -include_once("translator.inc"); -global $_t; - -include_once("pl/common_po.inc"); - -include_once("it/common_po.inc"); - -include_once("ca/common_po.inc"); - -include_once("pt/common_po.inc"); - -include_once("es/common_po.inc"); - -include_once("de/common_po.inc"); - -include_once("ru/common_po.inc"); - -include_once("fr/common_po.inc"); -include_once("tr/common_po.inc"); - -include_once("uk/common_po.inc"); - diff --git a/web/lang/index_po.inc b/web/lang/index_po.inc deleted file mode 100644 index 5e783a7..0000000 --- a/web/lang/index_po.inc +++ /dev/null @@ -1,30 +0,0 @@ -<?php -# INSTRUCTIONS TO TRANSLATORS -# -# This file contains the i18n translations for a subset of the -# Arch Linux User-community Repository (AUR). This is a PHP -# script, and as such, you MUST pay great attention to the syntax. -# If your text contains any double-quotes ("), you MUST escape -# them with the backslash character (\). -# - -include_once("translator.inc"); -global $_t; - -include_once("pl/index_po.inc"); - -include_once("it/index_po.inc"); - -include_once("ca/index_po.inc"); - -include_once("pt/index_po.inc"); - -include_once("es/index_po.inc"); - -include_once("de/index_po.inc"); - -include_once("ru/index_po.inc"); - -include_once("fr/index_po.inc"); -include_once("tr/index_po.inc"); - diff --git a/web/lang/logout_po.inc b/web/lang/logout_po.inc deleted file mode 100644 index 471f53e..0000000 --- a/web/lang/logout_po.inc +++ /dev/null @@ -1,30 +0,0 @@ -<?php -# INSTRUCTIONS TO TRANSLATORS -# -# This file contains the i18n translations for a subset of the -# Arch Linux User-community Repository (AUR). This is a PHP -# script, and as such, you MUST pay great attention to the syntax. -# If your text contains any double-quotes ("), you MUST escape -# them with the backslash character (\). -# - -include_once("translator.inc"); -global $_t; - -include_once("pl/logout_po.inc"); - -include_once("it/logout_po.inc"); - -include_once("ca/logout_po.inc"); - -include_once("pt/logout_po.inc"); - -include_once("es/logout_po.inc"); - -include_once("de/logout_po.inc"); - -include_once("ru/logout_po.inc"); -include_once("tr/logout_po.inc"); - -include_once("fr/logout_po.inc"); - diff --git a/web/lang/pkgedit_po.inc b/web/lang/pkgedit_po.inc deleted file mode 100644 index b471d9b..0000000 --- a/web/lang/pkgedit_po.inc +++ /dev/null @@ -1,32 +0,0 @@ -<?php -# INSTRUCTIONS TO TRANSLATORS -# -# This file contains the i18n translations for a subset of the -# Arch Linux User-community Repository (AUR). This is a PHP -# script, and as such, you MUST pay great attention to the syntax. -# If your text contains any double-quotes ("), you MUST escape -# them with the backslash character (\). -# - -include_once("translator.inc"); -global $_t; - -include_once("pl/pkgedit_po.inc"); - -include_once("it/pkgedit_po.inc"); - -include_once("ca/pkgedit_po.inc"); - -include_once("pt/pkgedit_po.inc"); - -include_once("es/pkgedit_po.inc"); - -include_once("de/pkgedit_po.inc"); - -include_once("ru/pkgedit_po.inc"); - -include_once("fr/pkgedit_po.inc"); -include_once("tr/pkgedit_po.inc"); - -include_once("uk/pkgedit_po.inc"); - diff --git a/web/lang/pkgfuncs_po.inc b/web/lang/pkgfuncs_po.inc deleted file mode 100644 index 5868f45..0000000 --- a/web/lang/pkgfuncs_po.inc +++ /dev/null @@ -1,32 +0,0 @@ -<?php -# INSTRUCTIONS TO TRANSLATORS -# -# This file contains the i18n translations for a subset of the -# Arch Linux User-community Repository (AUR). This is a PHP -# script, and as such, you MUST pay great attention to the syntax. -# If your text contains any double-quotes ("), you MUST escape -# them with the backslash character (\). -# - -include_once("translator.inc"); -global $_t; - -include_once("pl/pkgfuncs_po.inc"); - -include_once("it/pkgfuncs_po.inc"); - -include_once("ca/pkgfuncs_po.inc"); - -include_once("pt/pkgfuncs_po.inc"); - -include_once("es/pkgfuncs_po.inc"); - -include_once("de/pkgfuncs_po.inc"); - -include_once("ru/pkgfuncs_po.inc"); - -include_once("fr/pkgfuncs_po.inc"); -include_once("tr/pkgfuncs_po.inc"); - -include_once("uk/pkgfuncs_po.inc"); - diff --git a/web/lang/search_po.inc b/web/lang/search_po.inc deleted file mode 100644 index 92c9589..0000000 --- a/web/lang/search_po.inc +++ /dev/null @@ -1,32 +0,0 @@ -<?php -# INSTRUCTIONS TO TRANSLATORS -# -# This file contains the i18n translations for a subset of the -# Arch Linux User-community Repository (AUR). This is a PHP -# script, and as such, you MUST pay great attention to the syntax. -# If your text contains any double-quotes ("), you MUST escape -# them with the backslash character (\). -# - -include_once("translator.inc"); -global $_t; - -include_once("pl/search_po.inc"); - -include_once("it/search_po.inc"); - -include_once("ca/search_po.inc"); - -include_once("pt/search_po.inc"); - -include_once("es/search_po.inc"); - -include_once("de/search_po.inc"); - -include_once("ru/search_po.inc"); - -include_once("fr/search_po.inc"); -include_once("tr/search_po.inc"); - -include_once("uk/search_po.inc"); - diff --git a/web/lang/submit_po.inc b/web/lang/submit_po.inc deleted file mode 100644 index 60a2041..0000000 --- a/web/lang/submit_po.inc +++ /dev/null @@ -1,32 +0,0 @@ -<?php -# INSTRUCTIONS TO TRANSLATORS -# -# This file contains the i18n translations for a subset of the -# Arch Linux User-community Repository (AUR). This is a PHP -# script, and as such, you MUST pay great attention to the syntax. -# If your text contains any double-quotes ("), you MUST escape -# them with the backslash character (\). -# - -include_once("translator.inc"); -global $_t; - -include_once("pl/submit_po.inc"); - -include_once("it/submit_po.inc"); - -include_once("ca/submit_po.inc"); - -include_once("pt/submit_po.inc"); - -include_once("es/submit_po.inc"); - -include_once("de/submit_po.inc"); - -include_once("ru/submit_po.inc"); - -include_once("fr/submit_po.inc"); -include_once("tr/submit_po.inc"); - -include_once("uk/submit_po.inc"); - diff --git a/web/lang/tu_po.inc b/web/lang/tu_po.inc deleted file mode 100644 index b26d02a..0000000 --- a/web/lang/tu_po.inc +++ /dev/null @@ -1,11 +0,0 @@ -<?php - -include_once("translator.inc"); -global $_t; - -include_once("ru/tu_po.inc"); - -include_once("it/tu_po.inc"); - -include_once("fr/tu_po.inc"); - diff --git a/web/lib/acctfuncs.inc b/web/lib/acctfuncs.inc index d7fabcf..959ae4a 100644 --- a/web/lib/acctfuncs.inc +++ b/web/lib/acctfuncs.inc @@ -1,5 +1,5 @@ <?php -include_once("acctfuncs_po.inc"); +include_lang('acctfuncs_po.inc'); # Display the standard Account form, pass in default values if any # diff --git a/web/lib/aur.inc b/web/lib/aur.inc index e43ddf6..121c692 100644 --- a/web/lib/aur.inc +++ b/web/lib/aur.inc @@ -1,22 +1,23 @@ <?php -set_include_path(get_include_path() . PATH_SEPARATOR . '../template'); +set_include_path(get_include_path() . PATH_SEPARATOR . '../lib' . PATH_SEPARATOR . '../template'); header('Content-Type: text/html; charset=utf-8'); header('Cache-Control: no-cache, must-revalidate'); header('Expires: Tue, 11 Oct 1988 22:00:00 GMT'); // quite a special day header('Pragma: no-cache'); -include_once("version.inc"); + +include_once('translator.inc'); +set_lang(); +include_lang('aur_po.inc'); +include_lang('common_po.inc'); + include_once("config.inc"); -include_once("aur_po.inc"); -// TODO: remove this, move translations over for login form -include_once("index_po.inc"); +include_once("version.inc"); include_once("acctfuncs.inc"); # TODO do we need to set the domain on cookies? I seem to remember some # security concerns about not using domains - but it's not like # we really care if another site can see what language/SID a user # is using... -# - # return an array of info for each Trusted user diff --git a/web/lib/pkgfuncs.inc b/web/lib/pkgfuncs.inc index ca054db..dfda0e8 100644 --- a/web/lib/pkgfuncs.inc +++ b/web/lib/pkgfuncs.inc @@ -1,5 +1,5 @@ <?php -include_once("pkgfuncs_po.inc"); +include_lang('pkgfuncs_po.inc'); include_once("config.inc"); # define variables used during pkgsearch diff --git a/web/lib/translator.inc b/web/lib/translator.inc index 2bb3b23..25f2524 100644 --- a/web/lib/translator.inc +++ b/web/lib/translator.inc @@ -1,4 +1,6 @@ <?php +set_include_path(get_include_path() . PATH_SEPARATOR . '../lib' . PATH_SEPARATOR . '../lang'); + # this include file provides support for i18n # @@ -23,7 +25,17 @@ # deprecated usage: # print __("%s has %s apples.", array("Bill", "5")); -include_once("common_po.inc"); +include_once('config.inc'); + +function include_lang($trans) { + global $LANG; + + if ($LANG != DEFAULT_LANG) { + return include_once("$LANG/$trans"); + } + else + return true; +} function __() { global $_t; @@ -41,10 +53,8 @@ function __() { else $translated = $_t[$LANG][$tag]; + # If there is no translation, just print the given string. if (empty($translated)) { - # if it's a supported language, but there isn't a translation, - # alert the visitor to the missing translation. - # $translated = $tag; } diff --git a/web/template/template.phps b/web/template/template.phps index 7a86686..358bf52 100644 --- a/web/template/template.phps +++ b/web/template/template.phps @@ -2,10 +2,10 @@ # This template shows how a front page script is commonly coded. -set_include_path(get_include_path() . PATH_SEPARATOR . '../lib' . PATH_SEPARATOR . '../lang'); +set_include_path(get_include_path() . PATH_SEPARATOR . '../lib'); include("aur.inc"); # access AUR common functions -include("template_po.inc"); # use some form of this for i18n support +include_lang('template_po.inc'); # use some form of this for i18n support set_lang(); # this sets up the visitor's language check_sid(); # see if they're still logged in html_header(); # print out the HTML header -- 1.6.0.5

2 1

[aur-dev] [PATCH] Make all web paths relative.
by Loui Chang 21 Dec '08

21 Dec '08

The site no longer needs to be hosted from the root of a domain, or virtual host. Signed-off-by: Loui Chang <louipc.ist(a)gmail.com> --- web/html/css/arch.css | 4 ++-- web/lib/acctfuncs.inc | 4 ++-- web/lib/pkgfuncs.inc | 22 +++++++++++----------- web/template/header.php | 14 +++++++------- web/template/login_form.php | 2 +- 5 files changed, 23 insertions(+), 23 deletions(-) diff --git a/web/html/css/arch.css b/web/html/css/arch.css index 9dc630e..bc629e8 100644 --- a/web/html/css/arch.css +++ b/web/html/css/arch.css @@ -2,7 +2,7 @@ * ul { padding: 20px; } body { min-width: 600px; - background: #fbf8f1 url("/images/titlebar.png") repeat-x top left; + background: #fbf8f1 url("../images/titlebar.png") repeat-x top left; padding: 0 30px; color: #555; font-family: "DejaVu Sans", "Bitstream Vera Sans", "Lucida Grande", Arial, sans-serif; @@ -125,7 +125,7 @@ body { } #logo h1#archtitle a { display: block; - background: transparent url("/images/titlelogo.png") top left no-repeat; + background: transparent url("../images/titlelogo.png") top left no-repeat; width: 350px; height: 103px; } diff --git a/web/lib/acctfuncs.inc b/web/lib/acctfuncs.inc index 6120777..d7fabcf 100644 --- a/web/lib/acctfuncs.inc +++ b/web/lib/acctfuncs.inc @@ -463,7 +463,7 @@ function search_results_page($UTYPE,$O=0,$SB="",$U="",$T="", } print "<tr>"; print "<td class='".$c."'>"; - print "<span class='f5'><a href='/packages.php?SeB=m&K=".$row["Username"]."'>".$row["Username"]."</a></span></td>"; + print "<span class='f5'><a href='packages.php?SeB=m&K=".$row["Username"]."'>".$row["Username"]."</a></span></td>"; print "<td class='".$c."'>"; print "<span class='f5'>".$row["AccountType"]; print "</span></td>"; @@ -593,7 +593,7 @@ function display_account_info($U="",$T="", print " </tr>\n"; print " <tr>\n"; - print " <td colspan='2'><a href='/packages.php?K=".$U."&SeB=m'>".__("View this user's packages")."</a></td>\n"; + print " <td colspan='2'><a href='packages.php?K=".$U."&SeB=m'>".__("View this user's packages")."</a></td>\n"; print " </tr>\n"; print "</table>\n"; diff --git a/web/lib/pkgfuncs.inc b/web/lib/pkgfuncs.inc index f99810a..ca054db 100644 --- a/web/lib/pkgfuncs.inc +++ b/web/lib/pkgfuncs.inc @@ -306,7 +306,7 @@ function package_details($id=0, $SID="") { uid_from_sid($SID) == $row["MaintainerUID"] or (account_from_sid($SID) == "Developer" or account_from_sid($SID) == "Trusted User"))) { - $edit_cat = "<a href='/pkgedit.php?change_Category=1&ID="; + $edit_cat = "<a href='pkgedit.php?change_Category=1&ID="; $edit_cat .= intval($_REQUEST["ID"])."'>".$row["Category"]."</a>"; $edit_cat .= "  <span class='fix'>("; $edit_cat .= __("change category").")</span>"; @@ -318,7 +318,7 @@ function package_details($id=0, $SID="") { if ($row["MaintainerUID"]) { $maintainer = username_from_id($row["MaintainerUID"]); if ($SID) { - echo "<a href='/account.php?Action=AccountInfo&ID="; + echo "<a href='account.php?Action=AccountInfo&ID="; echo $row["MaintainerUID"] . "'>"; echo $maintainer . "</a></span></td>"; } else { @@ -473,7 +473,7 @@ function package_details($id=0, $SID="") { echo "<div class=\"pgbox\">\n"; echo " <div class=\"pgboxtitle\"><span class=\"f3\">".__("Actions")."</span></div>\n"; echo " <div class=\"pgboxbody\">\n"; - echo " <form action='/packages.php?ID=".$row['ID']."' method='post'>\n"; + echo " <form action='packages.php?ID=".$row['ID']."' method='post'>\n"; echo " <input type='hidden' name='IDs[".$row["ID"]."]' value='1'>\n"; echo " <input type='hidden' name='ID' value='".$row["ID"]."'>\n"; # Voting Button @@ -537,7 +537,7 @@ function package_details($id=0, $SID="") { echo " <table width='100%'>\n"; if (isset($_COOKIE['AURSID'])) { echo "<tr><td>"; - echo " <form action='/pkgedit.php' method='post'>\n"; + echo " <form action='pkgedit.php' method='post'>\n"; echo " <input type='hidden' name='ID' value='".$row["ID"]."'>\n"; echo " <input type='submit' class='button' name='add_Comment' value=\""; echo __("Add Comment")."\">\n"; @@ -555,7 +555,7 @@ function package_details($id=0, $SID="") { echo " <tr>\n"; echo " <td class='boxSoftTitle'><span class='f3'>"; if (canDeleteComment($carr["ID"], account_from_sid($SID), $SID)) { - $durl = "<a href='/pkgedit.php?del_Comment=1"; + $durl = "<a href='pkgedit.php?del_Comment=1"; $durl.= "&comment_id=".$carr["ID"]."&ID=".$row["ID"]; $durl.= "'><img src='/images/x.png' border='0'"; $durl.= " alt=\"".__("Delete comment")."\"></a>"; @@ -564,7 +564,7 @@ function package_details($id=0, $SID="") { } if ($SID) { echo __("Comment by: %h%s%h on %h%s%h", - array("<a href='/account.php?Action=AccountInfo&ID=".$carr["UsersID"]."'><b>",$carr["UserName"],"</b></a>", + array("<a href='account.php?Action=AccountInfo&ID=".$carr["UsersID"]."'><b>",$carr["UserName"],"</b></a>", "<i>",gmdate("Ymd [H:i:s]",$carr["CommentTS"]),"</i>")); } else { echo __("Comment by: %h%s%h on %h%s%h", @@ -767,7 +767,7 @@ function pkg_search_page($SID="") { $result = db_query($q, $dbh); $total = mysql_result(db_query('SELECT FOUND_ROWS() AS Total', $dbh), 0); - print "<form action='/packages.php?".$_SERVER['QUERY_STRING']."' method='post'>\n"; + print "<form action='packages.php?".$_SERVER['QUERY_STRING']."' method='post'>\n"; print "<center>\n"; print "<table cellspacing='3' class='boxSoft'>\n"; print "<tr>\n"; @@ -856,7 +856,7 @@ function pkg_search_page($SID="") { print " <td class='".$c."'><span class='f5'><span class='blue'>"; print $row["Category"]."</span></span></td>\n"; print " <td class='".$c."'><span class='f4'>"; - $url = "<a href='/packages.php?"; + $url = "<a href='packages.php?"; $url .= "ID="; $url .= $row["ID"]; $url.= "'>"; @@ -957,15 +957,15 @@ function pkg_search_page($SID="") { print " <tr>"; print " <td align='left'>"; if (($O-$PP) >= 0) { - print "<a href='/packages.php?O=" . ($O - $PP) . "&L=".intval($_REQUEST["L"])."&C=".intval($_REQUEST["C"])."&K=$K&SB=$SB&SO=$SO&PP=$PP&SeB=".$_REQUEST["SeB"]."&do_Orphans=".$_REQUEST["do_Orphans"]. "'>" . __("Less") . "</a>"; + print "<a href='packages.php?O=" . ($O - $PP) . "&L=".intval($_REQUEST["L"])."&C=".intval($_REQUEST["C"])."&K=$K&SB=$SB&SO=$SO&PP=$PP&SeB=".$_REQUEST["SeB"]."&do_Orphans=".$_REQUEST["do_Orphans"]. "'>" . __("Less") . "</a>"; } else if ($O<$PP && $O>0) { - print "<a href='/packages.php?O=0&L=".intval($_REQUEST["L"])."&C=".intval($_REQUEST["C"])."&K=$K&SB=$SB&SO=$SO&PP=$PP&SeB=".$_REQUEST["SeB"]."&do_Orphans=".$_REQUEST["do_Orphans"]. "'>" . __("Less") . "</a>"; + print "<a href='packages.php?O=0&L=".intval($_REQUEST["L"])."&C=".intval($_REQUEST["C"])."&K=$K&SB=$SB&SO=$SO&PP=$PP&SeB=".$_REQUEST["SeB"]."&do_Orphans=".$_REQUEST["do_Orphans"]. "'>" . __("Less") . "</a>"; } print " </td>"; // RIGHT print " <td align='right'>"; if ($total - $PP - $O > 0) { - print "<a href='/packages.php?O=" . ($O + $PP) . + print "<a href='packages.php?O=" . ($O + $PP) . "&L=".intval($_REQUEST["L"])."&C=".intval($_REQUEST["C"]) . "&K=$K&SB=$SB&SO=$SO&PP=$PP&SeB=".$_REQUEST["SeB"] . "&do_Orphans=".$_REQUEST["do_Orphans"]."'>" . diff --git a/web/template/header.php b/web/template/header.php index 352135a..dcf99f3 100644 --- a/web/template/header.php +++ b/web/template/header.php @@ -5,9 +5,9 @@ xml:lang="<?php print "$LANG\" lang=\"$LANG"; ?>"> <head> <title>AUR (<?php print $LANG; ?>)<?php if ($title != "") { print " - " . $title; } ?></title> - <link rel='stylesheet' type='text/css' href='/css/fonts.css' /> - <link rel='stylesheet' type='text/css' href='/css/containers.css' /> - <link rel='stylesheet' type='text/css' href='/css/arch.css' /> + <link rel='stylesheet' type='text/css' href='css/fonts.css' /> + <link rel='stylesheet' type='text/css' href='css/containers.css' /> + <link rel='stylesheet' type='text/css' href='css/arch.css' /> <link rel='shortcut icon' href='images/favicon.ico' /> <link rel='alternate' type='application/rss+xml' title='Newest Packages RSS' href='rss2.php' /> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> @@ -20,7 +20,7 @@ <div id="main_nav"> <ul> <li><a href="http://www.archlinux.org/download/">Download</a></li> - <li class="selected"><a href="/">AUR</a></li> + <li class="selected"><a href="index.php">AUR</a></li> <li><a href="http://bugs.archlinux.org/">Bugs</a></li> <li><a href="http://wiki.archlinux.org/">Wiki</a></li> <li><a href="http://bbs.archlinux.org/">Forums</a></li> @@ -46,13 +46,13 @@ <?php if (isset($_COOKIE["AURSID"])) { ?> - <li><a href="/pkgsubmit.php"><?php print __("Submit"); ?></a></li> - <li><a href="/packages.php?SeB=m&K=<?php print username_from_sid($_COOKIE["AURSID"]); ?>"><?php print __("My Packages"); ?></a></li> + <li><a href="pkgsubmit.php"><?php print __("Submit"); ?></a></li> + <li><a href="packages.php?SeB=m&K=<?php print username_from_sid($_COOKIE["AURSID"]); ?>"><?php print __("My Packages"); ?></a></li> <?php if (account_from_sid($_COOKIE["AURSID"]) == "Trusted User" || account_from_sid($_COOKIE["AURSID"]) == "Developer") { ?> - <li><a href="/tu.php"><?php print __("Trusted User"); ?></a></li> + <li><a href="tu.php"><?php print __("Trusted User"); ?></a></li> <?php } } diff --git a/web/template/login_form.php b/web/template/login_form.php index 70c24c7..1eba5cf 100644 --- a/web/template/login_form.php +++ b/web/template/login_form.php @@ -3,7 +3,7 @@ if (isset($_COOKIE["AURSID"])) { print __("Logged-in as: %h%s%h", array("<b>", username_from_sid($_COOKIE["AURSID"]), "</b>")); ?> -<br /><a href="/logout.php"><?php print __("Logout"); ?></a> +<br /><a href="logout.php"><?php print __("Logout"); ?></a> <?php } else { -- 1.6.0.5

2 1