Merge branch 'php8'

[scuttle] / ajaxGetTitle.php

diff --git a/ajaxGetTitle.php b/ajaxGetTitle.php
index 0bc142d154fd3f138bab7bf5dff1adbd544f007a..81e23293d2baa7931d23121d84d7c300e5c9574c 100644 (file)
--- a/ajaxGetTitle.php
+++ b/ajaxGetTitle.php
@@ -1,7 +1,6 @@
 <?php
 /***************************************************************************
-Copyright (C) 2005 - 2006 Scuttle project
-http://sourceforge.net/projects/scuttle/
+Copyright (c) 2005 - 2010 Marcus Campbell
 http://scuttle.org/
 
 This program is free software; you can redistribute it and/or modify
@@ -19,11 +18,10 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 ***************************************************************************/
 
-header('Content-Type: text/xml; charset=UTF-8');
-header("Last-Modified: ". gmdate("D, d M Y H:i:s") ." GMT");
-header("Cache-Control: no-cache, must-revalidate");
-
-require_once('header.inc.php');
+header('Content-Type: text/plain; charset=UTF-8');
+header('Last-Modified: '. gmdate("D, d M Y H:i:s") .' GMT');
+header('Cache-Control: no-cache, must-revalidate');
+require_once 'header.inc.php';
 
 function getTitle($url) {
     $fd = @fopen($url, 'r');
@@ -40,7 +38,7 @@ function getTitle($url) {
         $encoding = strtoupper($matches[1][0]);
 
         // Convert to UTF-8 from the original encoding
-        if (function_exists('mb_convert_encoding') {
+        if (function_exists('mb_convert_encoding')) {
             $title = @mb_convert_encoding($title, 'UTF-8', $encoding);
         }
 
@@ -58,9 +56,4 @@ function getTitle($url) {
         return false;
     }
 }
-echo '<?xml version="1.0" encoding="utf-8"?>';
-?>
-<response>
-  <method>getTitle</method>
-  <result><?php echo getTitle($_GET['url']); ?></result>
-</response>
\ No newline at end of file
+echo getTitle($_GET['url']);