From 5faf3a7efcd751109fb9afb8071d48c68b497a55 Mon Sep 17 00:00:00 2001
From: Joe Presbrey <presbrey@mit.edu>
Date: Thu, 29 Nov 2007 13:06:56 +0000
Subject: [PATCH] redirect fixes

git-svn-id: svn://presbrey.mit.edu/sql/web/dev@150 a142d4bd-2cfb-0310-9673-cb33a7e74f58
---
 index.php            | 1 +
 lib/security.lib.php | 2 +-
 mitsql.cfg.php       | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/index.php b/index.php
index e8474a6..e018d83 100755
--- a/index.php
+++ b/index.php
@@ -9,6 +9,7 @@
 require_once('mitsql.cfg.php');
 require_once('mitsql.lib.php');
 
+if (substr(URI, -strlen('do/index')) != 'do/index') redirect('main/do/index');
 isLoggedIn() && redirect('main');
 !DEVEL && $_SERVER['SERVER_NAME'] != 'sql.mit.edu' && redirect2('http://sql.mit.edu/');
 
diff --git a/lib/security.lib.php b/lib/security.lib.php
index fbdea62..f7a50b0 100644
--- a/lib/security.lib.php
+++ b/lib/security.lib.php
@@ -295,7 +295,7 @@ function getSSLCert() {
 ## 302 REDIRECTS
 
 function redirect($target=null,$secure=null) {
-    $base = (is_null($target)||substr($target,0,1)=='?')?URI:(dirname(URI).'/');
+    $base = (is_null($target)||substr($target,0,1)=='?')?URI:((strlen(dirname(URI))>1?dirname(URI).'/':'/'));
     redirectFull(is_null($target)?$base:($base.$target),$secure);
 }
 function redirectStart() {
diff --git a/mitsql.cfg.php b/mitsql.cfg.php
index 49d1085..0ef46c1 100755
--- a/mitsql.cfg.php
+++ b/mitsql.cfg.php
@@ -17,10 +17,10 @@ defined('OFFLINE') || define('OFFLINE', 0);
 define('VER', '1.2');
 if (DEVEL) {
 	define('VERSION', VER.'-dev');
-	defined('BASE_URL') || define('BASE_URL', '/~sql/dev/');
+	defined('BASE_URL') || define('BASE_URL', '/dev/');
 } else {
 	define('VERSION', VER);
-	defined('BASE_URL') || define('BASE_URL', '/~sql/main/');
+	defined('BASE_URL') || define('BASE_URL', '/main/');
 }
 defined('BASE_HTTP') || define('BASE_HTTP', 'http://sql.mit.edu');
 defined('BASE_HTTPS') || define('BASE_HTTPS', 'https://sql.mit.edu');
-- 
2.45.0