[geeklog-cvs] Geeklog-1.x/plugins/links functions.inc,1.94,1.95

[Dirk Haun]

Update of /cvsroot/geeklog/Geeklog-1.x/plugins/links
In directory qs1489.pair.com:/tmp/cvs-serv36929/plugins/links

Modified Files:
	functions.inc 
Log Message:
Added "All" topic for categories


Index: functions.inc
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/links/functions.inc,v
retrieving revision 1.94
retrieving revision 1.95
diff -C2 -d -r1.94 -r1.95
*** functions.inc	31 Dec 2007 10:41:47 -0000	1.94
--- functions.inc	31 Dec 2007 12:27:09 -0000	1.95
***************
*** 1230,1234 ****
  function plugin_getListField_categories($fieldname, $fieldvalue, $A, $icon_arr)
  {
!     global $_CONF, $LANG_ACCESS;
  
      $retval = '';
--- 1230,1234 ----
  function plugin_getListField_categories($fieldname, $fieldvalue, $A, $icon_arr)
  {
!     global $_CONF, $_TABLES, $LANG_ACCESS, $LANG_LINKS_ADMIN;
  
      $retval = '';
***************
*** 1267,1272 ****
                  }
                  break;
!             case 'topic';
!                 $retval = $A['tid'];
                  break;
              default:
--- 1267,1280 ----
                  }
                  break;
!             case 'tid';
!                 if ($A['tid'] == 'all') {
!                     $retval = $LANG_LINKS_ADMIN[35];
!                 } else {
!                     $retval = DB_getItem($_TABLES['topics'], 'topic',
!                                          "tid = '{$A['tid']}'");
!                 }
!                 if (empty($retval)) {
!                     $retval = $A['tid'];
!                 }
                  break;
              default:
***************
*** 1513,1517 ****
      if (!empty($topic)) {
          $tid = addslashes($topic);
!         $result = DB_query("SELECT l.lid, l.title, c.cid FROM {$_TABLES['links']} AS l LEFT JOIN {$_TABLES['linkcategories']} AS c ON l.cid=c.cid WHERE c.tid='{$tid}'" . COM_getPermSQL('AND', 0, 2, 'c'));
          $nrows = DB_numRows($result);
          if ($nrows > 0) {
--- 1521,1525 ----
      if (!empty($topic)) {
          $tid = addslashes($topic);
!         $result = DB_query("SELECT l.lid, l.title, c.cid FROM {$_TABLES['links']} AS l LEFT JOIN {$_TABLES['linkcategories']} AS c ON l.cid=c.cid WHERE c.tid='{$tid}' OR c.tid='all'" . COM_getPermSQL('AND', 0, 2, 'c'));
          $nrows = DB_numRows($result);
          if ($nrows > 0) {
***************
*** 1542,1546 ****
      if (!empty($topic)) {
          $tid = addslashes($topic);
!         $result = DB_query("SELECT category, cid FROM {$_TABLES['linkcategories']} WHERE tid='{$tid}'" . COM_getPermSQL ('AND'));
          $nrows = DB_numRows($result);
          if ($nrows > 0) {
--- 1550,1554 ----
      if (!empty($topic)) {
          $tid = addslashes($topic);
!         $result = DB_query("SELECT category, cid FROM {$_TABLES['linkcategories']} WHERE tid='{$tid}' OR tid='all'" . COM_getPermSQL ('AND'));
          $nrows = DB_numRows($result);
          if ($nrows > 0) {