Minor fix: correct url checking

git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@196 b3834d28-1941-0410-a4f8-b48e95affb8f

1 files changed, 28 insertions, 25 deletions

diff --git a/api/export_gcs.php b/api/export_gcs.php
index 48d51c1..fd1121e 100644
--- a/api/export_gcs.php
+++ b/api/export_gcs.php
@@ -1,7 +1,7 @@
 <?php
 /*
-Export for Google Custom Search
-*/
+ Export for Google Custom Search
+ */
 
 // Force HTTP authentication first!
 //require_once('httpauth.inc.php');
@@ -11,22 +11,22 @@ $bookmarkservice =& ServiceFactory::getServiceInstance('BookmarkService');
 $userservice =& ServiceFactory::getServiceInstance('UserService');
 
 /*
-// Restrict to admins?
-if(!$userservice->isAdmin($userservice->getCurrentUserId())) {
-    die(T_('You are not allowed to do this action (admin access)'));
-}*/
+ // Restrict to admins?
+ if(!$userservice->isAdmin($userservice->getCurrentUserId())) {
+ die(T_('You are not allowed to do this action (admin access)'));
+ }*/
 
 // Check if queried format is xml
 if (isset($_REQUEST['xml']) && (trim($_REQUEST['xml']) == 1))
-    $xml = true;
+$xml = true;
 else
-    $xml = false;
+$xml = false;
 
 // Check to see if a tag was specified.
 if (isset($_REQUEST['tag']) && (trim($_REQUEST['tag']) != ''))
-    $tag = trim($_REQUEST['tag']);
+$tag = trim($_REQUEST['tag']);
 else
-    $tag = NULL;
+$tag = NULL;
 
 // Get the posts relevant to the passed-in variables.
 $bookmarks =& $bookmarkservice->getBookmarks(0, NULL, NULL, $tag, NULL, getSortOrder());
@@ -37,23 +37,26 @@ $currentusername = $currentuser[$userservice->getFieldName('username')];
 // Set up the plain file and output all the posts.
 header('Content-Type: text/plain');
 if(!$xml) {
-    header('Content-Type: text/plain');
-    foreach($bookmarks['bookmarks'] as $row) {
-	echo $row['bAddress']."\n";
-    }
+	header('Content-Type: text/plain');
+	foreach($bookmarks['bookmarks'] as $row) {
+		if(checkUrl($row['bAddress'], false)) {
+			echo $row['bAddress']."\n";
+		}
+	}
 } else {
-    header('Content-Type: application/xml');
-    echo '<GoogleCustomizations>'."\n";
-    echo '  <Annotations>'."\n";
-    foreach($bookmarks['bookmarks'] as $row) {
-	if(substr($row['bAddress'], 0, 7) == "http://") {
-	    echo '    <Annotation about="'.filter($row['bAddress']).'">'."\n";
-	    echo '      <Label name="include"/>'."\n";
-	    echo '    </Annotation>'."\n";
+	header('Content-Type: application/xml');
+	echo '<GoogleCustomizations>'."\n";
+	echo '  <Annotations>'."\n";
+	foreach($bookmarks['bookmarks'] as $row) {
+		//if(substr($row['bAddress'], 0, 7) == "http://") {
+		if(checkUrl($row['bAddress'], false)) {
+			echo '    <Annotation about="'.filter($row['bAddress']).'">'."\n";
+			echo '      <Label name="include"/>'."\n";
+			echo '    </Annotation>'."\n";
+		}
 	}
-    }
-    echo '  </Annotations>'."\n";
-    echo '</GoogleCustomizations>'."\n";
+	echo '  </Annotations>'."\n";
+	echo '</GoogleCustomizations>'."\n";
 }
 
 ?>