Rename Phergie_ExtendedBot to Phergie_StatusnetBot

diff --git a/plugins/Irc/extlib/phergie/Phergie/ExtendedBot.php b/plugins/Irc/extlib/phergie/Phergie/ExtendedBot.php
deleted file mode 100644 (file)
index 113bb8b..0000000
--- a/plugins/Irc/extlib/phergie/Phergie/ExtendedBot.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php\r
-/**\r
- * StatusNet - the distributed open-source microblogging tool\r
- *\r
- * This program is free software: you can redistribute it and/or modify\r
- * it under the terms of the GNU Affero General Public License as published by\r
- * the Free Software Foundation, either version 3 of the License, or\r
- * (at your option) any later version.\r
- *\r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU Affero General Public License for more details.\r
- *\r
- * You should have received a copy of the GNU Affero General Public License\r
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.\r
- *\r
- * Extends the bot class (Phergie_Bot) to allow connection and access to\r
- * sockets and to allow StatusNet to 'drive' the bot\r
- *\r
- * @category  Phergie\r
- * @package   Phergie_Extended_Bot\r
- * @author    Luke Fitzgerald <lw.fitzgerald@googlemail.com>\r
- * @copyright 2010 StatusNet, Inc.\r
- * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0\r
- * @link      http://status.net/\r
- */\r
-class Phergie_ExtendedBot extends Phergie_Bot {\r
-    /**\r
-    * Set up bot and connect to servers\r
-    *\r
-    * @return void\r
-    */\r
-    public function connect() {\r
-        $ui = $this->getUi();\r
-        $ui->setEnabled($this->getConfig('ui.enabled'));\r
-\r
-        $this->loadPlugins();\r
-        $this->loadConnections();\r
-    }\r
-\r
-    /**\r
-    * Transmit raw command to server using driver\r
-    *\r
-    * Handles construction of command strings and their transmission to the\r
-    * server.\r
-    *\r
-    * @param string       $command Command to send\r
-    * @param string|array $args    Optional string or array of sequential\r
-    *        arguments\r
-    *\r
-    * @return string Command string that was sent\r
-    * @throws Phergie_Driver_Exception\r
-    */\r
-    public function send($command, $args = '') {\r
-        return $this->getDriver()->send($command, $args);\r
-    }\r
-\r
-    /**\r
-    * Handle incoming data on the socket using the handleEvents\r
-    * method of the Processor\r
-    *\r
-    * @return void\r
-    */\r
-    public function receive() {\r
-        $this->getProcessor()->handleEvents();\r
-    }\r
-\r
-    /**\r
-    * Get the sockets used by the bot\r
-    *\r
-    * @return array Array of socket resources\r
-    */\r
-    public function getSockets() {\r
-        return $this->getDriver()->getSockets();\r
-    }\r
-}
\ No newline at end of file

diff --git a/plugins/Irc/extlib/phergie/Phergie/Process/Statusnet.php b/plugins/Irc/extlib/phergie/Phergie/Process/Statusnet.php
index 672e6f610b663d610b562a4fe7e457f68aec5a59..9369c2c1e7b04fb458406d71f2b4e8230eec44f6 100644 (file)
--- a/plugins/Irc/extlib/phergie/Phergie/Process/Statusnet.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Process/Statusnet.php
@@ -27,7 +27,7 @@
  */\r
 \r
 class Phergie_Process_Statusnet extends Phergie_Process_Async {\r
-    public function __construct(Phergie_ExtendedBot $bot, array $options) {\r
+    public function __construct(Phergie_StatusnetBot $bot, array $options) {\r
         $this->usec = 0;\r
         Phergie_Process_Abstract::__construct($bot, $options);\r
     }\r

diff --git a/plugins/Irc/extlib/phergie/Phergie/StatusnetBot.php b/plugins/Irc/extlib/phergie/Phergie/StatusnetBot.php
new file mode 100644 (file)
index 0000000..ba41f26
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Phergie/StatusnetBot.php
@@ -0,0 +1,77 @@
+<?php\r
+/**\r
+ * StatusNet - the distributed open-source microblogging tool\r
+ *\r
+ * This program is free software: you can redistribute it and/or modify\r
+ * it under the terms of the GNU Affero General Public License as published by\r
+ * the Free Software Foundation, either version 3 of the License, or\r
+ * (at your option) any later version.\r
+ *\r
+ * This program is distributed in the hope that it will be useful,\r
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
+ * GNU Affero General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU Affero General Public License\r
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.\r
+ *\r
+ * Extends the bot class (Phergie_Bot) to allow connection and access to\r
+ * sockets and to allow StatusNet to 'drive' the bot\r
+ *\r
+ * @category  Phergie\r
+ * @package   Phergie_StatusnetBot\r
+ * @author    Luke Fitzgerald <lw.fitzgerald@googlemail.com>\r
+ * @copyright 2010 StatusNet, Inc.\r
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0\r
+ * @link      http://status.net/\r
+ */\r
+class Phergie_StatusnetBot extends Phergie_Bot {\r
+    /**\r
+    * Set up bot and connect to servers\r
+    *\r
+    * @return void\r
+    */\r
+    public function connect() {\r
+        $ui = $this->getUi();\r
+        $ui->setEnabled($this->getConfig('ui.enabled'));\r
+\r
+        $this->loadPlugins();\r
+        $this->loadConnections();\r
+    }\r
+\r
+    /**\r
+    * Transmit raw command to server using driver\r
+    *\r
+    * Handles construction of command strings and their transmission to the\r
+    * server.\r
+    *\r
+    * @param string       $command Command to send\r
+    * @param string|array $args    Optional string or array of sequential\r
+    *        arguments\r
+    *\r
+    * @return string Command string that was sent\r
+    * @throws Phergie_Driver_Exception\r
+    */\r
+    public function send($command, $args = '') {\r
+        return $this->getDriver()->send($command, $args);\r
+    }\r
+\r
+    /**\r
+    * Handle incoming data on the socket using the handleEvents\r
+    * method of the Processor\r
+    *\r
+    * @return void\r
+    */\r
+    public function receive() {\r
+        $this->getProcessor()->handleEvents();\r
+    }\r
+\r
+    /**\r
+    * Get the sockets used by the bot\r
+    *\r
+    * @return array Array of socket resources\r
+    */\r
+    public function getSockets() {\r
+        return $this->getDriver()->getSockets();\r
+    }\r
+}
\ No newline at end of file

diff --git a/plugins/Irc/ircmanager.php b/plugins/Irc/ircmanager.php
index c885064916c4532d65e7d2972876e3c6c5bbd4e8..ea98263a539c5ac31811da9ce2f920514a8107ce 100644 (file)
--- a/plugins/Irc/ircmanager.php
+++ b/plugins/Irc/ircmanager.php
@@ -81,7 +81,7 @@ class IrcManager extends ImManager {
     */
     public function connect() {
         if (!$this->conn) {
-            $this->conn = new Phergie_ExtendedBot;
+            $this->conn = new Phergie_StatusnetBot;
 
             $port = empty($this->plugin->port) ? 6667 : $this->plugin->port;
             $password = empty($this->plugin->password) ? '' : $this->plugin->password;