- $dfrn_id = x($_POST,'dfrn_id') ? $_POST['dfrn_id'] : '';
- $challenge = x($_POST,'challenge') ? $_POST['challenge'] : '';
- $url = x($_POST,'url') ? $_POST['url'] : '';
- $sec = x($_POST,'sec') ? $_POST['sec'] : '';
- $ptype = x($_POST,'type') ? $_POST['type'] : '';
- $dfrn_version = x($_POST,'dfrn_version') ? (float) $_POST['dfrn_version'] : 2.0;
- $perm = x($_POST,'perm') ? $_POST['perm'] : 'r';
+ $dfrn_id = defaults($_POST, 'dfrn_id' , '');
+ $challenge = defaults($_POST, 'challenge', '');
+ $url = defaults($_POST, 'url' , '');
+ $sec = defaults($_POST, 'sec' , '');
+ $ptype = defaults($_POST, 'type' , '');
+ $perm = defaults($_POST, 'perm' , 'r');
+ $dfrn_version = !empty($_POST['dfrn_version']) ? (float) $_POST['dfrn_version'] : 2.0;