demand https and other kewl stuff

2 files changed, 7 insertions, 8 deletions

diff --git a/cgi-bin/inbox b/cgi-bin/inbox
index 9760a54..8cb7d1f 100755
--- a/cgi-bin/inbox
+++ b/cgi-bin/inbox
@@ -61,10 +61,9 @@ else
 	my $box = exists($input->{box}) ? $input->{box} : "inbox";
 	my $limit = exists($input->{limit}) ? int($input->{limit}) : 50;
 	my $date = exists($input->{start}) ? int($input->{start}) : "now";
-
 	header("your $box");
-	menu();
 
+	menu();
 	my $messages = get_messages("$USER->{username}.$box", $limit, $date);
 	my $boxes = get_boxes($USER->{username});
 
@@ -111,7 +110,7 @@ userbox
 		{
 		print qq!<div align="right"><big><br>!;
 		$oldest = $messages->[-1]->{date};
-		print qq(<a href="$BUCKY/inbox/$box&limit=$limit&start=$oldest">next <b>$limit</b> messages &gt;&gt;</a>);
+		print qq(<a href="$BUCKY/inbox/$box?limit=$limit&start=$oldest">next <b>$limit</b> messages &gt;&gt;</a>);
 		print qq!</big></div>\n!;
 		}
 
diff --git a/cgi-bin/login b/cgi-bin/login
index 86fc4b1..0335549 100755
--- a/cgi-bin/login
+++ b/cgi-bin/login
@@ -12,11 +12,11 @@ if (-e "/var/www/vhosts/carbonpictures.com/bucky/lock")
   exit(0);
   }
 
-#if (! exists $ENV{'HTTPS'} || $ENV{'HTTPS'} ne "on")
-#	{
-#	print "Location: https://www.carbonpictures.com/cgi-bin/bucky/index\n\n";
-#	exit;
-#	}
+if (! exists $ENV{'HTTPS'} || $ENV{'HTTPS'} ne "on")
+	{
+	print "Location: https://www.carbonpictures.com/cgi-bin/bucky/index\n\n";
+	exit;
+	}
 use localbucky;
 
 $dbh = DBI->connect ($dsn);