Revert change to wrong branch.

[ccbs] / html / ccbs.pm

diff --git a/html/ccbs.pm b/html/ccbs.pm
index 915e9507f1ffa99f24924c8020db2a496eb589b2..61dadf8f529e31638989b8794441509216582292 100755 (executable)
--- a/html/ccbs.pm
+++ b/html/ccbs.pm
@@ -3,13 +3,23 @@ use Template;
 use CGI;
 use DBI;
 use HTML::Entities;
+use Time::HiRes;
 use strict;
 use warnings;
 
+our $start_time;
+
+BEGIN {
+       $start_time = [Time::HiRes::gettimeofday()];
+}
+
 our $ccbs_dbdebug = 0;
+
+# Set this flag to disable any admin tasks -- it's quite crude, but hey :-)
+our $ccbs_noadmin = 0;
        
 sub print_header {
-       print CGI::header(-type=>'application/xhtml+xml; charset=utf-8');
+       print CGI::header(-type=>'text/html; charset=utf-8');
 }
 sub print_see_other {
        my $location = shift;
@@ -22,7 +32,7 @@ sub print_see_other {
 sub db_connect {
        $ccbs_dbdebug = defined(shift) ? 1 : 0;
 
-       my $dbh = DBI->connect("dbi:Pg:dbname=ccbs;host=sql.samfundet.no", "ccbs", "GeT|>>B_")
+       my $dbh = DBI->connect("dbi:Pg:dbname=ccbs;host=altersex.samfundet.no", "ccbs", "GeT|>>B_")
                or die "Couldn't connect to database";
        $dbh->{RaiseError} = 1;
        return $dbh;
@@ -60,6 +70,8 @@ sub process_template {
        my ($page, $title, $vars) = @_;
        $vars->{'page'} = $page;
        $vars->{'title'} = $title;
+       $vars->{'public'} = $ccbs_noadmin;
+       $vars->{'timetogenerate'} = sprintf "%.3f", Time::HiRes::tv_interval($start_time);
        
        my $config = {
                INCLUDE_PATH => 'templates/',
@@ -85,6 +97,9 @@ sub user_error {
 
        exit;
 }
+sub admin_only {
+       user_error("Beklager, databasen står i no-admin-mode.") if ($ccbs_noadmin);
+}
 
 $SIG{__DIE__} = sub {
        # Gosh! Net::Resolver::DNS is brain-damaged.