[geeklog-cvs] geeklog-1.3/system lib-trackback.php,1.1,1.2

[dhaun at iowaoutdoors.org]

Update of /var/cvs/geeklog-1.3/system
In directory www:/tmp/cvs-serv7569/system

Modified Files:
	lib-trackback.php 
Log Message:
Send a character set with the trackback comment; moved some error messages to the language files.


Index: lib-trackback.php
===================================================================
RCS file: /var/cvs/geeklog-1.3/system/lib-trackback.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** lib-trackback.php	16 Jan 2005 19:14:29 -0000	1.1
--- lib-trackback.php	17 Jan 2005 16:20:26 -0000	1.2
***************
*** 458,462 ****
  function TRB_sendTrackbackPing ($targeturl, $url, $title, $excerpt, $blog = '')
  {
!     global $_CONF;
  
      if (empty ($blog)) {
--- 458,462 ----
  function TRB_sendTrackbackPing ($targeturl, $url, $title, $excerpt, $blog = '')
  {
!     global $_CONF, $LANG_TRB, $LANG_CHARSET;
  
      if (empty ($blog)) {
***************
*** 476,480 ****
          COM_errorLog ('Trackback: Could not connect to ' . $t);
  
!         return 'Could not open socket.';
      }
  
--- 476,480 ----
          COM_errorLog ('Trackback: Could not connect to ' . $t);
  
!         return $LANG_TRB['error_socket'];
      }
  
***************
*** 483,489 ****
              . rawurlencode ($excerpt);
  
      fputs ($sock, 'POST ' . $target['path'] . $target['query'] . " HTTP/1.1\n");
      fputs ($sock, 'Host: ' . $target['host'] . "\n");
!     fputs ($sock, "Content-type: application/x-www-form-urlencoded\n");
      fputs ($sock, 'Content-length: ' . strlen ($toSend) . "\n");
      fputs ($sock, "Connection: close\n\n");
--- 483,500 ----
              . rawurlencode ($excerpt);
  
+     if (empty ($LANG_CHARSET)) {
+         $charset = $_CONF['default_charset'];
+                                                                                 
+         if (empty ($charset)) {
+             $charset = 'iso-8859-1';
+         }
+     } else {
+         $charset = $LANG_CHARSET;
+     }
+ 
      fputs ($sock, 'POST ' . $target['path'] . $target['query'] . " HTTP/1.1\n");
      fputs ($sock, 'Host: ' . $target['host'] . "\n");
!     fputs ($sock, 'Content-type: application/x-www-form-urlencoded; charset='
!                   . $charset . "\n");
      fputs ($sock, 'Content-length: ' . strlen ($toSend) . "\n");
      fputs ($sock, "Connection: close\n\n");
***************
*** 501,505 ****
      $r2 = strpos ($res, '</error>');
      if (($r1 === false) || ($r2 === false)) {
!         return 'Response not understood.';
      }
      $r1 += strlen ('<error>');
--- 512,516 ----
      $r2 = strpos ($res, '</error>');
      if (($r1 === false) || ($r2 === false)) {
!         return $LANG_TRB['error_response'];
      }
      $r1 += strlen ('<error>');
***************
*** 511,515 ****
          $r1 += strlen ('<message>');
          if (($r1 === false) || ($r2 === false)) {
!             return 'Unspecified error.';
          }
          $m = trim (substr ($res, $r1, $r2 - $r1));
--- 522,526 ----
          $r1 += strlen ('<message>');
          if (($r1 === false) || ($r2 === false)) {
!             return $LANG_TRB['error_unspecified'];
          }
          $m = trim (substr ($res, $r1, $r2 - $r1));