signup exits rather than die'ing

[sql-web.git] / mitsql.cfg.php

diff --git a/mitsql.cfg.php b/mitsql.cfg.php
index 1c96be67d4ab44a887f6a930b20f4fcd6f54094b..6a5acfda080832a5c119e6d8905b3129491fad0c 100755 (executable)
--- a/mitsql.cfg.php
+++ b/mitsql.cfg.php
@@ -7,23 +7,26 @@
 $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);
 defined('OFFLINE') || define('OFFLINE', 0);
 
-define('VER', '1.0');
+define('VER', '1.2');
 if (DEVEL) {
        define('VERSION', VER.'-dev');
+       defined('BASE_URL') || define('BASE_URL', '/~sql/dev/');
 } else {
        define('VERSION', VER);
+       defined('BASE_URL') || define('BASE_URL', '/~sql/main/');
 }
 
 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__).'/';
@@ -47,7 +50,10 @@ require_once('defaults.cfg.php');
 if (!OFFLINE) {
        $cxn = mysql_connect(DBHOST, ADMINUSER, ADMINPASS);
        mysql_select_db(ADMINDB,$cxn);
-       if (mysql_error()) die(mysql_error());
+       if (mysql_error()) {
+               require_once('errorhandler.lib.php');
+               trigger_error(mysql_error(),E_USER_ERROR);
+       }
 }
 
 chdir($CWD);