summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--api/export_gcs.php5
-rw-r--r--scuttle.css6
-rw-r--r--search.php3
-rw-r--r--templates/top.inc.php3
4 files changed, 17 insertions, 0 deletions
diff --git a/api/export_gcs.php b/api/export_gcs.php
index fd1121e..1040dd4 100644
--- a/api/export_gcs.php
+++ b/api/export_gcs.php
@@ -7,6 +7,11 @@
//require_once('httpauth.inc.php');
require_once('../header.inc.php');
+if($GLOBALS['enableGoogleCustomSearch'] == false) {
+ echo "Google Custom Search disabled. You can enable it into the config.inc.php file.";
+ die;
+}
+
$bookmarkservice =& ServiceFactory::getServiceInstance('BookmarkService');
$userservice =& ServiceFactory::getServiceInstance('UserService');
diff --git a/scuttle.css b/scuttle.css
index 2ab1616..271416a 100644
--- a/scuttle.css
+++ b/scuttle.css
@@ -45,6 +45,7 @@ select:focus,
textarea:focus {
border-color: #666;
}
+p.tipMsg,
p.error,
p.success {
border: 1px solid;
@@ -53,6 +54,11 @@ p.success {
padding: 0.5em;
width: 70%;
}
+p.tipMsg {
+ background: #FFFF99;
+ border-color: #CC9900;
+ color: #CC9900;
+}
p.error {
background: #FCC;
border-color: #966;
diff --git a/search.php b/search.php
index ff3729e..273fc05 100644
--- a/search.php
+++ b/search.php
@@ -117,6 +117,9 @@ if (POST_TERMS != '') {
// Save search
$searchhistoryservice->addSearch($terms, $range, $bookmarks['total'], $currentUserId);
+ if($GLOBALS['enableGoogleCustomSearch']) {
+ $tplVars['tipMsg'] = T_('Unsatisfied? You can also try our ').'<a href="'.createUrl('gsearch/index').'">Google Custom Search page</a>.';
+ }
$tplVars['rsschannels'] = array();
$tplVars['page'] = $page;
$tplVars['start'] = $start;
diff --git a/templates/top.inc.php b/templates/top.inc.php
index 55f0aaa..9bce24f 100644
--- a/templates/top.inc.php
+++ b/templates/top.inc.php
@@ -53,4 +53,7 @@ if (isset($error) && $error!='') {
if (isset($msg) && $msg!='') {
echo '<p class="success">'. $msg ."</p>\n";
}
+if (isset($tipMsg) && $tipMsg!='') {
+ echo '<p class="tipMsg">'. $tipMsg ."</p>\n";
+}
?> \ No newline at end of file