Added status icons/country flags to operator list, which now also sho…

…ws currently offline operators
phillf · Apr 8, 2012 · 4685d92 · 4685d92
1 parent 631afb4
commit 4685d92
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/lib/magirc/denora/Denora.class.php b/lib/magirc/denora/Denora.class.php
@@ -251,9 +251,9 @@ function getOperatorList() {
 		$hs = $this->ircd->getParam('services_protection_mode') ? "AND user." . $this->getSqlMode($this->ircd->getParam('services_protection_mode')) . " = 'N'" : NULL;
 		if (IRCD == "unreal32") {
 			$query = "SELECT user.*,server.uline FROM user,server WHERE (user.mode_un = 'Y' OR user.mode_ua = 'Y' OR user.mode_la = 'Y' OR user.mode_uc = 'Y' OR user.mode_lo = 'Y')
-				AND user.online = 'Y' $ho $hs AND user.server = server.server $hu ORDER BY user.mode_un,user.mode_ua,user.mode_la,user.mode_uc,user.mode_lo,user.nick ASC";
+				$ho $hs AND user.server = server.server $hu ORDER BY user.mode_un,user.mode_ua,user.mode_la,user.mode_uc,user.mode_lo,user.nick ASC";
 		} else {
-			$query = "SELECT user.*,server.uline FROM user,server WHERE user.mode_lo = 'Y' AND user.online = 'Y' $ho $hs AND user.server = server.server $hu ORDER BY user.nick ASC";
+			$query = "SELECT user.*,server.uline FROM user,server WHERE user.mode_lo = 'Y' $ho $hs AND user.server = server.server $hu ORDER BY user.nick ASC";
 		}
 		$stmt = $this->db->prepare($query);
 		$stmt->execute();
@@ -262,6 +262,7 @@ function getOperatorList() {
 			$data['nick'] = $row['nick'];
 			$data['server'] = $row['server'];
 			$data['connecttime'] = $row['connecttime'] ? $row['connecttime'] : NULL;
+			$data['online'] = $row['online'] == "Y" ? true : false;
 			$data['away'] = $row['away'] == "Y" ? true : false;
 			if (IRCD == "unreal32") {
 				if ($row['mode_un'] == "Y")
@@ -280,7 +281,10 @@ function getOperatorList() {
 			$data['level'] = $level;
 			$data['bot'] = $this->ircd->getParam('bot_mode') && $row[$this->getSqlMode($this->ircd->getParam('bot_mode'))] == 'Y';
 			$data['helper'] = $this->ircd->getParam('helper_mode') && $row[$this->getSqlMode($this->ircd->getParam('helper_mode'))] == 'Y';
-			$data['uline'] = $row['uline'] ? true : false;
+			$data['service'] = $row['uline'] ? true : false;
+			$data['operator'] = true;
+			$data['country_code'] = $row['countrycode'];
+			$data['country'] = $row['country'];
 			$array[] = $data;
 		}
 		return $array;

diff --git a/theme/default/tpl/network_operators.tpl b/theme/default/tpl/network_operators.tpl
@@ -1,4 +1,4 @@
-<h1>Operators currently online</h1>
+<h1>Operators</h1>
 <table id="tbl_operators" class="display">
 <thead>
 	<tr>
@@ -21,13 +21,16 @@ $(document).ready(function() {
 		"aaSorting": [[ 0, "asc" ]],
 		"sAjaxSource": 'rest/denora.php/operators?format=datatables',
 		"aoColumns": [
-			{ "mDataProp": "nick", "fnRender": function(oObj) {
+			/*{ "mDataProp": "nick", "fnRender": function(oObj) {
 				var out = oObj.aData['away'] ? '<img src="theme/'+theme+'/img/status/user-away.png" alt="away" title="Away" \/>' : '<img src="theme/'+theme+'/img/status/user-online.png" alt="online" title="Online" \/>';
 				out += ' <strong>'+oObj.aData['nick']+'</strong>';
 				if (oObj.aData['bot']) out += ' <img src="theme/'+theme+'/img/status/bot.png" alt="bot" title="Bot" \/>';
 				if (oObj.aData['helper']) out += ' <img src="theme/'+theme+'/img/status/help.png" alt="help" title="Available for help" \/>';
 				if (oObj.aData['uline']) out += ' <img src="theme/'+theme+'/img/status/service.png" alt="service" title="Service" \/>';
 				return out;
+			} },*/
+			{ "mDataProp": "nick", "fnRender": function(oObj) {
+				return getUserStatus(oObj.aData) + ' ' + getCountryFlag(oObj.aData) + ' <strong>'+oObj.aData['nick']+'</strong>' + getUserExtra(oObj.aData);
 			} },
 			{ "mDataProp": "server" },
 			{ "mDataProp": "connecttime" }