Added validate regexp and a few more comments

diff --git a/plugins/Msn/MsnPlugin.php b/plugins/Msn/MsnPlugin.php
index 8452f152205cc53771a9b66dae7d5f1325ca33ac..f00333d72870348df01dc86c9317455a4e1ed0ca 100644 (file)
--- a/plugins/Msn/MsnPlugin.php
+++ b/plugins/Msn/MsnPlugin.php
@@ -58,7 +58,7 @@ class MsnPlugin extends ImPlugin {
      *\r
      * @return string Name of service\r
      */\r
-    function getDisplayName() {\r
+    public function getDisplayName() {\r
         return _m('MSN');\r
     }\r
 \r
@@ -68,7 +68,7 @@ class MsnPlugin extends ImPlugin {
      * @param string $screenname screenname to normalize\r
      * @return string an equivalent screenname in normalized form\r
      */\r
-    function normalize($screenname) {\r
+    public function normalize($screenname) {\r
                $screenname = str_replace(" ","", $screenname);\r
         return strtolower($screenname);\r
     }\r
@@ -78,7 +78,7 @@ class MsnPlugin extends ImPlugin {
      *\r
      * @return string Screenname\r
      */\r
-    function daemon_screenname() {\r
+    public function daemon_screenname() {\r
         return $this->user;\r
     }\r
 \r
@@ -86,20 +86,21 @@ class MsnPlugin extends ImPlugin {
      * Validate (ensure the validity of) a screenname\r
      *\r
      * @param string $screenname screenname to validate\r
-     *\r
      * @return boolean\r
      */\r
-    function validate($screenname) {\r
-        //TODO Correct this for MSN screennames\r
-        //if(preg_match('/^[a-z]\w{2,15}$/i', $screenname)) {\r
-        return true;\r
+    public function validate($screenname) {\r
+        // RFC 2822 (simplified) regexp\r
+        if(preg_match('/[a-z0-9!#$%&\'*+\/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&\'*+\/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?/i', $screenname)) {\r
+            return true;\r
+        } else {\r
+            return false;\r
+        }\r
     }\r
 \r
     /**\r
      * Load related modules when needed\r
      *\r
      * @param string $cls Name of the class to be loaded\r
-     *\r
      * @return boolean hook value; true means continue processing, false means stop.\r
      */\r
     public function onAutoload($cls) {\r
@@ -159,7 +160,7 @@ class MsnPlugin extends ImPlugin {
     /**\r
     * Initialize plugin\r
     *\r
-    * @return void\r
+    * @return boolean\r
     */\r
     public function initialize() {\r
         if (!isset($this->user)) {\r
@@ -175,7 +176,13 @@ class MsnPlugin extends ImPlugin {
         return true;\r
     }\r
 \r
-    function onPluginVersion(&$versions) {\r
+    /**\r
+     * Get plugin information\r
+     * \r
+     * @param array $versions array to insert information into\r
+     * @return void\r
+     */\r
+    public function onPluginVersion(&$versions) {\r
         $versions[] = array(\r
             'name' => 'MSN',\r
             'version' => STATUSNET_VERSION,\r

diff --git a/plugins/Msn/msnmanager.php b/plugins/Msn/msnmanager.php
index 5b04995c1804ef991cbe559aef1ba2b44c7686a4..66152f0d2a3b979760b12a33aecea3a73e191785 100644 (file)
--- a/plugins/Msn/msnmanager.php
+++ b/plugins/Msn/msnmanager.php
@@ -146,6 +146,7 @@ class MsnManager extends ImManager {
     * Passes it back to the queuing system\r
     *\r
     * @param array $data Data\r
+    * @return void\r
     */\r
     private function handle_msn_message($data) {\r
         $this->plugin->enqueue_incoming_raw($data);\r
@@ -156,6 +157,7 @@ class MsnManager extends ImManager {
     * Called by callback to log failure during connect\r
     *\r
     * @param void $data Not used (there to keep callback happy)\r
+    * @return void\r
     */\r
     function handle_connect_failed($data) {\r
         common_log(LOG_NOTICE, 'MSN connect failed, retrying');\r
@@ -165,6 +167,7 @@ class MsnManager extends ImManager {
     * Called by callback to log reconnection\r
     *\r
     * @param void $data Not used (there to keep callback happy)\r
+    * @return void\r
     */\r
     function handle_reconnect($data) {\r
         common_log(LOG_NOTICE, 'MSN reconnecting');\r