- Aur-dev - lists.archlinux.org

[aur-dev] [PATCH] Add PKGBUILD Syntax Highlighting
by Manuel Tortosa 30 Sep '10

30 Sep '10

This patch adds pkgbuild syntax highlighting using geshi. Requisites: GeShi, the latest version the better, works with all versions http://sourceforge.net/projects/geshi/files/geshi/GeSHi%201.0.8.9/GeSHi-1.0… You don't need the whole extension, just: geshi.php -> lib/geshi.php bash.php -> lib/geshi/bash.php Best Regard.

3 3

[aur-dev] [PATCH] Fix AUR bug FS#20514
by Manuel Tortosa 30 Sep '10

30 Sep '10

It's a little nerd change but fixes completelly this bug: https://bugs.archlinux.org/task/20514 Greez.

2 1

[aur-dev] [PATCH] Convert logout and forgot password to buttons
by Manuel Tortosa 30 Sep '10

30 Sep '10

Just for visual coherence, i added this to CCR. Best Regards.

3 2

[aur-dev] [PATCH] Make possible to post patches in comments
by Manuel Tortosa 29 Sep '10

29 Sep '10

Altrough maybe it's not the world's better implementation, this makes possibe to post patches in comments, as you can see here: http://imgur.com/kY0EF Regards.

3 4

[aur-dev] [PATCH] adding better validation of emailadress
by Psykal 29 Sep '10

29 Sep '10

This patch check the email address for more criteria.

2 1

[aur-dev] small translation problem
by Stefan Husmann 29 Sep '10

29 Sep '10

Hello, in AUR 1.7.0 there is a bad translation for the "submit" button for submitting comments. "Paket hochladen" means "Upload Package". Here is a patch. Regards Stefan diff -Naur aur-1.7.0.orig//web/lang/de.po aur-1.7.0.new/web/lang/de.po --- aur-1.7.0.orig//web/lang/de.po 2010-09-21 21:42:46.000000000 +0200 +++ aur-1.7.0.new/web/lang/de.po 2010-09-21 21:47:12.000000000 +0200 @@ -134,7 +134,7 @@ $_t["Update"] = "Aktualisieren"; -$_t["Submit"] = "Paket hochladen"; +$_t["Submit"] = "Abschicken"; $_t["Password"] = "Passwort";

4 8

[aur-dev] Fwd: AUR Package Deletion Proposal for beebem
by Peter Lewis 26 Sep '10

26 Sep '10

FYI, an example email which would be sent to aur-general and those on the notify list. (links are duff, just example) Pete. On Sunday 26 September 2010 at 20:30 aur-notify(a)archlinux.org wrote: > The AUR package beebem has been proposed for deletion by pete [1]. > > You may view the package at: > http://aur.archlinux.org/packages.php?ID=901 > > The reason(s) given were: > - The package is duplicated elsewhere. > - The package's name has changed, and a new package replaces it. > > The proposer added the following details: > it already exists with -svn suffix. cvs is old skoool! > > [1] - http://aur.archlinux.org/account.php?Action=AccountInfo&ID=305

1 0

[aur-dev] [PATCH] Modify search and package pages to provide interface to deletion functions.
by Peter Lewis 26 Sep '10

26 Sep '10

--- web/template/actions_form.php | 5 +++-- web/template/pkg_details.php | 15 +++++++++++++++ web/template/pkg_search_results.php | 4 +++- 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/web/template/actions_form.php b/web/template/actions_form.php index 006f9ef..41b7860 100644 --- a/web/template/actions_form.php +++ b/web/template/actions_form.php @@ -45,8 +45,9 @@ if ($row["MaintainerUID"] == 0) { } if ($row["DeletionProposed"] == 0) { - echo "<input type='submit' class='button' name='do_ProposeDeletion'"; - echo " value='".__("Propose for deletion")."'>\n"; + # Disabled, since we require a reason to be given + #echo "<input type='submit' class='button' name='do_ProposeDeletion'"; + #echo " value='".__("Propose for deletion")."'>\n"; } else if ($atype == "Trusted User" || $atype == "Developer") { echo "<input type='submit' class='button' name='do_UnProposeDeletion'"; echo " value='".__("Cancel deletion proposal")."'>\n"; diff --git a/web/template/pkg_details.php b/web/template/pkg_details.php index 9c76ab3..6c52990 100644 --- a/web/template/pkg_details.php +++ b/web/template/pkg_details.php @@ -28,6 +28,15 @@ if ($atype == "Developer" or $atype == "Trusted User") { $votes = "<a href=\"voters.php?ID=$pkgid\">$votes</a>"; } +# If the package has been proposed for deletion +if ($row["DeletionProposed"]) { + $deletion_status = __("This package has been proposed for deletion")."<br />"; + $deletion_status .= __("You can view and participate in the discussion on the aur-general mailing list"); +} else { + $deletion_status = "<a href='pkgedit.php?propose_Deletion=1&ID="; + $deletion_status .= $pkgid ."'>".__("Propose deletion of this package")."</a>"; +} + # In case of wanting to put a custom message $msg = __('unknown'); $license = empty($row['License']) ? $msg : $row['License']; @@ -53,6 +62,12 @@ $submitted_time = ($row["SubmittedTS"] == 0) ? "(unknown)" : gmdate("r", intval( <span class='f3'><?php echo $votes ?></span> </p> + <p> + <span class='f3'><?php echo $deletion_status ?></span><br /> + </p> + + + <p><span class='f3'><?php echo __('License') . ': ' . $license ?></span></p> <p> diff --git a/web/template/pkg_search_results.php b/web/template/pkg_search_results.php index f2ce5c0..a7810ce 100644 --- a/web/template/pkg_search_results.php +++ b/web/template/pkg_search_results.php @@ -107,7 +107,9 @@ for ($i = 0; $row = mysql_fetch_assoc($result); $i++) { <?php endif; ?> <option value='do_Notify'><?php print __("Notify") ?></option> <option value='do_UnNotify'><?php print __("UnNotify") ?></option> - <option value='do_ProposeDeletion'><?php print __("Propose Deletion") ?></option> +  <?php if ($atype == "Trusted User" || $atype == "Developer"): ?> <option value='do_UnProposeDeletion'><?php print __("Cancel Deletion Proposal") ?></option> <?php endif; ?> -- 1.7.3

1 0

[aur-dev] [PATCH] Add functionality to the web interface to enable packages to be proposed for deletion and deletion proposals to be cancelled.
by Peter Lewis 26 Sep '10

26 Sep '10

--- web/html/packages.php | 4 ++++ web/template/actions_form.php | 12 +++++++++++- web/template/pkg_search_results.php | 4 ++++ 3 files changed, 19 insertions(+), 1 deletions(-) diff --git a/web/html/packages.php b/web/html/packages.php index 472f6a2..48924b6 100644 --- a/web/html/packages.php +++ b/web/html/packages.php @@ -45,6 +45,10 @@ if ($_POST['action'] == "do_Flag" || isset($_POST['do_Flag'])) { $output = pkg_vote($atype, $ids, True); } elseif ($_POST['action'] == "do_UnVote" || isset($_POST['do_UnVote'])) { $output = pkg_vote($atype, $ids, False); +} elseif ($_POST['action'] == "do_ProposeDeletion" || isset($_POST['do_ProposeDeletion'])) { + $output = pkg_propose_deletion($atype, $ids, True); +} elseif ($_POST['action'] == "do_UnProposeDeletion" || isset($_POST['do_UnProposeDeletion'])) { + $output = pkg_propose_deletion($atype, $ids, False); } elseif ($_POST['action'] == "do_Delete" || isset($_POST['do_Delete'])) { if (isset($_POST['confirm_Delete'])) { $output = pkg_delete($atype, $ids); diff --git a/web/template/actions_form.php b/web/template/actions_form.php index d1559f5..006f9ef 100644 --- a/web/template/actions_form.php +++ b/web/template/actions_form.php @@ -43,7 +43,17 @@ if ($row["MaintainerUID"] == 0) { echo "<input type='submit' class='button' name='do_Disown'"; echo " value='".__("Disown Packages")."'>\n"; } - + +if ($row["DeletionProposed"] == 0) { + echo "<input type='submit' class='button' name='do_ProposeDeletion'"; + echo " value='".__("Propose for deletion")."'>\n"; +} else if ($atype == "Trusted User" || $atype == "Developer") { + echo "<input type='submit' class='button' name='do_UnProposeDeletion'"; + echo " value='".__("Cancel deletion proposal")."'>\n"; +} else { + echo __("Deletion proposed"); +} + if ($atype == "Trusted User" || $atype == "Developer") { echo "<input type='submit' class='button' name='do_Delete'"; echo " value='".__("Delete Packages")."'>\n"; diff --git a/web/template/pkg_search_results.php b/web/template/pkg_search_results.php index bb898df..f2ce5c0 100644 --- a/web/template/pkg_search_results.php +++ b/web/template/pkg_search_results.php @@ -107,6 +107,10 @@ for ($i = 0; $row = mysql_fetch_assoc($result); $i++) { <?php endif; ?> <option value='do_Notify'><?php print __("Notify") ?></option> <option value='do_UnNotify'><?php print __("UnNotify") ?></option> + <option value='do_ProposeDeletion'><?php print __("Propose Deletion") ?></option> + <?php if ($atype == "Trusted User" || $atype == "Developer"): ?> + <option value='do_UnProposeDeletion'><?php print __("Cancel Deletion Proposal") ?></option> + <?php endif; ?> </select> <?php if ($atype == "Trusted User" || $atype == "Developer"): ?> <input type='checkbox' name='confirm_Delete' value='1' /> <?php print __("Confirm") ?> -- 1.7.3

1 0

[aur-dev] [PATCH] Add function pkg_propose_deletion to web/lib/pkgfuncs.inc, which manages whether or not a package is currently proposed for deletion and emails the maintainer and aur-general when a deletion is proposed.
by Peter Lewis 26 Sep '10

26 Sep '10

--- web/lib/pkgfuncs.inc | 95 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 95 insertions(+), 0 deletions(-) diff --git a/web/lib/pkgfuncs.inc b/web/lib/pkgfuncs.inc index 5605daa..386662c 100644 --- a/web/lib/pkgfuncs.inc +++ b/web/lib/pkgfuncs.inc @@ -678,6 +678,101 @@ function pkg_flag ($atype, $ids, $action = True) { } /** + * Propose packages for deletion and cancel proposals + * + * @param string $atype Account type, output of account_from_sid + * @param array $ids Array of package IDs to propose / cancel proposals for + * @param boolean $action True proposes deletion, false cancels proposal. + * Proposes by default. + * + * @return string Translated success or error messages + */ +function pkg_propose_deletion ($atype, $ids, $action = True) { + if (!$atype) { + if ($action) { + return __("You must be logged in before you can propose packages for deletion."); + } else { + return __("You must be logged in before you can cancel deletion proposals."); + } + } + + if (empty($ids)) { + if ($action) { + return __("You did not select any packages to propose."); + } else { + return __("You did not select any packages to cancel proposals for."); + } + } + + foreach ($ids as $pid) { + if (!is_numeric($pid)) { + if ($action) { + return __("You did not select any packages to propose."); + } else { + return __("You did not select any packages to cancel proposals for."); + } + } + } + + $dbh = db_connect(); + + $first = 1; + foreach ($ids as $pid) { + if ($first) { + $first = 0; + $propose = $pid; + } else { + $propose .= ", " . $pid; + } + } + + $ood = $action ? 1 : 0; + $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) { + return __("The selected packages have been proposed for deletion."); + } else { + return __("The deletion proposals have been cancelled for the selection packages."); + } +} + +/** * Delete packages * * @param string $atype Account type, output of account_from_sid -- 1.7.3

1 0