[geeklog-cvs] geeklog-1.3/public_html links.php,1.30,1.31

[dhaun at geeklog.net]

Update of /usr/cvs/geeklog/geeklog-1.3/public_html
In directory geeklog_prod:/tmp/cvs-serv1313

Modified Files:
	links.php 
Log Message:
Proper permission check when displaying the link to edit a link entry.
Also lets you use {edit_icon} now.


Index: links.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/links.php,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** links.php	11 Oct 2003 12:56:32 -0000	1.30
--- links.php	11 Dec 2003 09:47:05 -0000	1.31
***************
*** 105,109 ****
      $linklist->set_var('lang_addalink', $LANG06[3]);
  
!     $sql = "SELECT lid,category,url,description,title,hits FROM {$_TABLES['links']}";
      if ($_CONF['linkcols'] > 0) {
          if (!empty ($category)) {
--- 105,109 ----
      $linklist->set_var('lang_addalink', $LANG06[3]);
  
!     $sql = "SELECT lid,category,url,description,title,hits,owner_id,group_id,perm_owner,perm_group,perm_members,perm_anon FROM {$_TABLES['links']}";
      if ($_CONF['linkcols'] > 0) {
          if (!empty ($category)) {
***************
*** 123,127 ****
          $end = 10;
  
!         $result = DB_query("SELECT lid,url,title,description,hits FROM {$_TABLES['links']} WHERE (hits > 0)" . COM_getPermSQL ('AND') . " ORDER BY hits DESC LIMIT 10");
          $nrows  = DB_numRows($result);
          if ($nrows > 0) {
--- 123,127 ----
          $end = 10;
  
!         $result = DB_query ("SELECT lid,url,title,description,hits,owner_id,group_id,perm_owner,perm_group,perm_members,perm_anon FROM {$_TABLES['links']} WHERE (hits > 0)" . COM_getPermSQL ('AND') . " ORDER BY hits DESC LIMIT 10");
          $nrows  = DB_numRows($result);
          if ($nrows > 0) {
***************
*** 136,146 ****
                  $linklist->set_var('link_description',
                          stripslashes ($A['description']));
!                 if (SEC_hasRights ('link.edit')) {
!                     $linklist->set_var ('link_edit', '<a href="'
!                             . $_CONF['site_admin_url']
!                             . '/link.php?mode=edit&lid=' . $A['lid'] . '">'
!                             . $LANG01[4] . '</a>');
                  } else {
                      $linklist->set_var ('link_edit', '');
                  }
                  $linklist->parse('link_details', 'link', true);
--- 136,153 ----
                  $linklist->set_var('link_description',
                          stripslashes ($A['description']));
!                 if ((SEC_hasAccess ($A['owner_id'], $A['group_id'],
!                         $A['perm_owner'], $A['perm_group'], $A['perm_members'],
!                         $A['perm_anon']) == 3) && SEC_hasRights ('link.edit')) {
!                     $editurl = $_CONF['site_admin_url']
!                              . '/link.php?mode=edit&lid=' . $A['lid'];
!                     $linklist->set_var ('link_edit', '<a href="' . $editurl
!                             . '">' . $LANG01[4] . '</a>');
!                     $linklist->set_var ('edit_icon', '<a href="' . $editurl
!                             . '"><img src="' . $_CONF['layout_url']
!                             . '/images/edit.gif" alt="' . $LANG01[4]
!                             . '" title="' . $LANG01[4] . '" border="0"></a>');
                  } else {
                      $linklist->set_var ('link_edit', '');
+                     $linklist->set_var ('edit_icon', '');
                  }
                  $linklist->parse('link_details', 'link', true);
***************
*** 185,195 ****
                  $linklist->set_var('link_description',
                          stripslashes ($A['description']));
!                 if (SEC_hasRights ('link.edit')) {
!                     $linklist->set_var ('link_edit', '<a href="'
!                             . $_CONF['site_admin_url']
!                             . '/link.php?mode=edit&lid=' . $A['lid'] . '">'
!                             . $LANG01[4] . '</a>');
                  } else {
                      $linklist->set_var ('link_edit', '');
                  }
                  $linklist->parse('link_details', 'link', true);
--- 192,209 ----
                  $linklist->set_var('link_description',
                          stripslashes ($A['description']));
!                 if ((SEC_hasAccess ($A['owner_id'], $A['group_id'],
!                         $A['perm_owner'], $A['perm_group'], $A['perm_members'],
!                         $A['perm_anon']) == 3) && SEC_hasRights ('link.edit')) {
!                     $editurl = $_CONF['site_admin_url']
!                              . '/link.php?mode=edit&lid=' . $A['lid'];
!                     $linklist->set_var ('link_edit', '<a href="' . $editurl
!                             . '">' . $LANG01[4] . '</a>');
!                     $linklist->set_var ('edit_icon', '<a href="' . $editurl
!                             . '"><img src="' . $_CONF['layout_url']
!                             . '/images/edit.gif" alt="' . $LANG01[4]
!                             . '" title="' . $LANG01[4] . '" border="0"></a>');
                  } else {
                      $linklist->set_var ('link_edit', '');
+                     $linklist->set_var ('edit_icon', '');
                  }
                  $linklist->parse('link_details', 'link', true);