Simple-Home Biden vs. Trump Edition

app/models/Utilities.php

@@ -167,7 +167,7 @@ class Utilities
 
 		// Optional Authentication:
 		curl_setopt($curl, CURLOPT_HTTPAUTH, CURLAUTH_BASIC);
-		curl_setopt($curl, CURLOPT_USERPWD, "username:password");
+		//curl_setopt($curl, CURLOPT_USERPWD, "username:password");
 
 		curl_setopt($curl, CURLOPT_URL, $url);
 		curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);

app/models/managers/SubDeviceManager.php

@@ -87,7 +87,7 @@ class SubDeviceManager
 				GROUP BY subdevice_id
 			  )
 			GROUP BY subdevice_id
-			ORDER BY type DESC
+			ORDER BY d.name DESC
 		", $roomIds);
 
 		$ret = [];