From d6ff702d7f0937451c8595c7b3cbfb9f2813a07b Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Mon, 15 Jun 2009 13:34:52 -0700
Subject: Return network from network setup function

Return the network from the network setup function. Also, special-case
for when we get a server name the same as the wildcard.
---
 classes/Status_network.php | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

(limited to 'classes')

diff --git a/classes/Status_network.php b/classes/Status_network.php
index d2b942bfb..96b6d9a05 100644
--- a/classes/Status_network.php
+++ b/classes/Status_network.php
@@ -43,12 +43,19 @@ class Status_network extends DB_DataObject
     {
         global $config;
 
+        $sn = null;
+
         // XXX I18N, probably not crucial for hostnames
         // XXX This probably needs a tune up
 
         if (0 == strncasecmp(strrev($wildcard), strrev($servername), strlen($wildcard))) {
-            $parts = explode('.', $servername);
-            $sn = Status_network::staticGet('nickname', strtolower($parts[0]));
+            // special case for exact match
+            if (0 == strncmp($servername, $wildcard)) {
+                $sn = Status_network::staticGet('nickname', '');
+            } else {
+                $parts = explode('.', $servername);
+                $sn = Status_network::staticGet('nickname', strtolower($parts[0]));
+            }
         } else {
             $sn = Status_network::staticGet('hostname', strtolower($servername));
         }
@@ -70,9 +77,9 @@ class Status_network extends DB_DataObject
                 $config['site']['logo'] = $sn->logo;
             }
 
-            return true;
+            return $sn;
         } else {
-            return false;
+            return null;
         }
     }
 }
-- 
cgit v1.2.3-54-g00ecf


From 6532f0dff63576c94debe521d1ff8d9f594fe422 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Mon, 15 Jun 2009 14:29:25 -0700
Subject: strncmp -> strcasecmp

---
 classes/Status_network.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'classes')

diff --git a/classes/Status_network.php b/classes/Status_network.php
index 96b6d9a05..bf05ad61e 100644
--- a/classes/Status_network.php
+++ b/classes/Status_network.php
@@ -50,7 +50,7 @@ class Status_network extends DB_DataObject
 
         if (0 == strncasecmp(strrev($wildcard), strrev($servername), strlen($wildcard))) {
             // special case for exact match
-            if (0 == strncmp($servername, $wildcard)) {
+            if (0 == strcasecmp($servername, $wildcard)) {
                 $sn = Status_network::staticGet('nickname', '');
             } else {
                 $parts = explode('.', $servername);
-- 
cgit v1.2.3-54-g00ecf