From: Craig Andrews <candrews@integralblue.com>
Date: Thu, 14 Oct 2010 19:27:17 +0000 (-0400)
Subject: Merge remote branch 'statusnet/0.9.x' into 1.0.x
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=0721d8d3e257709d27994eb4ab4bbe60abc93e2e;p=quix0rs-gnu-social.git

Merge remote branch 'statusnet/0.9.x' into 1.0.x
---

0721d8d3e257709d27994eb4ab4bbe60abc93e2e
diff --cc lib/statusnet.php
index 39f90a5069,301994508d..3d018f4e21
--- a/lib/statusnet.php
+++ b/lib/statusnet.php
@@@ -371,22 -366,19 +370,34 @@@ class StatusNe
                  $config['cache']['base'] = $config['memcached']['base'];
              }
          }
 +        if (array_key_exists('xmpp', $config)) {
 +            if ($config['xmpp']['enabled']) {
 +                addPlugin('xmpp', array(
 +                    'server' => $config['xmpp']['server'],
 +                    'port' => $config['xmpp']['port'],
 +                    'user' => $config['xmpp']['user'],
 +                    'resource' => $config['xmpp']['resource'],
 +                    'encryption' => $config['xmpp']['encryption'],
 +                    'password' => $config['xmpp']['password'],
 +                    'host' => $config['xmpp']['host'],
 +                    'debug' => $config['xmpp']['debug'],
 +                    'public' => $config['xmpp']['public']
 +                ));
 +            }
 +        }
      }
+ 
+     /**
+      * Are we running from the web with HTTPS?
+      *
+      * @return boolean true if we're running with HTTPS; else false
+      */
+ 
+     static function isHTTPS()
+     {
+         // There are some exceptions to this; add them here!
+         return $_SERVER['HTTPS'];
+     }
  }
  
  class NoConfigException extends Exception