From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Wed, 21 Jul 2010 14:33:43 +0000 (-0700)
Subject: Rename Phergie_ExtendedBot to Phergie_StatusnetBot
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=2e9da023c04d826628063b36553a764126970599;p=quix0rs-gnu-social.git

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
index 113bb8b51b..0000000000
--- a/plugins/Irc/extlib/phergie/Phergie/ExtendedBot.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-/**
- * StatusNet - the distributed open-source microblogging tool
- *
- * 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/>.
- *
- * Extends the bot class (Phergie_Bot) to allow connection and access to
- * sockets and to allow StatusNet to 'drive' the bot
- *
- * @category  Phergie
- * @package   Phergie_Extended_Bot
- * @author    Luke Fitzgerald <lw.fitzgerald@googlemail.com>
- * @copyright 2010 StatusNet, Inc.
- * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
- * @link      http://status.net/
- */
-class Phergie_ExtendedBot extends Phergie_Bot {
-    /**
-    * Set up bot and connect to servers
-    *
-    * @return void
-    */
-    public function connect() {
-        $ui = $this->getUi();
-        $ui->setEnabled($this->getConfig('ui.enabled'));
-
-        $this->loadPlugins();
-        $this->loadConnections();
-    }
-
-    /**
-    * Transmit raw command to server using driver
-    *
-    * Handles construction of command strings and their transmission to the
-    * server.
-    *
-    * @param string       $command Command to send
-    * @param string|array $args    Optional string or array of sequential
-    *        arguments
-    *
-    * @return string Command string that was sent
-    * @throws Phergie_Driver_Exception
-    */
-    public function send($command, $args = '') {
-        return $this->getDriver()->send($command, $args);
-    }
-
-    /**
-    * Handle incoming data on the socket using the handleEvents
-    * method of the Processor
-    *
-    * @return void
-    */
-    public function receive() {
-        $this->getProcessor()->handleEvents();
-    }
-
-    /**
-    * Get the sockets used by the bot
-    *
-    * @return array Array of socket resources
-    */
-    public function getSockets() {
-        return $this->getDriver()->getSockets();
-    }
-}
\ 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 672e6f610b..9369c2c1e7 100644
--- a/plugins/Irc/extlib/phergie/Phergie/Process/Statusnet.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Process/Statusnet.php
@@ -27,7 +27,7 @@
  */
 
 class Phergie_Process_Statusnet extends Phergie_Process_Async {
-    public function __construct(Phergie_ExtendedBot $bot, array $options) {
+    public function __construct(Phergie_StatusnetBot $bot, array $options) {
         $this->usec = 0;
         Phergie_Process_Abstract::__construct($bot, $options);
     }
diff --git a/plugins/Irc/extlib/phergie/Phergie/StatusnetBot.php b/plugins/Irc/extlib/phergie/Phergie/StatusnetBot.php
new file mode 100644
index 0000000000..ba41f26db0
--- /dev/null
+++ b/plugins/Irc/extlib/phergie/Phergie/StatusnetBot.php
@@ -0,0 +1,77 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ *
+ * 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/>.
+ *
+ * Extends the bot class (Phergie_Bot) to allow connection and access to
+ * sockets and to allow StatusNet to 'drive' the bot
+ *
+ * @category  Phergie
+ * @package   Phergie_StatusnetBot
+ * @author    Luke Fitzgerald <lw.fitzgerald@googlemail.com>
+ * @copyright 2010 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+class Phergie_StatusnetBot extends Phergie_Bot {
+    /**
+    * Set up bot and connect to servers
+    *
+    * @return void
+    */
+    public function connect() {
+        $ui = $this->getUi();
+        $ui->setEnabled($this->getConfig('ui.enabled'));
+
+        $this->loadPlugins();
+        $this->loadConnections();
+    }
+
+    /**
+    * Transmit raw command to server using driver
+    *
+    * Handles construction of command strings and their transmission to the
+    * server.
+    *
+    * @param string       $command Command to send
+    * @param string|array $args    Optional string or array of sequential
+    *        arguments
+    *
+    * @return string Command string that was sent
+    * @throws Phergie_Driver_Exception
+    */
+    public function send($command, $args = '') {
+        return $this->getDriver()->send($command, $args);
+    }
+
+    /**
+    * Handle incoming data on the socket using the handleEvents
+    * method of the Processor
+    *
+    * @return void
+    */
+    public function receive() {
+        $this->getProcessor()->handleEvents();
+    }
+
+    /**
+    * Get the sockets used by the bot
+    *
+    * @return array Array of socket resources
+    */
+    public function getSockets() {
+        return $this->getDriver()->getSockets();
+    }
+}
\ No newline at end of file
diff --git a/plugins/Irc/ircmanager.php b/plugins/Irc/ircmanager.php
index c885064916..ea98263a53 100644
--- 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;