X-Git-Url: http://git.pk910.de/?p=PHP-P10.git;a=blobdiff_plain;f=Bots%2FStats.class.php;h=4fc06a2ad84d82fc11268257993b26b10335a393;hp=7c83105e82209e4f776314a034c136caa74d84d0;hb=ba724f8fe4ffd71406db9faa3612ef6fc5da612f;hpb=d492c5e4c9f835c6e4f7503430841c16aca4b77d

diff --git a/Bots/Stats.class.php b/Bots/Stats.class.php
index 7c83105..4fc06a2 100644
--- a/Bots/Stats.class.php
+++ b/Bots/Stats.class.php
@@ -1,12 +1,10 @@
 <?php
-/********************************* PHP-P10 ******************************
- *    P10 uplink class by pk910   (c)2011 pk910                         *
- ************************************************************************
- *                          Version 2 (OOP)                             *
+/******************************* PHP-P10 v2 *****************************
+ * Copyright (C) 2011-2012  Philipp Kreil (pk910)                       *
  *                                                                      *
- * PHP-P10 is free software; you can redistribute it and/or modify      *
+ * This program is free software: you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation; either version 2 of the License, or    *
+ * the Free Software Foundation, either version 3 of the License, or    *
  * (at your option) any later version.                                  *
  *                                                                      *
  * This program is distributed in the hope that it will be useful,      *
@@ -15,11 +13,10 @@
  * GNU General Public License for more details.                         *
  *                                                                      *
  * You should have received a copy of the GNU General Public License    *
- * along with PHP-P10; if not, write to the Free Software Foundation,   *
- * Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.       *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>. *
  *                                                                      *
  ************************************************************************
- * 
+ *
  *  Bots/Stats.class.php
  *
  * RRD Stats module...
@@ -29,7 +26,7 @@
 class {$_NAME} extends Bot {
 	private $uplink;
 	private $timer;
-	
+
 	public function load($uplink, $old = false) {
 		$this->uplink = $uplink;
 		if(!file_exists("db/network.rrd")) {
@@ -48,13 +45,13 @@ class {$_NAME} extends Bot {
 				"RRA:MAX:0.5:6:700",
 				"RRA:MAX:0.5:24:775",
 				"RRA:MAX:0.5:288:797"
-			);
-			$ret = rrd_create($fname, $opts, count($opts));
-			if(!$ret) {
-				$err = rrd_error();
-				echo "Create error: $err\n";
-				die();
-			}
+				);
+				$ret = rrd_create($fname, $opts, count($opts));
+				if(!$ret) {
+					$err = rrd_error();
+					echo "Create error: $err\n";
+					die();
+				}
 		}
 		if(!file_exists("db/network-away.rrd")) {
 			$fname = "db/network-away.rrd";
@@ -70,39 +67,100 @@ class {$_NAME} extends Bot {
 				"RRA:MAX:0.5:6:700",
 				"RRA:MAX:0.5:24:775",
 				"RRA:MAX:0.5:288:797"
-			);
-			$ret = rrd_create($fname, $opts, count($opts));
-			if(!$ret) {
-				$err = rrd_error();
-				echo "Create error: $err\n";
-				die();
-			}
+				);
+				$ret = rrd_create($fname, $opts, count($opts));
+				if(!$ret) {
+					$err = rrd_error();
+					echo "Create error: $err\n";
+					die();
+				}
+		}
+		if(!file_exists("db/network-peruser.rrd")) {
+			$fname = "db/network-peruser.rrd";
+			$opts = array(
+				"--step", "300", "--start", "0",
+				"DS:userperchan:GAUGE:600:0:U",
+				"DS:chanperuser:GAUGE:600:0:U",
+				"RRA:AVERAGE:0.5:1:600",
+				"RRA:AVERAGE:0.5:6:700",
+				"RRA:AVERAGE:0.5:24:775",
+				"RRA:AVERAGE:0.5:288:797",
+				"RRA:MAX:0.5:1:600",
+				"RRA:MAX:0.5:6:700",
+				"RRA:MAX:0.5:24:775",
+				"RRA:MAX:0.5:288:797"
+				);
+				$ret = rrd_create($fname, $opts, count($opts));
+				if(!$ret) {
+					$err = rrd_error();
+					echo "Create error: $err\n";
+					die();
+				}
+		}
+		if(!file_exists("db/network-connections.rrd")) {
+			$fname = "db/network-connections.rrd";
+			$opts = array(
+				"--step", "300", "--start", "0",
+				"DS:localhost:GAUGE:600:0:U",
+				"DS:ipv4:GAUGE:600:0:U",
+				"DS:ipv6:GAUGE:600:0:U",
+				"RRA:AVERAGE:0.5:1:600",
+				"RRA:AVERAGE:0.5:6:700",
+				"RRA:AVERAGE:0.5:24:775",
+				"RRA:AVERAGE:0.5:288:797",
+				"RRA:MAX:0.5:1:600",
+				"RRA:MAX:0.5:6:700",
+				"RRA:MAX:0.5:24:775",
+				"RRA:MAX:0.5:288:797"
+				);
+				$ret = rrd_create($fname, $opts, count($opts));
+				if(!$ret) {
+					$err = rrd_error();
+					echo "Create error: $err\n";
+					die();
+				}
 		}
 		$this->timer = timer(5,array(&$this,"create_stats"),array());
 	}
-	
+
 	public function unload($rehash = false) {
 		kill_timer($this->timer);
 	}
-	
+
 	function create_stats() {
 		$this->timer = timer(5*60,array(&$this,"create_stats"),array());
 		$stats = array(
 			"opers" => 0,
 			"total" => 0,
 			"away" => 0,
-			"here" => 0
+			"here" => 0,
+			"chansperuser" => 0,
+			"usersperchan" => 0,
+			"local" => 0,
+			"ipv4" => 0,
+			"ipv6" => 0
 		);
-		foreach(P10_User::getAllUsers() as $num => $user) {
+		foreach(P10_User::getAllUsers() as $user) {
 			$stats['total']++;
+			$stats['chansperuser'] += $user->getChannelCount();
 			if($user->isAway()) $stats['away']++;
 			else $stats['here']++;
 			if($user->getModes()->hasMode('o')) $stats['opers']++;
+			if($user->getIP()->isLocalAddress()) $stats['local']++;
+			if($user->getIP()->isIPv6()) $stats['ipv6']++;
+			else $stats['ipv4']++;
 		}
+		$stats['chansperuser'] = $stats['chansperuser'] / $stats['total'];
 		$channels = P10_Channel::getChannelCount();
+		foreach(P10_Channel::getChannels() as $channel) {
+			$stats['usersperchan'] += $channel->getUserCount();
+		}
+		$stats['usersperchan'] = $stats['usersperchan'] / $channels;
 		$servers = P10_Server::getServerCount();
 		rrd_update("db/network.rrd", time().":".$stats['total'].":".$channels.":".$stats['opers'].":".$servers);
 		rrd_update("db/network-away.rrd", time().":".$stats['away'].":".$stats['here']);
+		rrd_update("db/network-peruser.rrd", time().":".$stats['usersperchan'].":".$stats['chansperuser']);
+		rrd_update("db/network-connections.rrd", time().":".$stats['local'].":".$stats['ipv4'].":".$stats['ipv6']);
 		foreach(P10_Server::getServers() as $snum => $server) {
 			$count = $server->getUserCount();
 			$fname="db/".$server->getName().".rrd";
@@ -118,13 +176,13 @@ class {$_NAME} extends Bot {
 					"RRA:MAX:0.5:6:700",
 					"RRA:MAX:0.5:24:775",
 					"RRA:MAX:0.5:288:797"
-				);
-				$ret = rrd_create($fname, $opts, count($opts));
+					);
+					$ret = rrd_create($fname, $opts, count($opts));
 			}
 			rrd_update($fname, time().":".$count);
 		}
 	}
-	
+
 }
 
 ?>
\ No newline at end of file