From: friendica Date: Mon, 23 Apr 2012 12:16:57 +0000 (-0700) Subject: protect jappixmini/proxy from typo check, more work on email2 connector X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=8f0f644295ba292ebcc44edb1d8679bfb6a1d3a6;p=friendica.git protect jappixmini/proxy from typo check, more work on email2 connector --- diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php index 77a3124f76..74d25adbfd 100644 --- a/mod/dfrn_request.php +++ b/mod/dfrn_request.php @@ -314,7 +314,7 @@ function dfrn_request_post(&$a) { if($email_follow) { - if(! strpos($url,'@')) { + if(! validate_email($url)) { notice( t('Invalid email address.') . EOL); return; } @@ -346,11 +346,59 @@ function dfrn_request_post(&$a) { } } + $r = q("insert into contact ( uid, created, addr, name, nick, url, nurl, poll, notify, blocked, pending, network, rel ) + values( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', %d ) ", + intval($uid), + dbesc(datetime_convert()), + dbesc($addr), + dbesc($name), + dbesc($nick), + dbesc($url), + dbesc($nurl), + dbesc($poll), + dbesc($notify), + intval($blocked), + intval($pending), + dbesc($network), + intval($rel) + ); + + $r = q("select id from contact where poll = '%s' and uid = %d limit 1", + dbesc($poll), + intval($uid) + ); + if(count($r)) { + $contact_id = $r[0]['id']; + + $photo = avatar_img($addr); + + $r = q("UPDATE `contact` SET + `photo` = '%s', + `thumb` = '%s', + `micro` = '%s', + `name-date` = '%s', + `uri-date` = '%s', + `avatar-date` = '%s', + `hidden` = 0, + WHERE `id` = %d LIMIT 1 + ", + dbesc($photos[0]), + dbesc($photos[1]), + dbesc($photos[2]), + dbesc(datetime_convert()), + dbesc(datetime_convert()), + dbesc(datetime_convert()), + intval($contact_id) + ); + } + // contact is created. Now send an email verify form to the requestor. + // } + else { // Canonicalise email-style profile locator diff --git a/util/typo.php b/util/typo.php index e20cce86a5..7c275f3ca3 100644 --- a/util/typo.php +++ b/util/typo.php @@ -33,6 +33,8 @@ $files = glob($dir . '/*.php'); foreach($files as $file) { echo $file . "\n"; + if(stristr($file,'jappixmini/proxy.php')) + continue; include_once($file); } }