Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk

[quix0rs-gnu-social.git] / classes / Channel.php

diff --git a/classes/Channel.php b/classes/Channel.php
index 384fe8bb194c85b64f4d8bcf998dfc77884ae5b2..2e3e4e8d4a7cd5c9f44804edf9c10e195bda7189 100644 (file)
--- a/classes/Channel.php
+++ b/classes/Channel.php
@@ -19,60 +19,74 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
-class Channel {
+class Channel
+{
     
-    function on($user) {
+    function on($user)
+    {
         return false;
     }
 
-    function off($user) {
+    function off($user)
+    {
         return false;
     }
 
-    function output($user, $text) {
+    function output($user, $text)
+    {
         return false;
     }
     
-    function error($user, $text) {
+    function error($user, $text)
+    {
         return false;
     }
     
-    function source() {
-        return NULL;
+    function source()
+    {
+        return null;
     }
 }
 
-class XMPPChannel extends Channel {
+class XMPPChannel extends Channel
+{
 
-    var $conn = NULL;
+    var $conn = null;
     
-    function source() {
+    function source()
+    {
         return 'xmpp';
     }
     
-    function __construct($conn) {
+    function __construct($conn)
+    {
         $this->conn = $conn;
     }
     
-    function on($user) {
+    function on($user)
+    {
         return $this->set_notify($user, 1);
     }
     
-    function off($user) {
+    function off($user)
+    {
         return $this->set_notify($user, 0);
     }
 
-    function output($user, $text) {
+    function output($user, $text)
+    {
         $text = '['.common_config('site', 'name') . '] ' . $text;
         jabber_send_message($user->jabber, $text);
     }
     
-    function error($user, $text) {
+    function error($user, $text)
+    {
         $text = '['.common_config('site', 'name') . '] ' . $text;
         jabber_send_message($user->jabber, $text);
     }
     
-    function set_notify(&$user, $notify) {
+    function set_notify(&$user, $notify)
+    {
         $orig = clone($user);
         $user->jabbernotify = $notify;
         $result = $user->update($orig);
@@ -92,38 +106,46 @@ class XMPPChannel extends Channel {
 }
 
 
-class WebChannel extends Channel {
+class WebChannel extends Channel
+{
 
-    function source() {
+    function source()
+    {
         return 'web';
     }
     
-    function on($user) {
+    function on($user)
+    {
         return false;
     }
     
-    function off($user) {
+    function off($user)
+    {
         return false;
     }
 
-    function output($user, $text) {
+    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_element('p', null, $text);
         common_show_footer();
     }
     
-    function error($user, $text) {
+    function error($user, $text)
+    {
         common_user_error($text);
     }
 }
 
 
-class AjaxWebChannel extends WebChannel {
+class AjaxWebChannel extends WebChannel
+{
 
-    function output($user, $text) {
+    function output($user, $text)
+    {
         common_start_html('text/xml;charset=utf-8', true);
         common_element_start('head');
         common_element('title', null, _('Command results'));
@@ -134,7 +156,8 @@ class AjaxWebChannel extends WebChannel {
         common_element_end('html');
     }
 
-    function error($user, $text) {
+    function error($user, $text)
+    {
         common_start_html('text/xml;charset=utf-8', true);
         common_element_start('head');
         common_element('title', null, _('Ajax Error'));
@@ -147,27 +170,33 @@ class AjaxWebChannel extends WebChannel {
 }
 
 
-class MailChannel extends Channel {
+class MailChannel extends Channel
+{
 
-    var $addr = NULL;
+    var $addr = null;
 
-    function source() {
+    function source()
+    {
         return 'mail';
     }
     
-    function __construct($addr=NULL) {
+    function __construct($addr=null)
+    {
         $this->addr = $addr;
     }
     
-    function on($user) {
+    function on($user)
+    {
         return $this->set_notify($user, 1);
     }
     
-    function off($user) {
+    function off($user)
+    {
         return $this->set_notify($user, 0);
     }
 
-    function output($user, $text) {
+    function output($user, $text)
+    {
 
         $headers['From'] = $user->incomingemail;
         $headers['To'] = $this->addr;
@@ -177,7 +206,8 @@ class MailChannel extends Channel {
         return mail_send(array($this->addr), $headers, $text);
     }
     
-    function error($user, $text) {
+    function error($user, $text)
+    {
         
         $headers['From'] = $user->incomingemail;
         $headers['To'] = $this->addr;
@@ -187,7 +217,8 @@ class MailChannel extends Channel {
         return mail_send(array($this->addr), $headers, $text);
     }
     
-    function set_notify($user, $value) {
+    function set_notify($user, $value)
+    {
         $orig = clone($user);
         $user->smsnotify = $value;
         $result = $user->update($orig);