aliens/SemanticScuttle
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Minor fix: correct url checking

Browse source 
git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@196 b3834d28-1941-0410-a4f8-b48e95affb8f
This commit is contained in:
mensonge 2008-12-04 15:08:09 +00:00
parent 6b70f8355a
commit d72790690e
2 changed files with 125 additions and 118 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
api/export_gcs.php
View file

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

6
functions.inc.php
View file

@ -96,12 +96,13 @@ function shortenString($string, $maxSize=75) {
} }
/* Check url format and check online if the url is a valid page (Not a 404 error for example) */ /* Check url format and check online if the url is a valid page (Not a 404 error for example) */
function checkUrl($url) { function checkUrl($url, $checkOnline = true) {
//check format //check format
if(!preg_match("#(ht|f)tp(s?)\://\S+\.\S+#i",$url)) { if(!preg_match("#(ht|f)tp(s?)\://\S+\.\S+#i",$url)) {
return false; return false;
} }
if($checkOnline) {
//look if the page doesn't return a void or 40X or 50X HTTP code error //look if the page doesn't return a void or 40X or 50X HTTP code error
$h = @get_headers($url); $h = @get_headers($url);
if(is_array($h) && strpos($h[0], '40') === false && strpos($h[0], '50') === false) { if(is_array($h) && strpos($h[0], '40') === false && strpos($h[0], '50') === false) {
@ -109,6 +110,9 @@ function checkUrl($url) {
} else { } else {
return false; return false;
} }
} else {
return true;
}
} }