X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fimsettings.php;h=034f6dc2b284518ef50e6e3bae1416403ef180be;hb=ea40dabb392aec3d7b9da666285969bb296a94e2;hp=d8680c98b4dc4daa98a797dd104142f982cb0147;hpb=63dcbe1e6e4dc49de9ce9be82421c043cc751007;p=quix0rs-gnu-social.git

diff --git a/actions/imsettings.php b/actions/imsettings.php
index d8680c98b4..034f6dc2b2 100644
--- a/actions/imsettings.php
+++ b/actions/imsettings.php
@@ -20,60 +20,103 @@
 if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/settingsaction.php');
+require_once(INSTALLDIR.'/lib/jabber.php');
 
 class ImsettingsAction extends SettingsAction {
 
-	function show_top($arr) {
-		$msg = $arr[0];
-		$success = $arr[1];
-		if ($msg) {
-			$this->message($msg, $success);
-		} else {
-			common_element('div', 'instructions',
-						   _t('You can send and receive notices through '.
-							  'Jabber/GTalk instant messages. Configure '.
-							  'your address and settings below.'));
-		}
-		$this->settings_menu();
+	function get_instructions() {
+		return _('You can send and receive notices through Jabber/GTalk [instant messages](%%doc.im%%). Configure your address and settings below.');
 	}
 
 	function show_form($msg=NULL, $success=false) {
 		$user = common_current_user();
-		common_show_header(_t('IM settings'), NULL, array($msg, $success),
-						   array($this, 'show_top'));
-
-		common_element_start('form', array('method' => 'POST',
+		$this->form_header(_('IM Settings'), $msg, $success);
+		common_element_start('form', array('method' => 'post',
 										   'id' => 'imsettings',
 										   'action' =>
 										   common_local_url('imsettings')));
-		# too much common patterns here... abstractable?
-		common_input('jabber', _t('IM Address'),
-					 ($this->arg('jabber')) ? $this->arg('jabber') : $user->jabber,
-					 _t('Jabber or GTalk address, like "UserName@example.org"'));
+
+		common_element('h2', NULL, _('Address'));
+
+		if ($user->jabber) {
+			common_element_start('p');
+			common_element('span', 'address confirmed', $user->jabber);
+			common_element('span', 'input_instructions',
+			               _('Current confirmed Jabber/GTalk address.'));
+			common_hidden('jabber', $user->jabber);
+			common_element_end('p');
+			common_submit('remove', _('Remove'));
+		} else {
+			$confirm = $this->get_confirmation();
+			if ($confirm) {
+				common_element_start('p');
+				common_element('span', 'address unconfirmed', $confirm->address);
+				common_element('span', 'input_instructions',
+			  	              sprintf(_('Awaiting confirmation on this address. Check your Jabber/GTalk account for a message with further instructions. (Did you add %s to your buddy list?)'), jabber_daemon_address()));
+				common_hidden('jabber', $confirm->address);
+				common_element_end('p');
+				common_submit('cancel', _('Cancel'));
+			} else {
+				common_input('jabber', _('IM Address'),
+						 	($this->arg('jabber')) ? $this->arg('jabber') : NULL,
+						 sprintf(_('Jabber or GTalk address, like "UserName@example.org". First, make sure to add %s to your buddy list in your IM client or on GTalk.'), jabber_daemon_address()));
+				common_submit('add', _('Add'));
+			}
+		}
+
+		common_element('h2', NULL, _('Preferences'));
+
 		common_checkbox('jabbernotify',
-		                _t('Send me notices through Jabber/GTalk.'));
+		                _('Send me notices through Jabber/GTalk.'),
+		                $user->jabbernotify);
 		common_checkbox('updatefrompresence',
-		                _t('Post a notice when my Jabber/GTalk status changes.'));
-		common_submit('submit', _t('Save'));
+		                _('Post a notice when my Jabber/GTalk status changes.'),
+		                $user->updatefrompresence);
+		common_checkbox('jabberreplies',
+		                _('Send me replies through Jabber/GTalk from people I\'m not subscribed to.'),
+		                $user->jabberreplies);
+		common_checkbox('jabbermicroid',
+		                _('Publish a MicroID for my Jabber/GTalk address.'),
+		                $user->jabbermicroid);
+		common_submit('save', _('Save'));
+
 		common_element_end('form');
 		common_show_footer();
 	}
 
-	function handle_post() {
+	function get_confirmation() {
+		$user = common_current_user();
+		$confirm = new Confirm_address();
+		$confirm->user_id = $user->id;
+		$confirm->address_type = 'jabber';
+		if ($confirm->find(TRUE)) {
+			return $confirm;
+		} else {
+			return NULL;
+		}
+	}
 
-		$jabber = jabber_normalize_jid($this->trimmed('jabber'));
-		$jabbernotify = $this->boolean('jabbernotify');
-		$updatefrompresence = $this->boolean('updatefrompresence');
+	function handle_post() {
 
-		if (!jabber_valid_base_jid($jabber)) {
-			$this->show_form(_('Not a valid Jabber ID'));
-			return;
-		} else if ($this->jabber_exists($jabber)) {
-			$this->show_form(_('Not a valid Jabber ID'));
-			return;
+		if ($this->arg('save')) {
+			$this->save_preferences();
+		} else if ($this->arg('add')) {
+			$this->add_address();
+		} else if ($this->arg('cancel')) {
+			$this->cancel_confirmation();
+		} else if ($this->arg('remove')) {
+			$this->remove_address();
+		} else {
+			$this->show_form(_('Unexpected form submission.'));
 		}
+	}
 
-		# Some validation
+	function save_preferences() {
+
+		$jabbernotify = $this->boolean('jabbernotify');
+		$updatefrompresence = $this->boolean('updatefrompresence');
+		$jabberreplies = $this->boolean('jabberreplies');
+		$jabbermicroid = $this->boolean('jabbermicroid');
 
 		$user = common_current_user();
 
@@ -83,29 +126,128 @@ class ImsettingsAction extends SettingsAction {
 
 		$original = clone($user);
 
-		$user->jabber = $jabber;
 		$user->jabbernotify = $jabbernotify;
 		$user->updatefrompresence = $updatefrompresence;
+		$user->jabberreplies = $jabberreplies;
+		$user->jabbermicroid = $jabbermicroid;
 
-		$result = $user->updateKeys($original); # For key columns
+		$result = $user->update($original);
 
 		if ($result === FALSE) {
 			common_log_db_error($user, 'UPDATE', __FILE__);
-			common_server_error(_t('Couldnt update user.'));
+			common_server_error(_('Couldn\'t update user.'));
 			return;
 		}
 
-		$result = $user->update($original); # For non-key columns
+		$user->query('COMMIT');
+
+		$this->show_form(_('Preferences saved.'), true);
+	}
+
+	function add_address() {
+
+		$user = common_current_user();
+
+		$jabber = $this->trimmed('jabber');
+
+		# Some validation
+
+		if (!$jabber) {
+			$this->show_form(_('No Jabber ID.'));
+			return;
+		}
+
+		$jabber = jabber_normalize_jid($jabber);
+
+		if (!$jabber) {
+		    $this->show_form(_('Cannot normalize that Jabber ID'));
+		    return;
+		}
+		if (!jabber_valid_base_jid($jabber)) {
+		    $this->show_form(_('Not a valid Jabber ID'));
+		    return;
+		} else if ($user->jabber == $jabber) {
+		    $this->show_form(_('That is already your Jabber ID.'));
+		    return;
+		} else if ($this->jabber_exists($jabber)) {
+		    $this->show_form(_('Jabber ID already belongs to another user.'));
+		    return;
+		}
+
+  		$confirm = new Confirm_address();
+   		$confirm->address = $jabber;
+   		$confirm->address_type = 'jabber';
+   		$confirm->user_id = $user->id;
+   		$confirm->code = common_confirmation_code(64);
+
+		$result = $confirm->insert();
 
 		if ($result === FALSE) {
-			common_log_db_error($user, 'UPDATE', __FILE__);
-			common_server_error(_t('Couldnt update user.'));
+			common_log_db_error($confirm, 'INSERT', __FILE__);
+			common_server_error(_('Couldn\'t insert confirmation code.'));
 			return;
 		}
 
+		if (!common_config('queue', 'enabled')) {
+			jabber_confirm_address($confirm->code,
+								   $user->nickname,
+								   $jabber);
+		}
+
+		$msg = sprintf(_('A confirmation code was sent to the IM address you added. You must approve %s for sending messages to you.'), jabber_daemon_address());
+
+		$this->show_form($msg, TRUE);
+	}
+
+	function cancel_confirmation() {
+		$jabber = $this->arg('jabber');
+		$confirm = $this->get_confirmation();
+		if (!$confirm) {
+			$this->show_form(_('No pending confirmation to cancel.'));
+			return;
+		}
+		if ($confirm->address != $jabber) {
+			$this->show_form(_('That is the wrong IM address.'));
+			return;
+		}
+
+        $result = $confirm->delete();
+
+        if (!$result) {
+			common_log_db_error($confirm, 'DELETE', __FILE__);
+            $this->server_error(_('Couldn\'t delete email confirmation.'));
+            return;
+        }
+
+        $this->show_form(_('Confirmation cancelled.'), TRUE);
+	}
+
+	function remove_address() {
+
+		$user = common_current_user();
+		$jabber = $this->arg('jabber');
+
+		# Maybe an old tab open...?
+
+		if ($user->jabber != $jabber) {
+		    $this->show_form(_('That is not your Jabber ID.'));
+		    return;
+		}
+
+		$user->query('BEGIN');
+		$original = clone($user);
+		$user->jabber = NULL;
+		$result = $user->updateKeys($original);
+		if (!$result) {
+			common_log_db_error($user, 'UPDATE', __FILE__);
+			common_server_error(_('Couldn\'t update user.'));
+			return;
+		}
 		$user->query('COMMIT');
 
-		$this->show_form(_t('Settings saved.'), TRUE);
+		# XXX: unsubscribe to the old address
+
+		$this->show_form(_('The address was removed.'), TRUE);
 	}
 
 	function jabber_exists($jabber) {