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

diff --git a/login.php b/login.php
index 441c778ddbf24d855f5ed214fe6a7de249ae6f2e..18f7531ef35bfb7758d81b4a475be4c18d94546c 100644 (file)
--- a/login.php
+++ b/login.php
@@ -4,12 +4,12 @@ require_once('mitsql.cfg.php');
 require_once('mitsql.lib.php');
 
 if (isSSL()) {
+       $Login2 = new Login($SSLUsername);
        if (is_null($SSLCred)) {
                $err[] = 'Please install a valid certificate.';
        } else {
-           $Login2 = new Login($SSLUsername);
            if (!(empty($SSLUsername) || $Login2->exists())) {
-               addUser($cred);
+               addUser($SSLCred);
                $Login = new Login($SSLUsername);
            }
        }

diff --git a/mitsql.sql b/mitsql.sql
new file mode 100644 (file)
index 0000000..df06c00
--- /dev/null
+++ b/mitsql.sql
@@ -0,0 +1,165 @@
+-- MySQL dump 10.9\r
+--\r
+-- Host: localhost    Database: mitsql\r
+-- ------------------------------------------------------\r
+-- Server version      4.1.12-nt\r
+\r
+/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;\r
+/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;\r
+/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;\r
+/*!40101 SET NAMES utf8 */;\r
+/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;\r
+/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;\r
+/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;\r
+/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;\r
+\r
+--\r
+-- Table structure for table `db`\r
+--\r
+\r
+DROP TABLE IF EXISTS `db`;\r
+CREATE TABLE `db` (\r
+  `DatabaseId` int(10) unsigned NOT NULL auto_increment,\r
+  `Name` varchar(200) NOT NULL default '',\r
+  `nBytes` int(10) unsigned NOT NULL default '0',\r
+  `dLastCheck` datetime NOT NULL default '0000-00-00 00:00:00',\r
+  `dCreated` datetime NOT NULL default '0000-00-00 00:00:00',\r
+  `bEnabled` tinyint(3) unsigned NOT NULL default '1',\r
+  PRIMARY KEY  (`DatabaseId`)\r
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;\r
+\r
+--\r
+-- Table structure for table `dbowner`\r
+--\r
+\r
+DROP TABLE IF EXISTS `dbowner`;\r
+CREATE TABLE `dbowner` (\r
+  `DatabaseId` int(10) unsigned NOT NULL default '0',\r
+  `UserId` int(10) unsigned NOT NULL default '0',\r
+  `GroupId` int(10) unsigned NOT NULL default '0',\r
+  KEY `DatabaseId` (`DatabaseId`),\r
+  KEY `UserId` (`UserId`),\r
+  KEY `GroupId` (`GroupId`)\r
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;\r
+\r
+--\r
+-- Table structure for table `dbquota`\r
+--\r
+\r
+DROP TABLE IF EXISTS `dbquota`;\r
+CREATE TABLE `dbquota` (\r
+  `DatabaseId` int(10) unsigned NOT NULL default '0',\r
+  `nBytesSoft` int(10) unsigned NOT NULL default '0',\r
+  `nBytesHard` int(10) unsigned NOT NULL default '0',\r
+  `dCreated` datetime NOT NULL default '0000-00-00 00:00:00',\r
+  PRIMARY KEY  (`DatabaseId`)\r
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;\r
+\r
+--\r
+-- Table structure for table `group`\r
+--\r
+\r
+DROP TABLE IF EXISTS `group`;\r
+CREATE TABLE `group` (\r
+  `GroupId` int(10) unsigned NOT NULL auto_increment,\r
+  `Username` varchar(200) NOT NULL default '',\r
+  `Password` varchar(200) NOT NULL default '',\r
+  `Name` text NOT NULL,\r
+  `Email` text NOT NULL,\r
+  `dCreated` datetime NOT NULL default '0000-00-00 00:00:00',\r
+  `bEnabled` tinyint(3) unsigned NOT NULL default '1',\r
+  PRIMARY KEY  (`GroupId`)\r
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;\r
+\r
+--\r
+-- Table structure for table `groupquota`\r
+--\r
+\r
+DROP TABLE IF EXISTS `groupquota`;\r
+CREATE TABLE `groupquota` (\r
+  `GroupId` int(10) unsigned NOT NULL default '0',\r
+  `nDatabases` int(10) unsigned NOT NULL default '0',\r
+  `nBytesSoft` int(10) unsigned NOT NULL default '0',\r
+  `nBytesHard` int(10) unsigned NOT NULL default '0',\r
+  `dCreated` datetime NOT NULL default '0000-00-00 00:00:00',\r
+  PRIMARY KEY  (`GroupId`)\r
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;\r
+\r
+--\r
+-- Table structure for table `groupstat`\r
+--\r
+\r
+DROP TABLE IF EXISTS `groupstat`;\r
+CREATE TABLE `groupstat` (\r
+  `GroupId` int(10) unsigned NOT NULL default '0',\r
+  `nDatabases` int(10) unsigned NOT NULL default '0',\r
+  `nBytes` int(10) unsigned NOT NULL default '0',\r
+  `dLastCheck` datetime NOT NULL default '0000-00-00 00:00:00',\r
+  PRIMARY KEY  (`GroupId`)\r
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;\r
+\r
+--\r
+-- Table structure for table `user`\r
+--\r
+\r
+DROP TABLE IF EXISTS `user`;\r
+CREATE TABLE `user` (\r
+  `UserId` int(10) unsigned NOT NULL auto_increment,\r
+  `Username` varchar(200) NOT NULL default '',\r
+  `Password` varchar(200) NOT NULL default '',\r
+  `Name` text NOT NULL,\r
+  `Email` text NOT NULL,\r
+  `UL` tinyint(3) unsigned NOT NULL default '1',\r
+  `dCreated` datetime NOT NULL default '0000-00-00 00:00:00',\r
+  `dSignup` datetime NOT NULL default '0000-00-00 00:00:00',\r
+  `bEnabled` tinyint(3) unsigned NOT NULL default '0',\r
+  PRIMARY KEY  (`UserId`)\r
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;\r
+\r
+--\r
+-- Table structure for table `usergroup`\r
+--\r
+\r
+DROP TABLE IF EXISTS `usergroup`;\r
+CREATE TABLE `usergroup` (\r
+  `UserId` int(10) unsigned NOT NULL default '0',\r
+  `GroupId` int(10) unsigned NOT NULL default '0',\r
+  KEY `UserId` (`UserId`),\r
+  KEY `GroupId` (`GroupId`)\r
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;\r
+\r
+--\r
+-- Table structure for table `userquota`\r
+--\r
+\r
+DROP TABLE IF EXISTS `userquota`;\r
+CREATE TABLE `userquota` (\r
+  `UserId` int(10) unsigned NOT NULL default '0',\r
+  `nDatabases` int(10) unsigned NOT NULL default '0',\r
+  `nBytesSoft` int(10) unsigned NOT NULL default '0',\r
+  `nBytesHard` int(10) unsigned NOT NULL default '0',\r
+  `dCreated` datetime NOT NULL default '0000-00-00 00:00:00',\r
+  PRIMARY KEY  (`UserId`)\r
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;\r
+\r
+--\r
+-- Table structure for table `userstat`\r
+--\r
+\r
+DROP TABLE IF EXISTS `userstat`;\r
+CREATE TABLE `userstat` (\r
+  `UserId` int(10) unsigned NOT NULL default '0',\r
+  `nDatabases` int(10) unsigned NOT NULL default '0',\r
+  `nBytes` int(10) unsigned NOT NULL default '0',\r
+  `dLastCheck` datetime NOT NULL default '0000-00-00 00:00:00',\r
+  PRIMARY KEY  (`UserId`)\r
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;\r
+\r
+/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;\r
+/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;\r
+/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;\r
+/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;\r
+/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;\r
+/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;\r
+/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;\r
+\r

diff --git a/signup.php b/signup.php
index e958d29a3109c48ac551dd1bad1d2f8b152e7b12..0b52815c42491d711d61079df0da4875e5e17591 100644 (file)
--- a/signup.php
+++ b/signup.php
@@ -4,20 +4,24 @@ require_once('mitsql.cfg.php');
 require_once('mitsql.lib.php');
 
 if (!isSSL())
-       redirect2(flipSSL());
+       redirect('index',false);
 
 if (isLoggedIn()) {
 
        redirect('index');
 
 } else {
-
+       
+       if (is_null($SSLCred)) {
+               $err[] = 'Please install a valid certificate.';
+       } else {
        $Login2 = new Login($SSLUsername);
        if (isPost() && $Login2->canSignup()) {
                $u = new User($Login2->getUserId());
                $u->signup($i_p1);
                $Login2->refresh();
        }
+       }
 
 }
 

diff --git a/tpl/login.php b/tpl/login.php
index 5151449861ad863900fde03e51ad147f3995b93b..54abd2b8e2f4dbe5d50f3e27809ecbd9cf16cf2c 100644 (file)
--- a/tpl/login.php
+++ b/tpl/login.php
@@ -30,7 +30,7 @@ $otherTxt = isSSL()?' without a Certificate':' with a Certificate';
 <input type=submit value="Login<?=$thisTxt?>">
 </form>
 
-<?php elseif (isSSL()): ?>
+<?php elseif (isSSL() && !is_null($SSLCred)): ?>
 
 <h3><a href="signup">Signup</a> to use this service.</h3>
 

diff --git a/tpl/signup.php b/tpl/signup.php
index c2fed42e523ea336dd3d328ebcdc3a143ec3e9a6..f01aa182432ea077252c3bb036bd057751e75213 100644 (file)
--- a/tpl/signup.php
+++ b/tpl/signup.php
@@ -8,11 +8,13 @@ $thisTxt = isSSL()?' with this Certificate':' via SQL';
 
 <?php printErrors($err); ?>
 
+<?php if (isset($Login2) && !$Login2->canLogin()): ?>
 <h3>You are registering as: <?=$Username?></h3>
 <p><?=$SSLName?></p>
 <p><?=$SSLEmail?></p>
+<?php endif; ?>
 
-<?php if ($Login2->canSignup()): ?>
+<?php if (isset($Login2) && $Login2->canSignup()): ?>
 
 <form method=post>
 <p>password: <input type="password" name="p1"></p>
@@ -20,14 +22,12 @@ $thisTxt = isSSL()?' with this Certificate':' via SQL';
 <input type=submit value="Confirm Registration">
 </form>
 
-<?php elseif ($Login2->canLogin()): ?>
+<?php elseif (isset($Login2) && $Login2->canLogin()): ?>
 
-<h3><a href="login">Login</a>. This account is already signed up.</h3>
+<h3><a href="login">Login</a>. This account is signed up.</h3>
 
 <?php else: ?>
 
-Hi
-
 <?php endif; ?>
 
 <?php