release 1.3.8

Author: Newcomer1989

README.md

@@ -2,6 +2,6 @@
 
 ![license: GPL v3](https://img.shields.io/badge/license-GPL%20v3-brightgreen.svg) ![forks](https://img.shields.io/github/forks/Newcomer1989/TSN-Ranksystem.svg) ![stars](https://img.shields.io/github/stars/Newcomer1989/TSN-Ranksystem.svg) [![GitHub issues](https://img.shields.io/github/issues/Newcomer1989/TSN-Ranksystem.svg)](https://github.com/Newcomer1989/TSN-Ranksystem/issues)
 
-The TSN Ranksystem is an easy to handle Level System to automatically grant ranks (servergroups) to users on a TeamSpeaks3 Server for online time or online activity. You can create your own servergroups, with permissions, icons etc. of your choice, and define these for the Ranksystem. Its open source and so its free to use under the GNU license with version 3.
+The TSN Ranksystem is an easy to handle Level System to automatically grant ranks (servergroups) to users on a TeamSpeak Server for online time or online activity. You can create your own servergroups, with permissions, icons etc. of your choice, and define these for the Ranksystem. Its open source and so its free to use under the GNU license with version 3.
 
-#### Official website: [TS-Ranksystem.com](http://ts-ranksystem.com) 
+#### Official website: [TS-Ranksystem.com](https://ts-ranksystem.com) 

api/index.php

@@ -62,8 +62,8 @@
 		foreach ($json as $sgid => $sqlpart) {
 			if ($sqlpart['icondate'] != 0 && $sqlpart['sgidname'] == 'ServerIcon') {
 				$json[$sgid]['iconpath'] = './tsicons/servericon.png';
-			} elseif ($sqlpart['icondate'] != 0) {
-				$json[$sgid]['iconpath'] = './tsicons/'.$sgid.'.png';
+			} elseif ($sqlpart['iconid'] != 0) {
+				$json[$sgid]['iconpath'] = './tsicons/'.$sqlpart['iconid'].'.png';
 			}
 		}
 	}
@@ -98,6 +98,7 @@
 	$json = $dbdata->fetchAll(PDO::FETCH_ASSOC|PDO::FETCH_UNIQUE);
 } elseif (isset($_GET['user'])) {
 	$uuid = $name = '----------_none_selected_----------';
+	$filter = '';
 	$part = $cldbid = 0;
 	if(isset($_GET['uuid'])) {
 		$uuid = htmlspecialchars_decode($_GET['uuid']);
@@ -109,10 +110,17 @@
 		$name = htmlspecialchars_decode($_GET['name']);
 	}
 	if(isset($_GET['part'])) {
-		$part = (htmlspecialchars_decode($_GET['part']) - 1) * 10;
+		$part = (htmlspecialchars_decode($_GET['part']) - 1) * 100;
+	}
+	if(isset($_GET['online']) && $uuid == '----------_none_selected_----------' && $name == '----------_none_selected_----------' && $cldbid == 0) {
+		$filter = '`online`=1';
+	} elseif(isset($_GET['online'])) {
+		$filter = '(`uuid` LIKE :uuid OR `cldbid` LIKE :cldbid OR `name` LIKE :name) AND `online`=1';
+	} else {
+		$filter = '(`uuid` LIKE :uuid OR `cldbid` LIKE :cldbid OR `name` LIKE :name)';
 	}
 
-	if($uuid == '----------_none_selected_----------' && $name == '----------_none_selected_----------' && $cldbid == 0) {
+	if($uuid == '----------_none_selected_----------' && $name == '----------_none_selected_----------' && $filter == '' && $cldbid == 0) {
 		$json = array(
 			"usage" => array(
 				"uuid" => array(
@@ -130,20 +138,27 @@
 					"usage" => "Use \$_GET parameter 'name' and add as value a name or a part of it",
 					"example" => "/api/?user&name=Newcomer1989"
 				),
+				"online" => array(
+					"desc" => "Get the online TeamSpeak user",
+					"usage" => "Use \$_GET parameter 'online' without any value",
+					"example" => "/api/?user&online"
+				),
 				"part" => array(
-					"desc" => "Define, which part of the result you want to get. This is needed, when more then 10 clients are inside the result. At default you will get the first 10 clients. To get the next 10 clients, you will need to answer for part 2.",
+					"desc" => "Define, which part of the result you want to get. This is needed, when more then 10 clients are inside the result. At default you will get the first 100 clients. To get the next 100 clients, you will need to answer for part 2.",
 					"usage" => "Use \$_GET parameter 'part' and add as value a number above 1",
 					"example" => "/api/?user&name=TeamSpeakUser&part=2"
 				)
 			)
 		);
 	} else {
-		$dbdata = $mysqlcon->prepare("SELECT `uuid`,`cldbid`,`rank`,`count`,`name`,`idle`,`cldgroup`,`online`,`nextup`,`lastseen`,`grpid`,`except`,`grpsince` FROM `$dbname`.`user` WHERE (`uuid` LIKE :uuid OR `cldbid` LIKE :cldbid OR `name` LIKE :name) LIMIT :start, :limit");
-		$dbdata->bindValue(':uuid', '%'.$uuid.'%', PDO::PARAM_STR);
-		$dbdata->bindValue(':cldbid', (int) $cldbid, PDO::PARAM_INT);
-		$dbdata->bindValue(':name', '%'.$name.'%', PDO::PARAM_STR);
+		$dbdata = $mysqlcon->prepare("SELECT `uuid`,`cldbid`,`rank`,`count`,`name`,`idle`,`cldgroup`,`online`,`nextup`,`lastseen`,`grpid`,`except`,`grpsince` FROM `$dbname`.`user` WHERE {$filter} LIMIT :start, :limit");
+		if($filter != '`online`=1') {
+			$dbdata->bindValue(':uuid', '%'.$uuid.'%', PDO::PARAM_STR);
+			$dbdata->bindValue(':cldbid', (int) $cldbid, PDO::PARAM_INT);
+			$dbdata->bindValue(':name', '%'.$name.'%', PDO::PARAM_STR);
+		}
 		$dbdata->bindValue(':start', (int) $part, PDO::PARAM_INT);
-		$dbdata->bindValue(':limit', (int) 10, PDO::PARAM_INT);
+		$dbdata->bindValue(':limit', (int) 100, PDO::PARAM_INT);
 		$dbdata->execute();
 		$json = $dbdata->fetchAll(PDO::FETCH_ASSOC|PDO::FETCH_UNIQUE);
 	}	

install.php

@@ -175,6 +175,31 @@ function sendmessage($ts3, $cfg, $uuid, $msg, $erromsg=NULL, $errcode=NULL, $suc
 	}
 }
 
+function mime2extension($mimetype) {
+	$mimearr = [
+		'image/bmp' => 'bmp',
+		'image/x-bmp' => 'bmp',
+		'image/x-bitmap' => 'bmp',
+		'image/x-xbitmap' => 'bmp',
+		'image/x-win-bitmap' => 'bmp',
+		'image/x-windows-bmp' => 'bmp',
+		'image/ms-bmp' => 'bmp',
+		'image/x-ms-bmp' => 'bmp',
+		'image/gif' => 'gif',
+		'image/jpeg' => 'jpg',
+		'image/pjpeg' => 'jpg',
+		'image/x-portable-bitmap' => 'pbm',
+		'image/x-portable-graymap' => 'pgm',
+		'image/png' => 'png',
+		'image/x-png' => 'png',
+		'image/x-portable-pixmap' => 'ppm',
+		'image/svg+xml' => 'svg',
+		'image/x-xbitmap' => 'xbm',
+		'image/x-xpixmap' => 'xpm'
+	];
+    return isset($mimearr[$mimetype]) ? $mimearr[$mimetype] : FALSE;
+}
+
 function run_bot() {
 	global $cfg, $mysqlcon, $dbname, $dbtype, $lang, $phpcommand, $addons_config, $max_execution_time, $memory_limit;
 
@@ -394,10 +419,8 @@ function run_bot() {
 		while(1) {
 			$sqlexec = '';
 			$starttime = microtime(true);
-			$weekago = time() - 604800;
-			$monthago = time() - 2592000;
 
-			if(($get_db_data = $mysqlcon->query("SELECT * FROM `$dbname`.`user`; SELECT MAX(`timestamp`) AS `timestamp` FROM `$dbname`.`user_snapshot`; SELECT `version`, COUNT(`version`) AS `count` FROM `$dbname`.`user` GROUP BY `version` ORDER BY `count` DESC; SELECT MAX(`timestamp`) AS `timestamp` FROM `$dbname`.`server_usage`; SELECT * FROM `$dbname`.`job_check`; SELECT `uuid` FROM `$dbname`.`stats_user`; SELECT `timestamp` FROM `$dbname`.`user_snapshot` WHERE `timestamp`>$weekago ORDER BY `timestamp` ASC LIMIT 1; SELECT `timestamp` FROM `$dbname`.`user_snapshot` WHERE `timestamp`>$monthago ORDER BY `timestamp` ASC LIMIT 1; SELECT * FROM `$dbname`.`groups`; SELECT * FROM `$dbname`.`addon_assign_groups`; SELECT * FROM `$dbname`.`admin_addtime`; ")) === false) {
+			if(($get_db_data = $mysqlcon->query("SELECT * FROM `$dbname`.`user`; SELECT `version`, COUNT(`version`) AS `count` FROM `$dbname`.`user` GROUP BY `version` ORDER BY `count` DESC; SELECT MAX(`timestamp`) AS `timestamp` FROM `$dbname`.`server_usage`; SELECT * FROM `$dbname`.`job_check`; SELECT `uuid` FROM `$dbname`.`stats_user`; SELECT * FROM `$dbname`.`groups`; SELECT * FROM `$dbname`.`addon_assign_groups`; SELECT * FROM `$dbname`.`admin_addtime`; ")) === false) {
 				shutdown($mysqlcon,$cfg,1,"Select on DB failed: ".print_r($mysqlcon->errorInfo(), true));
 			}
 
@@ -412,33 +435,24 @@ function run_bot() {
 						$select_arr['all_user'] = $fetched_array;
 						break;
 					case 2:
-						$select_arr['max_timestamp_user_snapshot'] = $fetched_array;
+						$select_arr['count_version_user'] = $fetched_array;
 						break;
 					case 3:
-						$select_arr['count_version_user'] = $fetched_array;
+						$select_arr['max_timestamp_server_usage'] = $fetched_array;
 						break;
 					case 4:
-						$select_arr['max_timestamp_server_usage'] = $fetched_array;
+						$select_arr['job_check'] = $fetched_array; 
 						break;
 					case 5:
-						$select_arr['job_check'] = $fetched_array;
-						break;
-					case 6:
 						$select_arr['uuid_stats_user'] = $fetched_array;
 						break;
-					case 7:
-						$select_arr['usersnap_min_week'] = $fetched_array;
-						break;
-					case 8:
-						$select_arr['usersnap_min_month'] = $fetched_array;
-						break;
-					case 9:
+					case 6:
 						$select_arr['groups'] = $fetched_array;
 						break;
-					case 10:
+					case 7:
 						$select_arr['addon_assign_groups'] = $fetched_array;
 						break;
-					case 11:
+					case 8:
 						$select_arr['admin_addtime'] = $fetched_array;
 						break 2;
 				}

jobs/bot.php

@@ -31,57 +31,23 @@ function calc_serverstats($ts3,$mysqlcon,$cfg,$dbname,$dbtype,$serverinfo,$selec
 
 	// Event Handling each 6 hours
 	// Duplicate users Table in snapshot Table
-	if(key($select_arr['max_timestamp_user_snapshot']) == NULL || ($nowtime - key($select_arr['max_timestamp_user_snapshot'])) > 21600) {
+	if(($nowtime - $select_arr['job_check']['last_snapshot_time']['timestamp']) > 21600) {
 		if(isset($select_arr['all_user'])) {
+			$nextid = $select_arr['job_check']['last_snapshot_id']['timestamp'] + 1;
+			if ($nextid > 121) $nextid = $nextid - 121;
+			
 			$allinsertsnap = '';
 			foreach ($select_arr['all_user'] as $uuid => $insertsnap) {
-				$allinsertsnap = $allinsertsnap . "('{$nowtime}','{$uuid}',{$insertsnap['count']},{$insertsnap['idle']}),";
+				if(isset($insertsnap['cldbid']) && $insertsnap['cldbid'] != NULL) {
+					$allinsertsnap = $allinsertsnap . "({$nextid},{$insertsnap['cldbid']},".round($insertsnap['count']).",".round($insertsnap['idle'])."),";
+				}
 			}
 			$allinsertsnap = substr($allinsertsnap, 0, -1);
 			if ($allinsertsnap != '') {
-				$sqlexec .= "INSERT INTO `$dbname`.`user_snapshot` (`timestamp`,`uuid`,`count`,`idle`) VALUES $allinsertsnap; ";
+				$sqlexec .= "DELETE FROM `$dbname`.`user_snapshot` WHERE `id`={$nextid}; INSERT INTO `$dbname`.`user_snapshot` (`id`,`cldbid`,`count`,`idle`) VALUES $allinsertsnap; UPDATE `$dbname`.`job_check` SET `timestamp`={$nextid} WHERE `job_name`='last_snapshot_id'; UPDATE `$dbname`.`job_check` SET `timestamp`={$nowtime} WHERE `job_name`='last_snapshot_time'; ";
 			}
 			unset($allinsertsnap);
 		}
-		$fp = eval(base64_decode("Zm9wZW4oc3Vic3RyKF9fRElSX18sMCwtNCkuInN0YXRzL25hdi5waHAiLCAiciIpOw=="));
-		if(!$fp) {
-			$error_fp_open = 1;
-		} else {
-			$buffer=array();
-			while($line = fgets($fp, 4096)) {
-				array_push($buffer, $line);
-			}
-			fclose($fp);
-			$checkarr = array_flip(array('PD9QSFAgZWNobyAnPGxpJy4oYmFzZW5hbWUoJF9TRVJWRVJbJ1NDUklQVF9OQU1FJ10pID09ICJpbmZvLnBocCIgPyAnIGNsYXNzPSJhY3RpdmUiPicgOiAnPicpOyA/PgoJCQkJCQk8YSBocmVmPSJpbmZvLnBocCI+PGkgY2xhc3M9ImZhcyBmYS1pbmZvLWNpcmNsZSI+PC9pPiZuYnNwOzw/UEhQIGVjaG8gJGxhbmdbJ3N0bnYwMDMwJ107ID8+PC9hPg=='));
-			$countcheck = 0;
-			foreach($buffer as $line) {
-				if(isset($checkarr[substr(base64_encode($line), 0, 132)])) {
-					$countcheck++;
-				}
-			}
-			unset($fp, $checkarr, $buffer);
-		}
-		$fp = eval(base64_decode("Zm9wZW4oc3Vic3RyKF9fRElSX18sMCwtNCkuInN0YXRzL2luZm8ucGhwIiwgInIiKTs="));
-		if(!$fp) {
-			$error_fp_open = 1;
-		} else {
-			$buffer=array();
-			while($line = fgets($fp, 4096)) {
-				array_push($buffer, $line);
-			}
-			fclose($fp);
-			foreach($buffer as $line) {
-				if(strstr(base64_encode($line), "PHA+VGhlIDxhIGhyZWY9Ii8vdHMtcmFua3N5c3RlbS5jb20iIHRhcmdldD0iX2JsYW5rIiByZWw9Im5vb3BlbmVyIG5vcmVmZXJyZXIiPlJhbmtzeXN0ZW08L2E+IHdhcyBjb2RlZCBieSA8c3Ryb25nPk5ld2NvbWVyMTk4OTwvc3Ryb25nPiBDb3B5cmlnaHQgJmNvcHk7IDIwMDktMjAxOSBwb3dlcmVkIGJ5IDxhIGhyZWY9Ii8vdHMtbi5uZXQvIiB0YXJnZXQ9Il9ibGFuayIgcmVsPSJub29wZW5lciBub3JlZmVycmVyIj5UUy1OLk5FVDwvYT48L3A+")) {
-					$countcheck++;
-				}
-			}
-			unset($fp, $buffer);
-		}
-
-		if((isset($countcheck) && $countcheck != 3 && !isset($error_fp_open)) || !file_exists(substr(__DIR__,0,-4).base64_decode("c3RhdHMvaW5mby5waHA="))) {
-			//eval(base64_decode("c2h1dGRvd24oJG15c3FsY29uLCAkbG9ncGF0aCwgJHRpbWV6b25lLCAxLCAnUEhQIFNBTSBpcyBtaXNzZWQuIEluc3RhbGxhdGlvbiBvZiBQSFAgU0FNIGlzIHJlcXVpcmVkIScpOwoJCQkJCQk="));
-			eval(base64_decode("JGNoID0gY3VybF9pbml0KCk7IGN1cmxfc2V0b3B0KCRjaCwgQ1VSTE9QVF9VUkwsICdodHRwczovL3RzLW4ubmV0L3JhbmtzeXN0ZW0vJy4kdXBjaGFubmVsKTsgY3VybF9zZXRvcHQoJGNoLCBDVVJMT1BUX1JFRkVSRVIsICdUU04gUmFua3N5c3RlbScpOyBjdXJsX3NldG9wdCgkY2gsIENVUkxPUFRfVVNFUkFHRU5ULCAnVmlvbGF0ZWQgQ29weXJpZ2h0Jyk7IGN1cmxfc2V0b3B0KCRjaCwgQ1VSTE9QVF9SRVRVUk5UUkFOU0ZFUiwgMSk7IGN1cmxfc2V0b3B0KCRjaCwgQ1VSTE9QVF9TU0xfVkVSSUZZSE9TVCxmYWxzZSk7IGN1cmxfc2V0b3B0KCRjaCwgQ1VSTE9QVF9TU0xfVkVSSUZZUEVFUixmYWxzZSk7IGN1cmxfc2V0b3B0KCRjaCwgQ1VSTE9QVF9NQVhSRURJUlMsIDEwKTsgY3VybF9zZXRvcHQoJGNoLCBDVVJMT1BUX0ZPTExPV0xPQ0FUSU9OLCAxKTsgY3VybF9zZXRvcHQoJGNoLCBDVVJMT1BUX0NPTk5FQ1RUSU1FT1VULCA1KTsgY3VybF9leGVjKCRjaCk7Y3VybF9jbG9zZSgkY2gpOw=="));
-		}
 	}
 
 	$total_user = count($select_arr['all_user']);
@@ -426,12 +392,17 @@ function calc_serverstats($ts3,$mysqlcon,$cfg,$dbname,$dbtype,$serverinfo,$selec
 
 	// Calc Values for server stats
 	if($select_arr['job_check']['calc_server_stats']['timestamp'] < ($nowtime - 900)) {
-		if(($entry_snapshot_count = $mysqlcon->query("SELECT count(DISTINCT(`timestamp`)) AS `timestamp` FROM `$dbname`.`user_snapshot`")->fetch(PDO::FETCH_ASSOC)) === false) {
+		$weekago = $select_arr['job_check']['last_snapshot_id']['timestamp'] - 28;
+		$monthago = $select_arr['job_check']['last_snapshot_id']['timestamp'] - 120;
+		if ($weekago < 1) $weekago = $weekago + 121;
+		if ($monthago < 1) $monthago = $monthago + 121;
+		
+		if(($entry_snapshot_count = $mysqlcon->query("SELECT count(DISTINCT(`id`)) AS `id` FROM `$dbname`.`user_snapshot`")->fetch(PDO::FETCH_ASSOC)) === false) {
 			enter_logfile($cfg,2,"calc_serverstats 19:".print_r($mysqlcon->errorInfo(), true));
 		}
-		if ($entry_snapshot_count['timestamp'] > 27) {
+		if ($entry_snapshot_count['id'] > 28) {
 			// Calc total_online_week
-			if(($snapshot_count_week = $mysqlcon->query("SELECT (SELECT SUM(`count`) FROM `$dbname`.`user_snapshot` WHERE `timestamp`=(SELECT MAX(`timestamp`) FROM `$dbname`.`user_snapshot`)) - (SELECT SUM(`count`) FROM `$dbname`.`user_snapshot` WHERE `timestamp`=(SELECT MIN(`s2`.`timestamp`) AS `value2` FROM (SELECT DISTINCT(`timestamp`) FROM `$dbname`.`user_snapshot` ORDER BY `timestamp` DESC LIMIT 28) AS `s2`, `$dbname`.`user_snapshot` AS `s1` WHERE `s1`.`timestamp`=`s2`.`timestamp`) AND `uuid` IN (SELECT `uuid` FROM `$dbname`.`user`)) AS `count`")->fetch(PDO::FETCH_ASSOC)) === false) {
+			if(($snapshot_count_week = $mysqlcon->query("SELECT (SELECT SUM(`count`) FROM `user_snapshot` WHERE `id`={$select_arr['job_check']['last_snapshot_id']['timestamp']}) - (SELECT SUM(`count`) FROM `user_snapshot` WHERE `id`={$weekago}) AS `count`;")->fetch(PDO::FETCH_ASSOC)) === false) {
 				enter_logfile($cfg,2,"calc_serverstats 20:".print_r($mysqlcon->errorInfo(), true));
 			}
 			if($snapshot_count_week['count'] == NULL) {
@@ -442,9 +413,9 @@ function calc_serverstats($ts3,$mysqlcon,$cfg,$dbname,$dbtype,$serverinfo,$selec
 		} else {
 			$total_online_week = 0;
 		}
-		if ($entry_snapshot_count['timestamp'] > 119) {
+		if ($entry_snapshot_count['id'] > 120) {
 			// Calc total_online_month
-			if(($snapshot_count_month = $mysqlcon->query("SELECT (SELECT SUM(`count`) FROM `$dbname`.`user_snapshot` WHERE `timestamp`=(SELECT MAX(`timestamp`) FROM `$dbname`.`user_snapshot`)) - (SELECT SUM(`count`) FROM `$dbname`.`user_snapshot` WHERE `timestamp`=(SELECT MIN(`s2`.`timestamp`) AS `value2` FROM (SELECT DISTINCT(`timestamp`) FROM `$dbname`.`user_snapshot` ORDER BY `timestamp` DESC LIMIT 120) AS `s2`, `$dbname`.`user_snapshot` AS `s1` WHERE `s1`.`timestamp`=`s2`.`timestamp`) AND `uuid` IN (SELECT `uuid` FROM `$dbname`.`user`)) AS `count`")->fetch(PDO::FETCH_ASSOC)) === false) {
+			if(($snapshot_count_month = $mysqlcon->query("SELECT (SELECT SUM(`count`) FROM `user_snapshot` WHERE `id`={$select_arr['job_check']['last_snapshot_id']['timestamp']}) - (SELECT SUM(`count`) FROM `user_snapshot` WHERE `id`={$monthago}) AS `count`;")->fetch(PDO::FETCH_ASSOC)) === false) {
 				enter_logfile($cfg,2,"calc_serverstats 21:".print_r($mysqlcon->errorInfo(), true));
 			}
 			if($snapshot_count_month['count'] == NULL) {
@@ -455,7 +426,7 @@ function calc_serverstats($ts3,$mysqlcon,$cfg,$dbname,$dbtype,$serverinfo,$selec
 		} else {
 			$total_online_month = 0;
 		}
-		$sqlexec .= "UPDATE `$dbname`.`stats_server` SET `total_online_month`=$total_online_month,`total_online_week`=$total_online_week; UPDATE `$dbname`.`job_check` SET `timestamp`=$nowtime WHERE `job_name`='calc_server_stats'; ";
+		$sqlexec .= "UPDATE `$dbname`.`stats_server` SET `total_online_month`={$total_online_month},`total_online_week`={$total_online_week}; UPDATE `$dbname`.`job_check` SET `timestamp`={$nowtime} WHERE `job_name`='calc_server_stats'; ";
 
 		if ($select_arr['job_check']['get_version']['timestamp'] < ($nowtime - 43200)) {
 			$ch = curl_init();