From 6b70f8355ab3c1e103a1c3c5ed2df49507c23ae3 Mon Sep 17 00:00:00 2001 From: mensonge Date: Thu, 4 Dec 2008 14:50:55 +0000 Subject: Minor fix: correct url checking and add gsearch help git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@195 b3834d28-1941-0410-a4f8-b48e95affb8f --- functions.inc.php | 10 +++++++--- gsearch/index.php | 18 +++++++++++++----- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/functions.inc.php b/functions.inc.php index 84f79c7..f474748 100644 --- a/functions.inc.php +++ b/functions.inc.php @@ -95,11 +95,15 @@ function shortenString($string, $maxSize=75) { return $output; } -/* Check online if a url is a valid page (Not a 404 error for example) */ -function checkUrl($url) { - $h = @get_headers($url); +/* Check url format and check online if the url is a valid page (Not a 404 error for example) */ +function checkUrl($url) { + //check format + if(!preg_match("#(ht|f)tp(s?)\://\S+\.\S+#i",$url)) { + return false; + } //look if the page doesn't return a void or 40X or 50X HTTP code error + $h = @get_headers($url); if(is_array($h) && strpos($h[0], '40') === false && strpos($h[0], '50') === false) { return true; } else { diff --git a/gsearch/index.php b/gsearch/index.php index e7011bf..70cc9a1 100644 --- a/gsearch/index.php +++ b/gsearch/index.php @@ -4,6 +4,9 @@ if($GLOBALS['enableGoogleCustomSearch']==false) { echo "Google Custom Search disabled. You can enable it into the config.inc.php file."; die; } + +$userservice = & ServiceFactory :: getServiceInstance('UserService'); +$currentUser = $userservice->getCurrentObjectUser(); ?> @@ -23,11 +26,16 @@ if($GLOBALS['enableGoogleCustomSearch']==false) { Based on Google Custom Search over this list of websites from . - - - +isLoggedOn() && $currentUser->isAdmin()){ + echo '
';
+ echo T_('Admin tips: ');
+ echo T_('To refresh manually Google Custom Search Engine, goes to: ');
+ echo 'http://www.google.com/coop/cse/cref
';
+ echo T_('If no result appears, check that all the urls are valid in the admin section.');
+ echo '