[SimBot-commits] CVS: simbot/plugins httpd.pl,1.5,1.6

[Pete P. <fou...@us...>]

Update of /cvsroot/simbot/simbot/plugins
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23118/plugins

Modified Files:
	httpd.pl 
Log Message:
Remote admin can now speak through SimBot. Enjoy ;-)
If plugins don't provide a status code, a RC_OK (200) will be provided for them
unless they fail to provide content, in which case we use
RC_INTERNAL_SERVER_ERROR (500) and provide some content.


Index: httpd.pl
===================================================================
RCS file: /cvsroot/simbot/simbot/plugins/httpd.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -p -r1.5 -r1.6
--- httpd.pl	27 Jul 2005 21:46:37 -0000	1.5
+++ httpd.pl	27 Jul 2005 22:09:52 -0000	1.6
@@ -32,7 +32,7 @@ our $aliases;
 #our $kernel;
 use vars qw( $kernel );
 
-$session = POE::Component::Server::HTTP->new(
+$aliases = POE::Component::Server::HTTP->new(
     Alias => 'simbot_plugin_httpd',
     Port => WEB_PORT,
     ContentHandler => {
@@ -54,6 +54,17 @@ sub index_handler {
     if(defined $SimBot::hash_plugin_httpd_pages{$req_root}) {
         my $handler = $SimBot::hash_plugin_httpd_pages{$req_root}->{'handler'};
         &$handler($request, $response);
+        
+        if(!defined $response->content
+            || length $response->content == 0) {
+            # Hey! Our plugin didn't do anything useful.
+            $response->code(RC_INTERNAL_SERVER_ERROR);
+            $response->content("something's broken");
+            # FIXME: We need error pages...
+        } elsif(!defined $response->code) {
+            $response->code(RC_OK); # assume everything's OK
+        }
+        
         return;
     }
     
@@ -113,14 +124,23 @@ sub admin_page {
         }
         &SimBot::restart($kernel);
         return;
-    } elsif(my $say = $request->uri =~ m|\?say=(\S+)$|) {
-        $say =~ s/\+/ /;
+    } elsif(my ($say) = $request->uri =~ m|\?say=(\S+)$|) {
+        $say =~ s/\+/ /g;
+        $say =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C", hex($1))/eg;
         &SimBot::debug(3, "Speech requested by web admin\n");
-        # FIXME: send message
+        &SimBot::send_message(&SimBot::option('network', 'channel'),
+            $say);
+    } elsif(my ($say) = $request->uri =~ m|\?action=(\S+)$|) {
+        $say =~ s/\+/ /g;
+        $say =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C", hex($1))/eg;
+        &SimBot::debug(3, "Action requested by web admin\n");
+        &SimBot::send_action(&SimBot::option('network', 'channel'),
+            $say);
     }
     $msg .= '<ul><li><a href="/admin?restart">Restart Simbot</a></li>';
     $msg .= '<li><form method="get" action=""><label for="say">Say: </label><input name="say"/></form></li>';
     $msg .= '<li><form method="get" action=""><label for="action">Action: </label><input name="action"/></form></li>';
+    $response->code(RC_OK);
     $response->content($msg);
 }
 
@@ -129,8 +149,12 @@ sub messup_httpd {
     $SimBot::hash_plugin_httpd_pages{'admin'} = {
         'title' => 'SimBot Administration',
         'handler' => \&admin_page,
-    }
-    #&add_page('/test', 'Goes nowhere, does nothing!', sub {});
+    };
+    
+    $SimBot::hash_plugin_httpd_pages{'fiveohoh'} = {
+        'title' => 'Internal Server Error Generation Department',
+        'handler' => sub {},
+    };
 }
 
 sub cleanup_httpd {