summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcweiske <cweiske@b3834d28-1941-0410-a4f8-b48e95affb8f>2010-01-16 08:11:39 +0000
committercweiske <cweiske@b3834d28-1941-0410-a4f8-b48e95affb8f>2010-01-16 08:11:39 +0000
commit88088f6d0f44cd74c145007cbab7f20b82d534e2 (patch)
tree1f82e3c412db4aa6ae64e4a9370a1f3fd9b3d15e
parenta4431ddc7d27afd3945645c02cef57ef2502743a (diff)
downloadsemanticscuttle-88088f6d0f44cd74c145007cbab7f20b82d534e2.tar.gz
semanticscuttle-88088f6d0f44cd74c145007cbab7f20b82d534e2.tar.bz2
respect $shorturl configuration setting
git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@577 b3834d28-1941-0410-a4f8-b48e95affb8f
-rw-r--r--data/config.default.php8
-rw-r--r--www/go.php7
2 files changed, 15 insertions, 0 deletions
diff --git a/data/config.default.php b/data/config.default.php
index acbb139..69d2c25 100644
--- a/data/config.default.php
+++ b/data/config.default.php
@@ -395,6 +395,14 @@ $useredir = false;
$url_redir = 'http://www.google.com/url?sa=D&q=';
/**
+ * Enable short URL service.
+ * Can be used to visit urls using http://example.org/go/shortname
+ *
+ * @var boolean
+ */
+$shorturl = true;
+
+/**
* Array of bookmark extensions that Scuttle should add system tags for.
* When adding an URL with one of the given extensions, a system
* tag is automatically assigned.
diff --git a/www/go.php b/www/go.php
index d306be0..9d1a44f 100644
--- a/www/go.php
+++ b/www/go.php
@@ -12,6 +12,13 @@
*/
require_once '../src/SemanticScuttle/header.php';
+if (!$GLOBALS['shorturl']) {
+ header('HTTP/1.0 500 Internal Server Error');
+ header('Content-Type: text/plain');
+ echo 'Short URL service deactivated';
+ exit();
+}
+
if (!isset($_SERVER['PATH_INFO'])) {
header('HTTP/1.0 400 Bad Request');
header('Content-Type: text/plain');