[geeklog-cvs] Geeklog-1.x/public_html/admin/plugins/links index.php, 1.47, 1.48

[Oliver]

Update of /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/public_html/admin/plugins/links
In directory qs1489.pair.com:/tmp/cvs-serv7999

Modified Files:
	index.php 
Log Message:
add links to categories in links admin

Index: index.php
===================================================================
RCS file: /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/public_html/admin/plugins/links/index.php,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -d -r1.47 -r1.48
*** index.php	29 Aug 2007 04:27:22 -0000	1.47
--- index.php	29 Aug 2007 05:53:55 -0000	1.48
***************
*** 365,370 ****
  
      $menu_arr = array (
-     //                array('url' => $_CONF['site_admin_url'] . '/plugins/links/index.php',
-     //                      'text' => $LANG_LINKS_ADMIN[27]),
                      array('url' => $_CONF['site_admin_url'] . '/plugins/links/index.php?mode=edit',
                            'text' => $LANG_LINKS_ADMIN[51]),
--- 365,368 ----
***************
*** 385,391 ****
  
      $query_arr = array('table' => 'links',
!                        'sql' => "SELECT l.lid AS lid, l.title AS title, c.category AS category, l.url AS url, l.description AS description, l.owner_id, l.group_id, l.perm_owner, l.perm_group, l.perm_members, l.perm_anon FROM {$_TABLES['links']} AS l LEFT JOIN {$_TABLES['linkcategories']} AS c ON l.cid=c.cid WHERE 1=1",
!                        'query_fields' => array('title', 'category', 'url', 'description'),
!                        'default_filter' => COM_getPermSql ('AND', 0, 3, 'l'));
  
      $retval .= ADMIN_list ("links", "plugin_getListField_links", $header_arr, $text_arr,
--- 383,393 ----
  
      $query_arr = array('table' => 'links',
!         'sql' => "SELECT l.lid AS lid, l.cid as cid, l.title AS title, c.category AS category, l.url AS url, l.description AS description, l.owner_id, l.group_id, l.perm_owner, l.perm_group, l.perm_members, l.perm_anon "
!             . "FROM {$_TABLES['links']} AS l "
!             . "LEFT JOIN {$_TABLES['linkcategories']} AS c "
!             . "ON l.cid=c.cid WHERE 1=1",
!         'query_fields' => array('title', 'category', 'url', 'description'),
!         'default_filter' => COM_getPermSql ('AND', 0, 3, 'l')
!     );
  
      $retval .= ADMIN_list ("links", "plugin_getListField_links", $header_arr, $text_arr,