From e616b19304d63b59e943dbf8c90b2f131d465dea Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Sat, 14 May 2011 10:18:46 +0200 Subject: proper status code when gsearch is deactivated --- www/gsearch/index.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'www') diff --git a/www/gsearch/index.php b/www/gsearch/index.php index 70be05e..12e7233 100644 --- a/www/gsearch/index.php +++ b/www/gsearch/index.php @@ -1,8 +1,11 @@ -- cgit v1.2.3-54-g00ecf From 81714ab878c275499b85981266208597cfbc315c Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Sat, 14 May 2011 10:26:38 +0200 Subject: make custom search more valid html --- www/gsearch/index.php | 57 +++++++++++++++++++++++++++++++++++---------------- 1 file changed, 39 insertions(+), 18 deletions(-) (limited to 'www') diff --git a/www/gsearch/index.php b/www/gsearch/index.php index 12e7233..477aacb 100644 --- a/www/gsearch/index.php +++ b/www/gsearch/index.php @@ -1,4 +1,23 @@ - + * @author Christian Weiske + * @author Eric Dane + * @license GPL http://www.gnu.org/licenses/gpl.html + * @link http://sourceforge.net/projects/semanticscuttle + * @link http://www.google.com/cse/docs/cref.html + */ +require_once '../www-header.php'; if ($GLOBALS['enableGoogleCustomSearch'] == false) { header('HTTP/1.0 403 Forbidden'); @@ -9,12 +28,14 @@ if ($GLOBALS['enableGoogleCustomSearch'] == false) { } ?> - - -<?php echo $GLOBALS['sitename'] ?> - -
-
+ + + + + <?php echo htmlspecialchars($GLOBALS['sitename']); ?> + + +
@@ -30,21 +51,21 @@ if ($GLOBALS['enableGoogleCustomSearch'] == false) { ... -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 '

'; - -} + echo T_('If no result appears, check that all the urls are valid in the admin section.'); + echo '

'; + +} ?> -
- + + -- cgit v1.2.3-54-g00ecf From 01f21995dd5d488fa13be54049610bec919ced95 Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Sat, 14 May 2011 10:30:01 +0200 Subject: fix google custom search xml --- www/gsearch/context.php | 31 +++++++++++++++++++++++++------ 1 file changed, 25 insertions(+), 6 deletions(-) (limited to 'www') diff --git a/www/gsearch/context.php b/www/gsearch/context.php index d714ec1..ea496de 100644 --- a/www/gsearch/context.php +++ b/www/gsearch/context.php @@ -1,16 +1,35 @@ + * @author Christian Weiske + * @author Eric Dane + * @license GPL http://www.gnu.org/licenses/gpl.html + * @link http://sourceforge.net/projects/semanticscuttle + * @link http://www.google.com/cse/docs/cref.html + */ require_once '../www-header.php'; -if($GLOBALS['enableGoogleCustomSearch'] == false) { - echo "Google Custom Search disabled. You can enable it into the config.php file."; - die; +if ($GLOBALS['enableGoogleCustomSearch'] == false) { + header('HTTP/1.0 403 Forbidden'); + header('Content-Type: text/plain; charset=utf-8'); + echo "Google Custom Search disabled." + . " You can enable it into the config.php file.\n"; + die(); } ?> - - + - <?php echo $GLOBALS['sitename'] ?> + <?php echo htmlspecialchars($GLOBALS['sitename']) ?> -- cgit v1.2.3-54-g00ecf From 8d29eaf349d8e8767863aff889fe82905387ef16 Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Sat, 14 May 2011 10:30:43 +0200 Subject: CS --- www/gsearch/context.php | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) (limited to 'www') diff --git a/www/gsearch/context.php b/www/gsearch/context.php index ea496de..fd10c4e 100644 --- a/www/gsearch/context.php +++ b/www/gsearch/context.php @@ -28,19 +28,16 @@ if ($GLOBALS['enableGoogleCustomSearch'] == false) { ?> - - <?php echo htmlspecialchars($GLOBALS['sitename']) ?> - - - - - - - - - - - - + + <?php echo htmlspecialchars($GLOBALS['sitename']) ?> + + + + + + + + + -- cgit v1.2.3-54-g00ecf