Client detection minor cleanup.

- Use 'is_XXX' name.
- Add 'is_mobile' method to check if client is a mobile phone or not.

diff --git a/keitairc b/keitairc
index f6768df..87ffa59 100755 (executable)
--- a/keitairc
+++ b/keitairc
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 # keitairc
-# $Id: keitairc,v 1.47 2008-05-02 14:40:27 matusita Exp $
+# $Id: keitairc,v 1.48 2008-05-08 14:23:16 matusita Exp $
 # $Source: /home/ishikawa/work/keitairc/tmp/keitairc/keitairc,v $
 #
 # Copyright (c) 2003-2008 Jun Morimoto <morimoto@mrmt.net>
@@ -252,7 +252,7 @@ sub action_login_icc{
        }
 
        my $view = new Keitairc::View($cf, $ci);
-       return $view->render('root.html', { docomo => $ci->is_docomo() });
+       return $view->render('root.html', { is_docomo => $ci->is_docomo() });
 }
 
 ################################################################
@@ -285,7 +285,7 @@ sub action_login_imodeid{
        }
 
        my $view = new Keitairc::View($cf, $ci);
-       return $view->render('root.html', { docomo => $ci->is_docomo() });
+       return $view->render('root.html', { is_docomo => $ci->is_docomo() });
 }
 
 ################################################################
@@ -343,7 +343,7 @@ sub action_root{
        }
 
        my $view = new Keitairc::View($cf, $ci);
-       return $view->render('root.html', { docomo => $ci->is_docomo() });
+       return $view->render('root.html', { is_docomo => $ci->is_docomo() });
 }
 
 ################################################################

diff --git a/lib/Keitairc/ClientInfo.pm b/lib/Keitairc/ClientInfo.pm
index f1540d9..e6bad62 100644 (file)
--- a/lib/Keitairc/ClientInfo.pm
+++ b/lib/Keitairc/ClientInfo.pm
@@ -1,6 +1,6 @@
 # -*-perl-*-
 # Keitairc::ClientInfo
-# $Id: ClientInfo.pm,v 1.2 2008-01-19 12:39:44 morimoto Exp $
+# $Id: ClientInfo.pm,v 1.3 2008-05-08 14:23:16 matusita Exp $
 # $Source: /home/ishikawa/work/keitairc/tmp/keitairc/lib/Keitairc/ClientInfo.pm,v $
 #
 # Copyright (c) 2008 Jun Morimoto <morimoto@mrmt.net>
@@ -63,6 +63,12 @@ sub is_softbank{
 }
 
 ################################################################
+sub is_mobile{
+       my $me = shift;
+       $me->is_ezweb() + $me->is_docomo() + $me->is_softbank();
+}
+
+################################################################
 sub softbank_serial{
        my $me = shift;
        if($me->is_softbank()){

diff --git a/lib/templates/phone.html b/lib/templates/phone.html
index df4027d..2a70198 100644 (file)
--- a/lib/templates/phone.html
+++ b/lib/templates/phone.html
@@ -14,7 +14,7 @@
 
     <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>
+      <tmpl_if is_docomo>
        <a accesskey="2" href="tel-av:<!-- tmpl_var phone -->">[2] TV\93d\98b\82ð\82©\82¯\82é</a><br />
       </tmpl_if>
       \93d\98b\94Ô\8d\86\82ðºËß-<br />

diff --git a/lib/templates/root.html b/lib/templates/root.html
index c60aff4..63d921c 100644 (file)
--- a/lib/templates/root.html
+++ b/lib/templates/root.html
@@ -15,13 +15,13 @@
       <input accesskey="1" type="submit" value="[1] Û¸Þ²Ý" />
     </form>
 
-    <tmpl_if docomo>
+    <tmpl_if is_docomo>
       <form method="post" action="login_icc" utn>
        <input accesskey="2"  type="submit" value="[2] FOMA¶-ÄÞ\90»\91¢\94Ô\8d\86\91\97\90M" />
       </form>
     </tmpl_if>
 
-    <tmpl_if docomo>
+    <tmpl_if is_docomo>
       <form method="post" action="login_imodeid?guid=ON">
        <input accesskey="3"  type="submit" value="[3] iÓ-ÄÞID\91\97\90M" />
       </form>