Tadashi Okoshi
slash****@users*****
2005年 6月 21日 (火) 17:45:25 JST
Index: affelio/lib/Affelio.pm diff -u affelio/lib/Affelio.pm:1.4 affelio/lib/Affelio.pm:1.5 --- affelio/lib/Affelio.pm:1.4 Mon Jun 20 14:06:13 2005 +++ affelio/lib/Affelio.pm Tue Jun 21 17:45:24 2005 @@ -1,4 +1,4 @@ -#!/usr/bin/perl +#!/usr/bin/perl -T # Affelio: Open social networking software # Copyright 2004-2005 Fish Grove @@ -6,7 +6,7 @@ # http://affelio.jp/ (Japan) # http://affelio.jp/ (USA and other area) # -# $Id: Affelio.pm,v 1.4 2005/06/20 05:06:13 slash5234 Exp $ +# $Id: Affelio.pm,v 1.5 2005/06/21 08:45:24 slash5234 Exp $ package Affelio; { @@ -26,6 +26,7 @@ use Affelio::Managing::ApplicationManager; use Affelio::misc::Debug; use Affelio::misc::L10N; + use Affelio::misc::WebInput; use Affelio::exception::TaintedInputException; @@ -348,6 +349,8 @@ my $self = shift; debug_print("Affelio::read_site_config: start."); + my $wi = new Affelio::misc::WebInput(); + my $Config = Config::Tiny->new(); $Config = Config::Tiny->read($self->{cfg_path}); @@ -379,7 +382,8 @@ #print "$dir\n"; if(($dir ne '.') && ($dir ne '..') && ($dir ne 'default') && ($dir ne 'CVS')){ - $self->{site__user_dir} = "$self->{cfg_dir}/userdata/$dir"; + $self->{site__user_dir} = + $wi->PTN_dirname("$self->{cfg_dir}/userdata/$dir"); } } #print "[$self->{site__user_dir}]\n"; @@ -389,11 +393,11 @@ my $Config2 = Config::Tiny->new(); $Config2 = Config::Tiny->read("$self->{site__user_dir}/login.cfg"); my $rootproperty2 = $Config2->{_}->{rootproperty}; - $self->{site__username} = $Config2->{auth}->{username}; + $self->{site__username} = $wi->PTN_nickname($Config2->{auth}->{username}); $self->{site__password} = $Config2->{auth}->{password}; #Determine session/..../ directory - $self->{site__session_dir} = "$self->{cfg_dir}/session"; + $self->{site__session_dir} = $wi->PTN_dirname("$self->{cfg_dir}/session"); debug_print("Affelio::read_site_config: session_dir = [$self->{site__session_dir}]"); debug_print("Affelio::read_site_config: end."); } @@ -422,7 +426,6 @@ debug_print("Affelio::write_user_prefs: end."); } - ###################################################################### #read_user_prefs ###################################################################### @@ -430,17 +433,19 @@ my $self = shift; debug_print("Affelio::read_user_prefs: start."); + my $wi = new Affelio::misc::WebInput; + my $Config = Config::Tiny->new(); $Config = Config::Tiny->read("$self->{site__user_dir}/preference.cfg"); my $rootproperty = $Config->{_}->{rootproperty}; #Read preferences $self->{userpref__emailack_fr_recv} - = $Config->{preference}->{emailack_friendship_recv}; + = $wi->PTN_word($Config->{preference}->{emailack_friendship_recv}); $self->{userpref__preferred_hosting_service} - = $Config->{preference}->{preferred_hosting_service}; + = $wi->PTN_URL($Config->{preference}->{preferred_hosting_service}); $self->{userpref__skin} - = $Config->{preference}->{skin}; + = $wi->PTN_word($Config->{preference}->{skin}); debug_print("Affelio::read_user_prefs: end."); }
