Changeset 186

Timestamp:

01/07/07 21:01:14 (2 years ago)

Author:

syrus

Message:

correction du nbr de nodes sur la homepage, correction des messages

Files:

• wifidog/wifidog-auth/wifidog/classes/Network.php (modified) (4 diffs)
• wifidog/wifidog-auth/wifidog/locale/fr/LC_MESSAGES/messages.po (modified) (6 diffs)
• wifidog/wifidog-auth/wifidog/templates/sites/index.tpl (modified) (2 diffs)

wifidog/wifidog-auth/wifidog/classes/Network.php

@@ -1247 +1247 @@
-    }
-
-
-
-
-
-
-
-
-
+
-        // Define globals
-        global $db;
@@ -1265 +1258 @@
-
-        // Create new cache objects (valid for 5 minutes)
+        $_cache = new Cache('network_'.$this->id.'_num_deployed_nodes', $this->id, 300);
+
+        // Check if caching has been enabled.
+        if ($_cache->isCachingEnabled) {
+            $_cachedData = $_cache->getCachedData();
+
+            if ($_cachedData) {
+                // Return cached data.
+                $_useCache = true;
+                $_retval = $_cachedData;
+            }
+        }
+
+        if (!$_useCache) {
+            // Get number of deployed nodes
+            $_network_id = $db->escapeString($this->id);
+            if(Network :: isDefaultNetwork()) {
+                $db->execSqlUniqueRes("SELECT COUNT(node_id) FROM nodes WHERE node_deployment_status = 'DEPLOYED' OR node_deployment_status = 'NON_WIFIDOG_NODE'", $_row, false);
+            }
+            else $db->execSqlUniqueRes("SELECT COUNT(node_id) FROM nodes WHERE network_id = '$_network_id' AND (node_deployment_status = 'DEPLOYED' OR node_deployment_status = 'NON_WIFIDOG_NODE')", $_row, false);    
+
+            // String has been found
+            $_retval = $_row['count'];
+
+            // Check if caching has been enabled.
+            if ($_cache->isCachingEnabled) {
+                // Save data into cache, because it wasn't saved into cache before.
+                $_cache->saveCachedData($_retval);
+            }
+        }
+
+        return $_retval;
+    }
+
+    /**
+     * Find out how many deployed nodes are online in this networks's database
+     *
+     * @return int Number of deployed nodes which are online
+     *
+     * @access public
+     */
+    public function getNumOnlineNodes() {
+        // Define globals
+        global $db;
+
+        // Init values
+        $_retval = 0;
+        $_row = null;
+        $_useCache = false;
+        $_cachedData = null;
+
+        // Create new cache objects (valid for 5 minutes)
-        $_cache = new Cache('network_'.$this->id.'_num_online_nodes', $this->id, 300);
-
@@ -1283 +1328 @@
-                        // Passage à 30 minutes
-            $db->execSqlUniqueRes("SELECT COUNT(node_id) FROM nodes WHERE network_id = '$_network_id' AND (node_deployment_status = 'DEPLOYED' OR node_deployment_status = 'NON_WIFIDOG_NODE') AND ((NOW()-last_heartbeat_timestamp) < interval '30 minutes')", $_row, false);
+
+            // String has been found
+            $_retval = $_row['count'];
+
+            // Check if caching has been enabled.
+            if ($_cache->isCachingEnabled) {
+                // Save data into cache, because it wasn't saved into cache before.
+                $_cache->saveCachedData($_retval);
+            }
+        }
+
+        return $_retval;
+    }
+
+    public function getNumOnlineNodes2() {
+        // Define globals
+        global $db;
+
+        // Init values
+        $_retval = 0;
+        $_row = null;
+        $_useCache = false;
+        $_cachedData = null;
+
+        // Create new cache objects (valid for 5 minutes)
+        $_cache = new Cache('network_'.$this->id.'_num_online_nodes', $this->id, 300);
+
+        // Check if caching has been enabled.
+        if ($_cache->isCachingEnabled) {
+            $_cachedData = $_cache->getCachedData();
+
+            if ($_cachedData) {
+                // Return cached data.
+                $_useCache = true;
+                $_retval = $_cachedData;
+            }
+        }
+
+        if (!$_useCache) {
+            // Get number of online nodes
+            $_network_id = $db->escapeString($this->id);
+            if (Network :: isDefaultNetwork())
+            {
+                        // Passage à 30 minutes
+            $db->execSqlUniqueRes("SELECT COUNT(node_id) FROM nodes WHERE (node_deployment_status = 'DEPLOYED' OR node_deployment_status = 'NON_WIFIDOG_NODE') AND ((NOW()-last_heartbeat_timestamp) < interval '30 minutes')", $_row, false);
+            } else $db->execSqlUniqueRes("SELECT COUNT(node_id) FROM nodes WHERE network_id = '$_network_id' AND (node_deployment_status = 'DEPLOYED' OR node_deployment_status = 'NON_WIFIDOG_NODE') AND ((NOW()-last_heartbeat_timestamp) < interval '30 minutes')", $_row, false);
-
-            // String has been found
@@ -1756 +1847 @@
-
-        // Set networks node information
-
-
+2
+2
-    }
-}

wifidog/wifidog-auth/wifidog/locale/fr/LC_MESSAGES/messages.po

@@ -1370 +1370 @@
-#: ../classes/StatisticReport/UserReport.php:137 smarty.txt:216 smarty.txt:238
-#: smarty.txt:241 smarty.txt:224 smarty.txt:222 smarty.txt:188
+msgid "network"
+msgstr "réseau"
+
+#:
-msgid "Network"
-msgstr "Réseau"
@@ -2855 +2859 @@
-#: smarty.txt:181 smarty.txt:215 smarty.txt:29 smarty.txt:179 smarty.txt:213
-#: smarty.txt:12 smarty.txt:192
-msgid "network"
-msgstr "réseau"
-
-msgid "new users"
@@ -5324 +5326 @@
-msgstr "réseau possÚde"
-
+#:
+msgid "currently has"
+msgstr "possÚde actuellement"
+
-#: smarty.txt:95 smarty.txt:117 smarty.txt:120 smarty.txt:94 smarty.txt:97
-#: smarty.txt:128
@@ -5336 +5342 @@
-#: smarty.txt:97 smarty.txt:119 smarty.txt:122 smarty.txt:96 smarty.txt:99
-#: smarty.txt:130
-
-
+
+
+
+
+
+
-
-#: smarty.txt:98 smarty.txt:120 smarty.txt:123 smarty.txt:97 smarty.txt:100
@@ -5357 +5367 @@
-#: smarty.txt:134
-msgid "It currently has"
-
+y 
-
-#: smarty.txt:102 smarty.txt:124 smarty.txt:127 smarty.txt:101 smarty.txt:104
@@ -5373 +5383 @@
-msgid "hotspots,"
-msgstr "points d'accÚs,"
+
+msgid "deployed hotspot,"
+msgstr "point d'accÚs déployé,"
+
+msgid "deployed hotspots,"
+msgstr "points d'accÚs déployés,"
-
-#: smarty.txt:105 smarty.txt:127 smarty.txt:130 smarty.txt:104 smarty.txt:107

wifidog/wifidog-auth/wifidog/templates/sites/index.tpl

@@ -70 +70 @@
-*}
-    <p>
-
-network currently has"|_} {$networkNumValidUsers} {"valid"|_}
+"network"|_} {
+currently has"|_} {$networkNumValidUsers} 
-        {if $networkNumValidUsers == 1}
-
+valid 
-        {else}
-
+valid 
-        {/if}
-        {$networkNumOnlineUsers}
@@ -85 +85 @@
-        {"currently online"|_}.
-        <br>
-It currently has"|_} {$networkNumDeployedNodes} {"deployed"|_
+The network currently has"|_} {$networkNumDeployedNodes
-        {if $networkNumDeployedNodes == 1}
-
+deployed 
-        {else}
-
+deployed 
-        {/if}
-        {$networkNumOnlineNodes}