Rename Phergie_ExtendedBot to Phergie_StatusnetBot

[quix0rs-gnu-social.git] / plugins / Irc / ircmanager.php

diff --git a/plugins/Irc/ircmanager.php b/plugins/Irc/ircmanager.php
index 549936ae7b486bb9812322a51152d6e1975b247d..ea98263a539c5ac31811da9ce2f920514a8107ce 100644 (file)
--- a/plugins/Irc/ircmanager.php
+++ b/plugins/Irc/ircmanager.php
@@ -81,13 +81,14 @@ class IrcManager extends ImManager {
     */
     public function connect() {
         if (!$this->conn) {
-            $this->conn = new Phergie_Extended_Bot;
+            $this->conn = new Phergie_StatusnetBot;
 
-            $password = isset($this->plugin->password) ? $this->plugin->password : '';
-            $transport = isset($this->plugin->transport) ? $this->plugin->transport : 'tcp';
-            $encoding = isset($this->plugin->encoding) ? $this->plugin->encoding : 'ISO-8859-1';
-            $nickservpassword = isset($this->plugin->nickservpassword) ? $this->plugin->nickservpassword : '';
-            $channels = isset($this->plugin->channels) ? $this->plugin->channels : array();
+            $port = empty($this->plugin->port) ? 6667 : $this->plugin->port;
+            $password = empty($this->plugin->password) ? '' : $this->plugin->password;
+            $transport = empty($this->plugin->transporttype) ? 'tcp' : $this->plugin->transporttype;
+            $encoding = empty($this->plugin->encoding) ? 'UTF-8' : $this->plugin->encoding;
+            $nickservpassword = empty($this->plugin->nickservpassword) ? '' : $this->plugin->nickservpassword;
+            $channels = empty($this->plugin->channels) ? array() : $this->plugin->channels;
 
             $config = new Phergie_Config;
             $config->readArray(
@@ -95,10 +96,10 @@ class IrcManager extends ImManager {
                     'connections' => array(
                         array(
                             'host' => $this->plugin->host,
-                            'port' => $this->plugin->port,
+                            'port' => $port,
                             'username' => $this->plugin->username,
                             'realname' => $this->plugin->realname,
-                            'nick' => $this->plugin->nickname,
+                            'nick' => $this->plugin->nick,
                             'password' => $password,
                             'transport' => $transport,
                             'encoding' => $encoding