From ec5e06a542d6b06ea9b1d3de7cb309dd1088b4d4 Mon Sep 17 00:00:00 2001
From: CiaranG <ciaran@ciarang.com>
Date: Tue, 21 Apr 2009 23:36:15 +0100
Subject: Suppress errors when checking for the existence of files that might
 be restricted by open_basedir - should resolve issue #1310

---
 lib/common.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/common.php')

diff --git a/lib/common.php b/lib/common.php
index b3882d207..f983c4d16 100644
--- a/lib/common.php
+++ b/lib/common.php
@@ -192,7 +192,7 @@ $_config_files[] = INSTALLDIR.'/config.php';
 $_have_a_config = false;
 
 foreach ($_config_files as $_config_file) {
-    if (file_exists($_config_file)) {
+    if (@file_exists($_config_file)) {
         include_once($_config_file);
         $_have_a_config = true;
     }
-- 
cgit v1.2.3-54-g00ecf


From bc190595d1dfd56bf7e68597b3d574909eb27260 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@controlyourself.ca>
Date: Thu, 7 May 2009 02:07:31 -0700
Subject: Added TwitterStatusFetcher into daemon startup and shutdown subsystem

---
 config.php.sample                |  3 +++
 lib/common.php                   |  2 ++
 scripts/getvaliddaemons.php      |  3 +++
 scripts/stopdaemons.sh           |  2 +-
 scripts/twitterstatusfetcher.php | 10 ++++++----
 5 files changed, 15 insertions(+), 5 deletions(-)

(limited to 'lib/common.php')

diff --git a/config.php.sample b/config.php.sample
index b8ed45fa8..6d6a9b533 100644
--- a/config.php.sample
+++ b/config.php.sample
@@ -150,6 +150,9 @@ $config['sphinx']['port'] = 3312;
 #$config['memcached']['server'] = 'localhost';
 #$config['memcached']['port'] = 11211;
 
+# Enable bidirectional Twitter bridge
+#$config['twitterbridge']['enabled'] = true;
+
 #Twitter integration source attribute. Note: default is Laconica
 #$config['integration']['source'] = 'Laconica';
 
diff --git a/lib/common.php b/lib/common.php
index 00e5b0bc2..abdc22c0e 100644
--- a/lib/common.php
+++ b/lib/common.php
@@ -143,6 +143,8 @@ $config =
         array('piddir' => '/var/run',
               'user' => false,
               'group' => false),
+        'twitterbridge' =>
+        array('enabled' => false),
         'integration' =>
         array('source' => 'Laconica', # source attribute for Twitter
               'taguri' => $_server.',2009'), # base for tag URIs
diff --git a/scripts/getvaliddaemons.php b/scripts/getvaliddaemons.php
index 482e63af7..a10233e69 100755
--- a/scripts/getvaliddaemons.php
+++ b/scripts/getvaliddaemons.php
@@ -44,6 +44,9 @@ if(common_config('xmpp','enabled')) {
 if(common_config('memcached','enabled')) {
     echo "memcachedqueuehandler.php ";
 }
+if(common_config('twitterbridge','enabled')) {
+    echo "twitterstatusfetcher.php ";
+}
 echo "ombqueuehandler.php ";
 echo "twitterqueuehandler.php ";
 echo "facebookqueuehandler.php ";
diff --git a/scripts/stopdaemons.sh b/scripts/stopdaemons.sh
index f6d71eddf..764037e8f 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 \
-         memcachehandler inboxhandler; do
+         memcachehandler inboxhandler twitterstatusfetcher; do
 
 	FILES="$DIR/$f.*.pid"
 	for ff in "$FILES" ; do
diff --git a/scripts/twitterstatusfetcher.php b/scripts/twitterstatusfetcher.php
index e8819f665..9dfadc760 100755
--- a/scripts/twitterstatusfetcher.php
+++ b/scripts/twitterstatusfetcher.php
@@ -32,7 +32,7 @@ define('LACONICA', true);
 define('MAXCHILDREN', 2);
 define('POLL_INTERVAL', 60); // in seconds
 
-// Uncomment this to get useful console output
+// Uncomment this to get useful logging
 define('SCRIPT_DEBUG', true);
 
 require_once(INSTALLDIR . '/lib/common.php');
@@ -45,7 +45,7 @@ class TwitterStatusFetcher extends Daemon
 
     function name()
     {
-        return 'twitterstatusfetcher';
+        return ('twitterstatusfetcher.generic');
     }
 
     function run()
@@ -130,7 +130,9 @@ class TwitterStatusFetcher extends Daemon
                     ' secs before hitting Twitter again.');
             }
 
-            sleep(POLL_INTERVAL);
+            if (POLL_INTERVAL > 0) {
+                sleep(POLL_INTERVAL);
+            }
 
         } while (true);
     }
@@ -282,7 +284,7 @@ class TwitterStatusFetcher extends Daemon
             // XXX: Figure out a better way to link Twitter replies?
             $notice->saveReplies();
 
-            // XXX: Do we want to polute our tag cloud with
+            // XXX: Do we want to pollute our tag cloud with
             // hashtags from Twitter?
             $notice->saveTags();
             $notice->saveGroups();
-- 
cgit v1.2.3-54-g00ecf