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

diff --git a/classes/Notice.php b/classes/Notice.php
index 6db59c96ef5775b9b82d4a66311c9e8413592e90..b8cd2bd7f29710f47ac2da0efe075b4ab2a54942 100644 (file)
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -136,10 +136,12 @@ class Notice extends Memcached_DataObject
         $notice->profile_id = $profile_id;
 
         $blacklist = common_config('public', 'blacklist');
+        $autosource = common_config('public', 'autosource');
 
         # Blacklisted are non-false, but not 1, either
 
-        if ($blacklist && in_array($profile_id, $blacklist)) {
+        if (($blacklist && in_array($profile_id, $blacklist)) ||
+            ($source && $autosource && in_array($source, $autosource))) {
             $notice->is_local = -1;
         } else {
             $notice->is_local = $is_local;

diff --git a/config.php.sample b/config.php.sample
index a2c5801f45c41995eafe64f1f8a2f40900dd087e..3fa898e1be0c19461b1aa083def86bec098d2d07 100644 (file)
--- a/config.php.sample
+++ b/config.php.sample
@@ -107,6 +107,14 @@ $config['sphinx']['port'] = 3312;
 #$config['public']['blacklist'][] = 123;
 #$config['public']['blacklist'][] = 2307;
 
+#Mark certain notice sources as automatic and thus not
+#appropriate for public feed
+#$config['public]['autosource'][] = 'twitterfeed';
+#$config['public]['autosource'][] = 'rssdent';
+#$config['public]['autosource'][] = 'Ping.Fm';
+#$config['public]['autosource'][] = 'HelloTxt';
+#$config['public]['autosource'][] = 'Updating.Me';
+
 #Do notice broadcasts offline
 #If you use this, you must run the six offline daemons in the
 #background. See the README for details.

diff --git a/lib/common.php b/lib/common.php
index 7bfd14c4291517b9f0d31663dc0e18381ebfc5f8..4fc749ca06540095b258e9ab4871a7e842855e00 100644 (file)
--- a/lib/common.php
+++ b/lib/common.php
@@ -106,7 +106,8 @@ $config =
         array('server' => null),
         'public' =>
         array('localonly' => true,
-              'blacklist' => array()),
+              'blacklist' => array(),
+              'autosource' => array()),
         'theme' =>
         array('server' => null),
         'throttle' =>