[geeklog-cvs] Geeklog-1.x/plugins/links functions.inc,1.88,1.89

[Oliver]

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

Modified Files:
	functions.inc 
Log Message:
XHTML optional updates

Index: functions.inc
===================================================================
RCS file: /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/plugins/links/functions.inc,v
retrieving revision 1.88
retrieving revision 1.89
diff -C2 -d -r1.88 -r1.89
*** functions.inc	9 Oct 2007 05:39:36 -0000	1.88
--- functions.inc	25 Nov 2007 06:56:04 -0000	1.89
***************
*** 156,160 ****
      else
      {
!         $retval .= $LANG_LINKS[88] . '<br>' . LB;
      }
  
--- 156,160 ----
      else
      {
!         $retval .= $LANG_LINKS[88] . '<br' . XHTML . '>' . LB;
      }
  
***************
*** 182,186 ****
              $lid = COM_applyFilter ($autotag['parm1']);
              $url = COM_buildUrl ($_CONF['site_url']
!                                  . '/links/portal.php?what=link&item=' . $lid);
              if (empty ($autotag['parm2'])) {
                  $linktext = stripslashes (DB_getItem ($_TABLES['links'],
--- 182,186 ----
              $lid = COM_applyFilter ($autotag['parm1']);
              $url = COM_buildUrl ($_CONF['site_url']
!                                  . '/links/portal.php?what=link&item=' . $lid);
              if (empty ($autotag['parm2'])) {
                  $linktext = stripslashes (DB_getItem ($_TABLES['links'],
***************
*** 615,619 ****
  
          $linklink = COM_buildUrl( $_CONF['site_url']
!                   . '/links/portal.php?what=link&item=' . $row['lid'] );
  
          $content[] = array( 'title'   => $linktitle,
--- 615,619 ----
  
          $linklink = COM_buildUrl( $_CONF['site_url']
!                   . '/links/portal.php?what=link&item=' . $row['lid'] );
  
          $content[] = array( 'title'   => $linktitle,
***************
*** 1046,1049 ****
--- 1046,1050 ----
      $linkform->set_var('lang_submit', $LANG12[8]);
      $linkform->set_var('max_url_length', 255);
+     $linkform->set_var('xhtml', XHTML);
      $linkform->parse('theform', 'linkform');
      $retval .= $linkform->finish($linkform->get_var('theform'));
***************
*** 1083,1087 ****
      // pseudo-formatted link description for the spam check
      $spamcheck = '<p>'. COM_createLink($A['title'], $A['url']) .' ('
!                . $A['cid'] . ', ' . $A['categorydd'] . ')<br>'
                 . $A['description'] . '</p>';
      $result = PLG_checkforSpam ($spamcheck, $_CONF['spamx']);
--- 1084,1088 ----
      // pseudo-formatted link description for the spam check
      $spamcheck = '<p>'. COM_createLink($A['title'], $A['url']) .' ('
!                . $A['cid'] . ', ' . $A['categorydd'] . ')<br' . XHTML . '>'
                 . $A['description'] . '</p>';
      $result = PLG_checkforSpam ($spamcheck, $_CONF['spamx']);
***************
*** 1111,1115 ****
          }
  
!         $retval = COM_refresh ($_CONF['site_url'] . '/index.php?msg=1&plugin=links');
      } else { // add link directly
  
--- 1112,1116 ----
          }
  
!         $retval = COM_refresh ($_CONF['site_url'] . '/index.php?msg=1&plugin=links');
      } else { // add link directly
  
***************
*** 1120,1124 ****
          COM_rdfUpToDateCheck ();
  
!         $retval = COM_refresh ($_CONF['site_url'] . '/index.php?msg=4&plugin=links');
      }
  
--- 1121,1125 ----
          COM_rdfUpToDateCheck ();
  
!         $retval = COM_refresh ($_CONF['site_url'] . '/index.php?msg=4&plugin=links');
      }
  
***************
*** 1437,1441 ****
          if ($cid==$sel) {
              // yes, selected
!             $menu .= '<option value="'.$cid.'" SELECTED="SELECTED">'.$indent.$category.'</option>';
          } else {
              // no, not selected
--- 1438,1442 ----
          if ($cid==$sel) {
              // yes, selected
!             $menu .= '<option value="'.$cid.'" selected="selected">'.$indent.$category.'</option>';
          } else {
              // no, not selected
***************
*** 1509,1513 ****
              $content = stripslashes ($A['title']);
              $url = $_CONF['site_url'] . '/links/portal.php?what=link&item=' . $A['lid'];
!             $retval .= COM_createLink ($content, $url) . '<br>';
          }
      }
--- 1510,1514 ----
              $content = stripslashes ($A['title']);
              $url = $_CONF['site_url'] . '/links/portal.php?what=link&item=' . $A['lid'];
!             $retval .= COM_createLink ($content, $url) . '<br' . XHTML . '>';
          }
      }
***************
*** 1533,1537 ****
                  $content = stripslashes ($A['category']);
                  $url = $_CONF['site_url'] . '/links/portal.php?what=category&item=' . $A['cid'];
!                 $retval .= COM_createLink ($content, $url) . '<br>';
              }
          }
--- 1534,1538 ----
                  $content = stripslashes ($A['category']);
                  $url = $_CONF['site_url'] . '/links/portal.php?what=category&item=' . $A['cid'];
!                 $retval .= COM_createLink ($content, $url) . '<br' . XHTML . '>';
              }
          }