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

diff --git a/.htaccess.main b/.htaccess.main
index cd38f11451d1abad362df628f11e823b71720ffb..cddad4455ffc28c24e6491bff98dbc053f94ccdf 100755 (executable)
--- a/.htaccess.main
+++ b/.htaccess.main
@@ -55,7 +55,7 @@ RewriteBase /~sql/main/
 ## REVISION 4
 
 RewriteCond %{REQUEST_URI} ^.*/do/(.+)$
-RewriteRule ^do/(.+)$ $1.php [QSA]
+RewriteRule ^do/(.+)$ $1.php [L,QSA]
 
 RewriteCond %{REQUEST_FILENAME} !-f
 RewriteRule .* do/index [R,L,QSA]

diff --git a/contact.php b/contact.php
index 68ecd241c02207268ea38dcdeeb6e0b853c8b1db..d0e68af8c3ceb44ebc6548c886818b324381f7b2 100644 (file)
--- a/contact.php
+++ b/contact.php
@@ -1,4 +1,7 @@
 <?php
+/*
+       (c) 2005 Joe Presbrey
+*/
 
 require_once('mitsql.cfg.php');
 require_once('mitsql.lib.php');

diff --git a/defaults.cfg.php b/defaults.cfg.php
index 104fdef79c8052ee68d07c98365cb322bf8c8eb5..10dceb3bb1fda9700fd0ca3d38fa2f3f765b38e3 100644 (file)
--- a/defaults.cfg.php
+++ b/defaults.cfg.php
@@ -1,4 +1,7 @@
 <?php
+/*
+       (c) 2005 Joe Presbrey
+*/
 
 $_NEW_DB['nBytes'] = 0;
 $_NEW_DB['dCreated'] = 'NOW()';

diff --git a/global.act.php b/global.act.php
index b7ff5ee370dabd0ca2388af4167f76d8599d78f7..724ab548b15cebff648f7a88cea047becb0fa633 100644 (file)
--- a/global.act.php
+++ b/global.act.php
@@ -1,4 +1,7 @@
 <?php
+/*
+       (c) 2005 Joe Presbrey
+*/
 
 require_once('mitsql.cfg.php');
 require_once('mitsql.lib.php');

diff --git a/global.done.php b/global.done.php
index 2f652898aa419196cca4b32514c6325219551bd6..fcd343d97f1cb550b2ad2edd261fc4c4fed7c715 100644 (file)
--- a/global.done.php
+++ b/global.done.php
@@ -1,4 +1,7 @@
 <?php
+/*
+       (c) 2005 Joe Presbrey
+*/
 
 require_once('mitsql.cfg.php');
 require_once('mitsql.lib.php');

diff --git a/lib/dbaccess.lib.php b/lib/dbaccess.lib.php
index 76a3a3437a735a2985fceb5589aba39125fedfa3..150aeabb552c252621c9862e5ac93e718fb7f3cb 100644 (file)
--- a/lib/dbaccess.lib.php
+++ b/lib/dbaccess.lib.php
@@ -1,4 +1,7 @@
 <?php
+/*
+       (c) 2005 Joe Presbrey
+*/
 
 require_once('joe.lib.php');
 

diff --git a/lib/display.lib.php b/lib/display.lib.php
index 1b890044774a4e2606677e61ac1222c43753b723..e33721d1339935312ae802351ee0fb086a865b0c 100644 (file)
--- a/lib/display.lib.php
+++ b/lib/display.lib.php
@@ -1,4 +1,7 @@
 <?php
+/*
+       (c) 2005 Joe Presbrey
+*/
 
 ## FORMATTING FUNCTIONS
 

diff --git a/lib/errorhandler.lib.php b/lib/errorhandler.lib.php
index cbbac4ede10dc0f24ce537d8755873460b2dab05..647e40a6ca4ce7f01ab8e5443a0611d6e16132fd 100644 (file)
--- a/lib/errorhandler.lib.php
+++ b/lib/errorhandler.lib.php
@@ -1,4 +1,7 @@
 <?php
+/*
+       (c) 2005 Joe Presbrey
+*/
 
 function ErrorHandler($errno, $errstr, $errfile, $errline, $errcontext) {
        $error_halt = true;

diff --git a/lib/joe.lib.php b/lib/joe.lib.php
index 0bf1fb034a21da6178ebc1383827eb6597b024d3..d36cef13c84d43025ea0ba9a8d333a071edb1378 100755 (executable)
--- a/lib/joe.lib.php
+++ b/lib/joe.lib.php
@@ -1,7 +1,6 @@
 <?php
 /*
     (c) 2005 Joe Presbrey
-    joepresbrey@gmail.com
 
     ATTN:  This library was assembled and completed in its entirety independent of
     any and all corporate projects and/or work environ.

diff --git a/lib/proc.lib.php b/lib/proc.lib.php
index f9ebc8d6bd9a659a1c673aedc9867f0cdb99274a..adf8252858526148ef4176df1ad06dbf914bdc19 100644 (file)
--- a/lib/proc.lib.php
+++ b/lib/proc.lib.php
@@ -1,4 +1,7 @@
 <?php
+/*
+       (c) 2005 Joe Presbrey
+*/
 
 require_once('mitsql.lib.php');
 
@@ -11,9 +14,9 @@ class proc {
                $uname = $User->getUsername();
                $uname = str_replace('.','',$uname);
                $dbname = $uname.DELIMETER.$i_newdb;
-               if ($User->isOverQuota()) {
+               if ($User->isOverQuota() && !isAdmin()) {
                        $err1[] = 'You are over your quota. You may not add more databases.';
-               } elseif (count($User->getDBList())>MAXDBS) {
+               } elseif (count($User->getDBList())>MAXDBS && !isAdmin()) {
                        $err1[] = 'You have too many databases. You may not add more databases.';
                } elseif (empty($i_newdb)) {
                        $err1[] = 'Your database name may not be empty.';

diff --git a/lib/security.lib.php b/lib/security.lib.php
index 2084e5399660c76ca85f9d904f8f2006ad6beb90..0b7c384da06da09ec7a4860dd72c5b40037de23f 100644 (file)
--- a/lib/security.lib.php
+++ b/lib/security.lib.php
@@ -1,4 +1,7 @@
 <?php
+/*
+       (c) 2005 Joe Presbrey
+*/
 
 require_once('mitsql.lib.php');
 

diff --git a/login.php b/login.php
index 57d8e88aa3b145ce718dfbc838840e7c4ccbaebf..48588930438b22573df3ab27423bad0bdf6a2f4a 100644 (file)
--- a/login.php
+++ b/login.php
@@ -1,4 +1,7 @@
 <?php
+/*
+       (c) 2005 Joe Presbrey
+*/
 
 require_once('mitsql.cfg.php');
 require_once('mitsql.lib.php');

diff --git a/logout.php b/logout.php
index 9ad1d2ac94ca4d58441eefcba89af6030de21bb7..1b8b5d5815a4db0280fbd210b352fb833ba7b9c1 100644 (file)
--- a/logout.php
+++ b/logout.php
@@ -1,4 +1,7 @@
 <?php
+/*
+       (c) 2005 Joe Presbrey
+*/
 
 require_once('mitsql.cfg.php');
 require_once('mitsql.lib.php');

diff --git a/main.php b/main.php
index f83723c35cc6c6aba49cf716e92f367a169def09..4551be7984b1b47622834156c17d0d9e1798b410 100644 (file)
--- a/main.php
+++ b/main.php
@@ -1,4 +1,7 @@
 <?php
+/*
+       (c) 2005 Joe Presbrey
+*/
 
 require_once('mitsql.cfg.php');
 require_once('mitsql.lib.php');

diff --git a/setup.php b/setup.php
index 85e58bca32d8ef7f8d8f088700673a1f90b1f381..70e4e1edd4fb6df9b45cfed3e85adad7168d8e7a 100755 (executable)
--- a/setup.php
+++ b/setup.php
@@ -1,4 +1,7 @@
 <?php
+/*
+       (c) 2005 Joe Presbrey
+*/
 
 require_once('mitsql.cfg.php');
 require_once('mitsql.lib.php');

diff --git a/signup.php b/signup.php
index f8de8e9c1addb288999caef139622c80152674c3..96aba8c9429223aa9f7b4f938f4d9041f0687f8a 100644 (file)
--- a/signup.php
+++ b/signup.php
@@ -1,4 +1,7 @@
 <?php
+/*
+       (c) 2005 Joe Presbrey
+*/
 
 require_once('mitsql.cfg.php');
 require_once('mitsql.lib.php');

diff --git a/test.php b/test.php
index 16150f4d1ea62651232272762dc4d53495e2986e..2c6210a5eed3b872db8f22a14300c1aa73efcced 100755 (executable)
--- a/test.php
+++ b/test.php
@@ -1,4 +1,7 @@
 <?php
+/*
+       (c) 2005 Joe Presbrey
+*/
 
 require_once('mitsql.cfg.php');
 require_once('mitsql.lib.php');

diff --git a/tpl/index.php b/tpl/index.php
index 2386425477b013e4f8d6d3d52007b460be59836c..9b940f18a0e907abcdd3f5ccda2084599a0eba24 100644 (file)
--- a/tpl/index.php
+++ b/tpl/index.php
@@ -1,13 +1,10 @@
 <?php
 include 'head.php';
 ?>
-<?/*
-<h3>About</h3>
-*/?>
 
 <p>
 This service provides <a target="_blank" href="http://dev.mysql.com/doc">MySQL</a> databases to <a target="_blank" href="http://ca.mit.edu/">MIT certificate</a> holders.
-You must choose a MySQL password (which should be different from your Athena account password) when you <a href="do/signup">sign up</a>, and you can
+You must choose a MySQL password (which should be different from your Athena account password) when you <a href="do/signup">sign up</a>, and
 then use this interface to create and drop databases.  All subsequent SQL commands can be issued from any host, client, and/or script of your choice;
 simply connect to the MySQL server at <b>sql.mit.edu</b> using your username and your new MySQL password.
 You may find it convenient to run scripts using the <a target="_blank" href="http://scripts.mit.edu/web">web script service</a> or
@@ -18,37 +15,8 @@ You may find it convenient to run scripts using the <a target="_blank" href="htt
 All uses of this service must comply with the <a target="_blank" href="http://web.mit.edu/olh/Welcome/rules.html">MITnet rules of use</a>.
 </p>
 
-<?/*
-<h3>Backups</h3>
-
-<p>
-<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.
-</p>
-
-<h3>Quotas</h3>
-
-<p>
-By default, new users can create up to <strong>5 databases</strong>, consuming a total of <strong>50 megabytes</strong> of SQL data.
-The system will periodically check your database sizes and suspend creation of new data (INSERT statements) if your total usage exceeds your allotted quota.
-</p>
-
-<p>
-This service is not designed to store gratuitous amounts of information in the BLOB or BINARY formats. Extra quota space will not be allotted to users for this type of data.
-Users should instead store these types of data in AFS and use SQL tables only to catalogue it.
-</p>
-
-<p>
-<strong>Always use this interface to create and drop databases.</strong>
-Although you can drop any of your databases outside this interface, doing so will not relinquish your rights to that database and will therefore still count against your quota.
-</p>
-
-<h3>Disclaimer</h3>
-*/?>
-
 <p>
 Although this service has been designed with reliability in mind, the SIPB MySQL service should not be used to host critical applications that cannot tolerate downtime.
-<? /* We may, of course, suspend or terminate your MySQL account at any time, for any or no reason. */ ?>
 We perform no query logging, schema or data backups, or any other backups otherwise generally available. You are solely responsible for performing backups of your data.
 We maintain general usage statistics of this service by the MIT community at large.
 </p>