redirect fixes

git-svn-id: svn://presbrey.mit.edu/sql/web/dev@150 a142d4bd-2cfb-0310-9673-cb33a7e74f58

diff --git a/index.php b/index.php
index e8474a6aa5a22460b2f9bf4819499dc460eb9d52..e018d836fa854602d8beff51243635c88fd7b09b 100755 (executable)
--- 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 fbdea6274b6c8d1ed31b03b7d3c5539a5723ca94..f7a50b01d9255f2019eb97d542dfd6e4078996f4 100644 (file)
--- 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 49d10859193003e79b1dcf46e2fdb1703840ab04..0ef46c1c1337224eead0e1e38e0cff11f100dfe0 100755 (executable)
--- 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');