- Aur-dev - lists.archlinux.org

[aur-dev] [PATCH] rm_rf: pull fullpath into a local variable
by Dan McGee 24 Oct '08

24 Oct '08

From: Dan McGee <dan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> --- web/lib/aur.inc | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/web/lib/aur.inc b/web/lib/aur.inc index 81ffde2..b243cc4 100644 --- a/web/lib/aur.inc +++ b/web/lib/aur.inc @@ -378,11 +378,12 @@ function rm_rf($dirname="") { $d = dir($dirname); while ($f = $d->read()) { if ($f != "." && $f != "..") { - if (is_dir($dirname."/".$f)) { - rm_rf($dirname."/".$f); + $fullpath = $dirname."/".$f; + if (is_dir($fullpath)) { + rm_rf($fullpath); } - if (is_file($dirname."/".$f) || is_link($dirname."/".$f)) { - unlink($dirname."/".$f); + if (is_file($fullpath) || is_link($fullpath)) { + unlink($fullpath); } } } -- 1.6.0.3

1 0

[aur-dev] [PATCH] Convert package flagging to a function
by Callan Barrett 15 Oct '08

15 Oct '08

Signed-off-by: Callan Barrett <wizzomafizzo(a)gmail.com> --- web/html/packages.php | 101 +++---------------------------------------------- web/lib/pkgfuncs.inc | 74 +++++++++++++++++++++++++++++++++++- 2 files changed, 79 insertions(+), 96 deletions(-) diff --git a/web/html/packages.php b/web/html/packages.php index 4cfe9c4..317583f 100644 --- a/web/html/packages.php +++ b/web/html/packages.php @@ -37,106 +37,17 @@ if (isset($_COOKIE["AURSID"])) { # grab the list of Package IDs to be operated on # isset($_POST["IDs"]) ? $ids = $_POST["IDs"] : $ids = array(); -#isset($_REQUEST["All_IDs"]) ? -# $all_ids = explode(":", $_REQUEST["All_IDs"]) : -# $all_ids = array(); - # determine what button the visitor clicked # if ($_POST['action'] == "do_Flag" || isset($_POST['do_Flag'])) { - if (!$atype) { - print __("You must be logged in before you can flag packages."); - print "<br />\n"; - - } else { - - if (!empty($ids)) { - $dbh = db_connect(); - - # Flag the packages in $ids array - # - $first = 1; - while (list($pid, $v) = each($ids)) { - if ($first) { - $first = 0; - $flag = $pid; - } else { - $flag .= ", ".$pid; - } - } - $q = "UPDATE Packages SET OutOfDate = 1 "; - $q.= "WHERE ID IN (" . $flag . ")"; - db_query($q, $dbh); - - print "<p>\n"; - print __("The selected packages have been flagged out-of-date."); - print "</p>\n"; - - # notification by tardo. - $f_name = username_from_sid($_COOKIE['AURSID']); - $f_email = email_from_sid($_COOKIE['AURSID']); - $f_uid = uid_from_sid($_COOKIE['AURSID']); - $q = "SELECT Packages.Name, Users.Email, Packages.ID "; - $q.= "FROM Packages, Users "; - $q.= "WHERE Packages.ID IN (" . $flag .") "; - $q.= "AND Users.ID = Packages.MaintainerUID "; - $q.= "AND Users.ID != " . $f_uid; - $result = db_query($q, $dbh); - if (mysql_num_rows($result)) { - while ($row = mysql_fetch_assoc($result)) { - # construct email - $body = "Your package " . $row['Name'] . " has been flagged out of date by " . $f_name . ". You may view your package at:\nhttp://aur.archlinux.org/packages.php?do_Details=1&ID=" . $row['ID']; - $body = wordwrap($body, 70); - $headers = "To: ".$row['Email']."\nReply-to: nobody@archlinux.org\nFrom:aur-notify@archlinux.org\nX-Mailer: PHP\nX-MimeOLE: Produced By AUR\n"; - @mail(' ', "AUR Out-of-date Notification for ".$row['Name'], $body, $headers); - } - } - - } else { - print "<p>\n"; - print __("You did not select any packages to flag."); - print "</p>\n"; - } - } - + print "<p>"; + print pkg_flag($atype, $ids, True); + print "</p>"; } elseif ($_POST['action'] == "do_UnFlag" || isset($_POST['do_UnFlag'])) { - if (!$atype) { - print __("You must be logged in before you can unflag packages."); - print "<br />\n"; - - } else { - - if (!empty($ids)) { - $dbh = db_connect(); - - # Un-Flag the packages in $ids array - # - $first = 1; - while (list($pid, $v) = each($ids)) { - if ($first) { - $first = 0; - $unflag = $pid; - } else { - $unflag .= ", ".$pid; - } - } - $q = "UPDATE Packages SET OutOfDate = 0 "; - $q.= "WHERE ID IN (" . $unflag . ")"; - db_query($q, $dbh); - - print "<p>\n"; - print __("The selected packages have been unflagged."); - print "</p>\n"; - } else { - print "<p>\n"; - print __("You did not select any packages to unflag."); - print "</p>\n"; - } - - - } - + print "<p>"; + print pkg_flag($atype, $ids, False); + print "</p>"; } elseif ($_POST['action'] == "do_Disown" || isset($_POST['do_Disown'])) { if (!$atype) { print __("You must be logged in before you can disown packages."); diff --git a/web/lib/pkgfuncs.inc b/web/lib/pkgfuncs.inc index 5ba56da..0f3defc 100644 --- a/web/lib/pkgfuncs.inc +++ b/web/lib/pkgfuncs.inc @@ -985,4 +985,76 @@ function pkg_search_page($SID="") { return; } -?> +function pkg_flag ($atype, $ids, $action = True) { + if (!$atype) { + if ($action) { + return __("You must be logged in before you can flag packages."); + } else { + return __("You must be logged in before you can unflag packages."); + } + } + + if (empty($ids)) { + if ($action) { + return __("You did not select any packages to flag."); + } else { + return __("You did not select any packages to unflag."); + } + } + + foreach ($ids as $pid => $v) { + if (!is_numeric($pid)) { + if ($action) { + return __("You did not select any packages to flag."); + } else { + return __("You did not select any packages to unflag."); + } + } + } + + $dbh = db_connect(); + + $first = 1; + foreach ($ids as $pid => $v) { + if ($first) { + $first = 0; + $flag = $pid; + } else { + $flag .= ", " . $pid; + } + } + + $ood = $action ? 1 : 0; + $q = "UPDATE Packages SET OutOfDate = " . $ood; + $q.= " WHERE ID IN (" . $flag . ")"; + + db_query($q, $dbh); + + if ($action) { + # Notify of flagging by email + $f_name = username_from_sid($_COOKIE['AURSID']); + $f_email = email_from_sid($_COOKIE['AURSID']); + $f_uid = uid_from_sid($_COOKIE['AURSID']); + $q = "SELECT Packages.Name, Users.Email, Packages.ID "; + $q.= "FROM Packages, Users "; + $q.= "WHERE Packages.ID IN (" . $flag .") "; + $q.= "AND Users.ID = Packages.MaintainerUID "; + $q.= "AND Users.ID != " . $f_uid; + $result = db_query($q, $dbh); + if (mysql_num_rows($result)) { + while ($row = mysql_fetch_assoc($result)) { + # construct email + $body = "Your package " . $row['Name'] . " has been flagged out of date by " . $f_name . ". You may view your package at:\nhttp://aur.archlinux.org/packages.php?ID=" . $row['ID']; + $body = wordwrap($body, 70); + $headers = "To: ".$row['Email']."\nReply-to: nobody@archlinux.org\nFrom:aur-notify@archlinux.org\nX-Mailer: PHP\nX-MimeOLE: Produced By AUR\n"; + @mail(' ', "AUR Out-of-date Notification for ".$row['Name'], $body, $headers); + } + } + } + + if ($action) { + return __("The selected packages have been flagged out-of-date."); + } else { + return __("The selected packages have been unflagged."); + } +} -- 1.6.0.2

2 2

[aur-dev] [PATCH] Turn on package notification by default for new packages
by Callan Barrett 10 Oct '08

10 Oct '08

Signed-off-by: Callan Barrett <wizzomafizzo(a)gmail.com> --- web/html/pkgsubmit.php | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/web/html/pkgsubmit.php b/web/html/pkgsubmit.php index 78d6e50..3290293 100644 --- a/web/html/pkgsubmit.php +++ b/web/html/pkgsubmit.php @@ -328,6 +328,7 @@ if ($_COOKIE["AURSID"]): header('Location: packages.php?ID=' . $pdata['ID']); } else { + $uid = uid_from_sid($_COOKIE["AURSID"]); # 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')", @@ -338,8 +339,8 @@ if ($_COOKIE["AURSID"]): mysql_real_escape_string($_REQUEST['category']), mysql_real_escape_string($new_pkgbuild['pkgdesc']), mysql_real_escape_string($new_pkgbuild['url']), - uid_from_sid($_COOKIE["AURSID"]), - uid_from_sid($_COOKIE["AURSID"]), + $uid, + $uid, mysql_real_escape_string(INCOMING_DIR . $pkg_name . "/" . $pkg_name . ".tar.gz"), mysql_real_escape_string(URL_DIR . $pkg_name . "/" . $pkg_name . ".tar.gz")); @@ -370,6 +371,10 @@ if ($_COOKIE["AURSID"]): $q .= $packageID . ", '" . mysql_real_escape_string($src) . "')"; db_query($q, $dbh); } + + # Turn on package notification + $q = 'INSERT INTO CommentNotify (PkgID, UserID) VALUES (' . $packageID . ', ' . $uid . ')'; + db_query($q, $dbh); header('Location: packages.php?ID=' . $packageID); -- 1.6.0.2

2 3

[aur-dev] [PATCH] Setup translation for addvote.php
by Callan Barrett 10 Oct '08

10 Oct '08

Signed-off-by: Callan Barrett <wizzomafizzo(a)gmail.com> --- web/html/addvote.php | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-) diff --git a/web/html/addvote.php b/web/html/addvote.php index 8e4df79..449bbb0 100644 --- a/web/html/addvote.php +++ b/web/html/addvote.php @@ -2,7 +2,7 @@ set_include_path(get_include_path() . PATH_SEPARATOR . '../lib' . PATH_SEPARATOR . '../lang'); -include("pkgfuncs_po.inc"); +include("tu_po.inc"); include("aur.inc"); set_lang(); check_sid(); @@ -25,23 +25,23 @@ if ($atype == "Trusted User" OR $atype == "Developer") { $check = mysql_num_rows(db_query($qcheck, $dbh)); if ($check == 0) { - $error.= "<div style='color: red; font-weight: bold'>Username does not exist.</div>"; + $error.= "<div style='color: red; font-weight: bold'>" . __("Username does not exist.") . "</div>"; } else { $qcheck = "SELECT * FROM TU_VoteInfo WHERE User = '" . mysql_real_escape_string($_POST['user']) . "'"; $qcheck.= " AND End > UNIX_TIMESTAMP()"; $check = mysql_num_rows(db_query($qcheck, $dbh)); if ($check != 0) { - $error.= "<div style='color: red; font-weight: bold'>" . htmlentities($_POST['user']) . " already has proposal running for them.</div>"; + $error.= "<div style='color: red; font-weight: bold'>" . __("%s already has proposal running for them.", htmlentities($_POST['user'])) . "</div>"; } } } if (!empty($_POST['length'])) { if (!is_numeric($_POST['length'])) { - $error.= "<div style='color: red; font-weight: bold'>Length must be a number.</div>"; + $error.= "<div style='color: red; font-weight: bold'>" . __("Length must be a number.") . "</div>"; } else if ($_POST['length'] < 1) { - $error.= "<div style='color: red; font-weight: bold'>Length must be at least 1.</div>"; + $error.= "<div style='color: red; font-weight: bold'>" . __("Length must be at least 1.") . "</div>"; } else { $len = (60*60*24)*$_POST['length']; } @@ -50,7 +50,7 @@ if ($atype == "Trusted User" OR $atype == "Developer") { } if (empty($_POST['agenda'])) { - $error.= "<div style='color: red; font-weight: bold'>Proposal cannot be empty.</div>"; + $error.= "<div style='color: red; font-weight: bold'>" . __("Proposal cannot be empty.") . "</div>"; } } @@ -62,21 +62,21 @@ if ($atype == "Trusted User" OR $atype == "Developer") { $q.= ", " . uid_from_sid($_COOKIE["AURSID"]) . ")"; db_query($q, $dbh); - print "<p>New proposal submitted.</p>\n"; + print "<p>" . __("New proposal submitted.") . "</p>\n"; } else { ?> -<p>Submit a proposal to vote on.</p> +<p><?php print __("Submit a proposal to vote on.") ?></p> <?php if (!empty($error)) { print $error . "<br />"; } ?> <form action='addvote.php' method='post'> -<b>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); } ?>'> -(empty if not applicable) +<?php print __("(empty if not applicable)") ?> <br /> -<b>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); } ?>'> -(defaults to 7 if empty) +<?php print __("(defaults to 7 if empty)") ?> <br /> -<b>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'> @@ -84,9 +84,9 @@ if ($atype == "Trusted User" OR $atype == "Developer") { <br /> <?php } - print "<a href='tu.php'>Back</a>"; + print "<a href='tu.php'>" . __("Back") . "</a>"; } else { - print "You are not allowed to access this area.\n"; + print __("You are not allowed to access this area."); } html_footer(AUR_VERSION); -- 1.6.0.2

2 1

[aur-dev] [PATCH] Add comment and submitted to notification emails for comments
by Callan Barrett 09 Oct '08

09 Oct '08

Signed-off-by: Callan Barrett <wizzomafizzo(a)gmail.com> --- web/html/pkgedit.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/html/pkgedit.php b/web/html/pkgedit.php index 610113a..974f14b 100644 --- a/web/html/pkgedit.php +++ b/web/html/pkgedit.php @@ -91,7 +91,7 @@ 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'].", you may view it at:\nhttp://aur.archlinux.org/packages.php?ID=".$_REQUEST["ID"]."\n\n\n---\nYou received this e-mail because you chose to recieve 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 = "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 = 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"; -- 1.6.0.2

2 4

[aur-dev] [PATCH] Sanitize input of package functions in pkg_funcs.inc
by Callan Barrett 09 Oct '08

09 Oct '08

Signed-off-by: Callan Barrett <wizzomafizzo(a)gmail.com> --- web/lib/pkgfuncs.inc | 32 ++++++++++++++++++++++++++++++++ 1 files changed, 32 insertions(+), 0 deletions(-) diff --git a/web/lib/pkgfuncs.inc b/web/lib/pkgfuncs.inc index 06171fa..27b623a 100644 --- a/web/lib/pkgfuncs.inc +++ b/web/lib/pkgfuncs.inc @@ -1086,6 +1086,12 @@ function pkg_delete ($atype, $ids) { return __("You did not select any packages to delete."); } + foreach ($ids as $pid) { + if (!is_numeric($pid)) { + return __("You did not select any packages to delete."); + } + } + # Delete the packages in $ids array (but only if they are Unsupported) # $dbh = db_connect(); @@ -1175,6 +1181,16 @@ function pkg_adopt ($atype, $ids, $action = True) { return __("You did not select any packages to disown."); } } + + foreach ($ids as $pid) { + if (!is_numeric($pid)) { + if ($action) { + return __("You did not select any packages to adopt."); + } else { + return __("You did not select any packages to disown."); + } + } + } $dbh = db_connect(); @@ -1242,6 +1258,16 @@ function pkg_vote ($atype, $ids, $action = True) { return __("Your votes have been removed from the selected packages."); } } + + foreach ($ids as $pid) { + if (!is_numeric($ids)) { + if ($action) { + return __("You did not select any packages to vote for."); + } else { + return __("Your votes have been removed from the selected packages."); + } + } + } $dbh = db_connect(); $my_votes = pkgvotes_from_sid($_COOKIE["AURSID"]); @@ -1320,6 +1346,12 @@ function pkg_notify ($atype, $ids) { return __("Couldn't add to notification list."); } + foreach ($ids as $pid) { + if (!is_numeric($ids)) { + return __("Couldn't add to notification list."); + } + } + $dbh = db_connect(); $uid = uid_from_sid($_COOKIE["AURSID"]); -- 1.6.0.2

2 1

[aur-dev] [PATCH] Setup translation files for tu.php
by Callan Barrett 07 Oct '08

07 Oct '08

Signed-off-by: Callan Barrett <wizzomafizzo(a)gmail.com> --- web/html/tu.php | 2 +- web/lang/tu_po.inc | 4 ++++ 2 files changed, 5 insertions(+), 1 deletions(-) create mode 100644 web/lang/tu_po.inc diff --git a/web/html/tu.php b/web/html/tu.php index e2e44b7..67ac3f2 100644 --- a/web/html/tu.php +++ b/web/html/tu.php @@ -2,7 +2,7 @@ set_include_path(get_include_path() . PATH_SEPARATOR . '../lib' . PATH_SEPARATOR . '../lang'); -include("pkgfuncs_po.inc"); +include("tu_po.inc"); include("aur.inc"); set_lang(); check_sid(); diff --git a/web/lang/tu_po.inc b/web/lang/tu_po.inc new file mode 100644 index 0000000..00f603a --- /dev/null +++ b/web/lang/tu_po.inc @@ -0,0 +1,4 @@ +<?php + +include_once("translator.inc"); +global $_t; -- 1.6.0.2

1 1

[aur-dev] [PATCH] English translation for tu.php
by Callan Barrett 07 Oct '08

07 Oct '08

Signed-off-by: Callan Barrett <wizzomafizzo(a)gmail.com> --- web/html/tu.php | 2 +- web/lang/en/tu_po.inc | 34 ++++++++++++++++++++++++++++++++++ web/lang/tu_po.inc | 6 ++++++ 3 files changed, 41 insertions(+), 1 deletions(-) create mode 100644 web/lang/en/tu_po.inc create mode 100644 web/lang/tu_po.inc diff --git a/web/html/tu.php b/web/html/tu.php index 09808d4..32f764b 100644 --- a/web/html/tu.php +++ b/web/html/tu.php @@ -2,7 +2,7 @@ set_include_path(get_include_path() . PATH_SEPARATOR . '../lib' . PATH_SEPARATOR . '../lang'); -include("pkgfuncs_po.inc"); +include("tu_po.inc"); include("aur.inc"); set_lang(); check_sid(); diff --git a/web/lang/en/tu_po.inc b/web/lang/en/tu_po.inc new file mode 100644 index 0000000..9fe789d --- /dev/null +++ b/web/lang/en/tu_po.inc @@ -0,0 +1,34 @@ +<?php + +include_once("translator.inc"); +global $_t; + +$_t["en"]["Vote ID not valid."] = "Vote ID not valid."; + +$_t["en"]["Abstain"] = "Abstain"; + +$_t["en"]["No"] = "No"; + +$_t["en"]["You are not allowed to access this area."] = "You are not allowed to access this area."; + +$_t["en"]["Voting is closed for this proposal."] = "Voting is closed for this proposal."; + +$_t["en"]["Back"] = "Back"; + +$_t["en"]["Next"] = "Next"; + +$_t["en"]["Add"] = "Add"; + +$_t["en"]["All Votes"] = "All Votes"; + +$_t["en"]["You've already voted for this proposal."] = "You've already voted for this proposal."; + +$_t["en"]["Could not retrieve proposal details."] = "Could not retrieve proposal details."; + +$_t["en"]["Current Votes"] = "Current Votes"; + +$_t["en"]["Yes"] = "Yes"; + +$_t["en"]["You cannot vote in an proposal about you."] = "You cannot vote in an proposal about you."; + +$_t["en"]["You've already voted in this proposal."] = "You've already voted in this proposal."; diff --git a/web/lang/tu_po.inc b/web/lang/tu_po.inc new file mode 100644 index 0000000..5b1735a --- /dev/null +++ b/web/lang/tu_po.inc @@ -0,0 +1,6 @@ +<?php + +include_once("translator.inc"); +global $_t; + +include_once("en/tu_po.inc"); -- 1.6.0.2

2 3

[aur-dev] fwd: AUR PKGBUILD files and web searches
by Simo Leone 06 Oct '08

06 Oct '08

I'm forwarding this to aur-dev, as it's come up before and I want to gather current opinions on it. A couple thoughts that come to my mind are that spam harvesters won't honor robots.txt anyway, and in the past people sort of agreed that by uploading a pkgbuild, you probably should have noticed the fact that it's google searchable before you did it, and taken countermeasures yourself. Opinions? -S ----- Forwarded message from Tom Wizetek <mailadmin(a)wizetek.com> ----- To: simo(a)archlinux.org Subject: AUR PKGBUILD files and web searches Date: Sat, 4 Oct 2008 02:56:53 -0400 From: Tom Wizetek <mailadmin(a)wizetek.com> Hello. I must admit that I'm a bit concerned about how certain information contained in PKGBUILD files hosted on archlinux.org is returned by web searches. Specifically, I mean email addresses. For example, a simple search for my name: http://www.google.ca/search?q=tom+wizetek produces: Contributor: Tom Wizetek <tom(a)wizetek.com> pkgname=tleds linking to http://aur.archlinux.org/packages/tleds/tleds/PKGBUILD This could be easily used for email address harvesting. Any chance you can add to the site's robots.txt (seems like the file exists but is empty) the appropriate entries to prevent web bots from listing the contents of PKGBUILDs? Thanks for hearing me out. -- Tom Wizetek (MajorTom) ----- End forwarded message -----

5 4

[aur-dev] [PATCH] Show developer-TUs their total community packages.
by Loui 06 Oct '08

06 Oct '08

2 1