Mercurial > hg > soundsoftware-site
changeset 196:2eaccf99a7b0 luisf
Merge from branch "live"
| author | Chris Cannam |
|---|---|
| date | Mon, 07 Feb 2011 14:07:12 +0000 |
| parents | 90cc857e968a (current diff) 172b8d25c1ae (diff) |
| children | 55c3f4afe85d |
| files | config/locales/en-GB.yml config/locales/en.yml |
| diffstat | 2 files changed, 17 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/app/views/layouts/base.rhtml Mon Feb 07 12:52:57 2011 +0000 +++ b/app/views/layouts/base.rhtml Mon Feb 07 14:07:12 2011 +0000 @@ -3,8 +3,8 @@ <head> <meta http-equiv="content-type" content="text/html; charset=utf-8" /> <title><%=h html_title %></title> -<meta name="description" content="<%= Redmine::Info.app_name %>" /> -<meta name="keywords" content="issue,bug,tracker" /> +<meta name="description" content="A repository for software developed and published by audio and music researchers in the UK." /> +<meta name="keywords" content="audio,music,software,research,UK,sound,repository,code,redmine" /> <%= favicon %> <%= stylesheet_link_tag 'application', :media => 'all' %> <%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
--- a/extra/svn/SoundSoftware.pm Mon Feb 07 12:52:57 2011 +0000 +++ b/extra/svn/SoundSoftware.pm Mon Feb 07 14:07:12 2011 +0000 @@ -160,7 +160,7 @@ sub access_handler { my $r = shift; - print STDERR "SoundSoftware.pm: In access handler\n"; + print STDERR "SoundSoftware.pm: In access handler at " . scalar localtime() . "\n"; unless ($r->some_auth_required) { $r->log_reason("No authentication has been configured"); @@ -178,6 +178,13 @@ } my $dbh = connect_database($r); + unless ($dbh) { + print STDERR "SoundSoftware.pm: Database connection failed!: " . $DBI::errstr . "\n"; + return FORBIDDEN; + } + + +print STDERR "Connected to db, dbh is " . $dbh . "\n"; my $project_id = get_project_identifier($dbh, $r); my $status = get_project_status($dbh, $project_id, $r); @@ -201,9 +208,13 @@ sub authen_handler { my $r = shift; - print STDERR "SoundSoftware.pm: In authentication handler\n"; + print STDERR "SoundSoftware.pm: In authentication handler at " . scalar localtime() . "\n"; my $dbh = connect_database($r); + unless ($dbh) { + print STDERR "SoundSoftware.pm: Database connection failed!: " . $DBI::errstr . "\n"; + return AUTH_REQUIRED; + } my $project_id = get_project_identifier($dbh, $r); my $realm = get_realm($dbh, $project_id, $r); @@ -415,8 +426,8 @@ (__PACKAGE__, $r->server, $r->per_dir_config); return DBI->connect($cfg->{SoundSoftwareDSN}, - $cfg->{SoundSoftwareDbUser}, - $cfg->{SoundSoftwareDbPass}); + $cfg->{SoundSoftwareDbUser}, + $cfg->{SoundSoftwareDbPass}); } 1;