2 files changed, 134 insertions, 5 deletions

diff --git a/classes/Channel.php b/classes/Channel.php
index f2e7ad34f..ee0e57c89 100644
--- a/classes/Channel.php
+++ b/classes/Channel.php
@@ -22,14 +22,135 @@ if (!defined('LACONICA')) { exit(1); }
 class Channel {
 	
 	function on($user) {
+		return false;
 	}
 
 	function off($user) {
+		return false;
 	}
 
-	function output($user) {
+	function output($user, $text) {
+		return false;
 	}
 	
-	function error($user) {
+	function error($user, $text) {
+		return false;
 	}
-}
\ No newline at end of file
+}
+
+class XMPPChannel extends Channel {
+
+	var $conn = NULL;
+	
+	function __construct($conn) {
+		$this->conn = $conn;
+	}
+	
+	function on($user) {
+		return $this->set_notify($user, 1);
+	}
+	
+	function off($user) {
+		return $this->set_notify($user, 0);
+	}
+
+	function output($user, $text) {
+		$text = '['.common_config('site', 'name') . '] ' . $text;
+		jabber_send_message($user->jabber, $text);
+	}
+	
+	function error($user, $text) {
+		$text = '['.common_config('site', 'name') . '] ' . $text;
+		jabber_send_message($user->jabber, $text);
+	}
+	
+	function set_notify(&$user, $notify) {
+		$orig = clone($user);
+		$user->jabbernotify = $notify;
+		$result = $user->update($orig);
+		if (!$result) {
+			$last_error = &PEAR::getStaticProperty('DB_DataObject','lastError');
+			common_log(LOG_ERR,
+					   'Could not set notify flag to ' . $notify .
+					   ' for user ' . common_log_objstring($user) .
+					   ': ' . $last_error->message);
+			return false;
+		} else {
+			common_log(LOG_INFO,
+					   'User ' . $user->nickname . ' set notify flag to ' . $notify);
+		}
+	}
+}
+
+
+class WebChannel extends Channel {
+
+	function on($user) {
+		return false;
+	}
+	
+	function off($user) {
+		return false;
+	}
+
+	function output($user, $text) {
+		# XXX: buffer all output and send it at the end
+		# XXX: even better, redirect to appropriate page
+		#      depending on what command was run
+		common_show_header(_('Command results'));
+		common_element('p', NULL, $text);
+		common_show_footer();
+	}
+	
+	function error($user, $text) {
+		common_client_error($text);
+	}
+}
+
+class MailChannel extends Channel {
+
+	var $addr = NULL;
+	
+	function __construct($addr=NULL) {
+		$this->addr = $addr;
+	}
+	
+	function on($user) {
+		return $this->set_notify($user, 1);
+	}
+	
+	function off($user) {
+		return $this->set_notify($user, 0);
+	}
+
+	function output($user, $text) {
+
+		$headers['From'] = $user->incomingemail;
+		$headers['To'] = $this->addr;
+		
+		$headers['Subject'] = _('Command complete');
+
+		return mail_send(array($this->addr), $headers, $text);
+	}
+	
+	function error($user, $text) {
+		
+		$headers['From'] = $user->incomingemail;
+		$headers['To'] = $this->addr;
+		
+		$headers['Subject'] = _('Command failed');
+
+		return mail_send(array($this->addr), $headers, $text);
+	}
+	
+	function set_notify($user, $value) {
+		$orig = clone($user);
+		$user->smsnotify = $value;
+		$result = $user->update($orig);
+		if (!$result) {
+			common_log_db_error($user, 'UPDATE', __FILE__);
+			return false;
+		}
+		return true;
+	}
+}
diff --git a/classes/Command.php b/classes/Command.php
index 1a6d7cc06..3e2afec6c 100644
--- a/classes/Command.php
+++ b/classes/Command.php
@@ -299,7 +299,11 @@ class OffCommand extends Command {
 		if ($other) {
 			$channel->error($this->user, _("Command not yet implemented."));
 		} else {
-			$channel->off($this->user);
+			if ($channel->off($this->user)) {
+				$channel->output(_('Notification off.'));
+			} else {
+				$channel->error(_('Can\'t turn off notification.'));
+			}
 		}
 	}
 }
@@ -315,7 +319,11 @@ class OnCommand extends Command {
 		if ($other) {
 			$channel->error($this->user, _("Command not yet implemented."));
 		} else {
-			$channel->on($this->user);
+			if ($channel->on($this->user)) {
+				$channel->output(_('Notification on.'));
+			} else {
+				$channel->error(_('Can\'t turn on notification.'));
+			}
 		}
 	}
 }