From 0b638a233cb97668b340c1321c61b305966805a9 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Mon, 22 Jun 2009 17:02:40 -0700
Subject: [PATCH] maildaemon.php uses commandline.inc

---
 scripts/maildaemon.php | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/scripts/maildaemon.php b/scripts/maildaemon.php
index dc3ab0b56e..cfb11a36fc 100755
--- a/scripts/maildaemon.php
+++ b/scripts/maildaemon.php
@@ -18,21 +18,16 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-# Abort if called from a web server
-if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) {
-    print "This script must be run from the command line\n";
-    exit();
-}
-
 define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
-define('LACONICA', true);
 
-// Preset the server at the command line
+$helptext = <<<END_OF_HELP
+Script for converting mail messages into notices. Takes message body
+as STDIN.
 
-$server = ($argc > 1) ? $argv[1] : null;
-$path   = ($argc > 2) ? $argv[2] : null;
+END_OF_HELP;
+
+require_once INSTALLDIR.'/scripts/commandline.inc';
 
-require_once(INSTALLDIR . '/lib/common.php');
 require_once(INSTALLDIR . '/lib/mail.php');
 require_once('Mail/mimeDecode.php');