Merge remote-tracking branch 'querwurzelt/master' into mergev0.99.0

2 files changed, 5 insertions, 47 deletions

diff --git a/www/.htaccess b/www/.htaccess
index 5799444..381c0fe 100644
--- a/www/.htaccess
+++ b/www/.htaccess
@@ -10,7 +10,7 @@ Options -MultiViews +FollowSymLinks
 
 # Rewrite clean URLs onto real files
 <IfModule mod_rewrite.c>
-Options +FollowSymlinks
+Options -MultiViews +FollowSymlinks
 RewriteEngine On
 RewriteCond %{REQUEST_FILENAME}.php -f
 RewriteRule ^([^/.]+)/?(.*)$ /$1.php/$2 [QSA,L]
diff --git a/www/ajaxGetTitle.php b/www/ajaxGetTitle.php
index e1fbe30..b95e29b 100644
--- a/www/ajaxGetTitle.php
+++ b/www/ajaxGetTitle.php
@@ -27,53 +27,11 @@ require_once 'www-header.php';
 
 /* Managing all possible inputs */
 isset($_GET['url']) ? define('GET_URL', $_GET['url']): define('GET_URL', '');
+$urlhelper = new SemanticScuttle_UrlHelper();
 
-function getTitle($url) {
-	$fd = @fopen($url, 'r');
-	if ($fd) {
-		$html = fread($fd, 1750);
-		fclose($fd);
-
-		// Get title from title tag
-		preg_match_all('/<title>(.*)<\/title>/si', $html, $matches);
-		$title = $matches[1][0];
-
-		$encoding = 'utf-8';
-		// Get encoding from charset attribute
-		preg_match_all('/<meta.*charset=([^;"]*)">/i', $html, $matches);
-		if (isset($matches[1][0])) {
-			$encoding = strtoupper($matches[1][0]);
-		}
-
-		// Convert to UTF-8 from the original encoding
-		if (function_exists("mb_convert_encoding")) {
-			$title = @mb_convert_encoding($title, 'UTF-8', $encoding);
-		}
-
-		$title = trim($title);
-
-		if (utf8_strlen($title) > 0) {
-			$title = html_entity_decode($title, ENT_QUOTES, 'UTF-8');
-			return $title;
-		} else {
-			// No title, so return filename
-			$uriparts = explode('/', $url);
-			$filename = end($uriparts);
-			unset($uriparts);
-
-			return $filename;
-		}
-	} else {
-		return false;
-	}
-}
-echo '<?xml version="1.0" encoding="utf-8"?>';
+echo '<?xml version="1.0" encoding="utf-8"?>' . "\n";
 ?>
 <response>
-<method>
-getTitle
-</method>
-<result>
-<?php echo getTitle(GET_URL); ?>
-</result>
+ <method>getTitle</method>
+ <result><?php echo htmlspecialchars($urlhelper->getTitle(GET_URL)); ?></result>
 </response>