diff options
author | Evan Prodromou <evan@status.net> | 2010-01-24 18:18:24 -0500 |
---|---|---|
committer | Brion Vibber <brion@pobox.com> | 2010-01-24 16:01:00 -0800 |
commit | 8dce24c82cb8855425c601c2d9b5e77f3fbc2f3a (patch) | |
tree | cee94be48edf1060b62558288f56ab0f610d96cc /classes | |
parent | 3f5ffe5c5be2290e157f6390952f75ec583b41c9 (diff) |
save nickname and wildcard when setting up status network
Diffstat (limited to 'classes')
-rw-r--r-- | classes/Status_network.php | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/classes/Status_network.php b/classes/Status_network.php index ef8e1ed43..445f8a5a3 100644 --- a/classes/Status_network.php +++ b/classes/Status_network.php @@ -48,6 +48,7 @@ class Status_network extends DB_DataObject static $cache = null; static $base = null; + static $wildcard = null; /** * @param string $dbhost @@ -187,7 +188,12 @@ class Status_network extends DB_DataObject $config['db']['database'] = "mysqli://$dbuser:$dbpass@$dbhost/$dbname"; - $config['site']['name'] = $sn->sitename; + $config['site']['name'] = $sn->sitename; + $config['site']['nickname'] = $sn->nickname; + + self::$wildcard = $wildcard; + + $config['site']['wildcard'] =& self::$wildcard; if (!empty($sn->hostname)) { $config['site']['server'] = $sn->hostname; @@ -230,4 +236,13 @@ class Status_network extends DB_DataObject exit; } + + function getServerName() + { + if (!empty($this->hostname)) { + return $this->hostname; + } else { + return $this->nickname . '.' . self::$wildcard; + } + } } |