From 53f8750e5b66b6986b35b8fc38fbb1c2ab17095f Mon Sep 17 00:00:00 2001
From: Joe Presbrey <presbrey@mit.edu>
Date: Sun, 11 Sep 2005 16:43:21 +0000
Subject: [PATCH] form submit bug preventing signups

git-svn-id: svn://presbrey.mit.edu/sql/mitsql@68 a142d4bd-2cfb-0310-9673-cb33a7e74f58
---
 defaults.cfg.php | 2 +-
 mitsql.cfg.php   | 1 +
 test.php         | 4 +++-
 tpl/index.php    | 6 +-----
 tpl/login.php    | 4 ++--
 tpl/main.php     | 8 ++++----
 tpl/setup.php    | 2 +-
 tpl/signup.php   | 2 +-
 8 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/defaults.cfg.php b/defaults.cfg.php
index ae2efcb..104fdef 100644
--- 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['nBytesHard'] 104857600;
+$_NEW_USERQUOTA['nBytesHard'] = 104857600;
 $_NEW_USERQUOTA['dCreated'] = 'NOW()';
 
 $_NEW_USERSTAT['nDatabases'] = 0;
diff --git a/mitsql.cfg.php b/mitsql.cfg.php
index e2f44a5..491429c 100755
--- 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__).'/';
+$URI = (isset($_SERVER['REQUEST_URI'])?$_SERVER['REQUEST_URI']:'');
 
 set_time_limit(0);
 ignore_user_abort(1);
diff --git a/test.php b/test.php
index 7876ba8..7b7ff64 100755
--- a/test.php
+++ b/test.php
@@ -28,7 +28,9 @@ $User = new User($Login->getUserId());
 print_r($User->getDBList());
 */
 
-checkQuotas();
+phpinfo();
+
+//checkQuotas();
 
 include 'tpl/foot.php';
 ?>
diff --git a/tpl/index.php b/tpl/index.php
index 8199e93..c49ddea 100644
--- 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>
-<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.
-<?/*
-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>
 
 <?/*
diff --git a/tpl/login.php b/tpl/login.php
index 8b8ddba..cd9acc5 100644
--- a/tpl/login.php
+++ b/tpl/login.php
@@ -10,14 +10,14 @@ $thisTxt = isSSL()?' using this Certificate':' using your MySQL Password';
 
 <?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)): ?>
 
-<form method=post>
+<form method=post action="<?=$URI?>">
 <h3>You are identified as: <?=$SSLUsername?></h3>
 <p><?=$SSLName?></p>
 <p><?=$SSLEmail?></p>
diff --git a/tpl/main.php b/tpl/main.php
index 25d10ed..1929731 100644
--- a/tpl/main.php
+++ b/tpl/main.php
@@ -4,7 +4,7 @@ include 'head.php';
 
 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">';
 	}
@@ -14,13 +14,13 @@ if (isset($i_dropask)) {
 ?>
 <h2>Databases</h2>
 
-<form method="post">
+<form method="post" action="<?=$URI?>">
 <?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'];
@@ -53,7 +53,7 @@ if (isset($i_dropask)) {
 </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>
diff --git a/tpl/setup.php b/tpl/setup.php
index 5a402da..fb5b6fe 100755
--- 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); ?>
 
-<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>*/?>
diff --git a/tpl/signup.php b/tpl/signup.php
index c65228b..e5e532e 100644
--- 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.
 
-<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">
-- 
2.45.0