diff options
Diffstat (limited to 'mod')
| -rw-r--r-- | mod/dfrn_poll.php | 214 | ||||
| -rw-r--r-- | mod/display.php | 12 | ||||
| -rw-r--r-- | mod/item.php | 12 | ||||
| -rw-r--r-- | mod/lockview.php | 7 | ||||
| -rw-r--r-- | mod/network.php | 14 | ||||
| -rw-r--r-- | mod/photos.php | 2 | ||||
| -rw-r--r-- | mod/profile.php | 11 | ||||
| -rw-r--r-- | mod/redir.php | 23 | ||||
| -rw-r--r-- | mod/register.php | 30 |
9 files changed, 238 insertions, 87 deletions
diff --git a/mod/dfrn_poll.php b/mod/dfrn_poll.php index de3d00aea..20fdc8f79 100644 --- a/mod/dfrn_poll.php +++ b/mod/dfrn_poll.php @@ -7,12 +7,12 @@ require_once('include/auth.php'); function dfrn_poll_init(&$a) { $dfrn_id = ((x($_GET,'dfrn_id')) ? $_GET['dfrn_id'] : ''); - $type = ((x($_GET,'type')) ? $_GET['type'] : ''); + $type = ((x($_GET,'type')) ? $_GET['type'] : 'data'); $last_update = ((x($_GET,'last_update')) ? $_GET['last_update'] : ''); $destination_url = ((x($_GET,'destination_url')) ? $_GET['destination_url'] : ''); - $sec = ((x($_GET,'sec')) ? intval($_GET['sec']) : 0); - $dfrn_version = ((x($_GET,'dfrn_version')) ? (float) $_GET['dfrn_version'] : 0); - + $challenge = ((x($_GET,'challenge')) ? $_GET['challenge'] : ''); + $sec = ((x($_GET,'sec')) ? $_GET['sec'] : ''); + $dfrn_version = ((x($_GET,'dfrn_version')) ? (float) $_GET['dfrn_version'] : 2.0); $direction = (-1); @@ -29,7 +29,7 @@ function dfrn_poll_init(&$a) { killme(); } - if((isset($type)) && ($type === 'profile')) { + if(($type === 'profile') && (! strlen($sec))) { $sql_extra = ''; switch($direction) { @@ -61,6 +61,8 @@ function dfrn_poll_init(&$a) { $s = fetch_url($r[0]['poll'] . '?dfrn_id=' . $my_id . '&type=profile-check'); + logger("dfrn_poll: old profile returns " . $s, LOGGER_DATA); + if(strlen($s)) { $xml = simplexml_load_string($s); @@ -85,30 +87,87 @@ function dfrn_poll_init(&$a) { } - if((isset($type)) && ($type === 'profile-check')) { + if($type === 'profile-check') { - switch($direction) { - case 1: - $dfrn_id = '0:' . $dfrn_id; - break; - case 0: - $dfrn_id = '1:' . $dfrn_id; - break; - default: - break; + if((strlen($challenge)) && (strlen($sec))) { + + q("DELETE FROM `profile_check` WHERE `expire` < " . intval(time())); + $r = q("SELECT * FROM `profile_check` WHERE `sec` = '%s' ORDER BY `expire` DESC LIMIT 1", + dbesc($sec) + ); + if(! count($r)) { + xml_status(3); + // NOTREACHED + } + $orig_id = $r[0]['dfrn_id']; + if(strpos(':',$orig_id)) + $orig_id = substr($orig_id,2); + + $c = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1", + intval($r[0]['cid']) + ); + if(! count($c)) { + xml_status(3); + } + $contact = $c[0]; + + $sent_dfrn_id = hex2bin($dfrn_id); + $challenge = hex2bin($challenge); + + $final_dfrn_id = ''; + + if(($contact['duplex']) && strlen($contact['prvkey'])) { + openssl_private_decrypt($sent_dfrn_id,$final_dfrn_id,$contact['prvkey']); + openssl_private_decrypt($challenge,$decoded_challenge,$contact['prvkey']); + } + else { + openssl_public_decrypt($sent_dfrn_id,$final_dfrn_id,$contact['pubkey']); + openssl_public_decrypt($challenge,$decoded_challenge,$contact['pubkey']); + } + + $final_dfrn_id = substr($final_dfrn_id, 0, strpos($final_dfrn_id, '.')); + + if(strpos($final_dfrn_id,':') == 1) + $final_dfrn_id = substr($final_dfrn_id,2); + + if($final_dfrn_id != $orig_id) { + + // did not decode properly - cannot trust this site + xml_status(3); + } + + header("Content-type: text/xml"); + echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?><dfrn_poll><status>0</status><challenge>$decoded_challenge</challenge><sec>$sec</sec></dfrn_poll>"; + killme(); + // NOTREACHED } - q("DELETE FROM `profile_check` WHERE `expire` < " . intval(time())); - $r = q("SELECT * FROM `profile_check` WHERE `dfrn_id` = '%s' ORDER BY `expire` DESC", - dbesc($dfrn_id)); - if(count($r)) { - xml_status(1); + else { + // old protocol + + switch($direction) { + case 1: + $dfrn_id = '0:' . $dfrn_id; + break; + case 0: + $dfrn_id = '1:' . $dfrn_id; + break; + default: + break; + } + + + q("DELETE FROM `profile_check` WHERE `expire` < " . intval(time())); + $r = q("SELECT * FROM `profile_check` WHERE `dfrn_id` = '%s' ORDER BY `expire` DESC", + dbesc($dfrn_id)); + if(count($r)) { + xml_status(1); + return; // NOTREACHED + } + xml_status(0); return; // NOTREACHED } - xml_status(0); - return; // NOTREACHED } - } @@ -118,7 +177,7 @@ function dfrn_poll_post(&$a) { $dfrn_id = ((x($_POST,'dfrn_id')) ? $_POST['dfrn_id'] : ''); $challenge = ((x($_POST,'challenge')) ? $_POST['challenge'] : ''); $url = ((x($_POST,'url')) ? $_POST['url'] : ''); - $dfrn_version = ((x($_POST,'dfrn_version')) ? (float) $_POST['dfrn_version'] : 0); + $dfrn_version = ((x($_POST,'dfrn_version')) ? (float) $_POST['dfrn_version'] : 2.0); $direction = (-1); if(strpos($dfrn_id,':') == 1) { @@ -213,11 +272,12 @@ function dfrn_poll_post(&$a) { function dfrn_poll_content(&$a) { - $dfrn_id = ((x($_GET,'dfrn_id')) ? $_GET['dfrn_id'] : ''); - $type = ((x($_GET,'type')) ? $_GET['type'] : 'data'); - $last_update = ((x($_GET,'last_update')) ? $_GET['last_update'] : ''); - $dfrn_version = ((x($_GET,'dfrn_version')) ? (float) $_GET['dfrn_version'] : 2.0); - $sec = ((x($_GET,'sec')) ? intval($_GET['sec']) : 0); + $dfrn_id = ((x($_GET,'dfrn_id')) ? $_GET['dfrn_id'] : ''); + $type = ((x($_GET,'type')) ? $_GET['type'] : 'data'); + $last_update = ((x($_GET,'last_update')) ? $_GET['last_update'] : ''); + $destination_url = ((x($_GET,'destination_url')) ? $_GET['destination_url'] : ''); + $sec = ((x($_GET,'sec')) ? $_GET['sec'] : ''); + $dfrn_version = ((x($_GET,'dfrn_version')) ? (float) $_GET['dfrn_version'] : 2.0); $direction = (-1); if(strpos($dfrn_id,':') == 1) { @@ -234,19 +294,23 @@ function dfrn_poll_content(&$a) { $r = q("DELETE FROM `challenge` WHERE `expire` < " . intval(time())); - $r = q("INSERT INTO `challenge` ( `challenge`, `dfrn-id`, `expire` , `type`, `last_update` ) - VALUES( '%s', '%s', '%s', '%s', '%s' ) ", - dbesc($hash), - dbesc($dfrn_id), - intval(time() + 60 ), - dbesc($type), - dbesc($last_update) - ); - + if($type !== 'profile') { + $r = q("INSERT INTO `challenge` ( `challenge`, `dfrn-id`, `expire` , `type`, `last_update` ) + VALUES( '%s', '%s', '%s', '%s', '%s' ) ", + dbesc($hash), + dbesc($dfrn_id), + intval(time() + 60 ), + dbesc($type), + dbesc($last_update) + ); + } $sql_extra = ''; switch($direction) { case (-1): - $sql_extra = sprintf(" AND `issued-id` = '%s' ", dbesc($dfrn_id)); + if($type === 'profile') + $sql_extra = sprintf(" AND ( `dfrn-id` = '%s' OR `issued-id` = '%s' ) ", dbesc($dfrn_id),dbesc($dfrn_id)); + else + $sql_extra = sprintf(" AND `issued-id` = '%s' ", dbesc($dfrn_id)); $my_id = $dfrn_id; break; case 0: @@ -262,7 +326,12 @@ function dfrn_poll_content(&$a) { break; // NOTREACHED } - $r = q("SELECT * FROM `contact` WHERE `blocked` = 0 AND `pending` = 0 $sql_extra LIMIT 1"); + $r = q("SELECT `contact`.*, `user`.`username`, `user`.`nickname` + FROM `contact` LEFT JOIN `user` ON `contact`.`uid` = `user`.`uid` + WHERE `contact`.`blocked` = 0 AND `contact`.`pending` = 0 + AND `user`.`nickname` = '%s' $sql_extra LIMIT 1", + dbesc($a->argv[1]) + ); if(count($r)) { @@ -270,7 +339,6 @@ function dfrn_poll_content(&$a) { $encrypted_id = ''; $id_str = $my_id . '.' . mt_rand(1000,9999); - if($r[0]['duplex'] && strlen($r[0]['pubkey'])) { openssl_public_encrypt($hash,$challenge,$r[0]['pubkey']); openssl_public_encrypt($id_str,$encrypted_id,$r[0]['pubkey']); @@ -287,15 +355,61 @@ function dfrn_poll_content(&$a) { $status = 1; } - header("Content-type: text/xml"); - echo '<?xml version="1.0" encoding="UTF-8"?>' . "\r\n" - . '<dfrn_poll>' . "\r\n" - . "\t" . '<status>' . $status . '</status>' . "\r\n" - . "\t" . '<dfrn_version>' . DFRN_PROTOCOL_VERSION . '</dfrn_version>' . "\r\n" - . "\t" . '<dfrn_id>' . $encrypted_id . '</dfrn_id>' . "\r\n" - . "\t" . '<challenge>' . $challenge . '</challenge>' . "\r\n" - . '</dfrn_poll>' . "\r\n" ; - killme(); + if(($type === 'profile') && (strlen($sec))) { + // URL reply + + $s = fetch_url($r[0]['poll'] + . '?dfrn_id=' . $encrypted_id + . '&type=profile-check' + . '&dfrn_version=' . DFRN_PROTOCOL_VERSION + . '&challenge=' . $challenge + . '&sec=' . $sec + ); + + logger("dfrn_poll: sec profile: " . $s, LOGGER_DATA); + + if(strlen($s) && strstr($s,'<?xml')) { + + $xml = simplexml_load_string($s); + + logger('dfrn_poll: profile: parsed xml: ' . print_r($xml,true), LOGGER_DATA); + + logger('dfrn_poll: secure profile: challenge: ' . $xml->challenge . ' expecting ' . $hash); + logger('dfrn_poll: secure profile: sec: ' . $xml->sec . ' expecting ' . $sec); + + + if(((int) $xml->status == 0) && ($xml->challenge == $hash) && ($xml->sec == $sec)) { + $_SESSION['authenticated'] = 1; + $_SESSION['visitor_id'] = $r[0]['id']; + notice( $r[0]['username'] . t(' welcomes ') . $r[0]['name'] . EOL); + // Visitors get 1 day session. + $session_id = session_id(); + $expire = time() + 86400; + q("UPDATE `session` SET `expire` = '%s' WHERE `sid` = '%s' LIMIT 1", + dbesc($expire), + dbesc($session_id) + ); + } + $profile = $r[0]['nickname']; + goaway((strlen($destination_url)) ? $destination_url : $a->get_baseurl() . '/profile/' . $profile); + } + goaway($a->get_baseurl()); + // NOTREACHED + + } + else { + // XML reply + header("Content-type: text/xml"); + echo '<?xml version="1.0" encoding="UTF-8"?>' . "\r\n" + . '<dfrn_poll>' . "\r\n" + . "\t" . '<status>' . $status . '</status>' . "\r\n" + . "\t" . '<dfrn_version>' . DFRN_PROTOCOL_VERSION . '</dfrn_version>' . "\r\n" + . "\t" . '<dfrn_id>' . $encrypted_id . '</dfrn_id>' . "\r\n" + . "\t" . '<challenge>' . $challenge . '</challenge>' . "\r\n" + . '</dfrn_poll>' . "\r\n" ; + killme(); + // NOTREACHED + } } } diff --git a/mod/display.php b/mod/display.php index aa9455361..ec036de62 100644 --- a/mod/display.php +++ b/mod/display.php @@ -142,8 +142,8 @@ function display_content(&$a) { && ($item['id'] != $item['parent'])) continue; - $lock = (($item['uid'] == local_user()) && (strlen($item['allow_cid']) || strlen($item['allow_gid']) - || strlen($item['deny_cid']) || strlen($item['deny_gid'])) + $lock = ((($item['private']) || (($item['uid'] == local_user()) && (strlen($item['allow_cid']) || strlen($item['allow_gid']) + || strlen($item['deny_cid']) || strlen($item['deny_gid'])))) ? '<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="' . t('Private Message') . '" onclick="lockview(event,' . $item['id'] . ');" /></div>' : '<div class="wall-item-lock"></div>'); @@ -235,6 +235,12 @@ function display_content(&$a) { $location = '<span class="smalltext">' . $coord . '</span>'; } + $indent = (($item['parent'] != $item['item_id']) ? ' comment' : ''); + + if(strcmp(datetime_convert('UTC','UTC',$item['created']),datetime_convert('UTC','UTC','now - 12 hours')) > 0) + $indent .= ' shiny'; + + $o .= replace_macros($template,array( '$id' => $item['item_id'], '$profile_url' => $profile_link, @@ -247,7 +253,7 @@ function display_content(&$a) { '$ago' => relative_date($item['created']), '$lock' => $lock, '$location' => $location, - '$indent' => (($item['parent'] != $item['item_id']) ? ' comment' : ''), + '$indent' => $indent, '$owner_url' => $owner_url, '$owner_photo' => $owner_photo, '$owner_name' => $owner_name, diff --git a/mod/item.php b/mod/item.php index 504856d7d..ea88e6c31 100644 --- a/mod/item.php +++ b/mod/item.php @@ -53,6 +53,8 @@ function item_post(&$a) { $str_group_deny = perms2str($_POST['group_deny']); $str_contact_deny = perms2str($_POST['contact_deny']); + $private = ((strlen($str_group_allow) || strlen($str_contact_allow) || strlen($str_group_deny) || strlen($str_contact_deny)) ? 1 : 0); + $title = notags(trim($_POST['title'])); $body = escape_tags(trim($_POST['body'])); $location = notags(trim($_POST['location'])); @@ -195,8 +197,8 @@ function item_post(&$a) { $r = q("INSERT INTO `item` (`uid`,`type`,`wall`,`gravity`,`contact-id`,`owner-name`,`owner-link`,`owner-avatar`, `author-name`, `author-link`, `author-avatar`, `created`, `edited`, `changed`, `uri`, `title`, `body`, `location`, `coord`, - `tag`, `inform`, `verb`, `allow_cid`, `allow_gid`, `deny_cid`, `deny_gid`) - VALUES( %d, '%s', %d, %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s' )", + `tag`, `inform`, `verb`, `allow_cid`, `allow_gid`, `deny_cid`, `deny_gid`, `private` ) + VALUES( %d, '%s', %d, %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d )", intval($profile_uid), dbesc($post_type), intval($wall), @@ -222,7 +224,8 @@ function item_post(&$a) { dbesc($str_contact_allow), dbesc($str_group_allow), dbesc($str_contact_deny), - dbesc($str_group_deny) + dbesc($str_group_deny), + intval($private) ); $r = q("SELECT `id` FROM `item` WHERE `uri` = '%s' LIMIT 1", dbesc($uri)); @@ -241,12 +244,13 @@ function item_post(&$a) { // Inherit ACL's from the parent item. // TODO merge with subsequent UPDATE operation and save a db write - $r = q("UPDATE `item` SET `allow_cid` = '%s', `allow_gid` = '%s', `deny_cid` = '%s', `deny_gid` = '%s' + $r = q("UPDATE `item` SET `allow_cid` = '%s', `allow_gid` = '%s', `deny_cid` = '%s', `deny_gid` = '%s', `private` = %d WHERE `id` = %d LIMIT 1", dbesc($parent_item['allow_cid']), dbesc($parent_item['allow_gid']), dbesc($parent_item['deny_cid']), dbesc($parent_item['deny_gid']), + intval($parent_item['private']), intval($post_id) ); diff --git a/mod/lockview.php b/mod/lockview.php index b8f4318df..a886effeb 100644 --- a/mod/lockview.php +++ b/mod/lockview.php @@ -22,6 +22,13 @@ function lockview_content(&$a) { $deny_users = expand_acl($item['deny_cid']); $deny_groups = expand_acl($item['deny_gid']); + if(($item['private']) && (! strlen($item['allow_cid'])) && (! strlen($item['allow_gid'])) + && (! strlen($item['deny_cid'])) && (! strlen($item['deny_gid']))) { + + echo t('Remote privacy information not available.') . '<br />'; + killme(); + } + $o = t('Visible to:') . '<br />'; $l = array(); diff --git a/mod/network.php b/mod/network.php index dd4ec63a3..c52bb74fc 100644 --- a/mod/network.php +++ b/mod/network.php @@ -165,11 +165,13 @@ function network_content(&$a, $update = 0) { if(((activity_match($item['verb'],ACTIVITY_LIKE)) || (activity_match($item['verb'],ACTIVITY_DISLIKE))) && ($item['id'] != $item['parent'])) continue; - $lock = (($item['uid'] == local_user()) && (strlen($item['allow_cid']) || strlen($item['allow_gid']) - || strlen($item['deny_cid']) || strlen($item['deny_gid'])) + + $lock = ((($item['private']) || (($item['uid'] == local_user()) && (strlen($item['allow_cid']) || strlen($item['allow_gid']) + || strlen($item['deny_cid']) || strlen($item['deny_gid'])))) ? '<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="' . t('Private Message') . '" onclick="lockview(event,' . $item['id'] . ');" /></div>' : '<div class="wall-item-lock"></div>'); + // Top-level wall post not written by the wall owner (wall-to-wall) // First figure out who owns it. @@ -274,6 +276,12 @@ function network_content(&$a, $update = 0) { $location = '<span class="smalltext">' . $coord . '</span>'; } + $indent = (($item['parent'] != $item['item_id']) ? ' comment' : ''); + + if(strcmp(datetime_convert('UTC','UTC',$item['created']),datetime_convert('UTC','UTC','now - 12 hours')) > 0) + $indent .= ' shiny'; + + // Build the HTML $o .= replace_macros($template,array( @@ -288,7 +296,7 @@ function network_content(&$a, $update = 0) { '$ago' => relative_date($item['created']), '$lock' => $lock, '$location' => $location, - '$indent' => (($item['parent'] != $item['item_id']) ? ' comment' : ''), + '$indent' => $indent, '$owner_url' => $owner_url, '$owner_photo' => $owner_photo, '$owner_name' => $owner_name, diff --git a/mod/photos.php b/mod/photos.php index 581c104a5..f29c39386 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -644,7 +644,7 @@ function photos_content(&$a) { $owner_uid = $a->data['user']['uid']; $community_page = (($a->data['user']['page-flags'] == PAGE_COMMUNITY) ? true : false); -dbg(1); + if((local_user()) && (local_user() == $owner_uid)) $can_post = true; else { diff --git a/mod/profile.php b/mod/profile.php index c18c7d196..d09e0187b 100644 --- a/mod/profile.php +++ b/mod/profile.php @@ -305,8 +305,8 @@ function profile_content(&$a, $update = 0) { && ($item['id'] != $item['parent'])) continue; - $lock = (($item['uid'] == local_user()) && (strlen($item['allow_cid']) || strlen($item['allow_gid']) - || strlen($item['deny_cid']) || strlen($item['deny_gid'])) + $lock = ((($item['private']) || (($item['uid'] == local_user()) && (strlen($item['allow_cid']) || strlen($item['allow_gid']) + || strlen($item['deny_cid']) || strlen($item['deny_gid'])))) ? '<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="' . t('Private Message') . '" onclick="lockview(event,' . $item['id'] . ');" /></div>' : '<div class="wall-item-lock"></div>'); @@ -376,6 +376,11 @@ function profile_content(&$a, $update = 0) { $location = '<span class="smalltext">' . $coord . '</span>'; } + $indent = (($item['parent'] != $item['item_id']) ? ' comment' : ''); + + if(strcmp(datetime_convert('UTC','UTC',$item['created']),datetime_convert('UTC','UTC','now - 12 hours')) > 0) + $indent .= ' shiny'; + $o .= replace_macros($template,array( '$id' => $item['item_id'], '$profile_url' => $profile_link, @@ -387,7 +392,7 @@ function profile_content(&$a, $update = 0) { '$ago' => relative_date($item['created']), '$lock' => $lock, '$location' => $location, - '$indent' => (($item['parent'] != $item['item_id']) ? ' comment' : ''), + '$indent' => $indent, '$drop' => $drop, '$like' => $like, '$vote' => $likebuttons, diff --git a/mod/redir.php b/mod/redir.php index f95c52c96..cc58b9cd1 100644 --- a/mod/redir.php +++ b/mod/redir.php @@ -4,10 +4,13 @@ function redir_init(&$a) { if((! local_user()) || (! ($a->argc == 2)) || (! intval($a->argv[1]))) goaway($a->get_baseurl()); + $cid = $a->argv[1]; + $r = q("SELECT `network`, `issued-id`, `dfrn-id`, `duplex`, `poll` FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1", - intval($a->argv[1]), + intval($cid), intval(local_user()) ); + if((! count($r)) || ($r[0]['network'] !== 'dfrn')) goaway($a->get_baseurl()); @@ -21,12 +24,20 @@ function redir_init(&$a) { $orig_id = $r[0]['dfrn-id']; $dfrn_id = '0:' . $orig_id; } - q("INSERT INTO `profile_check` ( `uid`, `dfrn_id`, `expire`) - VALUES( %d, '%s', %d )", - intval($_SESSION['uid']), + + $sec = random_string(); + + q("INSERT INTO `profile_check` ( `uid`, `cid`, `dfrn_id`, `sec`, `expire`) + VALUES( %d, %s, '%s', '%s', %d )", + intval(local_user()), + intval($cid), dbesc($dfrn_id), - intval(time() + 45)); + dbesc($sec), + intval(time() + 45) + ); + goaway ($r[0]['poll'] . '?dfrn_id=' . $dfrn_id - . '&dfrn_version=' . DFRN_PROTOCOL_VERSION . '&type=profile&sec=1'); +// . '&dfrn_version=' . DFRN_PROTOCOL_VERSION . '&type=profile'); + . '&dfrn_version=' . DFRN_PROTOCOL_VERSION . '&type=profile&sec=' . $sec); } diff --git a/mod/register.php b/mod/register.php index 973c54470..7ad7ef211 100644 --- a/mod/register.php +++ b/mod/register.php @@ -30,17 +30,12 @@ function register_post(&$a) { break; } - if(x($_POST,'username')) - $username = notags(trim($_POST['username'])); - if(x($_POST['nickname'])) - $nickname = notags(trim($_POST['nickname'])); - if(x($_POST,'email')) - $email = notags(trim($_POST['email'])); - if(x($_POST,'openid_url')) - $openid_url = notags(trim($_POST['openid_url'])); - - $photo = ((x($_POST,'photo')) ? notags(trim($_POST['photo'])) : ''); + $username = ((x($_POST,'username')) ? notags(trim($_POST['username'])) : ''); + $nickname = ((x($_POST,'nickname')) ? notags(trim($_POST['nickname'])) : ''); + $email = ((x($_POST,'email')) ? notags(trim($_POST['email'])) : ''); + $openid_url = ((x($_POST,'openid_url')) ? notags(trim($_POST['openid_url'])) : ''); + $photo = ((x($_POST,'photo')) ? notags(trim($_POST['photo'])) : ''); if((! x($username)) || (! x($email)) || (! x($nickname))) { if($openid_url) { @@ -71,14 +66,15 @@ function register_post(&$a) { // I don't really like having this rule, but it cuts down // on the number of auto-registrations by Russian spammers -// $no_utf = get_config('system','no_utf'); - -// $pat = (($no_utf) ? '/^[a-zA-Z]* [a-zA-Z]*$/' : '/^\p{L}* \p{L}*$/u' ); + // Using preg_match was completely unreliable, due to mixed UTF-8 regex support + // $no_utf = get_config('system','no_utf'); + // $pat = (($no_utf) ? '/^[a-zA-Z]* [a-zA-Z]*$/' : '/^\p{L}* \p{L}*$/u' ); -// $loose_reg = get_config('system','no_regfullname'); - -// if((! $loose_reg) && (! preg_match($pat,$username))) -// $err .= t('That doesn\'t appear to be your full name.') . EOL; + // So now we are just looking for a space in the full name. + + $loose_reg = get_config('system','no_regfullname'); + if((! $loose_reg) && (! strpos($username,' '))) + $err .= t("That doesn\'t appear to be your full \x28First Last\x29 name.") . EOL; if(! allowed_email($email)) $err .= t('Your email domain is not among those allowed on this site.') . EOL; |