From 01f21995dd5d488fa13be54049610bec919ced95 Mon Sep 17 00:00:00 2001
From: Christian Weiske <cweiske@cweiske.de>
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/gsearch/context.php')

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 @@
 <?php
+/**
+ * Google custom search context information for SemanticScuttle.
+ * Tells Google meta data about the search.
+ *
+ * SemanticScuttle - your social bookmark manager.
+ *
+ * PHP version 5.
+ *
+ * @category Bookmarking
+ * @package  SemanticScuttle
+ * @author   Benjamin Huynh-Kim-Bang <mensonge@users.sourceforge.net>
+ * @author   Christian Weiske <cweiske@cweiske.de>
+ * @author   Eric Dane <ericdane@users.sourceforge.net>
+ * @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();
 }
 ?>
-
-<!--?xml version="1.0" encoding="UTF-8" ?-->
+<?xml version="1.0" encoding="UTF-8" ?>
 <GoogleCustomizations>
     <CustomSearchEngine>
-        <Title><?php echo $GLOBALS['sitename'] ?></Title>
+        <Title><?php echo htmlspecialchars($GLOBALS['sitename']) ?></Title>
         <Description><?php echo filter($GLOBALS['welcomeMessage']) ?></Description>
         <Context>
            <BackgroundLabels>
-- 
cgit v1.2.3


From 8d29eaf349d8e8767863aff889fe82905387ef16 Mon Sep 17 00:00:00 2001
From: Christian Weiske <cweiske@cweiske.de>
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/gsearch/context.php')

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) {
 ?>
 <?xml version="1.0" encoding="UTF-8" ?>
 <GoogleCustomizations>
-    <CustomSearchEngine>
-        <Title><?php echo htmlspecialchars($GLOBALS['sitename']) ?></Title>
-        <Description><?php echo filter($GLOBALS['welcomeMessage']) ?></Description>
-        <Context>
-           <BackgroundLabels>
-             <Label name="include" mode="FILTER" />
-          </BackgroundLabels>
-        </Context>
-        <LookAndFeel nonprofit="false">
-        </LookAndFeel>
-    </CustomSearchEngine>
-
-    <Include type="Annotations" href="<?php echo ROOT;?>api/export_gcs.php?xml=1" />
-
-
+ <CustomSearchEngine>
+  <Title><?php echo htmlspecialchars($GLOBALS['sitename']) ?></Title>
+  <Description><?php echo filter($GLOBALS['welcomeMessage']) ?></Description>
+  <Context>
+   <BackgroundLabels>
+    <Label name="include" mode="FILTER" />
+   </BackgroundLabels>
+  </Context>
+  <LookAndFeel nonprofit="false">
+  </LookAndFeel>
+ </CustomSearchEngine>
+ <Include type="Annotations" href="<?php echo ROOT;?>api/export_gcs.php?xml=1" />
 </GoogleCustomizations>
-- 
cgit v1.2.3