X-Git-Url: http://andersk.mit.edu/gitweb/sql-web.git/blobdiff_plain/49ea14ad520eb03df3df15a7fb6f04d5a3be0551..HEAD:/mitsql.cfg.php

diff --git a/mitsql.cfg.php b/mitsql.cfg.php
index 2869203..0ef46c1 100755
--- a/mitsql.cfg.php
+++ b/mitsql.cfg.php
@@ -7,6 +7,8 @@
 $CWD = getcwd();
 chdir(dirname(__FILE__));
 
+file_exists('/etc/sql-mit-edu.cfg.php') && require('/etc/sql-mit-edu.cfg.php');
+file_exists('/usr/local/etc/sql-mit-edu.cfg.php') && require('/usr/local/etc/sql-mit-edu.cfg.php');
 file_exists('server.cfg.php') && require('server.cfg.php');
 defined('DEBUG') || define('DEBUG', 0);
 defined('DEVEL') || define('DEVEL', 0);
@@ -15,21 +17,32 @@ defined('OFFLINE') || define('OFFLINE', 0);
 define('VER', '1.2');
 if (DEVEL) {
 	define('VERSION', VER.'-dev');
+	defined('BASE_URL') || define('BASE_URL', '/dev/');
 } else {
 	define('VERSION', VER);
+	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');
+defined('SIGNUP_URL') || define('SIGNUP_URL', BASE_HTTPS.BASE_URL.'do/batch/signup');
 
 define('DELIMETER', '+');
 defined('DBHOST') || define('DBHOST', 'sql.mit.edu');
-defined('BASE_URL') || define('BASE_URL', '/~sql/main/');
 defined('ADMINUSER') || define('ADMINUSER', 'root');
-defined('ADMINPASS') || define('ADMINPASS', base64_decode('TXlCZWF0c1Bvc3RA'));
+defined('ADMINPASS') || die('Please email sql@mit.edu');
 defined('ADMINDB') || define('ADMINDB', 'mitsql');
 
 $BASE_PATH = dirname(__FILE__).'/';
 define('BASE_PATH', $BASE_PATH);
+defined('TEMP_PATH') || define('TEMP_PATH', '/tmp');
 $URI = (isset($_SERVER["REDIRECT_URL"])?$_SERVER["REDIRECT_URL"]:'');
-$URI = ((empty($URI) && isset($_SERVER['REQUEST_URI']))?$_SERVER['REQUEST_URI']:$URI);
+if (empty($URI) && isset($_SERVER['REQUEST_URI'])) {
+	if (empty($_SERVER['QUERY_STRING'])) {
+		$URI = $_SERVER['REQUEST_URI'];
+	} else {
+		$URI = substr($_SERVER['REQUEST_URI'], 0, -strlen($_SERVER['QUERY_STRING'])-1);
+	}
+}
 define('URI', $URI);
 $THIS_PAGE = str_replace(BASE_URL, '', URI);
 define('THIS_PAGE', $THIS_PAGE);