[geeklog-cvs] geeklog-1.3/public_html comment.php,1.76,1.77

[vinny at iowaoutdoors.org]

Update of /var/cvs/geeklog-1.3/public_html
In directory www:/tmp/cvs-serv18154

Modified Files:
	comment.php 
Log Message:
Forgot to take polls and plugins into account.  Now will use correct permissions
to determine whether the delete options should be shown.


Index: comment.php
===================================================================
RCS file: /var/cvs/geeklog-1.3/public_html/comment.php,v
retrieving revision 1.76
retrieving revision 1.77
diff -C2 -d -r1.76 -r1.77
*** comment.php	25 Sep 2004 20:08:16 -0000	1.76
--- comment.php	25 Sep 2004 20:16:14 -0000	1.77
***************
*** 742,749 ****
                  }
              }
!             $delete_option = ( SEC_hasRights( 'story.edit' ) &&
!                 SEC_hasAccess( $A['owner_id'], $A['group_id'],
!                 $A['perm_owner'], $A['perm_group'], $A['perm_members'],
!                 $A['perm_anon'] ) == 3 ? true : false );
              $display .= COM_userComments ($sid, $title, $type, 
                              COM_applyFilter ($_REQUEST['order']), $format, $cid,
--- 742,758 ----
                  }
              }
!             if ($type == 'poll' || $type == 'article') {
!                 if ( $type == 'poll' ) {
!                     $delete_option = SEC_hasRights( 'poll.edit' );
!                 } else {
!                     $delete_option = SEC_hasRights( 'story.edit' );
!                 }
!                 $delete_option = ( $delete_option &&
!                     SEC_hasAccess( $A['owner_id'], $A['group_id'],
!                     $A['perm_owner'], $A['perm_group'], $A['perm_members'],
!                     $A['perm_anon'] ) == 3 ? true : false );
!             } else {
!                 $delete_option = false;
!             }
              $display .= COM_userComments ($sid, $title, $type, 
                              COM_applyFilter ($_REQUEST['order']), $format, $cid,
***************
*** 785,792 ****
                  $format = 'threaded';
              }
!             $delete_option = ( SEC_hasRights( 'story.edit' ) &&
!                 SEC_hasAccess( $A['owner_id'], $A['group_id'],
!                 $A['perm_owner'], $A['perm_group'], $A['perm_members'],
!                 $A['perm_anon'] ) == 3 ? true : false );
              $display .= COM_userComments ($sid, $title, $type,
                      COM_applyFilter ($_REQUEST['order']), $format, $pid,
--- 794,810 ----
                  $format = 'threaded';
              }
!             if ($type == 'poll' || $type == 'article') {
!                 if ( $type == 'poll' ) {
!                     $delete_option = SEC_hasRights( 'poll.edit' );
!                 } else {
!                     $delete_option = SEC_hasRights( 'story.edit' );
!                 }
!                 $delete_option = ( $delete_option &&
!                     SEC_hasAccess( $A['owner_id'], $A['group_id'],
!                     $A['perm_owner'], $A['perm_group'], $A['perm_members'],
!                     $A['perm_anon'] ) == 3 ? true : false );
!             } else {
!                 $delete_option = false;
!             }
              $display .= COM_userComments ($sid, $title, $type,
                      COM_applyFilter ($_REQUEST['order']), $format, $pid,