Set lastPing on connect

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

diff --git a/plugins/Irc/ircmanager.php b/plugins/Irc/ircmanager.php
index bd6242a6a579ac55a87ebacd0a2a2e8a4b40b0da..7acb85468f7f1df0d220a9f0e9adf64d4dcda286 100644 (file)
--- a/plugins/Irc/ircmanager.php
+++ b/plugins/Irc/ircmanager.php
@@ -33,8 +33,8 @@ class IrcManager extends ImManager {
     protected $conn = null;
     protected $lastPing = null;
 
-    protected $regchecks = array();
-    protected $regchecksLookup = array();
+    protected $regChecks = array();
+    protected $regChecksLookup = array();
 
     /**
      * Initialize connection to server.
@@ -71,9 +71,9 @@ class IrcManager extends ImManager {
      *
      * @return void
      */
-    public function idle($timeout = 0) {
+    public function idle() {
         if (empty($this->lastPing) || time() - $this->lastPing > 120) {
-            $this->send_ping();
+            $this->sendPing();
         }
     }
 
@@ -148,6 +148,7 @@ class IrcManager extends ImManager {
             );
 
             $this->conn->setConfig($config);
+            $this->lastPing = time();
             $this->conn->connect();
         }
         return $this->conn;
@@ -175,10 +176,10 @@ class IrcManager extends ImManager {
     public function handle_reg_response($data) {
         // Retrieve data
         $screenname = $data['screenname'];
-        $nickdata = $this->regchecks[$screenname];
+        $nickdata = $this->regChecks[$screenname];
         $usernick = $nickdata['user']->nickname;
 
-        if (isset($this->regchecksLookup[$usernick])) {
+        if (isset($this->regChecksLookup[$usernick])) {
             if ($data['registered']) {
                 // Send message
                 $this->plugin->send_confirmation_code($screenname, $nickdata['code'], $nickdata['user'], true);
@@ -203,10 +204,10 @@ class IrcManager extends ImManager {
             }
 
             // Unset lookup value
-            unset($this->regchecksLookup[$usernick]);
+            unset($this->regChecksLookup[$usernick]);
 
             // Unset data
-            unset($this->regchecks[$screename]);
+            unset($this->regChecks[$screename]);
         }
     }
 
@@ -229,12 +230,12 @@ class IrcManager extends ImManager {
             $screenname = $nickdata['screenname'];
 
             // Cancel any existing checks for this user
-            if (isset($this->regchecksLookup[$usernick])) {
-                unset($this->regchecks[$this->regchecksLookup[$usernick]]);
+            if (isset($this->regChecksLookup[$usernick])) {
+                unset($this->regChecks[$this->regChecksLookup[$usernick]]);
             }
 
-            $this->regchecks[$screenname] = $nickdata;
-            $this->regchecksLookup[$usernick] = $screenname;
+            $this->regChecks[$screenname] = $nickdata;
+            $this->regChecksLookup[$usernick] = $screenname;
         }
 
         try {
@@ -252,7 +253,7 @@ class IrcManager extends ImManager {
     *
     * @return void
     */
-    protected function send_ping() {
+    protected function sendPing() {
         $this->lastPing = time();
         $this->conn->send('PING', $this->lastPing);
     }