form submit bug preventing signups

git-svn-id: svn://presbrey.mit.edu/sql/mitsql@68 a142d4bd-2cfb-0310-9673-cb33a7e74f58

diff --git a/defaults.cfg.php b/defaults.cfg.php
index ae2efcbef5966dbe24862224b916b41f7361e518..104fdef79c8052ee68d07c98365cb322bf8c8eb5 100644 (file)
--- a/defaults.cfg.php
+++ b/defaults.cfg.php
@@ -17,7 +17,7 @@ $_NEW_USER['bEnabled'] = 0;
 
 $_NEW_USERQUOTA['nDatabasesHard'] = 5;
 $_NEW_USERQUOTA['nBytesSoft'] = 94371840;
 
 $_NEW_USERQUOTA['nDatabasesHard'] = 5;
 $_NEW_USERQUOTA['nBytesSoft'] = 94371840;

-$_NEW_USERQUOTA['nBytesHard'] 104857600;
+$_NEW_USERQUOTA['nBytesHard'] = 104857600;

 $_NEW_USERQUOTA['dCreated'] = 'NOW()';
 
 $_NEW_USERSTAT['nDatabases'] = 0;
 $_NEW_USERQUOTA['dCreated'] = 'NOW()';
 
 $_NEW_USERSTAT['nDatabases'] = 0;

diff --git a/mitsql.cfg.php b/mitsql.cfg.php
index e2f44a56cf1a94129e7d3a01362015a94f4850eb..491429c04a80750a9bfe9b0db5902791e76d0186 100755 (executable)
--- a/mitsql.cfg.php
+++ b/mitsql.cfg.php
@@ -26,6 +26,7 @@ defined('ADMINPASS') || define('ADMINPASS', base64_decode('TXlCZWF0c1Bvc3RA'));
 defined('ADMINDB') || define('ADMINDB', 'mitsql');
 
 $BASE_PATH = dirname(__FILE__).'/';
 defined('ADMINDB') || define('ADMINDB', 'mitsql');
 
 $BASE_PATH = dirname(__FILE__).'/';

+$URI = (isset($_SERVER['REQUEST_URI'])?$_SERVER['REQUEST_URI']:'');

 
 set_time_limit(0);
 ignore_user_abort(1);
 
 set_time_limit(0);
 ignore_user_abort(1);

diff --git a/test.php b/test.php
index 7876ba8ad8128b449b9508d98133bfbd2ae0edbf..7b7ff64650c053100a5336bc2644462ed11c6eea 100755 (executable)
--- a/test.php
+++ b/test.php
@@ -28,7 +28,9 @@ $User = new User($Login->getUserId());
 print_r($User->getDBList());
 */
 
 print_r($User->getDBList());
 */
 

-checkQuotas();
+phpinfo();
+
+//checkQuotas();

 
 include 'tpl/foot.php';
 ?>
 
 include 'tpl/foot.php';
 ?>

diff --git a/tpl/index.php b/tpl/index.php
index 8199e9335d176edcf8a255abb82ddc8bf7d1fcca..c49ddea2e8e4b94ed2e6cf80e8f136ba45d1ee8c 100644 (file)
--- a/tpl/index.php
+++ b/tpl/index.php
@@ -27,12 +27,8 @@ The SIPB MySQL Service is part of the <a href="http://scripts.mit.edu/">scripts.
 <h2>Backups</h2>
 
 <p>
 <h2>Backups</h2>
 
 <p>

-<strong>We strongly recommend you keep your own backups of your SQL schema and data. MySQL data is not stored in AFS.</strong>
+<strong>We strongly recommend you keep your own backups of your SQL schema and data.</strong> Your MySQL data is not stored in AFS.

 Although we use various technical means to try to ensure the availability of your data (including hardware-level redundancy and real-time replication), we can make no guarantees about the reliability of the service and access to your data.
 Although we use various technical means to try to ensure the availability of your data (including hardware-level redundancy and real-time replication), we can make no guarantees about the reliability of the service and access to your data.

-<?/*
-As you work with your SQL data, it is automatically saved on an additional secondary SQL server for restoration in the event of a server failure.
-Although we continually put forth our best efforts, we can make no guarantees about the reliability of the service and access to the data.
-*/?>

 </p>
 
 <?/*
 </p>
 
 <?/*

diff --git a/tpl/login.php b/tpl/login.php
index 8b8ddbaac6e639137680a6969dad23e5e668a58a..cd9acc5ed5efb5af17ca98578fed59fccb5d8b36 100644 (file)
--- a/tpl/login.php
+++ b/tpl/login.php
@@ -10,14 +10,14 @@ $thisTxt = isSSL()?' using this Certificate':' using your MySQL Password';
 
 <?php if (!isSSL()): ?>
 
 
 <?php if (!isSSL()): ?>
 

-<form method=post>
+<form method=post action="<?=$URI?>">

 <h3>Please enter your MySQL login information:</h3>
 <p>username: <input type="text" name="u" value="<?=isset($i_u)?$i_u:''?>"></p>
 <p>password: <input type="password" name="p"></p>
 
 <?php elseif (isSSL() && !empty($SSLCred)): ?>
 
 <h3>Please enter your MySQL login information:</h3>
 <p>username: <input type="text" name="u" value="<?=isset($i_u)?$i_u:''?>"></p>
 <p>password: <input type="password" name="p"></p>
 
 <?php elseif (isSSL() && !empty($SSLCred)): ?>
 

-<form method=post>
+<form method=post action="<?=$URI?>">

 <h3>You are identified as: <?=$SSLUsername?></h3>
 <p><?=$SSLName?></p>
 <p><?=$SSLEmail?></p>
 <h3>You are identified as: <?=$SSLUsername?></h3>
 <p><?=$SSLName?></p>
 <p><?=$SSLEmail?></p>

diff --git a/tpl/main.php b/tpl/main.php
index 25d10edb32170adb1020a4508224be3ba5f0881f..1929731338d865a6ebce1904e2f06f84b115606f 100644 (file)
--- a/tpl/main.php
+++ b/tpl/main.php
@@ -4,7 +4,7 @@ include 'head.php';
 
 if (isset($i_dropask)) {
        $dropdbs = array_keys($i_dropask);
 
 if (isset($i_dropask)) {
        $dropdbs = array_keys($i_dropask);

-       echo '<form method="post">';
+       echo '<form method="post" action="', $URI,'">';

        foreach($dropdbs as $dbname) {
                $msg1[] = 'Are you sure you want to drop `'.$dbname.'`? <input style="position:absolute; right:20px;" type="submit" name="drop['.$dbname.']" value="Yes">';
        }
        foreach($dropdbs as $dbname) {
                $msg1[] = 'Are you sure you want to drop `'.$dbname.'`? <input style="position:absolute; right:20px;" type="submit" name="drop['.$dbname.']" value="Yes">';
        }


@@ -14,13 +14,13 @@ if (isset($i_dropask)) {
 ?>
 <h2>Databases</h2>
 
 ?>
 <h2>Databases</h2>
 

-<form method="post">
+<form method="post" action="<?=$URI?>">

 <?php printErrors($err1); ?>
 <?php printMsgs($msg1); ?>
 </form>
 
 <table width="100%">
 <?php printErrors($err1); ?>
 <?php printMsgs($msg1); ?>
 </form>
 
 <table width="100%">

-<form method="post">
+<form method="post" action="<?=$URI?>">

 <?php
        $bytes = $User->getBytes();
        $usage = $bytes['nBytes'];
 <?php
        $bytes = $User->getBytes();
        $usage = $bytes['nBytes'];


@@ -53,7 +53,7 @@ if (isset($i_dropask)) {
 </form>
 </table>
 
 </form>
 </table>
 

-<form method="post">
+<form method="post" action="<?=$URI?>">

 <p align="right"><span style="width: 150px;"><label for="p1">new database:</label></span> <input type="text" name="newdb">
 <input type=submit value="add"></p>
 </form>
 <p align="right"><span style="width: 150px;"><label for="p1">new database:</label></span> <input type="text" name="newdb">
 <input type=submit value="add"></p>
 </form>

diff --git a/tpl/setup.php b/tpl/setup.php
index 5a402dad43de7e18809f26d95b3c226de7a0e177..fb5b6fe6b61c63a95e5ccecaabe21d52a8789186 100755 (executable)
--- a/tpl/setup.php
+++ b/tpl/setup.php
@@ -10,7 +10,7 @@ Your MySQL password should be different from your Athena account password.<br>
 <?php printErrors($err); ?>
 <?php printMsgs($msg); ?>
 
 <?php printErrors($err); ?>
 <?php printMsgs($msg); ?>
 

-<form method="post">
+<form method="post" action="<?=$URI?>">

 <table>
 <?/*
 <tr><td align="right">old password:</td><td><input type="password" name="p[0]"></td></tr>*/?>
 <table>
 <?/*
 <tr><td align="right">old password:</td><td><input type="password" name="p[0]"></td></tr>*/?>

diff --git a/tpl/signup.php b/tpl/signup.php
index c65228b7a04e8bed6db57fe71068b276ea182ff3..e5e532e7a25b9194fb3df9cb44cb762071e34a8e 100644 (file)
--- a/tpl/signup.php
+++ b/tpl/signup.php
@@ -15,7 +15,7 @@ $thisTxt = isSSL()?' with this Certificate':' via SQL';
 
 Your MySQL password should be different from your Athena account password.
 
 
 Your MySQL password should be different from your Athena account password.
 

-<form method=post>
+<form method=post action="<?=$URI?>">

 <p><span style="width: 150px;"><label for="p1">password:</label></span> <input type="password" name="p1"></p>
 <p><span style="width: 150px;"><label for="p2">repeat password:</label></span> <input type="password" name="p2"></p>
 <input type=submit value="Confirm Registration">
 <p><span style="width: 150px;"><label for="p1">password:</label></span> <input type="password" name="p1"></p>
 <p><span style="width: 150px;"><label for="p2">repeat password:</label></span> <input type="password" name="p2"></p>
 <input type=submit value="Confirm Registration">