X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=html%2Fccbs.pm;h=cd71ce8aeb6f68b3ee318ee5464b03a436b79f1a;hb=2b281b9236c2b6aae61081717ea6210900f0dbbe;hp=d3f07210ebec20c9a7432d99b4d5e2d953a2e29e;hpb=721adff0d70d1f13dee093b7a0620a2a9c088d02;p=ccbs

diff --git a/html/ccbs.pm b/html/ccbs.pm
index d3f0721..cd71ce8 100755
--- a/html/ccbs.pm
+++ b/html/ccbs.pm
@@ -10,17 +10,20 @@ use strict;
 use warnings;
 require '../intl/Sesse::GettextizeTemplates.pm';
 
+require '../config.pm';
+-r '../config.local.pm' and require '../config.local.pm';
+
+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()];
 }
 
-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(@_);
@@ -38,9 +41,7 @@ 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_")
+	my $dbh = DBI->connect("dbi:Pg:dbname=$ccbs::config::dbname;host=$ccbs::config::dbhost", $ccbs::config::dbuser, $ccbs::config::dbpass)
 		or die "Couldn't connect to database";
 	$dbh->{RaiseError} = 1;
 	return $dbh;
@@ -53,14 +54,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};
@@ -78,14 +79,9 @@ 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);
 	
-	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");
-	
 	my $config = {
 		INCLUDE_PATH => 'templates/',
 		INTERPOLATE  => 1,
@@ -112,7 +108,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 {