cvs: pearweb /public_html/pepr pepr-proposal-show.php
| From: | Tobias Schlitt | Date: | Thu, 08 Apr 2004 15:05:00 +0000 |
| Subject: | cvs: pearweb /public_html/pepr pepr-proposal-show.php | ||
| Groups: | php.pear.cvs | ||
| Request: | Send a blank email to pear-cvs+get-18022@lists.php.net to get a copy of this message | ||
toby Thu Apr 8 11:05:00 2004 EDT
Modified files:
/pearweb/public_html/pepr pepr-proposal-show.php
Log:
* Switched to $proposal->mayEdit().
http://cvs.php.net/diff.php/pearweb/public_html/pepr/pepr-proposal-show.php?r1=1.17&r2=1.18&ty=u
Index: pearweb/public_html/pepr/pepr-proposal-show.php
diff -u pearweb/public_html/pepr/pepr-proposal-show.php:1.17
pearweb/public_html/pepr/pepr-proposal-show.php:1.18
--- pearweb/public_html/pepr/pepr-proposal-show.php:1.17 Tue Mar 16 15:23:08 2004
+++ pearweb/public_html/pepr/pepr-proposal-show.php Thu Apr 8 11:05:00 2004
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
| Authors: Tobias Schlitt <toby@php.net> |
+----------------------------------------------------------------------+
- $Id: pepr-proposal-show.php,v 1.17 2004/03/16 20:23:08 toby Exp $
+ $Id: pepr-proposal-show.php,v 1.18 2004/04/08 15:05:00 toby Exp $
*/
require_once 'pepr/pepr.php';
@@ -32,8 +32,6 @@
$proposal->getLinks($dbh);
$proposal->getVotes($dbh);
-
- $karma = new Damblan_Karma($dbh);
if (isset($_COOKIE['PEAR_USER']) && ($proposal->getStatus() ==
'vote')) {
$form = new HTML_QuickForm('vote', 'post',
'pepr-proposal-show.php?id='.$id);
@@ -105,10 +103,10 @@
$proposalVotesSum = ppVote::getSum($dbh, $proposal->id);
- if (($proposal->isEditable() &&
$proposal->isFromUser(@$_COOKIE['PEAR_USER'])) ||
($karma->has(@$_COOKIE['PEAR_USER'], "pear.pepr.admin") &&
($proposal->user_handle != $_COOKIE['PEAR_USER']))) {
- $proposalEditRow = "<div
align='right'>".make_link("pepr-proposal-edit.php?id=".$proposal->id,
make_image("edit.gif", "Edit"))."
".make_link("pepr-proposal-delete.php?id=".$proposal->id,
make_image("delete.gif", "Delete package"))."</div>";
- } else if ($proposal->isEditable() && empty($_COOKIE['PEAR_USER'])) {
+ if (empty($_COOKIE['PEAR_USER'])) {
$proposalEditRow = "<div align='right'><small>[You are the author?
Login to edit!]</small></div>";
+ } else if ($proposal->mayEdit($_COOKIE['PEAR_USER'])) {
+ $proposalEditRow = "<div
align='right'>".make_link("pepr-proposal-edit.php?id=".$proposal->id,
make_image("edit.gif", "Edit"))."
".make_link("pepr-proposal-delete.php?id=".$proposal->id,
make_image("delete.gif", "Delete package"))."</div>";
}
$proposer = user::info($proposal->user_handle);