From: Craig Andrews <candrews@integralblue.com>
Date: Tue, 2 Feb 2010 22:00:10 +0000 (-0500)
Subject: Merge branch '0.9.x' into 1.0.x
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=057ec1fceacbfec1f755a5bc6700a188aa70e33f;p=quix0rs-gnu-social.git

Merge branch '0.9.x' into 1.0.x

Conflicts:
	EVENTS.txt
	lib/imqueuehandler.php
	lib/jabber.php
	lib/util.php
	plugins/Xmpp/Sharing_XMPP.php
---

057ec1fceacbfec1f755a5bc6700a188aa70e33f
diff --cc EVENTS.txt
index 45f1e9d70f,6bf12bf13f..977e56b3b7
--- a/EVENTS.txt
+++ b/EVENTS.txt
@@@ -700,20 -700,17 +700,34 @@@ StartShowContentLicense: Showing the de
  EndShowContentLicense: Showing the default license for content
  - $action: the current action
  
 +GetImTransports: Get IM transports that are available
 +- &$transports: append your transport to this array like so: $transports[transportName]=array('display'=>display)
 +
 +NormalizeImScreenname: Normalize an IM screenname
 +- $transport: transport the screenname is on
 +- &$screenname: screenname to be normalized
 +
 +ValidateImScreenname: Validate an IM screenname
 +- $transport: transport the screenname is on
 +- $screenname: screenname to be validated
 +- $valid: is the screenname valid?
 +
 +SendImConfirmationCode: Send a confirmation code to confirm a user owns an IM screenname
 +- $transport: transport the screenname exists on
 +- $screenname: screenname being confirmed
 +- $code: confirmation code for confirmation URL
 +- $user: user requesting the confirmation
++
+ StartUserRegister: When a new user is being registered
+ - &$profile: new profile data (no ID)
+ - &$user: new user account (no ID or URI)
+ 
+ EndUserRegister: When a new user has been registered
+ - &$profile: new profile data
+ - &$user: new user account
+ 
+ StartRobotsTxt: Before outputting the robots.txt page
+ - &$action: RobotstxtAction being shown
+ 
+ EndRobotsTxt: After the default robots.txt page (good place for customization)
+ - &$action: RobotstxtAction being shown
 -
diff --cc lib/util.php
index e60cb6765c,9e8ac26add..9a24d268db
--- a/lib/util.php
+++ b/lib/util.php
@@@ -990,10 -989,22 +989,16 @@@ function common_enqueue_notice($notice
      static $localTransports = array('omb',
                                      'ping');
  
-     static $allTransports = array('sms', 'plugin');
- 
-     $transports = $allTransports;
+     $transports = array();
+     if (common_config('sms', 'enabled')) {
+         $transports[] = 'sms';
+     }
+     if (Event::hasHandler('HandleQueuedNotice')) {
+         $transports[] = 'plugin';
+     }
+     
  
 -    $xmpp = common_config('xmpp', 'enabled');
 -
 -    if ($xmpp) {
 -        $transports[] = 'jabber';
 -    }
 -
+     // @fixme move these checks into QueueManager and/or individual handlers
      if ($notice->is_local == Notice::LOCAL_PUBLIC ||
          $notice->is_local == Notice::LOCAL_NONPUBLIC) {
          $transports = array_merge($transports, $localTransports);