Move config stuff over in a separate file.

[ccbs] / html / ccbs.pm

diff --git a/html/ccbs.pm b/html/ccbs.pm
index 6dd7b1325421bee056436a69b018483de9f5a0d8..5a2638681252f07b476bc9b4955e5c7e4c8fe853 100755 (executable)
--- a/html/ccbs.pm
+++ b/html/ccbs.pm
@@ -10,22 +10,21 @@ use strict;
 use warnings;
 require '../intl/Sesse::GettextizeTemplates.pm';
 
+require '../config.pm';
+-r '../config.local.pm' and require '../config.local.pm';
+
+warn "Foo: " . $ccbs::config::lang;
+POSIX::setlocale( &POSIX::LC_CTYPE , $ccbs::config::lang );
+POSIX::setlocale( &POSIX::LC_MESSAGES , $ccbs::config::lang );
+Locale::gettext::bindtextdomain("ccbs", "po");
+Locale::gettext::textdomain("ccbs");
+
 our $start_time;
 
 BEGIN {
        $start_time = [Time::HiRes::gettimeofday()];
-       
-       POSIX::setlocale( &POSIX::LC_CTYPE , "nb_NO.UTF-8" );
-       POSIX::setlocale( &POSIX::LC_MESSAGES , "nb_NO.UTF-8" );
-       Locale::gettext::bindtextdomain("ccbs", "po");
-       Locale::gettext::textdomain("ccbs");
 }
 
-our $ccbs_dbdebug = 0;
-
-# Set this flag to disable any admin tasks -- it's quite crude, but hey :-)
-our $ccbs_noadmin = 0;
-
 # Hack to get the non-templatized gettext stuff working
 *_ = sub {
        return Locale::gettext::gettext(@_);
@@ -43,8 +42,6 @@ sub print_see_other {
 }
 
 sub db_connect {
-       $ccbs_dbdebug = defined(shift) ? 1 : 0;
-
        my $dbh = DBI->connect("dbi:Pg:dbname=ccbs;host=www.positivegaming.com", "ccbs", "GeT|>>B_")
                or die "Couldn't connect to database";
        $dbh->{RaiseError} = 1;
@@ -58,14 +55,14 @@ sub db_fetch_all {
        $q->execute(@parms)
                or die "Could not execute query: " . $dbh->errstr;
 
-       if ($ccbs_dbdebug) {
+       if ($config::ccbs::dbdebug) {
                warn $sql;
                warn "params=" . join(', ', @parms);
        }
        
        my @ret = ();
        while (my $ref = $q->fetchrow_hashref()) {
-               if ($ccbs_dbdebug) {
+               if ($config::ccbs::dbdebug) {
                        my $dbstr = "";
                        for my $k (sort keys %$ref) {
                                $dbstr .= " " . $k . "=" . $ref->{$k};
@@ -83,7 +80,7 @@ sub process_template {
        my ($page, $title, $vars) = @_;
        $vars->{'page'} = $page;
        $vars->{'title'} = $title;
-       $vars->{'public'} = $ccbs_noadmin;
+       $vars->{'public'} = $config::ccbs::noadmin;
        $vars->{'timetogenerate'} = sprintf "%.3f", Time::HiRes::tv_interval($start_time);
        
        my $config = {
@@ -112,7 +109,7 @@ sub user_error {
        exit;
 }
 sub admin_only {
-       user_error(_("Sorry, the database is in no-admin-mode.")) if ($ccbs_noadmin);
+       user_error(_("Sorry, the database is in no-admin-mode.")) if ($config::ccbs::noadmin);
 }
 
 $SIG{__DIE__} = sub {