summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authorMark Pemberton <mpemberton5@gmail.com>2011-05-21 21:38:25 -0400
committerMark Pemberton <mpemberton5@gmail.com>2011-05-21 21:38:25 -0400
commitb105867e75f103ae2b0c54edfaa9ce6467a8a258 (patch)
tree299bd99f271a55a98de88e8b27e457ea8401d2f1 /www
parente0149e24e2b5fac3b875fda468b18fbe2b6b1218 (diff)
parent97bba97049eeed2ecec022caa641b50ca507cb72 (diff)
downloadsemanticscuttle-b105867e75f103ae2b0c54edfaa9ce6467a8a258.tar.gz
semanticscuttle-b105867e75f103ae2b0c54edfaa9ce6467a8a258.tar.bz2
Merge branch 'master' into privatekey2
Diffstat (limited to 'www')
-rw-r--r--www/gsearch/context.php56
-rw-r--r--www/gsearch/index.php66
2 files changed, 81 insertions, 41 deletions
diff --git a/www/gsearch/context.php b/www/gsearch/context.php
index d714ec1..fd10c4e 100644
--- a/www/gsearch/context.php
+++ b/www/gsearch/context.php
@@ -1,27 +1,43 @@
<?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>
- <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>
diff --git a/www/gsearch/index.php b/www/gsearch/index.php
index 70be05e..477aacb 100644
--- a/www/gsearch/index.php
+++ b/www/gsearch/index.php
@@ -1,17 +1,41 @@
-<?php require_once '../www-header.php';
+<?php
+/**
+ * Google custom search for SemanticScuttle.
+ * This is a "linked CSE", a linked custom search engine.
+ * See the linked docs for more info.
+ *
+ * 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();
}
?>
-
-<html>
-<title><?php echo $GLOBALS['sitename'] ?></title>
-<body>
-<center>
-<br />
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+ <head>
+ <title><?php echo htmlspecialchars($GLOBALS['sitename']); ?></title>
+ </head>
+ <body>
+ <div style="text-align: center; padding-top: 2em">
<!-- Google CSE Search Box Begins -->
<form id="cref" action="http://www.google.com/cse">
@@ -27,21 +51,21 @@ if($GLOBALS['enableGoogleCustomSearch']==false) {
<small><a href="<?php echo ROOT?>"><?php echo T_('Come back to ').$GLOBALS['sitename'] ?>...</a></small>
-<?php if($userservice->isLoggedOn() && $currentUser->isAdmin()){
- echo '<p><small>';
- echo T_('Admin tips: ');
- echo T_('To refresh manually Google Custom Search Engine, goes to: ');
- echo '<a href="http://www.google.com/coop/cse/cref?cref='
+<?php if ($userservice->isLoggedOn() && $currentUser->isAdmin()) {
+ echo '<p><small>';
+ echo T_('Admin tips: ');
+ echo T_('To refresh manually Google Custom Search Engine, goes to: ');
+ echo '<a href="http://www.google.com/coop/cse/cref?cref='
. ROOT . 'gsearch/context.php">http://www.google.com/coop/cse/cref</a>'
. '<br/>';
- echo T_('If no result appears, check that all the urls are valid in the admin section.');
- echo '</small></p>';
-
-}
+ echo T_('If no result appears, check that all the urls are valid in the admin section.');
+ echo '</small></p>';
+
+}
?>
-</center>
-</body>
+ </div>
+ </body>
</html>