summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authoryorhel <yorhel@1fe2e327-d9db-4752-bcf7-ef0cb4a1748b>2008-06-06 15:33:01 +0000
committeryorhel <yorhel@1fe2e327-d9db-4752-bcf7-ef0cb4a1748b>2008-06-06 15:33:01 +0000
commit8ca9a520d993d0a1a8b7bbcd800b68bf7543b7c3 (patch)
tree1db0d1842a67ed0da169e02e6ade4b3324ad117f /lib
parentd667908bb47626b789344048537b3eb9e00d6828 (diff)
Removed old stuff and passwords. All passwords in older revisions have been changed :)
git-svn-id: svn://vndb.org/vndb@22 1fe2e327-d9db-4752-bcf7-ef0cb4a1748b
Diffstat (limited to 'lib')
-rw-r--r--lib/ChangeLog3
-rw-r--r--lib/Multi/Anime.pm2
-rw-r--r--lib/Multi/IRC.pm2
-rw-r--r--lib/VNDB.pm138
-rw-r--r--lib/VNDB/Util/Response.pm2
-rw-r--r--lib/global.pl44
6 files changed, 52 insertions, 139 deletions
diff --git a/lib/ChangeLog b/lib/ChangeLog
index 8570477b..1513b5af 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -14,6 +14,9 @@ TODO:
1.17 - 2008-05-23
- Added PS3 and Xbox 360 to platforms
- Relation graph generation improvements: Unicode, anti-aliassing, async
+ - Removed all passwords from the main code, and created a seperate config
+ file to override all options - not available on SVN
+ - Dynamic loading, several bugfixes, and code cleanup for Multi
1.16 - 2008-05-22
- Release dates in the current year or month without a specified day will
diff --git a/lib/Multi/Anime.pm b/lib/Multi/Anime.pm
index 68fcce4e..6f329bd5 100644
--- a/lib/Multi/Anime.pm
+++ b/lib/Multi/Anime.pm
@@ -58,8 +58,6 @@ sub spawn {
},
PeerPort => 9000,
# AniDB UDP API options
- user => 'vnmulti',
- pass => '',
client => 'multi',
clientver => 1,
# Misc settings
diff --git a/lib/Multi/IRC.pm b/lib/Multi/IRC.pm
index e143d56b..23b476ab 100644
--- a/lib/Multi/IRC.pm
+++ b/lib/Multi/IRC.pm
@@ -31,7 +31,7 @@ sub spawn {
],
heap => { irc => $irc,
o => {
- user => 'Multi',
+ user => 'Multi_test'.$$,
server => 'irc.synirc.net',
ircname => 'VNDB.org Multi',
channel => '#vndb',
diff --git a/lib/VNDB.pm b/lib/VNDB.pm
index 5ac3bc87..2e316324 100644
--- a/lib/VNDB.pm
+++ b/lib/VNDB.pm
@@ -5,34 +5,6 @@ use warnings;
BEGIN { require 'global.pl'; }
our $DEBUG;
-our %VNDBopts = (
- CookieDomain => '.vndb.org',
- root_url => $DEBUG ? 'http://beta.vndb.org' : 'http://vndb.org',
- static_url => $DEBUG ? 'http://static.beta.vndb.org' : 'http://static.vndb.org',
- debug => $DEBUG,
- tplopts => {
- filename => 'main',
- searchdir => '/www/vndb/data/tpl',
- compiled => '/www/vndb/data/tplcompiled.pm',
- namespace => 'VNDB::Util::Template::tpl',
- pre_chomp => 1,
- post_chomp => 1,
- rm_newlines => 0,
- deep_reload => $DEBUG,
- },
- ranks => [
- [ [ qw| visitor loser user mod admin | ], [] ],
- {map{$_,1}qw| hist |}, # 0 - visitor (not logged in)
- {map{$_,1}qw| hist |}, # 1 - loser
- {map{$_,1}qw| hist edit |}, # 2 - user
- {map{$_,1}qw| hist edit mod lock |}, # 3 - mod
- {map{$_,1}qw| hist edit mod lock del userlist useredit |}, # 4 - admin
- ],
- imgpath => '/www/vndb/static/cv',
- mappath => '/www/vndb/data/rg',
- docpath => '/www/vndb/data/docs',
-);
-$VNDBopts{ranks}[0][1] = { (map{$_,1} map { keys %{$VNDBopts{ranks}[$_]} } 1..5) };
require Time::HiRes if $DEBUG;
require Data::Dumper if $DEBUG;
@@ -168,6 +140,9 @@ my %OLDuris = (
'p+' => {
hist=>{rss => sub { shift->ResRedirect('/p'.(shift).'/hist/rss.xml', 'perm') } },
},
+ 'r+' => {
+ hist=>{rss => sub { shift->ResRedirect('/r'.(shift).'/hist/rss.xml', 'perm') } },
+ },
hist=>{rss => sub { shift->ResRedirect('/hist/rss.xml', 'perm') } },
);
@@ -241,110 +216,3 @@ sub uri2page {
1;
-
-__END__
-
-# O L D C O D E - N O T U S E D A N Y M O R E
-
-
-# Apache 2 handler
-sub handler ($$) {
- my $r = shift;
-
- # we don't handle internal redirects! (fixes ErrorDocument directives)
- return Apache2::Const::DECLINED
- if $r->prev || $r->next;
-
- my $start = [Time::HiRes::gettimeofday()] if $DEBUG;
- @WARN = ();
- my($code, $res, $err);
- $SIG{__WARN__} = sub { push(@VNDB::WARN, @_); warn @_; };
-
- $err = eval {
-
- @Time::CTime::DoW = qw|Sun Mon Tue Wed Thu Fri Sat|;
- @Time::CTime::DayOfWeek = qw|Sunday Monday Tuesday Wednesday Thursday Friday Saturday|;
- @Time::CTime::MoY = qw|Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec|;
- @Time::CTime::MonthOfYear = qw|January February March April May June July August September October November December|;
-
- $VNDB = VNDB->new(%VNDBopts) if !$VNDB;
- $VNDB->{r} = $r;
-
- # let apache handle static files
- (my $uri = lc($r->uri())) =~ s/\/+//;
- if(index($uri, '..') == -1 && -f '/www/vndb/www/' . $uri) {
- $code = Apache2::Const::DECLINED;
- return $code;
- }
-
- $VNDB->DBCheck();
- ($res, $code) = $VNDB->get_page($r);
- if($DEBUG) {
- my($sqlt, $sqlc) = (0, 0);
- foreach (@{$res->{_DB}->{Queries}}) {
- if($_->[0]) {
- $sqlc++;
- $sqlt += $_->[1];
- }
- }
- my $time = Time::HiRes::tv_interval($start);
- my $tpl = $res->{_Res}->{_tpltime} ? $res->{_Res}->{_tpltime}/$time*100 : 0;
- my $gzip = 0;
- $gzip = 100 - $res->{_Res}->{_gzip}->[1]/$res->{_Res}->{_gzip}->[0]*100
- if($res->{_Res}->{_gzip} && ref($res->{_Res}->{_gzip}) eq 'ARRAY' && $res->{_Res}->{_gzip}->[0] > 0);
- printf STDERR "Took %3dms (SQL/TPL/perl: %4.1f%% %4.1f%% %4.1f%%) (GZIP: %4.1f%%) to parse %s\n",
- $time*1000, $sqlt/$time*100, $tpl, 100-($sqlt/$time*100)-$tpl, $gzip, $r->uri();
- }
-
- };
-
- # error occured, create a dump file
- if(!defined $err && $@ && $DEBUG) {
- undef $res->{_Res};
- undef $res->{_Req};
- die $@;
- } elsif(!defined $err && $@) {
- if(open(my $E, sprintf '>/www/vndb/data/errors/%04d-%02d-%02d-%d',
- (localtime)[5]+1900, (localtime)[4]+1, (localtime)[3], time)) {
- print $E 'Error @ ' . scalar localtime;
-
- print $E "\n\nRequest:\n" . $r->the_request . "\n";
- print $E "$_: " . $r->headers_in->{$_} . "\n"
- for (keys %{$r->headers_in});
-
- print $E "\nParams:\n";
- my $re = Apache2::Request->new($r);
- print $E "$_: " . $re->param($_) . "\n"
- for ($re->param());
-
- print $E "\nError:\n$@\n\n";
- print $E "Warnings:\n".join('', @WARN)."\n";
- close($E);
- }
- $VNDB->DBRollBack();
- undef $res->{_Res};
- undef $res->{_Req};
- die "Error, check dumpfile!\n";
- }
-
- undef $res->{_Res};
- undef $res->{_Req};
- # let apache handle 404's
- $code = Apache2::Const::DECLINED if $code == 404;
- return $code;
-}
-
-
-sub mod_perl_init {
- require Apache2::RequestRec;
- require Apache2::RequestIO;
- $VNDB = __PACKAGE__->new(%VNDBopts);
- return 0;
-}
-
-
-sub mod_perl_exit {
- $VNDB->DBExit() if defined $VNDB && ref $VNDB eq __PACKAGE__;
- return 0;
-}
-
diff --git a/lib/VNDB/Util/Response.pm b/lib/VNDB/Util/Response.pm
index 8d3f33b8..c5e9a704 100644
--- a/lib/VNDB/Util/Response.pm
+++ b/lib/VNDB/Util/Response.pm
@@ -12,7 +12,7 @@ use Exporter 'import';
require bytes;
use vars ('$VERSION', '@EXPORT');
-$VERSION = $NTL::VERSION;
+$VERSION = $VNDB::VERSION;
@EXPORT = qw| ResRedirect ResNotFound ResDenied ResFile
ResForceBody ResSetContentType ResAddHeader ResAddTpl ResAddDefaultStuff
ResStartXML ResGetXML ResGetBody ResGet ResGetCGI ResSetModPerl |;
diff --git a/lib/global.pl b/lib/global.pl
index 37839a42..817f8928 100644
--- a/lib/global.pl
+++ b/lib/global.pl
@@ -5,6 +5,45 @@ our @SHMOPTS = ( -key => 'VNDB', -create => 'yes', -destroy => 'no', -mode => 06
our $DEBUG = 1;
our $VERSION = '1.17';
+our $MULTI = [
+ RG => {},
+ Image => {},
+ Sitemap => {},
+ #Anime => { user => '', pass => '' },
+ Maintenance => {},
+ #IRC => { user => 'Multi'},
+];
+
+our %VNDBopts = (
+ CookieDomain => '.vndb.org',
+ root_url => 'http://vndb.org',
+ static_url => 'http://static.vndb.org',
+ debug => $DEBUG,
+ tplopts => {
+ filename => 'main',
+ searchdir => '/www/vndb/data/tpl',
+ compiled => '/www/vndb/data/tplcompiled.pm',
+ namespace => 'VNDB::Util::Template::tpl',
+ pre_chomp => 1,
+ post_chomp => 1,
+ rm_newlines => 0,
+ deep_reload => $DEBUG,
+ },
+ ranks => [
+ [ [ qw| visitor loser user mod admin | ], [] ],
+ {map{$_,1}qw| hist |}, # 0 - visitor (not logged in)
+ {map{$_,1}qw| hist |}, # 1 - loser
+ {map{$_,1}qw| hist edit |}, # 2 - user
+ {map{$_,1}qw| hist edit mod lock |}, # 3 - mod
+ {map{$_,1}qw| hist edit mod lock del userlist useredit |}, # 4 - admin
+ ],
+ imgpath => '/www/vndb/static/cv',
+ mappath => '/www/vndb/data/rg',
+ docpath => '/www/vndb/data/docs',
+);
+$VNDBopts{ranks}[0][1] = { (map{$_,1} map { keys %{$VNDBopts{ranks}[$_]} } 1..5) };
+
+
our $PLAT = {
win => 'Windows',
lin => 'Linux',
@@ -597,5 +636,10 @@ our $LANG = {
# 'zun' => q|Zuni|,
};
+
+# override config vars
+require '/www/vndb/data/config.pl' if -e '/www/vndb/data/config.pl';
+
+
1;