demand https and other kewl stuff

8 files changed, 42 insertions, 25 deletions

diff --git a/bucky2/bin/build-index b/bucky2/bin/build-index
index 437f146..acf35db 100755
--- a/bucky2/bin/build-index
+++ b/bucky2/bin/build-index
@@ -79,7 +79,7 @@ sub parse_terms
 			$lexicon->{$t}->{$thread}->{'file'} ||= $file;
 			# give terms in title an extra bump
 			if ($comment eq '0' && $file eq '0')
-				{ $lexicon->{$t}->{$thread}->{'strength'} += 2; }
+				{ $lexicon->{$t}->{$thread}->{'strength'} += 20; }
 			else
 				{ $lexicon->{$t}->{$thread}->{'strength'} += 1; }
 			$count++;
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);
diff --git a/fortune/titles b/fortune/titles
index 91f7e0c..1dfc421 100644
--- a/fortune/titles
+++ b/fortune/titles
@@ -361,23 +361,40 @@ bucky masters chopsticks
 bucky gets serious
 bucky's an american classic
 bucky's on the same page
-bucky's breakfast bounty
+bucky's brunch bonanza
 call up bucky, let's hang out
-bucky's last day in the monastery
+bucky's last day in purgatory
 onward to aleph, bucky ho!
-let's hear bucky sing it
+let's hear bucky praise it
 bucky's got great stage presence
 bucky's new beginning
 bucky belts it out
-another round from bucky
-bucky does it every day
-bucky makes it sound better
+bucky buys another round
+bucky's doing it every day
+bucky's making it sound better
 bucky gets in sync
 bucky stares beyond the chessboard
-bucky's main squeeze
+bucky's chief squeeze
 bucky's final paroxysm
 bucky on two gelcaps
 bucky is transforming
 bucky making it happen
 bucky's berry store
 bucky dines out
+bucky throws down
+bucky begs the question
+bucky demands more
+bucky orders the best thing
+bucky will have double
+bucky demands satisfaction
+bucky's dream comes alive
+bucky's midday reverie
+call 555-bcky
+calling bucky to account
+bucky goes slo-mo
+bucky's perceptive transition dawns
+bucky's origin story
+bucky reveals the answer
+bucky and the dream deferred
+bucky intends to say more
+blushing bucky bends backward
diff --git a/lib/cookies.pm b/lib/cookies.pm
index 559e80a..23e560b 100644
--- a/lib/cookies.pm
+++ b/lib/cookies.pm
@@ -30,8 +30,9 @@ sub setCookie
 	print "Set-Cookie: ";
 	print $name, "=", $value, "; ";
 	if ($date) { print "expires=$date; "; }
-#	print "path=", $path, "; domain=", $domain, "; secure\n";
-	print "path=", $path, "; domain=", $domain, "\n";
+	# use first line to force HTTPS
+	print "path=", $path, "; domain=", $domain, "; secure\n";
+#	print "path=", $path, "; domain=", $domain, "\n";
 	}
 
 
diff --git a/lib/forms.pm b/lib/forms.pm
index 52c6415..5f31368 100644
--- a/lib/forms.pm
+++ b/lib/forms.pm
@@ -817,7 +817,7 @@ FORMEND
 sub login_form
   {
   my $uri = '';
-  print qq{<form action="http://$BUCKY_HOST$BUCKY/login" method="post" enctype="multipart/form-data" name="lf">\n}; 
+  print qq{<form action="https://$BUCKY_HOST$BUCKY/login" method="post" enctype="multipart/form-data" name="lf">\n}; 
 
   if ($input->{redir} =~ /\?/)
     {
diff --git a/lib/privacy.pm b/lib/privacy.pm
index fcf3188..c735cf9 100644
--- a/lib/privacy.pm
+++ b/lib/privacy.pm
@@ -10,8 +10,8 @@ sub check_privacy
 		{ return 1; }
 	if (check_key($t->{allowed}, $USER->{id}))
 		{ return 1; }
-	if ($USER->{ulevel} == 3)   # A:.H:.
-		{ return 1; }
+	# if ($USER->{ulevel} == 3)   # A:.H:.
+	#	{ return 1; }
 	if ($k != -1)
 		{
 		if ($k->{owner} eq $USER->{username})
diff --git a/lib/session.pm b/lib/session.pm
index 072c0dc..1ae4a18 100644
--- a/lib/session.pm
+++ b/lib/session.pm
@@ -119,8 +119,8 @@ sub logout
   {
   my $error = shift;
   my $lender = undef;
-  # my $s = $ENV{'HTTPS'} eq "on" ? "s" : "";
-  my $s = "";
+  my $s = $ENV{'HTTPS'} eq "on" ? "s" : "";
+  # my $s = "";
 
   setCookie( { name => "name", value => undef, path => "$BUCKY/", domain => $BUCKY_COOKIE_DOMAIN } );
   setCookie( { name => "pass", value => undef, path => "$BUCKY/", domain => $BUCKY_COOKIE_DOMAIN } );
@@ -164,8 +164,8 @@ sub nice_redirect
 sub redirect
   {
   my $uri = shift;
-  # my $s = ($ENV{'HTTPS'} eq "on" || exists($input->{secure})) ? "s" : "";
-  my $s = "";
+  my $s = ($ENV{'HTTPS'} eq "on" || exists($input->{secure})) ? "s" : "";
+  # my $s = "";
   print "Location: http$s://$BUCKY_HOST$uri\n\n";
   $dbh->disconnect() if (defined($dbh));
   exit (0);