diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/jabber.php | 19 | ||||
| -rw-r--r-- | lib/util.php | 2 |
2 files changed, 7 insertions, 14 deletions
diff --git a/lib/jabber.php b/lib/jabber.php index 340264cc2..6ae3af208 100644 --- a/lib/jabber.php +++ b/lib/jabber.php @@ -81,22 +81,15 @@ function jabber_send_presence($status, $show='available', $to=Null) { } function jabber_confirm_address($code, $nickname, $address) { - - # Fire off a subscription, just in case - - jabber_special_presence('subscribe', $address); - - # Hopefully this goes through if we're not already subscribed - $body = 'User "' . $nickname . '" on ' . common_config('site', 'name') . ' ' . 'has said that your Jabber ID belongs to them. ' . - 'If that\'s true, you can confirm by clicking on this URL: ' . - common_local_url('confirmaddress', array('code' => $code)) . - ' . (If you cannot click it, copy-and-paste it into the ' . - 'address bar of your browser). If that user isn\'t you, ' . - 'or if you didn\'t request this confirmation, just ignore this message.'; + 'If that\'s true, you can confirm by clicking on this URL: ' . + common_local_url('confirmaddress', array('code' => $code)) . + ' . (If you cannot click it, copy-and-paste it into the ' . + 'address bar of your browser). If that user isn\'t you, ' . + 'or if you didn\'t request this confirmation, just ignore this message.'; - jabber_send_message($address, $body); + jabber_send_message($address, $body); } function jabber_special_presence($type, $to=NULL, $show=NULL, $status=NULL) { diff --git a/lib/util.php b/lib/util.php index 4e318a770..ccaf53123 100644 --- a/lib/util.php +++ b/lib/util.php @@ -322,6 +322,7 @@ function common_input($id, $label, $value=NULL,$instructions=NULL) { function common_checkbox($id, $label, $instructions=NULL, $value='true') { common_element_start('p'); + common_element('label', array('for' => $id), $label); $attrs = array('name' => $id, 'type' => 'checkbox', 'id' => $id, @@ -330,7 +331,6 @@ function common_checkbox($id, $label, $instructions=NULL, $value='true') $attrs['value'] = htmlspecialchars($value); } common_element('input', $attrs); - common_element('label', array('for' => $id), $label); if ($instructions) { common_element('span', 'input_instructions', $instructions); } |