Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x

4 files changed, 57 insertions, 25 deletions

diff --git a/scripts/getvaliddaemons.php b/scripts/getvaliddaemons.php
new file mode 100755
index 000000000..482e63af7
--- /dev/null
+++ b/scripts/getvaliddaemons.php
@@ -0,0 +1,52 @@
+#!/usr/bin/env php
+<?php
+/*
+ * Laconica - a distributed open-source microblogging tool
+ * Copyright (C) 2008, Controlez-Vous, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * Utility script to get a list of daemons that should run, based on the
+ * current configuration. This is used by startdaemons.sh to determine what
+ * it should and shouldn't start up. The output is a list of space-separated
+ * 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');
+
+if(common_config('xmpp','enabled')) {
+    echo "xmppdaemon.php jabberqueuehandler.php publicqueuehandler.php ";
+    echo "xmppconfirmhandler.php ";
+}
+if(common_config('memcached','enabled')) {
+    echo "memcachedqueuehandler.php ";
+}
+echo "ombqueuehandler.php ";
+echo "twitterqueuehandler.php ";
+echo "facebookqueuehandler.php ";
+echo "pingqueuehandler.php ";
+echo "inboxqueuehandler.php ";
+echo "smsqueuehandler.php ";
diff --git a/scripts/startdaemons.sh b/scripts/startdaemons.sh
index 66f9ed4e0..3869e95c4 100755
--- a/scripts/startdaemons.sh
+++ b/scripts/startdaemons.sh
@@ -21,11 +21,9 @@
 # Note that the 'maildaemon' needs to run as a mail filter.
 
 DIR=`dirname $0`
+DAEMONS=`php $DIR/getvaliddaemons.php`
 
-for f in xmppdaemon.php jabberqueuehandler.php publicqueuehandler.php \
-         xmppconfirmhandler.php smsqueuehandler.php ombqueuehandler.php \
-         twitterqueuehandler.php facebookqueuehandler.php pingqueuehandler.php \
-	 memcachedqueuehandler.php inboxqueuehandler.php; do
+for f in $DAEMONS; do
 
          echo -n "Starting $f...";
 	 php $DIR/$f
diff --git a/scripts/stopdaemons.sh b/scripts/stopdaemons.sh
index 196991de0..f6d71eddf 100755
--- a/scripts/stopdaemons.sh
+++ b/scripts/stopdaemons.sh
@@ -25,7 +25,7 @@ DIR=`php $SDIR/getpiddir.php`
 
 for f in jabberhandler ombhandler publichandler smshandler pinghandler \
 	 xmppconfirmhandler xmppdaemon twitterhandler facebookhandler \
-         memcachedhandler inboxhandler; do
+         memcachehandler inboxhandler; do
 
 	FILES="$DIR/$f.*.pid"
 	for ff in "$FILES" ; do
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 0bc2e68b6..dc6b4bc29 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -842,23 +842,6 @@ text-transform:lowercase;
 }
 
 
-
-.notice-data {
-position:absolute;
-top:18px;
-right:0;
-min-height:50px;
-margin-bottom:4px;
-}
-.notice .entry-content .notice-data dt {
-display:none;
-}
-
-.notice-data a {
-display:block;
-outline:none;
-}
-
 .notice-options {
 padding-left:2%;
 float:left;
@@ -1036,6 +1019,8 @@ padding-right:30px;
 .hentry .entry-content p {
 margin-bottom:18px;
 }
+.system_notice ul,
+.instructions ul,
 .hentry entry-content ol,
 .hentry .entry-content ul {
 list-style-position:inside;
@@ -1160,9 +1145,6 @@ clear:both;
 margin-bottom:0;
 }
 
-.instructions ul {
-list-style-position:inside;
-}
 .instructions p,
 .instructions ul {
 margin-bottom:18px;