diff options
| author | Jules Laplace <carbon@melanarchy.org> | 2013-09-12 13:26:04 -0500 |
|---|---|---|
| committer | Jules Laplace <carbon@melanarchy.org> | 2013-09-12 13:26:04 -0500 |
| commit | 63b0cf5fd4a637b0dba3b823c0c028d5087134fb (patch) | |
| tree | 773c5b1af54fcf3440a947f1525fdbf1a7a6add8 /lib | |
| parent | de2c01c711867eb764b295ca33e0b764ca1b4011 (diff) | |
don't force https anymore
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/constants.pm | 2 | ||||
| -rw-r--r-- | lib/forms.pm | 2 | ||||
| -rw-r--r-- | lib/invite.pm | 4 | ||||
| -rw-r--r-- | lib/session.pm | 6 |
4 files changed, 8 insertions, 6 deletions
diff --git a/lib/constants.pm b/lib/constants.pm index 129a9fa..36f12b9 100644 --- a/lib/constants.pm +++ b/lib/constants.pm @@ -7,7 +7,7 @@ our $BUCKY_CONFIG = 'PRIVACY_KEYWORD' => undef, 'PRIVACY_OWNER' => 'private', 'BASE_PATH' => '/var/www/vhosts/carbonpictures.com/bucky/', - 'BPOD_SERVICES_WAREZ_DIR' => 'https://www.carbonpictures.com/bucky/data/', + 'BPOD_SERVICES_WAREZ_DIR' => 'http://www.carbonpictures.com/bucky/data/', 'USERLIST_TITLE' => 'the carbon consortium', 'BUCKY_NAME' => 'bucky', 'UNSORTED_POSITION' => 'top', diff --git a/lib/forms.pm b/lib/forms.pm index 5f31368..52c6415 100644 --- a/lib/forms.pm +++ b/lib/forms.pm @@ -817,7 +817,7 @@ FORMEND sub login_form { my $uri = ''; - print qq{<form action="https://$BUCKY_HOST$BUCKY/login" method="post" enctype="multipart/form-data" name="lf">\n}; + print qq{<form action="http://$BUCKY_HOST$BUCKY/login" method="post" enctype="multipart/form-data" name="lf">\n}; if ($input->{redir} =~ /\?/) { diff --git a/lib/invite.pm b/lib/invite.pm index 96c6de0..d568342 100644 --- a/lib/invite.pm +++ b/lib/invite.pm @@ -167,7 +167,7 @@ email address: <input type="text" name="email" value="" size=20><br> adduserfoot print <<snark; -oh <b>h</b>e<b>l</b>l<b>o</b> <b>t</b>h<b>e</b>r<b>e</b> duder, please say hello<br> +please say hello:<br> <textarea name="grass" rows="5" style="width: 86%; padding: 0px 1px 1px 1px; font-family: trebuchet ms, sans serif; font-size: 11px;"></textarea> snark @@ -366,7 +366,7 @@ sub display_invite_row print qq(<tr>); print qq(<td align=center colspan=4>); - print qq(<a href="$BUCKY/invite?i=$i->{hash}">https://$BUCKY_HOST$BUCKY/invite/$i->{hash}</a>); + print qq(<a href="$BUCKY/invite?i=$i->{hash}">http://$BUCKY_HOST$BUCKY/invite/$i->{hash}</a>); print qq(</td>); print qq(</tr>); diff --git a/lib/session.pm b/lib/session.pm index 2074ee4..072c0dc 100644 --- a/lib/session.pm +++ b/lib/session.pm @@ -119,7 +119,8 @@ sub logout { my $error = shift; my $lender = undef; - my $s = $ENV{'HTTPS'} eq "on" ? "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 } ); @@ -163,7 +164,8 @@ sub nice_redirect sub redirect { my $uri = shift; - my $s = ($ENV{'HTTPS'} eq "on" || exists($input->{secure})) ? "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); |