summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Prodromou <evan@controlyourself.ca>2009-06-22 16:55:55 -0700
committerEvan Prodromou <evan@controlyourself.ca>2009-06-22 16:55:55 -0700
commit06f976f1ac5624c8d447a0bed1b1205cea6747fd (patch)
tree64f3ed97139fcdbe8ec07fd625345e13c0cea04e
parenteced917d7965ab9b630bf0fe7ac031ac06ff7939 (diff)
getvaliddaemons.php uses commandline.inc
-rwxr-xr-xscripts/getvaliddaemons.php14
1 files changed, 6 insertions, 8 deletions
diff --git a/scripts/getvaliddaemons.php b/scripts/getvaliddaemons.php
index a45ff79ab..198ea8fb9 100755
--- a/scripts/getvaliddaemons.php
+++ b/scripts/getvaliddaemons.php
@@ -25,16 +25,14 @@
* daemon names.
*/
-# 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);
-require_once(INSTALLDIR . '/lib/common.php');
+$helptext = <<<ENDOFHELP
+getvaliddaemons.php - print out the currently configured PID directory
+
+ENDOFHELP;
+
+require_once INSTALLDIR.'/scripts/commandline.inc';
if(common_config('xmpp','enabled')) {
echo "xmppdaemon.php jabberqueuehandler.php publicqueuehandler.php ";