October 2010 - Aur-dev - lists.archlinux.org

[aur-dev] Adding the HE language.
by Netanel Shine 18 Feb '11

18 Feb '11

Hey there, i was working on translating the AUR to my language, Hebrew. I am adding to this message the gzipped patched file. btw. i know his name lame, but i think he will work just fine. THanks! -- Netanel Shine

6 40

[aur-dev] [PATCH] Make external links in comments clickable (FS#20137).
by Lukas Fleischer 25 Jan '11

25 Jan '11

This is a bit hacky patch to make links in AUR comments clickable (fixes FS#20137 [1]). Huge parts of this code are ripped from the DokuWiki plugin that is also used in Flyspray. I didn't have any time to test it extensively so I'd suggest to do some more tests if this will be commited. [1] https://bugs.archlinux.org/task/20137 --- web/lib/aur.inc | 45 +++++++++++++++++++++++++++++++++++++++++ web/template/pkg_comments.php | 2 +- 2 files changed, 46 insertions(+), 1 deletions(-) diff --git a/web/lib/aur.inc b/web/lib/aur.inc index bd69c4c..b0cfdc8 100644 --- a/web/lib/aur.inc +++ b/web/lib/aur.inc @@ -494,3 +494,48 @@ function salted_hash($passwd, $salt) } return md5($salt . $passwd); } + +function parse_link($matches) +{ + $name = $url = $matches[0]; + + if(substr($url, 0, 3) == 'ftp' && (substr($url, 0, 6) != 'ftp://')) { + $url = 'ftp://'.$url; + } + elseif (substr($url, 0, 3) == 'www') { + $url = 'http://'.$url; + } + + $url = str_replace('&', '&', $url); + $url = str_replace('&amp;', '&', $url); + $url = strtr($url, array('>' => '%3E', '<' => '%3C', '"' => '%22')); + + return '<a href="' . $url . '">' . $name . '</a>'; +} + +function parse_comment($comment) +{ + $schemes = array('http', 'https', 'ftp'); + $ltrs = '\w'; + $gunk = '\/\#~:.?+=&%@!\-'; + $punc = '.:?\-;,'; + $host = $ltrs . $punc; + $any = $ltrs . $gunk . $punc; + + $patterns = array(); + + foreach ($schemes as $scheme) { + $patterns[] = '(\b(?i)' . $scheme . '(?-i):\/\/[' . $any . ']+?(?=[' . $punc . ']*[^' . $any . ']))'; + } + + $patterns[] = '(\b(?i)www?(?-i)\.[' . $host . ']+?\.[' . $host . ']+?[' . $any . ']+?(?=[' . $punc . ']*[^' . $any . ']))'; + $patterns[] = '(\b(?i)ftp?(?-i)\.['. $host . ']+?\.[' . $host . ']+?[' . $any . ']+?(?=[' . $punc . ']*[^' . $any . ']))'; + + $regex = '/' . implode('|', $patterns) . '/msS'; + + $comment = htmlspecialchars($comment); + $comment = preg_replace_callback($regex, parse_link, $comment . "\n"); + $comment = nl2br($comment); + + return $comment; +} diff --git a/web/template/pkg_comments.php b/web/template/pkg_comments.php index 02171a0..2ca9bf0 100644 --- a/web/template/pkg_comments.php +++ b/web/template/pkg_comments.php @@ -20,7 +20,7 @@ while (list($indx, $carr) = each($comments)) { ?> ?></div> <blockquote class="comment-body"> <div> -<?php echo nl2br(htmlspecialchars($carr['Comments'])) ?> +<?php echo parse_comment($carr['Comments']) ?> </div> </blockquote> <?php -- 1.7.3

4 15

[aur-dev] [PATCH] Add timestamp when a package is flagged out-of-date (FS#20848).
by Lukas Fleischer 04 Dec '10

04 Dec '10

--- UPGRADING | 4 ++++ support/schema/aur-schema.sql | 1 + web/lang/cs.po | 2 +- web/lang/de.po | 2 +- web/lang/el_GR.po | 2 +- web/lang/fr.po | 2 +- web/lang/he.po | 2 +- web/lang/hr.po | 2 +- web/lang/hu.po | 2 +- web/lang/it.po | 2 +- web/lang/nb_NO.po | 2 +- web/lang/pl.po | 2 +- web/lang/ro.po | 2 +- web/lang/ru.po | 2 +- web/lang/sr.po | 2 +- web/lang/tr.po | 2 +- web/lang/uk.po | 2 +- web/lang/zh_CN.po | 2 +- web/lib/pkgfuncs.inc | 3 ++- web/template/pkg_details.php | 3 ++- 20 files changed, 25 insertions(+), 18 deletions(-) diff --git a/UPGRADING b/UPGRADING index 743f404..99c5d1a 100644 --- a/UPGRADING +++ b/UPGRADING @@ -1,6 +1,10 @@ Upgrading ========= +From 1.7.0 +---------- +ALTER TABLE Packages ADD OutOfDateTS BIGINT UNSIGNED NOT NULL; + From 1.6.0 to 1.7.0 ------------------- ALTER TABLE Users ADD Salt CHAR(32) NOT NULL DEFAULT ''; diff --git a/support/schema/aur-schema.sql b/support/schema/aur-schema.sql index 250d405..15705a3 100644 --- a/support/schema/aur-schema.sql +++ b/support/schema/aur-schema.sql @@ -120,6 +120,7 @@ CREATE TABLE Packages ( LocationID TINYINT UNSIGNED NOT NULL DEFAULT 1, NumVotes INTEGER UNSIGNED NOT NULL DEFAULT 0, OutOfDate TINYINT UNSIGNED DEFAULT 0, + OutOfDateTS BIGINT UNSIGNED NOT NULL, SubmittedTS BIGINT UNSIGNED NOT NULL, ModifiedTS BIGINT UNSIGNED NOT NULL, SubmitterUID INTEGER UNSIGNED NOT NULL DEFAULT 0, -- who submitted it? diff --git a/web/lang/cs.po b/web/lang/cs.po index e430d05..214df00 100644 --- a/web/lang/cs.po +++ b/web/lang/cs.po @@ -15,7 +15,7 @@ global $_t; $_t["Search by"] = "Vyhledat dle"; -$_t["This package has been flagged out of date."] = "BalÃÄek byl oznaÄen jako zastaralÃ½."; +$_t["This package has been flagged out of date"] = "BalÃÄek byl oznaÄen jako zastaralÃ½"; $_t["Voted"] = "HlasovÃ¡no"; diff --git a/web/lang/de.po b/web/lang/de.po index 929e6f8..bbaa16b 100644 --- a/web/lang/de.po +++ b/web/lang/de.po @@ -390,7 +390,7 @@ $_t["You are not allowed to access this area."] = "Es ist Dir nicht erlaubt, auf $_t["Unsafe"] = "Unsicher"; -$_t["This package has been flagged out of date."] = "Dieses Paket wurde als veraltet markiert."; +$_t["This package has been flagged out of date"] = "Dieses Paket wurde als veraltet markiert"; $_t["The above files have been verified (by %h%s%h) and are safe to use."] = "Die obigen Dateien wurden (von %h%s%h) als sicher markiert."; diff --git a/web/lang/el_GR.po b/web/lang/el_GR.po index 5f5c96c..4118c18 100644 --- a/web/lang/el_GR.po +++ b/web/lang/el_GR.po @@ -86,7 +86,7 @@ $_t["Unsupported packages are user produced content. Any use of the provided fil $_t["Search by"] = "ÎÎ½Î±Î¶Î®ÏÎ·ÏÎ· ÎºÎ±ÏÎ¬"; -$_t["This package has been flagged out of date."] = "ÎÏÏÏ ÏÎ¿ ÏÎ±ÎºÎÏÎ¿ ÎÏÎµÎ¹ ÏÎ±ÏÎ±ÎºÏÎ·ÏÎ¹ÏÏÎµÎ¯ ÏÎ±ÏÏÏÎ·Î¼ÎÎ½Î¿."; +$_t["This package has been flagged out of date"] = "ÎÏÏÏ ÏÎ¿ ÏÎ±ÎºÎÏÎ¿ ÎÏÎµÎ¹ ÏÎ±ÏÎ±ÎºÏÎ·ÏÎ¹ÏÏÎµÎ¯ ÏÎ±ÏÏÏÎ·Î¼ÎÎ½Î¿"; $_t["Voted"] = "Î¨Î·ÏÎ¹ÏÎ¼ÎÎ½Î¿"; diff --git a/web/lang/fr.po b/web/lang/fr.po index 596f4af..1ce1896 100644 --- a/web/lang/fr.po +++ b/web/lang/fr.po @@ -405,7 +405,7 @@ $_t["Out of Date"] = "PÃ©rimÃ©"; $_t["Required by"] = "Requis par"; -$_t["This package has been flagged out of date."] = "Ce paquet a Ã©tÃ© marquÃ© comme pÃ©rimÃ©."; +$_t["This package has been flagged out of date"] = "Ce paquet a Ã©tÃ© marquÃ© comme pÃ©rimÃ©"; $_t["Toggle Notify"] = "Suivre/Ne plus suivre"; diff --git a/web/lang/he.po b/web/lang/he.po index d5c19b7..ad0c558 100644 --- a/web/lang/he.po +++ b/web/lang/he.po @@ -14,7 +14,7 @@ global $_t; $_t["Confirm your e-mail address:"] = "×××©××¨ ××ª×××ª ×××××´× ×©××"; -$_t["This package has been flagged out of date."] = "×××××× ××¡××× ×ª ××× ×¢××× ××ª."; +$_t["This package has been flagged out of date"] = "×××××× ××¡××× ×ª ××× ×¢××× ××ª"; $_t["Missing a required field."] = "×©×× ×××¨×× ××¡×¨."; diff --git a/web/lang/hr.po b/web/lang/hr.po index 93028b7..4d46fec 100644 --- a/web/lang/hr.po +++ b/web/lang/hr.po @@ -162,7 +162,7 @@ $_t["Description"] = "Opis"; $_t["unknown"] = "nepoznato"; -$_t["This package has been flagged out of date."] = "Paket je obiljeÅ¾en kao zastarijeli."; +$_t["This package has been flagged out of date"] = "Paket je obiljeÅ¾en kao zastarijeli"; $_t["No New Comment Notification"] = "Nemoj me viÅ¡e obavjeÅ¡tavati o novim komentarima"; diff --git a/web/lang/hu.po b/web/lang/hu.po index e198ac3..54f3a12 100644 --- a/web/lang/hu.po +++ b/web/lang/hu.po @@ -6,7 +6,7 @@ global $_t; $_t["Search by"] = "KeresÃ©s eszerint"; -$_t["This package has been flagged out of date."] = "Ez a csomag elavultnak van jelÃ¶lve."; +$_t["This package has been flagged out of date"] = "Ez a csomag elavultnak van jelÃ¶lve"; $_t["Missing a required field."] = "Egy kÃ¶telezÅ mezÅ megadÃ¡sa hiÃ¡nyzik."; diff --git a/web/lang/it.po b/web/lang/it.po index 4bd0727..5876c45 100644 --- a/web/lang/it.po +++ b/web/lang/it.po @@ -411,7 +411,7 @@ $_t["Required by"] = "Richiesto da"; $_t["The above files have been verified (by %h%s%h) and are safe to use."] = "I file sono stati verificati (da %h%s%h) ed il loro utilizzo Ã¨ da considerarsi sicuro."; -$_t["This package has been flagged out of date."] = "Questo pacchetto Ã¨ stato contrassegnato come non aggiornato."; +$_t["This package has been flagged out of date"] = "Questo pacchetto Ã¨ stato contrassegnato come non aggiornato"; $_t["Toggle Notify"] = "Rimuovi la notifica"; diff --git a/web/lang/nb_NO.po b/web/lang/nb_NO.po index 687e639..1b8b20e 100644 --- a/web/lang/nb_NO.po +++ b/web/lang/nb_NO.po @@ -14,7 +14,7 @@ global $_t; $_t["Search by"] = "SÃ¸k etter"; -$_t["This package has been flagged out of date."] = "Denne pakken har blitt merket som utdatert."; +$_t["This package has been flagged out of date"] = "Denne pakken har blitt merket som utdatert"; $_t["Voted"] = "Stemmet"; diff --git a/web/lang/pl.po b/web/lang/pl.po index 967ab36..e337bb1 100644 --- a/web/lang/pl.po +++ b/web/lang/pl.po @@ -367,7 +367,7 @@ $_t["unknown"] = "nieznana"; $_t["Out of Date"] = "Nieaktualny"; -$_t["This package has been flagged out of date."] = "Ten pakiet zostaÅ oznaczony jako nieaktualny."; +$_t["This package has been flagged out of date"] = "Ten pakiet zostaÅ oznaczony jako nieaktualny"; $_t["Required by"] = "Wymagane przez"; diff --git a/web/lang/ro.po b/web/lang/ro.po index 0118f24..3a41477 100644 --- a/web/lang/ro.po +++ b/web/lang/ro.po @@ -14,7 +14,7 @@ global $_t; $_t["Search by"] = "CautÄ dupÄ"; -$_t["This package has been flagged out of date."] = "Acest pachet a fost marcat ca Neactualizat."; +$_t["This package has been flagged out of date"] = "Acest pachet a fost marcat ca Neactualizat"; $_t["Voted"] = "Votat"; diff --git a/web/lang/ru.po b/web/lang/ru.po index 2382b35..020f230 100644 --- a/web/lang/ru.po +++ b/web/lang/ru.po @@ -389,7 +389,7 @@ $_t["You are not allowed to access this area."] = "ÐÐ¾ÑÑÑÐ¿ ÑÑÐ´Ð° Ð²Ð°Ð¼ $_t["Unsafe"] = "ÐÐµÐ±ÐµÐ·Ð¾Ð¿Ð°Ð½ÑÐ¹"; -$_t["This package has been flagged out of date."] = "ÐÐ°ÐºÐµÑ Ð¾ÑÐ¼ÐµÑÐµÐ½ ÐºÐ°Ðº ÑÑÑÐ°ÑÐµÐ²ÑÐ¸Ð¹."; +$_t["This package has been flagged out of date"] = "ÐÐ°ÐºÐµÑ Ð¾ÑÐ¼ÐµÑÐµÐ½ ÐºÐ°Ðº ÑÑÑÐ°ÑÐµÐ²ÑÐ¸Ð¹"; $_t["The above files have been verified (by %h%s%h) and are safe to use."] = "Ð¤Ð°Ð¹Ð»Ñ Ð¿ÑÐ¾Ð²ÐµÑÐµÐ½Ñ %h%s%h Ð¸ Ð¼Ð¾Ð³ÑÑ Ð±ÑÑÑ Ð±ÐµÐ·Ð¾Ð¿Ð°ÑÐ½Ð¾ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ñ."; diff --git a/web/lang/sr.po b/web/lang/sr.po index ddd54da..c743728 100644 --- a/web/lang/sr.po +++ b/web/lang/sr.po @@ -14,7 +14,7 @@ global $_t; $_t["Search by"] = "PretraÅ¾uje se"; -$_t["This package has been flagged out of date."] = "Paket je oznaÄen kao zastareo"; +$_t["This package has been flagged out of date"] = "Paket je oznaÄen kao zastareo"; $_t["Missing a required field."] = "Nedostaje neophodno polje."; diff --git a/web/lang/tr.po b/web/lang/tr.po index 5d41840..df608ac 100644 --- a/web/lang/tr.po +++ b/web/lang/tr.po @@ -400,7 +400,7 @@ $_t["Required by"] = "Ä°htiyaÃ§ duyan"; $_t["The above files have been verified (by %h%s%h) and are safe to use."] = "YukarÄ±daki dosyalar doÄrulandÄ± (%h%s%h tarafÄ±ndan) ve kullanÄ±m iÃ§in gÃ¼venli olarak iÅaretlendi."; -$_t["This package has been flagged out of date."] = "Bu paket gÃ¼ncel deÄil olarak iÅaretlendi."; +$_t["This package has been flagged out of date"] = "Bu paket gÃ¼ncel deÄil olarak iÅaretlendi"; $_t["Toggle Notify"] = "Toggle Notify"; diff --git a/web/lang/uk.po b/web/lang/uk.po index 007c30e..3023f78 100644 --- a/web/lang/uk.po +++ b/web/lang/uk.po @@ -170,7 +170,7 @@ $_t["Description"] = "ÐÐ¿Ð¸Ñ"; $_t["unknown"] = "Ð½ÐµÐ²ÑÐ´Ð¾Ð¼Ð¾"; -$_t["This package has been flagged out of date."] = "Ð¦ÑÐ¾Ð¼Ñ Ð¿Ð°ÐºÑÐ½ÐºÑ Ð¿ÑÐ¸Ð·Ð½Ð°ÑÐµÐ½Ð¾ Ð¼ÑÑÐºÑ ÐÐ°ÑÑÐ°ÑÑÐ»Ð¸Ð¹"; +$_t["This package has been flagged out of date"] = "Ð¦ÑÐ¾Ð¼Ñ Ð¿Ð°ÐºÑÐ½ÐºÑ Ð¿ÑÐ¸Ð·Ð½Ð°ÑÐµÐ½Ð¾ Ð¼ÑÑÐºÑ ÐÐ°ÑÑÐ°ÑÑÐ»Ð¸Ð¹"; $_t["No New Comment Notification"] = "ÐÐµÐ¼Ð°Ñ Ð½Ð¾Ð²Ð¸Ñ ÑÐ¿Ð¾Ð²ÑÑÐµÐ½Ñ Ð¿ÑÐ¾ ÐºÐ¾Ð¼ÐµÐ½ÑÐ°ÑÑ"; diff --git a/web/lang/zh_CN.po b/web/lang/zh_CN.po index 19cc4f6..42d0f09 100644 --- a/web/lang/zh_CN.po +++ b/web/lang/zh_CN.po @@ -17,7 +17,7 @@ global $_t; $_t["Search by"] = "æç´¢"; -$_t["This package has been flagged out of date."] = "æ¤åå·²è¢«æ è®°ä¸ºè¿æã"; +$_t["This package has been flagged out of date"] = "æ¤åå·²è¢«æ è®°ä¸ºè¿æã"; $_t["Missing a required field."] = "ç¼ºå°å¿å¡«é¡¹ã"; diff --git a/web/lib/pkgfuncs.inc b/web/lib/pkgfuncs.inc index 5605daa..02c9c1c 100644 --- a/web/lib/pkgfuncs.inc +++ b/web/lib/pkgfuncs.inc @@ -643,7 +643,8 @@ function pkg_flag ($atype, $ids, $action = True) { } $ood = $action ? 1 : 0; - $q = "UPDATE Packages SET OutOfDate = " . $ood; + $q = "UPDATE Packages SET OutOfDate = " . $ood . ","; + $q.= " OutOfDateTS = UNIX_TIMESTAMP()"; $q.= " WHERE ID IN (" . $flag . ")"; db_query($q, $dbh); diff --git a/web/template/pkg_details.php b/web/template/pkg_details.php index 9c76ab3..a0996b9 100644 --- a/web/template/pkg_details.php +++ b/web/template/pkg_details.php @@ -35,6 +35,7 @@ $license = empty($row['License']) ? $msg : $row['License']; # Print the timestamps for last updates $updated_time = ($row["ModifiedTS"] == 0) ? "(unknown)" : gmdate("r", intval($row["ModifiedTS"])); $submitted_time = ($row["SubmittedTS"] == 0) ? "(unknown)" : gmdate("r", intval($row["SubmittedTS"])); +$out_of_date_time = ($row["OutOfDateTS"] == 0) ? "(unknown)" : gmdate("r", intval($row["OutOfDateTS"])); ?> <div class="pgbox"> @@ -70,7 +71,7 @@ $submitted_time = ($row["SubmittedTS"] == 0) ? "(unknown)" : gmdate("r", intval( } if ($row["OutOfDate"] == 1) { - echo "<br /><span class='f6'>".__("This package has been flagged out of date.")."</span>"; + echo "<br /><span class='f6'>".__("This package has been flagged out of date")." (".$out_of_date_time.")</span>"; } ?> </p> -- 1.7.3

4 17

[aur-dev] [PATCH] Bold links in the archnavbar header.
by Lukas Fleischer 21 Nov '10

21 Nov '10

--- web/html/css/archnavbar/archnavbar.css | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/web/html/css/archnavbar/archnavbar.css b/web/html/css/archnavbar/archnavbar.css index 8d1d785..e8ade28 100644 --- a/web/html/css/archnavbar/archnavbar.css +++ b/web/html/css/archnavbar/archnavbar.css @@ -39,3 +39,7 @@ div#archdev-navbar li a { padding: 0 0.5em; color: #07b; } /* highlight current website */ #archnavbar.anb-aur ul li#anb-aur a { color: white !important; } + +/* style the links */ +#archnavbar ul#archnavbarlist li a { color: #999; font-weight: bold !important; text-decoration: none !important; } +#archnavbar ul li a:hover { color: white !important; text-decoration: underline !important; } -- 1.7.3

2 1

[aur-dev] [PATCH] FS#3542 - auto redirect from confirmation screens
by Dan Vratil 21 Nov '10

21 Nov '10

Hi, this patch is adding meta refresh tag and a link back to the package page from the screens that confirm comment deletion and change of package category. The link is displayed always, but the autoredirection is done only when the action was sucessfull. This allows user to read or note down a possible error output in case of failure. The delay for refresh is set to 5 seconds, but that can be discussed. Dan -- --------------------------------- Dan Vrátil vratil(a)progdansoft.com ICQ 249163429 Jabber progdan(a)jabber.cz Tel. +420 732 326 870 Tento email neobsahuje žádné viry, protože odesílatel nepoužívá Windows. / This email does not contain any viruses because the sender does not use Windows.

3 9

[aur-dev] RFC: create link for account registration and account information next to the login.
by Justin Davis 17 Nov '10

17 Nov '10

Hello aur-dev! I have checked out the AUR sources from the code.toofishes.net git repository and started playing with it. While I was messing around I remembered a slight annoyance I had with the design of the website. The accounts "toolbar" link is a tad confusing. I see now that TU are able to view and edit accounts through that link but for the average user it is a misnomer. I did not expect that the "Accounts" link was what I had to click in order to register an account on the AUR. After I registered successfully, let's say I am looking for my own account information. "Accounts" is not a word I associate with my account. This is because I do not have more than one account. My suggestion, which I am willing to write a patch for, is to create a registration link near the login/password input boxes. When logged in this registration link is instead a link for viewing/editing account information. These links would be next to where the "[Forgot Password]" link is now. Or where the "[Logout]" link is when logged in. When an unprivileged user is logged in there is no "Accounts" link in AUR's little toolbar on the left. Only TUs and Devs have that link in order to edit accounts. This change of location creates a greater contrast between the normal AUR toolbar links and user account links. Often links that manipulate a users account are grouped closer together and away from links that basically get work done and are used more commonly. This also removes the generally confusing "Accounts" link from people who do not realize that it serves a dual purpose for account administration as well as personal account editing... oh and account registration. The only downside is that new translations would be needed for the registration link and for the account information viewing/editing link. As I side-note I would also like to move the account form printing and processing code out of acctfuncs.inc and into a template/controller. I would also make a new template/ file for the account info/edit form which would then be used from the account info and registration, and the TU's account admin. This would leave the low-level account login, password, etc code inside lib/acctfuncs.inc, move the html printing code into a template/ file, and the form checking code... somewhere else. Anyways, what do people think about those simple changes in design? -- -Justin

3 4

[aur-dev] bold title bar
by Martti Kühne 30 Oct '10

30 Oct '10

btw... when is the title bar update to be made? this is still irritating, and also users who have non-white background colors will be confused by the current layout. just to bring in my own shards of critics, aur is pretty cool so far... keep up the greatest repo ever! mar77i

3 2

[aur-dev] vim-vimoutliner
by karl 20 Oct '10

20 Oct '10

Dear all, I just wanted to update and takeover vim-vimoutliner. But instead I found out, the project is dead and the software can't be downloaded anymore from http://vimdownload.org. The AUR package for it's installation should be deleted. http://aur.archlinux.org/packages.php?ID=30302 Kind regards, Karl

2 1

[aur-dev] TRANSLATION: zh_CN updated
by Mod Gao 09 Oct '10

09 Oct '10

Hi, this is updated zh_CN translation, many strings changed and some string leave un-translated since last time, so today i think it's time to update it:) I tested with localhost:80 LAMP and everything seems perfect. and there is a problem: the "Bad username or password." string in web/lib/acctfuncs.inc don't got translated. and i changed my e-mail address to usrgdd (b) gmail, so i changed it in translation file also, just as proof:) attachment is git patch.

4 4

[aur-dev] [PATCH] Move deletion proposal code from pkgfuncs.inc to pkgedit.php and add mechanism for dealing with reasons for deletion.
by Peter Lewis 08 Oct '10

08 Oct '10

--- web/html/pkgedit.php | 210 ++++++++++++++++++++++++++++++++++++++++++++++++++ web/lib/pkgfuncs.inc | 42 ++-------- 2 files changed, 218 insertions(+), 34 deletions(-) diff --git a/web/html/pkgedit.php b/web/html/pkgedit.php index 0339d00..f04e816 100644 --- a/web/html/pkgedit.php +++ b/web/html/pkgedit.php @@ -103,6 +103,216 @@ if ($_REQUEST["change_Category"]) { exit(); } +# Propose deletion of package +# +# valid reasons are: +# - sources no longer available [nosource], +# - no longer builds on current systems (and cannot reasonably be patched) [wontbuild], +# - duplicated elsewhere in the repos [dupe], +# - name or source control system changed (e.g. from svn to git) [namechange] +# +if ($_REQUEST["propose_Deletion"]) { + + if ($_REQUEST["CONFIRM"] && ($_REQUEST["NOSOURCE"] || $_REQUEST["WONTBUILD"] || $_REQUEST["DUPE"] || $_REQUEST["NAMECHANGE"]) ) { + # The user confirmed and we have at least one reason - go ahead and do it + + $dbh = db_connect(); + + # Get details of the user who proposed the deletion + $f_name = username_from_sid($_COOKIE['AURSID']); + $f_email = email_from_sid($_COOKIE['AURSID']); + $f_uid = uid_from_sid($_COOKIE['AURSID']); + + # Get package name + $q = "SELECT Packages.Name "; + $q.= "FROM Packages "; + $q.= "WHERE Packages.ID = " . $_REQUEST['ID']; + + $result = db_query($q, $dbh); + + # If this is false, then something has gone wrong (i.e. the package got deleted while you were doing this) + if (!mysql_num_rows($result)) { + print __("Oops, something went wrong and the package no longer seems to exist!"); + exit(); + } + + $row = mysql_fetch_assoc($result); + + # Send a message to aur-general + $body = "The AUR package " . $row['Name'] . " has been proposed for deletion by " . $f_name . " [1].\n\n"; + $body.= "You may view the package at:\nhttp://aur.archlinux.org/packages.php?ID=" . $_REQUEST['ID'] . "\n\n"; + + $body.= "The reason(s) given were:\n"; + if ($_REQUEST['NOSOURCE']) { + $body.= " - The sources are no longer available.\n"; + } + if ($_REQUEST['WONTBUILD']) { + $body.= " - The package no longer builds on current systems.\n"; + } + if ($_REQUEST['DUPE']) { + $body.= " - The package is duplicated elsewhere.\n"; + } + if ($_REQUEST['NAMECHANGE']) { + $body.= " - The package's name has changed, and a new package replaces it.\n"; + } + + $body.= "\nThe proposer added the following details:\n"; + $body.= $_REQUEST['REASONTEXT']."\n\n"; + + + $body.= "[1] - http://aur.archlinux.org/account.php?Action=AccountInfo&ID=" . $f_uid; + + + $body = wordwrap($body, 70); + $headers = "Reply-to: nobody@archlinux.org\nFrom:aur-notify@archlinux.org\nX-Mailer: PHP\nX-MimeOLE: Produced By AUR\n"; + + # TODO: add the real aur-general(a)archlinux.org address here when done with testing + @mail('aur-general(a)__REMOVE_ME__archlinux.org', "AUR Package Deletion Proposal for ".$row['Name'], $body, $headers); + + + + # Notify maintainer of package by email + $q = "SELECT Packages.Name, Users.Email "; + $q.= "FROM Packages, Users "; + $q.= "WHERE Packages.ID = " . $_REQUEST['ID'] ." "; + $q.= "AND Users.ID = Packages.MaintainerUID"; + + $result = db_query($q, $dbh); + + # If this is false, then the package has no maintainer, so there's no email to send + if (mysql_num_rows($result)) { + $row = mysql_fetch_assoc($result); + + # construct email - maintainer + $body = "Your AUR package " . $row['Name'] . " has been proposed for deletion by " . $f_name . " [1].\n\n"; + $body.= "You may view your package at:\nhttp://aur.archlinux.org/packages.php?ID=" . $_REQUEST['ID'] . "\n\n"; + + $body.= "The reason(s) given were:\n"; + if ($_REQUEST['NOSOURCE']) { + $body.= " - The sources are no longer available.\n"; + } + if ($_REQUEST['WONTBUILD']) { + $body.= " - The package no longer builds on current systems.\n"; + } + if ($_REQUEST['DUPE']) { + $body.= " - The package is duplicated elsewhere.\n"; + } + if ($_REQUEST['NAMECHANGE']) { + $body.= " - The package's name has changed, and a new package replaces it.\n"; + } + + $body.= "\nThe proposer added the following details:\n"; + $body.= $_REQUEST['REASONTEXT']."\n\n"; + + $body.= "[1] - http://aur.archlinux.org/account.php?Action=AccountInfo&ID=" . $f_uid; + + $body = wordwrap($body, 70); + $headers = "Reply-to: nobody@archlinux.org\nFrom:aur-notify@archlinux.org\nX-Mailer: PHP\nX-MimeOLE: Produced By AUR\n"; + + @mail($row['Email'], "AUR Package Deletion Proposal for ".$row['Name'], $body, $headers); + } + + + # Send messages to those on the notify list as well (but not the maintainer again) + + $q = "SELECT Packages.Name, Users.Email "; + $q.= "FROM Packages, Users "; + $q.= "WHERE Packages.ID = " . $_REQUEST['ID'] . " "; + $q.= "AND Packages.MaintainerUID != Users.ID"; + $result = db_query($q, $dbh); + + # If this is false, then the package has no-one to notify, so there's no email to send + if (mysql_num_rows($result)) { + while($row = mysql_fetch_assoc($result)) { + + # construct email - maintainer + $body = "The AUR package " . $row['Name'] . " has been proposed for deletion by " . $f_name . " [1].\n\n"; + $body.= "You may view the package at:\nhttp://aur.archlinux.org/packages.php?ID=" . $_REQUEST['ID'] . "\n\n"; + + $body.= "The reason(s) given were:\n"; + if ($_REQUEST['NOSOURCE']) { + $body.= " - The sources are no longer available.\n"; + } + if ($_REQUEST['WONTBUILD']) { + $body.= " - The package no longer builds on current systems.\n"; + } + if ($_REQUEST['DUPE']) { + $body.= " - The package is duplicated elsewhere.\n"; + } + if ($_REQUEST['NAMECHANGE']) { + $body.= " - The package's name has changed, and a new package replaces it.\n"; + } + + $body.= "\nThe proposer added the following details:\n"; + $body.= $_REQUEST['REASONTEXT']."\n\n"; + + + $body.= "[1] - http://aur.archlinux.org/account.php?Action=AccountInfo&ID=" . $f_uid; + + + $body = wordwrap($body, 70); + $headers = "Reply-to: nobody@archlinux.org\nFrom:aur-notify@archlinux.org\nX-Mailer: PHP\nX-MimeOLE: Produced By AUR\n"; + + @mail($row['Email'], "AUR Package Deletion Proposal for ".$row['Name'], $body, $headers); + } + } + + + + # Update the database to know that deletion has been proposed + $q = "UPDATE Packages SET DeletionProposed = 1"; + $q.= " WHERE ID = " . $_REQUEST['ID']; + db_query($q, $dbh); + + + print __("Package successfully proposed for deletion. Check the aur-general list for this proposal's progress.")."<br />\n"; + print "<a href='packages.php?ID=" . $_REQUEST["ID"] . ">" . __("Back to the package page") . "</a>"; + + } else { + + # We can be here because both of these aren't true: + + if (!$_REQUEST["CONFIRM"]) { + # The user gave a reason, but didn't hit confirm + print __("You must check the last box to confirm that you wish to propose the package for deletion.") . "<br /><br />"; + } + + if ($_REQUEST["CONFIRM"]) { + print __("You must give at least one valid reason when proposing a package deletion.") . "<br /><br />"; + } + + + + # Prompt visitor for reasons for the deletion + + print "<form action='pkgedit.php' method='post'>\n"; + print "<input type='hidden' name='propose_Deletion' value='1'>\n"; + print "<input type='hidden' name='ID' value=\"".$_REQUEST["ID"]."\">\n"; + print __("Please select the reason(s) why you think this package should be deleted.")."<br />\n"; + + print " <input type='checkbox' name='NOSOURCE' value='1' /> " .__("The sources are no longer available")."<br />\n"; + print " <input type='checkbox' name='WONTBUILD' value='1' /> " .__("The package no longer builds on a current system")."<br />\n"; + print " <input type='checkbox' name='DUPE' value='1' /> " .__("The package is duplicated in the AUR or another repository")."<br />\n"; + print " <input type='checkbox' name='NAMECHANGE' value='1' /> " .__("The package's name has changed (including a -vcs suffix)")."<br />\n"; + print "<br />\n"; + print " ".__("Please give further details here. For example, if the package is duplicated, please post a link to where. If the name has changed, please say where the new package is.")."\n"; + print " <textarea rows='10' cols='90' name='REASONTEXT'></textarea>"; + + print "<br /> <br />\n"; + + print " <input type='checkbox' name='CONFIRM' value='1' /> " .__("Check this box to confirm that you want to propose the deletion.")."<br />\n"; + + print "<br /> <br />\n"; + print "<input type='submit' value=\"".__("Submit")."\">\n"; + print "<input type='reset' value=\"".__("Reset")."\">\n"; + print "</form>\n"; + + } + html_footer(AUR_VERSION); + exit(); +} + + print __("You've found a bug if you see this....")."<br />\n"; html_footer(AUR_VERSION); diff --git a/web/lib/pkgfuncs.inc b/web/lib/pkgfuncs.inc index 386662c..36fd13c 100644 --- a/web/lib/pkgfuncs.inc +++ b/web/lib/pkgfuncs.inc @@ -714,6 +714,11 @@ function pkg_propose_deletion ($atype, $ids, $action = True) { } } + # For now, we don't allow deletion proposals through this mechanism, since we require a reason + if ($action) { + return __("Deletion proposals are not currently allowed without giving a reason."); + } + $dbh = db_connect(); $first = 1; @@ -730,45 +735,14 @@ function pkg_propose_deletion ($atype, $ids, $action = True) { $q = "UPDATE Packages SET DeletionProposed = " . $ood; $q.= " WHERE ID IN (" . $propose . ")"; - if (!$action) { - echo "Undeleting!!!!"; - } - db_query($q, $dbh); if ($action) { - # Notify maintainer and aur-general of proposal 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 (" . $propose .") "; - $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 - maintainer - $body = "Your package " . $row['Name'] . " has been proposed for deletion by " . $f_name . " [1]. You may view your package at:\nhttp://aur.archlinux.org/packages.php?ID=" . $row['ID'] . "\n\n[1] - http://aur.archlinux.org/account.php?Action=AccountInfo&ID=" . $f_uid; - $body = wordwrap($body, 70); - $headers = "Reply-to: nobody@archlinux.org\nFrom:aur-notify@archlinux.org\nX-Mailer: PHP\nX-MimeOLE: Produced By AUR\n"; - @mail($row['Email'], "AUR Package Deletion Proposal for ".$row['Name'], $body, $headers); - - # construct email - aur-general - $body = "The AUR package " . $row['Name'] . " has been proposed for deletion by " . $f_name . " [1]. You may view the package at:\nhttp://aur.archlinux.org/packages.php?ID=" . $row['ID'] . "\n\n[1] - http://aur.archlinux.org/account.php?Action=AccountInfo&ID=" . $f_uid; - $body = wordwrap($body, 70); - $headers = "Reply-to: nobody@archlinux.org\nFrom:aur-notify@archlinux.org\nX-Mailer: PHP\nX-MimeOLE: Produced By AUR\n"; - @mail('aur-general(a)archlinux.org', "AUR Package Deletion Proposal for ".$row['Name'], $body, $headers); - - } - } - } - - if ($action) { + # If we wanted to allow deletion propsals without reasons, we'd do it here. + # And we'd then say... return __("The selected packages have been proposed for deletion."); } else { - return __("The deletion proposals have been cancelled for the selection packages."); + return __("The deletion proposals have been cancelled for the selected packages."); } } -- 1.7.3

2 1