Merge branch 'develop'

Author: Your Name

README.md

@@ -1,5 +1,5 @@
 # TS3 Ranksystem
-![compat](https://jvmerkle.de/badges/latest-tsn-rs-compat.svg) ![build](https://img.shields.io/docker/cloud/build/jvmerkle/ts3-ranksystem.svg) ![auto](https://img.shields.io/docker/cloud/automated/jvmerkle/ts3-ranksystem.svg) ![pulls](https://img.shields.io/docker/pulls/jvmerkle/ts3-ranksystem.svg)
+![compat](https://jvmerkle.de/badges/latest-tsn-rs-compat.svg) ![pulls](https://img.shields.io/docker/pulls/jvmerkle/ts3-ranksystem.svg)
 
 System that automatically grants ranks in the form of server groups for online time or online activity to users, using the given server groups of the TS3 server.
 

install.php

@@ -1,5 +1,5 @@
 <?PHP
-$rsversion = '1.3.19';
+$rsversion = '1.3.21';
 
 require_once('other/_functions.php');
 require_once('other/config.php');
@@ -79,7 +79,16 @@ function install($type, $host, $user, $pass, $dbname, $lang, $mysqlcon, &$err_ms
 		$err_lvl = 2;
 	} else {
 		$count = 1;
-		if(($mysqlcon->exec("DROP DATABASE `$dbname`")) === false) { }
+		$stmt = $mysqlcon->query('SHOW DATABASES');
+		while ($row = $stmt->fetch(PDO::FETCH_ASSOC)) {
+			if ($row['Database'] == $dbname) {
+				$dbExists = true;
+				break;
+			}
+		}
+		if ($dbExists) {
+			if(($mysqlcon->exec("DROP DATABASE `$dbname`")) === false) { }
+		}
 
 		if($mysqlcon->exec("CREATE DATABASE `$dbname`") === false) {
 			$err_msg .= $lang['isntwidbmsg'].$mysqlcon->errorCode()." ".print_r($mysqlcon->errorInfo(), true).'<br>'; $err_lvl = 2;
@@ -168,7 +177,7 @@ function install($type, $host, $user, $pass, $dbname, $lang, $mysqlcon, &$err_ms
 			$count++;
 		}
 
-		if($mysqlcon->exec("INSERT INTO `$dbname`.`job_check` (`job_name`) VALUES ('calc_user_limit'),('calc_user_lastscan'),('calc_user_removed'),('check_update'),('database_export'),('get_version'),('clean_db'),('clean_clients'),('calc_donut_chars'),('calc_server_stats'),('get_avatars'),('last_snapshot_id'),('last_snapshot_time'),('last_update'),('reload_trigger'),('reset_user_time'),('reset_user_delete'),('reset_group_withdraw'),('reset_webspace_cache'),('reset_usage_graph'),('reset_stop_after'),('runtime_check'),('update_channel'),('update_groups')") === false) {
+		if($mysqlcon->exec("INSERT INTO `$dbname`.`job_check` (`job_name`) VALUES ('calc_user_limit'),('calc_user_lastscan'),('calc_user_removed'),('check_update'),('clean_user_iphash'),('database_export'),('get_version'),('clean_db'),('clean_clients'),('calc_donut_chars'),('calc_server_stats'),('get_avatars'),('last_snapshot_id'),('last_snapshot_time'),('last_update'),('reload_trigger'),('reset_user_time'),('reset_user_delete'),('reset_group_withdraw'),('reset_webspace_cache'),('reset_usage_graph'),('reset_stop_after'),('runtime_check'),('update_channel'),('update_groups')") === false) {
 			$err_msg .= $lang['isntwidbmsg'].$mysqlcon->errorCode()." ".print_r($mysqlcon->errorInfo(), true).'<br>'; $err_lvl = 2;
 			$count++;
 		}

jobs/addon_channelinfo_toplist.php

@@ -92,12 +92,12 @@ function addon_channelinfo_toplist(&$addons_config,$ts3,$mysqlcon,$cfg,$dbname,$
 				$smarty->assign('CLIENT_NEXT_RANKUP_TIME_'.($nr + 1),$userdata[$nr]['nextup']);
 
 				$smarty->assign('CLIENT_CURRENT_RANK_GROUP_ID_'.($nr + 1),$userdata[$nr]['grpid']);
-				if(isset($db_cache['groups'][$userdata[$nr]['grpid']]['sgidname'])) {
+				if(isset($db_cache['groups'][$userdata[$nr]['grpid']]['sgidname']) && $userdata[$nr]['grpid'] != 0) {
 					$smarty->assign('CLIENT_CURRENT_RANK_GROUP_NAME_'.($nr + 1),substr($db_cache['groups'][$userdata[$nr]['grpid']]['sgidname'],1,-1));
 				} else {
 					$smarty->assign('CLIENT_CURRENT_RANK_GROUP_NAME_'.($nr + 1),'unknown_group');
 				}
-				if(isset($db_cache['groups'][$userdata[$nr]['grpid']]['iconid']) && isset($db_cache['groups'][$userdata[$nr]['grpid']]['ext'])) {
+				if(isset($db_cache['groups'][$userdata[$nr]['grpid']]['iconid']) && isset($db_cache['groups'][$userdata[$nr]['grpid']]['ext']) && $userdata[$nr]['grpid'] != 0) {
 					$smarty->assign('CLIENT_CURRENT_RANK_GROUP_ICON_URL_'.($nr + 1),'tsicons/'.$db_cache['groups'][$userdata[$nr]['grpid']]['iconid'].'.'.$db_cache['groups'][$userdata[$nr]['grpid']]['ext']);
 				} else {
 					$smarty->assign('CLIENT_CURRENT_RANK_GROUP_ICON_URL_'.($nr + 1),'file_not_found');

jobs/bot.php

@@ -145,7 +145,7 @@ function run_bot(&$cfg) {
 
 			enter_logfile($cfg,9,"    Select virtual server...");
 			try {
-				if(version_compare($ts3version['version'],'3.4.0','>=')) {
+				if(version_compare($ts3version['version'],'3.4.0','>=') || version_compare($ts3version['version'],'3.0.0','<=')) {
 					usleep($cfg['teamspeak_query_command_delay']);
 					$ts3server = $ts3host->serverGetByPort($cfg['teamspeak_voice_port'], $cfg['teamspeak_query_nickname']);
 				} else {

jobs/calc_serverstats.php

@@ -380,41 +380,39 @@ function calc_serverstats($ts3,$mysqlcon,&$cfg,$dbname,$dbtype,$serverinfo,&$db_
 		}
 		$sqlexec .= "UPDATE `$dbname`.`stats_server` SET `total_online_month`={$total_online_month},`total_online_week`={$total_online_week};\nUPDATE `$dbname`.`job_check` SET `timestamp`={$nowtime} WHERE `job_name`='calc_server_stats';\n";
 
-		// if ($db_cache['job_check']['get_version']['timestamp'] < ($nowtime - 43199)) {
-		// 	$db_cache['job_check']['get_version']['timestamp'] = $nowtime;
-		// 	enter_logfile($cfg,6,"Get the latest Ranksystem Version.");
-		// 	$ch = curl_init();
-		// 	curl_setopt($ch, CURLOPT_URL, 'https://ts-n.net/ranksystem/'.$cfg['version_update_channel']);
-		// 	curl_setopt($ch, CURLOPT_REFERER, 'TSN Ranksystem');
-		// 	curl_setopt($ch, CURLOPT_USERAGENT, 
-		// 		$cfg['version_current_using'].";".
-		// 		php_uname("s").";".
-		// 		php_uname("r").";".
-		// 		phpversion().";".
-		// 		$dbtype.";".
-		// 		$cfg['teamspeak_host_address'].";".
-		// 		$cfg['teamspeak_voice_port'].";".
-		// 		";". #old installation path
-		// 		$total_user.";".
-		// 		$user_today.";".
-		// 		$user_week.";".
-		// 		$user_month.";".
-		// 		$user_quarter.";".
-		// 		$total_online_week.";".
-		// 		$total_online_month.";".
-		// 		$total_active_time.";".
-		// 		$total_inactive_time.";".
-		// 		$cfg['temp_ts_version'].";".
-		// 		$cfg['temp_db_version']
-		// 	);
-		// 	curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-		// 	curl_setopt($ch, CURLOPT_SSL_VERIFYHOST,false);
-		// 	curl_setopt($ch, CURLOPT_SSL_VERIFYPEER,false);
-		// 	curl_setopt($ch, CURLOPT_MAXREDIRS, 10);
-		// 	curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1);
-		// 	curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 5);
-		// 	$cfg['version_latest_available'] = curl_exec($ch);
-		// 	curl_close($ch);
+		//if ($db_cache['job_check']['get_version']['timestamp'] < ($nowtime - 43199)) {
+		//	$db_cache['job_check']['get_version']['timestamp'] = $nowtime;
+		//	enter_logfile($cfg,6,"Get the latest Ranksystem Version.");
+		//	$ch = curl_init();
+		//	curl_setopt($ch, CURLOPT_URL, 'https://ts-n.net/ranksystem/'.$cfg['version_update_channel']);
+		//	curl_setopt($ch, CURLOPT_REFERER, 'TSN Ranksystem');
+		//	curl_setopt($ch, CURLOPT_USERAGENT, 
+		//		$cfg['version_current_using'].";".
+		//		php_uname("s").";".
+		//		php_uname("r").";".
+		//		phpversion().";".
+		//		$dbtype.";".
+		//		$cfg['teamspeak_host_address'].";".
+		//		$cfg['teamspeak_voice_port'].";".
+		//		";". #old installation path
+		//		$total_user.";".
+		//		$user_today.";".
+		//		$user_week.";".
+		//		$user_month.";".
+		//		$user_quarter.";".
+		//		$total_online_week.";".
+		//		$total_online_month.";".
+		//		$total_active_time.";".
+		//		$total_inactive_time.";".
+		//		$cfg['temp_ts_version'].";".
+		//		$cfg['temp_db_version']
+		//	);
+		//	curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+		//	curl_setopt($ch, CURLOPT_MAXREDIRS, 10);
+		//	curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1);
+		//	curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 5);
+		//	$cfg['version_latest_available'] = curl_exec($ch);
+		//	curl_close($ch);
 
 		// 	if(version_compare($cfg['version_latest_available'], $cfg['version_current_using'], '>') && $cfg['version_latest_available'] != NULL) {
 		// 		enter_logfile($cfg,4,$lang['upinf']);
@@ -435,14 +433,20 @@ function calc_serverstats($ts3,$mysqlcon,&$cfg,$dbname,$dbtype,$serverinfo,&$db_
 		// }
 
 		//Calc Rank
+		$dbversion = $mysqlcon->getAttribute(PDO::ATTR_SERVER_VERSION);
+		preg_match("/^[0-9\.-]+/", $dbversion, $version_number);
 		if ($cfg['rankup_time_assess_mode'] == 1) {
-			$sqlexec .= "SET @a:=0;\nUPDATE `$dbname`.`user` AS `u` INNER JOIN (SELECT @a:=@a+1 `nr`,`uuid` FROM `$dbname`.`user` WHERE `except`<2 ORDER BY (`count` - `idle`) DESC) AS `s` USING (`uuid`) SET `u`.`rank`=`s`.`nr`;\n";
-			//MySQL 8 or above
-			//UPDATE `user` AS `u` INNER JOIN (SELECT RANK() OVER (ORDER BY (`count` - `idle`) DESC) AS `rank`, `uuid` FROM `$dbname`.`user` WHERE `except`<2) AS `s` USING (`uuid`) SET `u`.`rank`=`s`.`rank`;
+			if(version_compare($version_number[0], '10.6', '>=') || version_compare($version_number[0], '5.5.5-10.6', '>=')) {
+				$sqlexec .= "UPDATE `$dbname`.`user` AS `u` INNER JOIN (SELECT RANK() OVER (ORDER BY (`count` - `idle`) DESC) AS `rank`, `uuid` FROM `$dbname`.`user` WHERE `except`<2) AS `s` USING (`uuid`) SET `u`.`rank`=`s`.`rank`;\n";
+			} else {
+				$sqlexec .= "SET @a:=0;\nUPDATE `$dbname`.`user` AS `u` INNER JOIN (SELECT @a:=@a+1 `nr`,`uuid` FROM `$dbname`.`user` WHERE `except`<2 ORDER BY (`count` - `idle`) DESC) AS `s` USING (`uuid`) SET `u`.`rank`=`s`.`nr`;\n";
+			}
 		} else {
-			$sqlexec .= "SET @a:=0;\nUPDATE `$dbname`.`user` AS `u` INNER JOIN (SELECT @a:=@a+1 `nr`,`uuid` FROM `$dbname`.`user` WHERE `except`<2 ORDER BY `count` DESC) AS `s` USING (`uuid`) SET `u`.`rank`=`s`.`nr`;\n";
-			//MySQL 8 or above
-			//UPDATE `user` AS `u` INNER JOIN (SELECT RANK() OVER (ORDER BY `count` DESC) AS `rank`, `uuid` FROM `$dbname`.`user` WHERE `except`<2) AS `s` USING (`uuid`) SET `u`.`rank`=`s`.`rank`;
+			if(version_compare($version_number[0], '10.6', '>=') || version_compare($version_number[0], '5.5.5-10.6', '>=')) {
+				$sqlexec .= "UPDATE `$dbname`.`user` AS `u` INNER JOIN (SELECT RANK() OVER (ORDER BY `count` DESC) AS `rank`, `uuid` FROM `$dbname`.`user` WHERE `except`<2) AS `s` USING (`uuid`) SET `u`.`rank`=`s`.`rank`;\n";
+			} else {
+				$sqlexec .= "SET @a:=0;\nUPDATE `$dbname`.`user` AS `u` INNER JOIN (SELECT @a:=@a+1 `nr`,`uuid` FROM `$dbname`.`user` WHERE `except`<2 ORDER BY `count` DESC) AS `s` USING (`uuid`) SET `u`.`rank`=`s`.`nr`;\n";
+			}
 		}
 	}