Merge branch '0.8.x' into userdesign

* 0.8.x: (32 commits)
  updates to Status_network
  makeadmin action
  make admins of groups
  show aliases when showing a group
  Link and distribute notices tagged for a group alias
  Code for adding and saving group aliases
  Styles for group block
  add correct li for css magic for block stuff
  typo in profileminilist class
  return count from show
  try to get the right class for profileminilist
  fix perms for classes/statusnet.ini
  fixup perms for classes
  Added Group_alias class
  add a table for group aliases
  Cross-browser notice_attach
  Allow users to be unblocked from a group
  Some UI improvements for blocking and unblocking
  The rest of the things necessary to make group block work
  Make group block work
  ...

Conflicts:
	db/laconica.sql
	lib/common.php

1 files changed, 21 insertions, 4 deletions

diff --git a/classes/Status_network.php b/classes/Status_network.php
index f7747f71d..d2b942bfb 100644
--- a/classes/Status_network.php
+++ b/classes/Status_network.php
@@ -12,11 +12,13 @@ class Status_network extends DB_DataObject
     public $nickname;                        // varchar(64)  primary_key not_null
     public $hostname;                        // varchar(255)  unique_key
     public $pathname;                        // varchar(255)  unique_key
-    public $sitename;                        // varchar(255)
     public $dbhost;                          // varchar(255)
     public $dbuser;                          // varchar(255)
     public $dbpass;                          // varchar(255)
     public $dbname;                          // varchar(255)
+    public $sitename;                        // varchar(255)
+    public $theme;                           // varchar(255)
+    public $logo;                            // varchar(255)
     public $created;                         // datetime()   not_null
     public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
 
@@ -37,13 +39,19 @@ class Status_network extends DB_DataObject
         return true;
     }
 
-    static function setupSite($servername, $pathname)
+    static function setupSite($servername, $pathname, $wildcard)
     {
         global $config;
 
-        $parts = explode('.', $servername);
+        // XXX I18N, probably not crucial for hostnames
+        // XXX This probably needs a tune up
 
-        $sn = Status_network::staticGet('nickname', $parts[0]);
+        if (0 == strncasecmp(strrev($wildcard), strrev($servername), strlen($wildcard))) {
+            $parts = explode('.', $servername);
+            $sn = Status_network::staticGet('nickname', strtolower($parts[0]));
+        } else {
+            $sn = Status_network::staticGet('hostname', strtolower($servername));
+        }
 
         if (!empty($sn)) {
             $dbhost = (empty($sn->dbhost)) ? 'localhost' : $sn->dbhost;
@@ -52,7 +60,16 @@ class Status_network extends DB_DataObject
             $dbname = (empty($sn->dbname)) ? $sn->nickname : $sn->dbname;
 
             $config['db']['database'] = "mysqli://$dbuser:$dbpass@$dbhost/$dbname";
+
             $config['site']['name'] = $sn->sitename;
+
+            if (!empty($sn->theme)) {
+                $config['site']['theme'] = $sn->theme;
+            }
+            if (!empty($sn->logo)) {
+                $config['site']['logo'] = $sn->logo;
+            }
+
             return true;
         } else {
             return false;