wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use built in email verifier

Browse Source
This commit is contained in:
Luke Fitzgerald 2010-06-20 15:53:36 +01:00
parent 7a6eb53b79
commit f37228f413
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
plugins/Msn/MsnPlugin.php
View File

@ -89,12 +89,7 @@ class MsnPlugin extends ImPlugin {
* @return boolean * @return boolean
*/ */
public function validate($screenname) { public function validate($screenname) {
// RFC 2822 (simplified) regexp return Validate::email($screenname, common_config('email', 'check_domain'));
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)) {
return true;
} else {
return false;
}
} }
/** /**

6
plugins/Msn/extlib/phpmsnclass/msn.class.php
View File

@ -871,7 +871,7 @@ class MSN {
$this->debug_message("NS: <<< XFR SB"); $this->debug_message("NS: <<< XFR SB");
$user = array_shift($this->waitingForXFR); $user = array_shift($this->waitingForXFR);
$bSBresult = $this->switchboard_control($ip, $port, $cki_code, $User, $Message); $bSBresult = $this->switchboard_control($ip, $port, $cki_code, $User, $Message);
/* /*
$bSBresult = $this->switchboard_control($ip, $port, $cki_code, $aMSNUsers[$nCurrentUser], $sMessage); $bSBresult = $this->switchboard_control($ip, $port, $cki_code, $aMSNUsers[$nCurrentUser], $sMessage);
if ($bSBresult === false) { if ($bSBresult === false) {
@ -904,8 +904,8 @@ class MSN {
case 'NLN': case 'NLN':
// NS: <<< NLN {status} {email} {networkid} {nickname} {clientid} {dpobj} // NS: <<< NLN {status} {email} {networkid} {nickname} {clientid} {dpobj}
// NS: <<< NLN NLN darkip@inflatablegoldfish.com 1 Luke 2685403136 0 // NS: <<< NLN NLN darkip@inflatablegoldfish.com 1 Luke 2685403136 0
@list(/* NLN */, $email, $network, $nickname, /* clientid */, /* dbobj */,) = @explode(' ', $data); @list(/* NLN */, $status, $email, $network, $nickname, /* clientid */, /* dbobj */,) = @explode(' ', $data);
$this->callHandler('StatusChange', array('screenname' => $email, 'network' => $network, 'nickname' => $nickname)); $this->callHandler('StatusChange', array('screenname' => $email, 'status' => $status, 'network' => $network, 'nickname' => $nickname));
break; break;
case 'OUT': case 'OUT':