revived web_root option

diff --git a/etc/dot.keitairc b/etc/dot.keitairc
index 9588c8d..fea3668 100644 (file)
--- a/etc/dot.keitairc
+++ b/etc/dot.keitairc
@@ -1,7 +1,7 @@
 #
 # sample ~/.keitairc for keitairc 2.x
 #
-# $Id: dot.keitairc,v 1.4 2008-02-23 16:21:10 morimoto Exp $
+# $Id: dot.keitairc,v 1.5 2008-02-23 18:58:22 morimoto Exp $
 # $Source: /home/ishikawa/work/keitairc/tmp/keitairc/etc/dot.keitairc,v $
 
 ################################################################
@@ -26,6 +26,8 @@ web_host = your-keitairc-server.example.com
 # web_title = keitairc
 # Number of history per irc channel. Set to 100 by default.
 # web_lines = 100
+# root directory for web access. Set to / by default.
+# web_root = /
 
 ################################################################
 # Authorization setup
@@ -78,12 +80,14 @@ web_password = 1234
 # Set to /var/run by default.
 # pid_dir = /var/run
 
+# Verbose logging
+# debug = 1
+
 ################################################################
 # Obsoleted options
 ################################################################
 # au_pcsv option is obsoleted from keitairc 2.0
 # use_cookie is obsoleted from keitairc 2.0
-# web_root is obsoleted from keitairc 2.0
 # web_username is obsoleted from keitairc 2.0
 # show_newmsgonly is obsoleted from keitairc 2.0
 

diff --git a/keitairc b/keitairc
index b3ceac7..af4a5cc 100755 (executable)
--- a/keitairc
+++ b/keitairc
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 # keitairc
-# $Id: keitairc,v 1.41 2008-02-23 16:21:10 morimoto Exp $
+# $Id: keitairc,v 1.42 2008-02-23 18:58:22 morimoto Exp $
 # $Source: /home/ishikawa/work/keitairc/tmp/keitairc/keitairc,v $
 #
 # Copyright (c) 2003-2008 Jun Morimoto <morimoto@mrmt.net>
@@ -120,6 +120,12 @@ sub dispatch{
 
        ::log_debug("dispatch: $uri");
 
+       {
+               # chop off $cf->web_root()
+               my $root = $cf->web_root();
+               $uri =~ s|$root|/|;
+       }
+
        if($uri eq '/'){
                return action_root($request);
        }
@@ -189,7 +195,7 @@ sub action_login{
 
        # password mismatch
        my $view = new Keitairc::View($cf, $ci);
-       return $view->redirect("/");
+       return $view->redirect('/');
 }
 
 ################################################################
@@ -353,19 +359,18 @@ sub render_line{
 sub log{
        my $m = shift;
        warn "keitairc: $m\n";
-       # TODO
 }
 
 sub log_die{
        my $m = shift;
        die "keitairc: $m\n";
-       # TODO
 }
 
 sub log_debug{
        my $m = shift;
-       warn "keitairc: $m\n";
-       # TODO
+       if($cf->debug()){
+               warn "keitairc(debug): $m\n";
+       }
 }
 
 __END__

diff --git a/lib/Keitairc/Config.pm b/lib/Keitairc/Config.pm
index 804fd68..bc68674 100644 (file)
--- a/lib/Keitairc/Config.pm
+++ b/lib/Keitairc/Config.pm
@@ -1,6 +1,6 @@
 # -*-perl-*-
 # Keitairc::Config
-# $Id: Config.pm,v 1.5 2008-02-23 16:21:10 morimoto Exp $
+# $Id: Config.pm,v 1.6 2008-02-23 18:58:22 morimoto Exp $
 # $Source: /home/ishikawa/work/keitairc/tmp/keitairc/lib/Keitairc/Config.pm,v $
 #
 # Copyright (c) 2008 Jun Morimoto <morimoto@mrmt.net>
@@ -27,11 +27,12 @@ sub new{
                   irc_server irc_port irc_password
                   au_subscriber_id au_pcsv
                   docomo_foma_icc
+                  softbank_serial_key
                   use_cookie cookie_ttl session_ttl
                   web_port web_title web_lines web_root
                   web_username web_password web_host
                   show_newmsgonly ping_delay reconnect_delay
-                  smtp_server smtp_from smtp_to
+                  smtp_server smtp_from smtp_to debug
                   template_dir version daemonize pid_dir plugin_dir)
                );
 
@@ -41,7 +42,8 @@ sub new{
        $me->irc_port(6667);
        $me->web_port(8080);
        $me->web_title('keitairc');
-       $me->web_line(100);
+       $me->web_lines(100);
+       $me->web_root('/');
        $me->ping_delay(30);
        $me->reconnect_delay(10);
        $me->cookie_ttl(86400 * 3);  # 3 days
@@ -77,10 +79,6 @@ sub new{
                ::log("use_cookie has obsoleted from keitairc 2.0");
        }
 
-       if(defined $me->web_root()){
-               ::log("web_root has obsoleted from keitairc 2.0");
-       }
-
        if(defined $me->au_pcsv()){
                ::log("au_pcsv has obsoleted from keitairc 2.0");
        }

diff --git a/lib/Keitairc/IrcCallback.pm b/lib/Keitairc/IrcCallback.pm
index dac049d..a6a71c7 100644 (file)
--- a/lib/Keitairc/IrcCallback.pm
+++ b/lib/Keitairc/IrcCallback.pm
@@ -1,6 +1,6 @@
 # -*-perl-*-
 # Keitairc::IrcCallback
-# $Id: IrcCallback.pm,v 1.4 2008-02-23 15:36:56 morimoto Exp $
+# $Id: IrcCallback.pm,v 1.5 2008-02-23 18:58:22 morimoto Exp $
 # $Source: /home/ishikawa/work/keitairc/tmp/keitairc/lib/Keitairc/IrcCallback.pm,v $
 #
 # Copyright (c) 2008 Jun Morimoto <morimoto@mrmt.net>
@@ -174,9 +174,10 @@ sub irc_msg{
                $buddy = $who;
        }
        $ib->join($buddy); # XXX: join $buddy if not joined
+       my $cid = $ib->name2cid($buddy);
 
        Encode::from_to($msg, 'jis', 'euc-jp');
-       $ib->add_message($buddy, $msg, $who);
+       $ib->add_message($cid, $msg, $who);
        $heap->{seen_traffic} = 1;
        $heap->{disconnect_msg} = 1;
 }

diff --git a/lib/Keitairc/View.pm b/lib/Keitairc/View.pm
index 2356113..f62c171 100644 (file)
--- a/lib/Keitairc/View.pm
+++ b/lib/Keitairc/View.pm
@@ -1,6 +1,6 @@
 # -*-perl-*-
 # Keitairc::View
-# $Id: View.pm,v 1.6 2008-01-14 05:21:09 morimoto Exp $
+# $Id: View.pm,v 1.7 2008-02-23 18:58:22 morimoto Exp $
 # $Source: /home/ishikawa/work/keitairc/tmp/keitairc/lib/Keitairc/View.pm,v $
 #
 # Copyright (c) 2008 Jun Morimoto <morimoto@mrmt.net>
@@ -33,11 +33,22 @@ sub redirect{
        my $me = shift;
        my $path = shift;
 
-       $path = sprintf('http://%s:%d%s%s',
-                       $me->{Config}->web_host(),
-                       $me->{Config}->web_port(),
-                       $path);
+       if($me->{Config}->web_root() eq '/'){
+               $path = sprintf('http://%s:%d%s%s',
+                               $me->{Config}->web_host(),
+                               $me->{Config}->web_port(),
+                               $path);
+       }else{
+               # Softbank
+               $path =~ s|^/||;
+               $path = sprintf('http://%s%s%s',
+                               $me->{Config}->web_host(),
+                               $me->{Config}->web_root(),
+                               $path);
+       }
+
        ::log_debug("path [$path]");
+
        my $response = HTTP::Response->new(302);
        $response->push_header('Location', $path);
        $response;
@@ -61,6 +72,7 @@ sub template{
        my $vars = shift;
 
        my $p = {};
+       $p->{root} = $me->{Config}->web_root();
        $p->{title} = $me->{Config}->web_title();
        $p->{version} = $me->{Config}->version();
        $p->{timestamp} = timestamp();

diff --git a/lib/plugins/10url b/lib/plugins/10url
index 7c0e34a..8ae9b64 100644 (file)
--- a/lib/plugins/10url
+++ b/lib/plugins/10url
@@ -1,7 +1,7 @@
 # -*-perl-*-
 # keitairc/lib/plugins/10url
 # URL\8f\88\97\9d
-# $Id: 10url,v 1.3 2008-01-15 12:21:00 morimoto Exp $
+# $Id: 10url,v 1.4 2008-02-23 18:58:22 morimoto Exp $
 # $Source: /home/ishikawa/work/keitairc/tmp/keitairc/lib/plugins/10url,v $
 
 $plugin = {
@@ -11,9 +11,13 @@ $plugin = {
        message_replace_imprementation => sub {
                my ($session_id, $param) = @_;
                if($param =~ m/^http/){
-                       return sprintf('<a href="/%s/url/%s">%s</a>', $session_id, $param, $param);
+                       return sprintf('<a href="%s%s/url/%s">%s</a>',
+                                      $::cf->web_root(),
+                                      $session_id, $param, $param);
                }
-               return sprintf('<a href="/%s/url/http://%s">%s</a>', $session_id, $param, $param);
+               return sprintf('<a href="%s%s/url/http://%s">%s</a>',
+                              $::cf->web_root(),
+                              $session_id, $param, $param);
        },
 
        action_imprementation => sub {

diff --git a/lib/plugins/20mail b/lib/plugins/20mail
index c836346..085968a 100644 (file)
--- a/lib/plugins/20mail
+++ b/lib/plugins/20mail
@@ -1,7 +1,7 @@
 # -*-perl-*-
 # keitairc/lib/plugins/20mail
 # \83\81\81[\83\8b\83A\83h\83\8c\83X
-# $Id: 20mail,v 1.2 2008-01-13 12:12:55 morimoto Exp $
+# $Id: 20mail,v 1.3 2008-02-23 18:58:22 morimoto Exp $
 # $Source: /home/ishikawa/work/keitairc/tmp/keitairc/lib/plugins/20mail,v $
 
 $plugin = {
@@ -10,7 +10,8 @@ $plugin = {
        message_replace_regexp => '\b(\w[\w.+=-]*\@[\w.-]+[\w]\.[\w]{2,4})\b',
        message_replace_imprementation => sub {
                my ($session_id, $param) = @_;
-               sprintf('<a href="/%s/mail/%s">%s</a>', $session_id, $param, $param);
+               sprintf('<a href="%s%s/mail/%s">%s</a>',
+                       $::cf->web_root(), $session_id, $param, $param);
        },
 
        action_imprementation => sub {

diff --git a/lib/plugins/20phone b/lib/plugins/20phone
index 5684231..64c4ea2 100644 (file)
--- a/lib/plugins/20phone
+++ b/lib/plugins/20phone
@@ -1,7 +1,7 @@
 # -*-perl-*-
 # keitairc/lib/plugins/20phone
 # \93d\98b\94Ô\8d\86
-# $Id: 20phone,v 1.3 2008-01-13 12:12:55 morimoto Exp $
+# $Id: 20phone,v 1.4 2008-02-23 18:58:22 morimoto Exp $
 # $Source: /home/ishikawa/work/keitairc/tmp/keitairc/lib/plugins/20phone,v $
 
 $plugin = {
@@ -10,7 +10,8 @@ $plugin = {
        message_replace_regexp => '\b(0\d{1,3})([-(]?)(\d{2,4})([-)]?)(\d{4})\b',
        message_replace_imprementation => sub {
                my ($session_id, $p1, $p2, $p3, $p4, $p5) = @_;
-               sprintf('<a href="/%s/phone/%s%s%s">%s%s%s%s%s</a>',
+               sprintf('<a href="%s%s/phone/%s%s%s">%s%s%s%s%s</a>',
+                       $::cf->web_root(),
                        $session_id,
                        $p1, $p3, $p5,
                        $p1, $p2, $p3, $p4, $p5);

diff --git a/lib/templates/404.html b/lib/templates/404.html
index fd587d4..2f5841b 100644 (file)
--- a/lib/templates/404.html
+++ b/lib/templates/404.html
@@ -12,7 +12,7 @@
 
     404: No such action (<!-- tmpl_var action -->)<br />
     <hr />
-    <a accesskey="0" href="/">[0] Û¸Þ²Ý</a>
+    <a accesskey="0" href="<!-- tmpl_var root -->">[0] Û¸Þ²Ý</a>
     <hr />
     <!-- tmpl_var timestamp --><br />
     keitairc <!-- tmpl_var version -->

diff --git a/lib/templates/location.html b/lib/templates/location.html
index 51e06c9..97811a4 100644 (file)
--- a/lib/templates/location.html
+++ b/lib/templates/location.html
@@ -22,8 +22,8 @@
     </tmpl_if>
 
     <tmpl_if is_softbank>
-      <a accesskey="1" href="/<!-- tmpl_var session_id -->/location_receiver/<!-- tmpl_var cid -->" z>[1] \88Ê\92u\8fî\95ñ\91ª\92è</a><br />
-      <a accesskey="2" href="location:auto?url=http://<!-- tmpl_var web_host -->:<!-- tmpl_var web_port -->/<!-- tmpl_var session_id -->/location_receiver/<!-- tmpl_var cid -->">[1] \88Ê\92u\8fî\95ñ\91ª\92è(3GC\92[\96\96)</a><br />
+      <a accesskey="1" href="<!-- tmpl_var root --><!-- tmpl_var session_id -->/location_receiver/<!-- tmpl_var cid -->" z>[1] \88Ê\92u\8fî\95ñ\91ª\92è</a><br />
+      <a accesskey="2" href="location:auto?url=http://<!-- tmpl_var web_host -->:<!-- tmpl_var root -->/<!-- tmpl_var session_id -->/location_receiver/<!-- tmpl_var cid -->">[2] \88Ê\92u\8fî\95ñ\91ª\92è(3GC\92[\96\96)</a><br />
     </tmpl_if>
 
     <hr />

diff --git a/lib/templates/location_receiver.html b/lib/templates/location_receiver.html
index 8158144..cdfadaa 100644 (file)
--- a/lib/templates/location_receiver.html
+++ b/lib/templates/location_receiver.html
@@ -26,7 +26,7 @@
        <img src="<!-- tmpl_var map_image_url -->" width="160" height="240" alt="" />
       </center>
       \8c»\8dÝ\88Ê\92u\82Í<!-- tmpl_var address -->\82Å\82·\81B<br />
-      <form action="/<!-- tmpl_var session_id -->/all/<!-- tmpl_var cid -->" method="post">
+      <form action="<!-- tmpl_var root --><!-- tmpl_var session_id -->/all/<!-- tmpl_var cid -->" method="post">
        <tmpl_if is_ipod>
          <input type="text" name="m" value="\8c»\8dÝ\88Ê\92u L:<!-- tmpl_var address -->" />
        <tmpl_else>
@@ -39,7 +39,7 @@
     </tmpl_if>
 
     <hr />
-    <a accesskey="8" href="/<!-- tmpl_var session_id -->/index">[8] Á¬ÈÙؽÄ</a><br />
+    <a accesskey="8" href="<!-- tmpl_var root --><!-- tmpl_var session_id -->/index">[8] Á¬ÈÙؽÄ</a><br />
     <hr />
     <!-- tmpl_var timestamp --><br />
     keitairc <!-- tmpl_var version -->

diff --git a/lib/templates/mail.html b/lib/templates/mail.html
index f973d86..2030d16 100644 (file)
--- a/lib/templates/mail.html
+++ b/lib/templates/mail.html
@@ -12,7 +12,7 @@
     Ò-Ù±ÄÞÚ½ <!-- tmpl_var mail -->
     <hr />
 
-    <form method="post" action="/<!-- tmpl_var session_id -->/postme">
+    <form method="post" action="<!-- tmpl_var root --><!-- tmpl_var session_id -->/postme">
       <a accesskey="1" href="mailto:<!-- tmpl_var mail -->">[1] Ò-Ù\82ð\8dì\90¬</a><br />
       Ò-Ù±ÄÞÚ½\82ðºËß-<br />
       <input type="text" name="text" value="<!-- tmpl_var mail -->" />
@@ -20,7 +20,7 @@
     </form>
 
     <hr />
-    <a accesskey="8" href="/<!-- tmpl_var session_id -->/index">[8] Á¬ÈÙؽÄ</a>
+    <a accesskey="8" href="<!-- tmpl_var root --><!-- tmpl_var session_id -->/index">[8] Á¬ÈÙؽÄ</a>
     <hr />
     <!-- tmpl_var timestamp --><br />
     keitairc <!-- tmpl_var version -->

diff --git a/lib/templates/phone.html b/lib/templates/phone.html
index 0f76252..df4027d 100644 (file)
--- a/lib/templates/phone.html
+++ b/lib/templates/phone.html
@@ -12,7 +12,7 @@
     \93d\98b\94Ô\8d\86 <!-- tmpl_var phone -->
     <hr />
 
-    <form method="post" action="/<!-- tmpl_var session_id -->/postme">
+    <form method="post" action="<!-- tmpl_var root --><!-- tmpl_var session_id -->/postme">
       <a accesskey="1" href="tel:<!-- tmpl_var phone -->">[1] \93d\98b\82ð\82©\82¯\82é</a><br />
       <tmpl_if docomo>
        <a accesskey="2" href="tel-av:<!-- tmpl_var phone -->">[2] TV\93d\98b\82ð\82©\82¯\82é</a><br />
@@ -23,7 +23,7 @@
     </form>
 
     <hr />
-    <a accesskey="8" href="/<!-- tmpl_var session_id -->/index">[8] Á¬ÈÙؽÄ</a>
+    <a accesskey="8" href="<!-- tmpl_var root --><!-- tmpl_var session_id -->/index">[8] Á¬ÈÙؽÄ</a>
     <hr />
     <!-- tmpl_var timestamp --><br />
     keitairc <!-- tmpl_var version -->

diff --git a/lib/templates/postme.html b/lib/templates/postme.html
index 1781be4..8389435 100644 (file)
--- a/lib/templates/postme.html
+++ b/lib/templates/postme.html
@@ -25,7 +25,7 @@
     </tmpl_if>
 
     <hr />
-    <a accesskey="8" href="/<!-- tmpl_var session_id -->/index">[8] Á¬ÈÙؽÄ</a>
+    <a accesskey="8" href="<!-- tmpl_var root --><!-- tmpl_var session_id -->/index">[8] Á¬ÈÙؽÄ</a>
     <hr />
     <!-- tmpl_var timestamp --><br />
     keitairc <!-- tmpl_var version -->

diff --git a/lib/templates/url.html b/lib/templates/url.html
index 7b423ef..91efff7 100644 (file)
--- a/lib/templates/url.html
+++ b/lib/templates/url.html
@@ -12,7 +12,7 @@
     <!-- tmpl_var url -->
     <hr />
     <font color="#f3333">\82±\82ÌÍß-¼Þ\82Å\82Í[\96ß\82é]ÎÞÀÝ\82Í\8eg\82¦\82Ü\82¹\82ñ</font><br />
-    <form method="post" action="/<!-- tmpl_var session_id -->/postme">
+    <form method="post" action="<!-- tmpl_var root --><!-- tmpl_var session_id -->/postme">
       <a accesskey="1" href="<!-- tmpl_var url -->">
        [1] \92¼\90Ú±¸¾½</a><br />
       <a accesskey="2" href="http://mgw.hatena.ne.jp/?url=<!-- tmpl_var escaped_url -->&noimage=0&split=1">
@@ -29,7 +29,7 @@
     </form>
 
     <hr />
-    <a accesskey="8" href="/<!-- tmpl_var session_id -->/index">[8] Á¬ÈÙؽÄ</a>
+    <a accesskey="8" href="<!-- tmpl_var root --><!-- tmpl_var session_id -->/index">[8] Á¬ÈÙؽÄ</a>
     <hr />
     <!-- tmpl_var timestamp --><br />
     keitairc <!-- tmpl_var version -->