Changed config flag for importing friends' timeline and added some comments

diff --git a/lib/default.php b/lib/default.php
index 9f3d4b1f9d858ea78fb2a8c5c745a5e5f4f3eaa8..68029c9778e706c768936e769ec5596249749e32 100644 (file)
--- a/lib/default.php
+++ b/lib/default.php
@@ -140,7 +140,7 @@ $default =
         array('enabled' => true),
         'sms' =>
         array('enabled' => true),
-        'twitterbridge' =>
+        'twitterimport' =>
         array('enabled' => false),
         'integration' =>
         array('source' => 'StatusNet', # source attribute for Twitter

diff --git a/plugins/TwitterBridge/TwitterBridgePlugin.php b/plugins/TwitterBridge/TwitterBridgePlugin.php
index 69bec06511524a027e8fcb86edb6ccc26fffd318..1a27c30cd220f85d206777835bf182ef32ebca29 100644 (file)
--- a/plugins/TwitterBridge/TwitterBridgePlugin.php
+++ b/plugins/TwitterBridge/TwitterBridgePlugin.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Laconica, the distributed open-source microblogging tool
+ * StatusNet, the distributed open-source microblogging tool
  *
  * PHP version 5
  *
@@ -18,14 +18,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @category  Plugin
- * @package   Laconica
- * @author    Zach Copley <zach@controlyourself.ca>
+ * @package   StatusNet
+ * @author    Zach Copley <zach@status.net>
  * @copyright 2009 Control Yourself, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://laconi.ca/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
@@ -35,8 +35,8 @@ if (!defined('LACONICA')) {
  * This class allows users to link their Twitter accounts
  *
  * @category Plugin
- * @package  Laconica
- * @author   Zach Copley <zach@controlyourself.ca>
+ * @package  StatusNet
+ * @author   Zach Copley <zach@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://laconi.ca/
  * @link     http://twitter.com/
@@ -58,17 +58,27 @@ class TwitterBridgePlugin extends Plugin
      *
      * Hook for RouterInitialized event.
      *
+     * @param Net_URL_Mapper &$m path-to-action mapper
+     *
      * @return boolean hook return
      */
 
     function onRouterInitialized(&$m)
     {
-        $m->connect('twitter/authorization', array('action' => 'twitterauthorization'));
+        $m->connect('twitter/authorization',
+                    array('action' => 'twitterauthorization'));
         $m->connect('settings/twitter', array('action' => 'twittersettings'));
 
         return true;
     }
 
+    /**
+     * Add the Twitter Settings page to the Connect Settings menu
+     *
+     * @param Action &$action The calling page
+     *
+     * @return boolean hook return
+     */
     function onEndConnectSettingsNav(&$action)
     {
         $action_name = $action->trimmed('action');
@@ -81,38 +91,65 @@ class TwitterBridgePlugin extends Plugin
         return true;
     }
 
+    /**
+     * Automatically load the actions and libraries used by the Twitter bridge
+     *
+     * @param Class $cls the class
+     *
+     * @return boolean hook return
+     *
+     */
     function onAutoload($cls)
     {
-        switch ($cls)
-        {
-         case 'TwittersettingsAction':
-         case 'TwitterauthorizationAction':
-            require_once(INSTALLDIR.'/plugins/TwitterBridge/' . strtolower(mb_substr($cls, 0, -6)) . '.php');
+        switch ($cls) {
+        case 'TwittersettingsAction':
+        case 'TwitterauthorizationAction':
+            include_once INSTALLDIR.'/plugins/TwitterBridge/' .
+              strtolower(mb_substr($cls, 0, -6)) . '.php';
             return false;
-         case 'TwitterOAuthClient':
-            require_once(INSTALLDIR.'/plugins/TwitterBridge/twitteroauthclient.php');
+        case 'TwitterOAuthClient':
+            include_once INSTALLDIR.'/plugins/TwitterBridge/twitteroauthclient.php';
             return false;
-         default:
+        default:
             return true;
         }
     }
 
+    /**
+     * Add a Twitter queue item for each notice
+     *
+     * @param Notice $notice     the notice
+     * @param array  $transports the list of transports (queues)
+     *
+     * @return boolean hook return
+     */
     function onStartEnqueueNotice($notice, $transports)
     {
         array_push($transports, 'twitter');
         return true;
     }
 
+    /**
+     * Add Twitter bridge daemons to the list of daemons to start
+     *
+     * @param array $daemons the list fo daemons to run
+     *
+     * @return boolean hook return
+     *
+     */
     function onGetValidDaemons($daemons)
     {
-        array_push($daemons, INSTALLDIR . '/plugins/TwitterBridge/daemons/twitterqueuehandler.php');
-        array_push($daemons, INSTALLDIR . '/plugins/TwitterBridge/daemons/synctwitterfriends.php');
-
-        if (common_config('twitterbridge', 'enabled')) {
-            array_push($daemons, INSTALLDIR . '/plugins/TwitterBridge/daemons/twitterstatusfetcher.php');
+        array_push($daemons, INSTALLDIR .
+                   '/plugins/TwitterBridge/daemons/twitterqueuehandler.php');
+        array_push($daemons, INSTALLDIR .
+                   '/plugins/TwitterBridge/daemons/synctwitterfriends.php');
+
+        if (common_config('twitterimport', 'enabled')) {
+            array_push($daemons, INSTALLDIR
+                . '/plugins/TwitterBridge/daemons/twitterstatusfetcher.php');
         }
 
         return true;
     }
 
-}
\ No newline at end of file
+}