Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase

[quix0rs-gnu-social.git] / plugins / Msn / MsnPlugin.php

diff --git a/plugins/Msn/MsnPlugin.php b/plugins/Msn/MsnPlugin.php
index 2d31f997589327a2b235bf82164aca80919b48d6..187486eedcb687aa4e75a429ef09446a8864d9a1 100644 (file)
--- a/plugins/Msn/MsnPlugin.php
+++ b/plugins/Msn/MsnPlugin.php
@@ -78,7 +78,7 @@ class MsnPlugin extends ImPlugin {
      *\r
      * @return string Screenname\r
      */\r
-    public function daemon_screenname() {\r
+    public function daemonScreenname() {\r
         return $this->user;\r
     }\r
 \r
@@ -106,6 +106,7 @@ class MsnPlugin extends ImPlugin {
                 require_once(INSTALLDIR.'/plugins/Msn/extlib/phpmsnclass/msn.class.php');\r
                 return false;\r
             case 'MsnManager':\r
+            case 'Msn_waiting_message':\r
                 include_once $dir . '/'.strtolower($cls).'.php';\r
                 return false;\r
             default:\r
@@ -124,6 +125,25 @@ class MsnPlugin extends ImPlugin {
         return true;\r
     }\r
 \r
+    /**\r
+    * Ensure the database table is present\r
+    *\r
+    */\r
+    public function onCheckSchema() {\r
+        $schema = Schema::get();\r
+\r
+        // For storing messages while sessions become ready\r
+        $schema->ensureTable('msn_waiting_message',\r
+                             array(new ColumnDef('id', 'integer', null,\r
+                                                 false, 'PRI', null, null, true),\r
+                                   new ColumnDef('screenname', 'varchar', 255, false),\r
+                                   new ColumnDef('message', 'text', null, false),\r
+                                   new ColumnDef('created', 'datetime', null, false),\r
+                                   new ColumnDef('claimed', 'datetime')));\r
+\r
+        return true;\r
+    }\r
+\r
     /**\r
     * Get a microid URI for the given screenname\r
     *\r
@@ -141,8 +161,8 @@ class MsnPlugin extends ImPlugin {
      * @param string $body Text to send\r
      * @return boolean success value\r
      */\r
-    public function send_message($screenname, $body) {\r
-        $this->enqueue_outgoing_raw(array('to' => $screenname, 'message' => $body));\r
+    public function sendMessage($screenname, $body) {\r
+        $this->enqueueOutgoingRaw(array('to' => $screenname, 'message' => $body));\r
         return true;\r
     }\r
 \r
@@ -152,8 +172,8 @@ class MsnPlugin extends ImPlugin {
      * @param array $data Data\r
      * @return true if processing completed, false if message should be reprocessed\r
      */\r
-    public function receive_raw_message($data) {\r
-        $this->handle_incoming($data['sender'], $data['message']);\r
+    public function receiveRawMessage($data) {\r
+        $this->handleIncoming($data['sender'], $data['message']);\r
         return true;\r
     }\r
 \r