On Thu, Sep 05, 2013 at 08:13:42PM -0400, canyonknight wrote:

* Changes adopting/disowning packages to use GET instead of POST * Uses CSS to make form submit button look like a link * Complements commit 3bc951e3d87eaf692a7e47cf16a28d838c7cb2bd

Signed-off-by: canyonknight <canyonknight@gmail.com> --- web/html/index.php | 6 ++++++ web/template/pkg_details.php | 34 +++++++++++++++++----------------- 2 files changed, 23 insertions(+), 17 deletions(-)

Applied, thanks!

diff --git a/web/html/index.php b/web/html/index.php index be6c98d..ccc94d2 100644 --- a/web/html/index.php +++ b/web/html/index.php @@ -25,6 +25,12 @@ if (!empty($tokens[1]) && '/' . $tokens[1] == get_pkg_route()) { /* TODO: Remove support for legacy URIs and move these * actions to separate modules. */ switch ($tokens[3]) { + case "adopt": + $_POST['do_Adopt'] = __('Adopt'); + break; + case "disown": + $_POST['do_Disown'] = __('Disown'); + break; case "vote": $_POST['do_Vote'] = __('Vote'); break; diff --git a/web/template/pkg_details.php b/web/template/pkg_details.php index 0484924..bc20a22 100644 --- a/web/template/pkg_details.php +++ b/web/template/pkg_details.php @@ -89,24 +89,24 @@ $sources = package_sources($row["ID"]); <li><a href="<?= get_pkg_uri($row['Name']) . 'merge/'; ?>"><?= __('Merge Package'); ?></a></li> <?php endif; ?> <?php endif; ?> + + <?php if ($uid && $row["MaintainerUID"] === NULL): ?> + <li> + <form action="<?= get_pkg_uri($row['Name']) . 'adopt/'; ?>" method="post"> + <input type="hidden" name="token" value="<?= htmlspecialchars($_COOKIE['AURSID']) ?>" /> + <input type="submit" class="button text-button" name="do_Adopt" value="<?= __('Adopt Package') ?>" /> + </form> + </li> + <?php elseif ($uid && $uid == $row["MaintainerUID"] || + $atype == "Trusted User" || $atype == "Developer"): ?> + <li> + <form action="<?= get_pkg_uri($row['Name']) . 'disown/'; ?>" method="post"> + <input type="hidden" name="token" value="<?= htmlspecialchars($_COOKIE['AURSID']) ?>" /> + <input type="submit" class="button text-button" name="do_Disown" value="<?= __('Disown Package') ?>" /> + </form> + </li> + <?php endif; ?> </ul> - <?php if ($uid): ?> - <form action="<?= htmlspecialchars(get_pkg_uri($row['Name']), ENT_QUOTES); ?>" method="post"> - <div> - <input type="hidden" name="IDs[<?= $row['ID'] ?>]" value="1" /> - <input type="hidden" name="ID" value="<?= $row['ID'] ?>" /> - <input type="hidden" name="token" value="<?= htmlspecialchars($_COOKIE['AURSID']) ?>" /> - </div> - <p> - <?php if ($row["MaintainerUID"] === NULL): ?> - <input type="submit" class="button" name="do_Adopt" value="<?= __("Adopt Package") ?>" /> - <?php elseif ($uid == $row["MaintainerUID"] || - $atype == "Trusted User" || $atype == "Developer"): ?> - <input type="submit" class="button" name="do_Disown" value="<?= __("Disown Package") ?>" /> - <?php endif; ?> - </p> - </form> - <?php endif; ?> </div> </div>

-- 1.8.4