Merge pull request #28 from szporwolik/dev

9.3
Merge branch 'master' into dev
2026-08-09 20:55:39 +02:00 · 2019-12-23 13:52:16 +01:00 · 2019-12-23 13:52:02 +01:00 · 2019-12-23 13:48:50 +01:00 · 2019-12-23 13:43:19 +01:00 · 2019-11-18 18:26:14 +01:00
10 changed files with 827 additions and 656 deletions
--- a/01_DCS/Hooks/Perun.lua
+++ b/01_DCS/Hooks/Perun.lua
--- a/01_DCS/Json/perun_status_data.json
+++ b/01_DCS/Json/perun_status_data.json
@@ -1 +0,0 @@
-[]
--- a/02_Windows_App/Perun_v1/01_Classes/DatabaseController.cs
+++ b/02_Windows_App/Perun_v1/01_Classes/DatabaseController.cs
@@ -21,7 +21,6 @@ public class DatabaseController
        string TCPFrameTimestamp = TCPFrame.timestamp;
        string TCPFrameInstance = TCPFrame.instance;
        string TCPFramePayload;
-        string TCPFramePayload_Perun;
        string SQLQueryTxt;
        int ReturnValue = 1;

@@ -49,39 +48,36 @@ public class DatabaseController
        {
            // Add entry to chat log
            SQLQueryTxt = "INSERT INTO `pe_DataPlayers` (`pe_DataPlayers_ucid`) SELECT '" + TCPFrame.payload.ucid + "' FROM DUAL WHERE NOT EXISTS (SELECT * FROM `pe_DataPlayers` where `pe_DataPlayers_ucid` = '" + TCPFrame.payload.ucid + "' );";
-            SQLQueryTxt += "UPDATE  `pe_DataPlayers` SET `pe_DataPlayers_updated` = " + TCPFrameTimestamp + ",`pe_DataPlayers_lastname`='" + TCPFrame.payload.player + "' WHERE `pe_DataPlayers_ucid`='" + TCPFrame.payload.ucid + "' ;";
+            SQLQueryTxt += "UPDATE  `pe_DataPlayers` SET `pe_DataPlayers_updated` = " + TCPFrameTimestamp + ",`pe_DataPlayers_lastname`=@PAR_payload_player WHERE `pe_DataPlayers_ucid`='" + TCPFrame.payload.ucid + "' ;";
            SQLQueryTxt += "INSERT INTO `pe_DataMissionHashes` (`pe_DataMissionHashes_hash`,`pe_DataMissionHashes_instance`) SELECT '" + TCPFrame.payload.missionhash + "','" + TCPFrameInstance + "' FROM DUAL WHERE NOT EXISTS (SELECT * FROM `pe_DataMissionHashes` where `pe_DataMissionHashes_hash` ='" + TCPFrame.payload.missionhash + "' AND `pe_DataMissionHashes_instance`=" + TCPFrameInstance + ");";
            SQLQueryTxt += "UPDATE `pe_DataMissionHashes` SET `pe_DataMissionHashes_datetime` = " + TCPFrameTimestamp + " WHERE `pe_DataMissionHashes_hash` = '" + TCPFrame.payload.missionhash + "' AND `pe_DataMissionHashes_instance`=" + TCPFrameInstance + " ;";
-            SQLQueryTxt += "INSERT INTO `pe_LogChat` (`pe_LogChat_id`,`pe_LogChat_datetime`, `pe_LogChat_playerid`, `pe_LogChat_msg`, `pe_LogChat_all`,`pe_LogChat_missionhash_id`) VALUES (NULL,'" + TCPFrame.payload.datetime + "', (SELECT `pe_DataPlayers_id` from `pe_DataPlayers` WHERE `pe_DataPlayers_ucid` = '" + TCPFrame.payload.ucid + "'), '" + TCPFrame.payload.msg + "', '" + TCPFrame.payload.all + "',(SELECT `pe_DataMissionHashes_id` FROM `pe_DataMissionHashes` WHERE `pe_DataMissionHashes_hash` = '" + TCPFrame.payload.missionhash + "'));";
+            SQLQueryTxt += "INSERT INTO `pe_LogChat` (`pe_LogChat_id`,`pe_LogChat_datetime`, `pe_LogChat_playerid`, `pe_LogChat_msg`, `pe_LogChat_all`,`pe_LogChat_missionhash_id`) VALUES (NULL,'" + TCPFrame.payload.datetime + "', (SELECT `pe_DataPlayers_id` from `pe_DataPlayers` WHERE `pe_DataPlayers_ucid` = '" + TCPFrame.payload.ucid + "'), @PAR_payload_msg, '" + TCPFrame.payload.all + "',(SELECT `pe_DataMissionHashes_id` FROM `pe_DataMissionHashes` WHERE `pe_DataMissionHashes_hash` = '" + TCPFrame.payload.missionhash + "'));";
        }
        else if (TCPFrameType == "51")
        {
            // Add entry to event log
            SQLQueryTxt = "INSERT INTO `pe_DataMissionHashes` (`pe_DataMissionHashes_hash`,`pe_DataMissionHashes_instance`) SELECT '" + TCPFrame.payload.log_missionhash + "','" + TCPFrameInstance + "' FROM DUAL WHERE NOT EXISTS (SELECT * FROM `pe_DataMissionHashes` where `pe_DataMissionHashes_hash` = '" + TCPFrame.payload.log_missionhash + "' AND `pe_DataMissionHashes_instance`=" + TCPFrameInstance + ");";
            SQLQueryTxt += "UPDATE `pe_DataMissionHashes` SET `pe_DataMissionHashes_datetime` = " + TCPFrameTimestamp + " WHERE `pe_DataMissionHashes_hash` = '" + TCPFrame.payload.log_missionhash + "' AND `pe_DataMissionHashes_instance`=" + TCPFrameInstance + ";";
-            SQLQueryTxt += "INSERT INTO `pe_LogEvent` (`pe_LogEvent_arg1`,`pe_LogEvent_arg2`,`pe_LogEvent_id`, `pe_LogEvent_datetime`, `pe_LogEvent_type`, `pe_LogEvent_content`,`pe_LogEvent_missionhash_id`) VALUES ('" + TCPFrame.payload.log_arg_1 + "','" + TCPFrame.payload.log_arg_2 + "', NULL, '" + TCPFrame.payload.log_datetime + "', '" + TCPFrame.payload.log_type + "', '" + TCPFrame.payload.log_content + "', (SELECT `pe_DataMissionHashes_id` FROM `pe_DataMissionHashes` WHERE `pe_DataMissionHashes_hash` = '" + TCPFrame.payload.log_missionhash + "'));";
+            SQLQueryTxt += "INSERT INTO `pe_LogEvent` (`pe_LogEvent_arg1`,`pe_LogEvent_arg2`,`pe_LogEvent_id`, `pe_LogEvent_datetime`, `pe_LogEvent_type`, `pe_LogEvent_content`,`pe_LogEvent_missionhash_id`) VALUES ('" + TCPFrame.payload.log_arg_1 + "','" + TCPFrame.payload.log_arg_2 + "', NULL, '" + TCPFrame.payload.log_datetime + "', '" + TCPFrame.payload.log_type + "', @PAR_log_content, (SELECT `pe_DataMissionHashes_id` FROM `pe_DataMissionHashes` WHERE `pe_DataMissionHashes_hash` = '" + TCPFrame.payload.log_missionhash + "'));";
        }
        else if (TCPFrameType == "52")
        {
            // Update user stats
-            TCPFramePayload = JsonConvert.SerializeObject(TCPFrame.payload.stat_data_dcs); // Deserialize payload
-            TCPFramePayload_Perun = JsonConvert.SerializeObject(TCPFrame.payload.stat_data_perun); // Deserialize payload
-
            SQLQueryTxt = "INSERT INTO `pe_DataMissionHashes` (`pe_DataMissionHashes_hash`,`pe_DataMissionHashes_instance`) SELECT '" + TCPFrame.payload.stat_missionhash + "','" + TCPFrameInstance + "' FROM DUAL WHERE NOT EXISTS (SELECT * FROM `pe_DataMissionHashes` where `pe_DataMissionHashes_hash` = '" + TCPFrame.payload.stat_missionhash + "' AND `pe_DataMissionHashes_instance`=" + TCPFrameInstance + ");";
            SQLQueryTxt += "UPDATE `pe_DataMissionHashes` SET `pe_DataMissionHashes_datetime` = " + TCPFrameTimestamp + " WHERE `pe_DataMissionHashes_hash` = '" + TCPFrame.payload.stat_missionhash + "' AND `pe_DataMissionHashes_instance`=" + TCPFrameInstance + " ;";
            SQLQueryTxt += "INSERT INTO `pe_DataPlayers` (`pe_DataPlayers_ucid`) SELECT '" + TCPFrame.payload.stat_ucid + "' FROM DUAL WHERE NOT EXISTS (SELECT * FROM `pe_DataPlayers` where `pe_DataPlayers_ucid` = '" + TCPFrame.payload.stat_ucid + "');";
            SQLQueryTxt += "UPDATE `pe_DataPlayers` SET `pe_DataPlayers_updated`=" + TCPFrameTimestamp + " WHERE `pe_DataPlayers_ucid`='" + TCPFrame.payload.stat_ucid + "';";
            SQLQueryTxt += "INSERT INTO `pe_DataTypes` (`pe_DataTypes_name`) SELECT '" + TCPFrame.payload.stat_data_type + "' FROM DUAL WHERE NOT EXISTS (SELECT * FROM `pe_DataTypes` where `pe_DataTypes_name` = '" + TCPFrame.payload.stat_data_type + "');";
            SQLQueryTxt += "INSERT INTO `pe_LogStats` (`pe_LogStats_playerid`,`pe_LogStats_missionhash_id`,`pe_LogStats_typeid`) SELECT (SELECT `pe_DataPlayers_id` from `pe_DataPlayers` WHERE `pe_DataPlayers_ucid` = '" + TCPFrame.payload.stat_ucid + "'), (SELECT `pe_DataMissionHashes_id` FROM `pe_DataMissionHashes` WHERE `pe_DataMissionHashes_hash` = '" + TCPFrame.payload.stat_missionhash + "'), (SELECT pe_DataTypes_id FROM `pe_DataTypes` where `pe_DataTypes_name` = '" + TCPFrame.payload.stat_data_type + "') FROM DUAL WHERE NOT EXISTS (SELECT * FROM `pe_LogStats` WHERE `pe_LogStats_missionhash_id`=(SELECT `pe_DataMissionHashes_id` FROM `pe_DataMissionHashes` WHERE `pe_DataMissionHashes_hash` = '" + TCPFrame.payload.stat_missionhash + "') AND `pe_LogStats_playerid` =  (SELECT `pe_DataPlayers_id` from `pe_DataPlayers` WHERE `pe_DataPlayers_ucid` = '" + TCPFrame.payload.stat_ucid + "') AND `pe_LogStats_typeid`= (SELECT pe_DataTypes_id FROM `pe_DataTypes` where `pe_DataTypes_name` = '" + TCPFrame.payload.stat_data_type + "'));";
-            SQLQueryTxt += "UPDATE `pe_LogStats` SET `ps_kills_fortification`=" + TCPFrame.payload.stat_data_perun.ps_kills_fortification + ",`ps_other_landings`=" + TCPFrame.payload.stat_data_perun.ps_other_landings + ",`ps_other_takeoffs`=" + TCPFrame.payload.stat_data_perun.ps_other_takeoffs + ",`ps_pvp`=" + TCPFrame.payload.stat_data_perun.ps_pvp + ",`ps_deaths`=" + TCPFrame.payload.stat_data_perun.ps_deaths + ",`ps_ejections`=" + TCPFrame.payload.stat_data_perun.ps_ejections + ",`ps_crashes`=" + TCPFrame.payload.stat_data_perun.ps_crashes + ",`ps_teamkills`=" + TCPFrame.payload.stat_data_perun.ps_teamkills + ",`ps_kills_planes`=" + TCPFrame.payload.stat_data_perun.ps_kills_planes + ",`ps_kills_helicopters`=" + TCPFrame.payload.stat_data_perun.ps_kills_helicopters + ",`ps_kills_air_defense`=" + TCPFrame.payload.stat_data_perun.ps_kills_air_defense + ",`ps_kills_armor`=" + TCPFrame.payload.stat_data_perun.ps_kills_armor + ",`ps_kills_unarmed`=" + TCPFrame.payload.stat_data_perun.ps_kills_unarmed + ",`ps_kills_infantry`=" + TCPFrame.payload.stat_data_perun.ps_kills_infantry + ",`ps_kills_ships`=" + TCPFrame.payload.stat_data_perun.ps_kills_ships + ",`ps_kills_other`=" + TCPFrame.payload.stat_data_perun.ps_kills_other + ",`ps_airfield_takeoffs`=" + TCPFrame.payload.stat_data_perun.ps_airfield_takeoffs + ",`ps_airfield_landings`=" + TCPFrame.payload.stat_data_perun.ps_airfield_landings + ",`ps_ship_takeoffs`=" + TCPFrame.payload.stat_data_perun.ps_ship_takeoffs + ",`ps_ship_landings`=" + TCPFrame.payload.stat_data_perun.ps_ship_landings + ",`ps_farp_takeoffs`=" + TCPFrame.payload.stat_data_perun.ps_farp_takeoffs + ",`ps_farp_landings`=" + TCPFrame.payload.stat_data_perun.ps_farp_landings + ", `pe_LogStats_datetime`='" + TCPFrame.payload.stat_datetime + "',`pe_LogStats_playerid` =  (SELECT `pe_DataPlayers_id` from `pe_DataPlayers` WHERE `pe_DataPlayers_ucid` = '" + TCPFrame.payload.stat_ucid + "'),`pe_LogStats_missionhash_id`=(SELECT `pe_DataMissionHashes_id` FROM `pe_DataMissionHashes` WHERE `pe_DataMissionHashes_hash` = '" + TCPFrame.payload.stat_missionhash + "') WHERE `pe_LogStats_missionhash_id`=(SELECT `pe_DataMissionHashes_id` FROM `pe_DataMissionHashes` WHERE `pe_DataMissionHashes_hash` = '" + TCPFrame.payload.stat_missionhash + "') AND `pe_LogStats_playerid` =  (SELECT `pe_DataPlayers_id` from `pe_DataPlayers` WHERE `pe_DataPlayers_ucid` = '" + TCPFrame.payload.stat_ucid + "') AND `pe_LogStats_typeid`=(SELECT pe_DataTypes_id FROM `pe_DataTypes` where `pe_DataTypes_name` = '" + TCPFrame.payload.stat_data_type + "');";
+            SQLQueryTxt += "UPDATE `pe_LogStats` SET `ps_time`=" + TCPFrame.payload.stat_data_perun.ps_time + ",`pe_LogStats_seat`=" + TCPFrame.payload.stat_data_subslot + ",`pe_LogStats_masterslot`=" + TCPFrame.payload.stat_data_masterslot + ",`ps_kills_fortification`=" + TCPFrame.payload.stat_data_perun.ps_kills_fortification + ",`ps_other_landings`=" + TCPFrame.payload.stat_data_perun.ps_other_landings + ",`ps_other_takeoffs`=" + TCPFrame.payload.stat_data_perun.ps_other_takeoffs + ",`ps_pvp`=" + TCPFrame.payload.stat_data_perun.ps_pvp + ",`ps_deaths`=" + TCPFrame.payload.stat_data_perun.ps_deaths + ",`ps_ejections`=" + TCPFrame.payload.stat_data_perun.ps_ejections + ",`ps_crashes`=" + TCPFrame.payload.stat_data_perun.ps_crashes + ",`ps_teamkills`=" + TCPFrame.payload.stat_data_perun.ps_teamkills + ",`ps_kills_planes`=" + TCPFrame.payload.stat_data_perun.ps_kills_planes + ",`ps_kills_helicopters`=" + TCPFrame.payload.stat_data_perun.ps_kills_helicopters + ",`ps_kills_air_defense`=" + TCPFrame.payload.stat_data_perun.ps_kills_air_defense + ",`ps_kills_armor`=" + TCPFrame.payload.stat_data_perun.ps_kills_armor + ",`ps_kills_unarmed`=" + TCPFrame.payload.stat_data_perun.ps_kills_unarmed + ",`ps_kills_infantry`=" + TCPFrame.payload.stat_data_perun.ps_kills_infantry + ",`ps_kills_ships`=" + TCPFrame.payload.stat_data_perun.ps_kills_ships + ",`ps_kills_other`=" + TCPFrame.payload.stat_data_perun.ps_kills_other + ",`ps_airfield_takeoffs`=" + TCPFrame.payload.stat_data_perun.ps_airfield_takeoffs + ",`ps_airfield_landings`=" + TCPFrame.payload.stat_data_perun.ps_airfield_landings + ",`ps_ship_takeoffs`=" + TCPFrame.payload.stat_data_perun.ps_ship_takeoffs + ",`ps_ship_landings`=" + TCPFrame.payload.stat_data_perun.ps_ship_landings + ",`ps_farp_takeoffs`=" + TCPFrame.payload.stat_data_perun.ps_farp_takeoffs + ",`ps_farp_landings`=" + TCPFrame.payload.stat_data_perun.ps_farp_landings + ", `pe_LogStats_datetime`='" + TCPFrame.payload.stat_datetime + "',`pe_LogStats_playerid` =  (SELECT `pe_DataPlayers_id` from `pe_DataPlayers` WHERE `pe_DataPlayers_ucid` = '" + TCPFrame.payload.stat_ucid + "'),`pe_LogStats_missionhash_id`=(SELECT `pe_DataMissionHashes_id` FROM `pe_DataMissionHashes` WHERE `pe_DataMissionHashes_hash` = '" + TCPFrame.payload.stat_missionhash + "') WHERE `pe_LogStats_missionhash_id`=(SELECT `pe_DataMissionHashes_id` FROM `pe_DataMissionHashes` WHERE `pe_DataMissionHashes_hash` = '" + TCPFrame.payload.stat_missionhash + "') AND `pe_LogStats_playerid` =  (SELECT `pe_DataPlayers_id` from `pe_DataPlayers` WHERE `pe_DataPlayers_ucid` = '" + TCPFrame.payload.stat_ucid + "') AND `pe_LogStats_typeid`=(SELECT pe_DataTypes_id FROM `pe_DataTypes` where `pe_DataTypes_name` = '" + TCPFrame.payload.stat_data_type + "');";
        }
        else if (TCPFrameType == "53")
        {
            // User logged in to DCS server

            SQLQueryTxt = "INSERT INTO `pe_DataPlayers` (`pe_DataPlayers_ucid`) SELECT '" + TCPFrame.payload.login_ucid + "' FROM DUAL WHERE NOT EXISTS (SELECT * FROM `pe_DataPlayers` where pe_DataPlayers_ucid='" + TCPFrame.payload.login_ucid + "');";
-            SQLQueryTxt += "UPDATE `pe_DataPlayers` SET  pe_DataPlayers_lastip='" + TCPFrame.payload.login_ipaddr + "', pe_DataPlayers_lastname='" + TCPFrame.payload.login_name + "',pe_DataPlayers_updated='" + TCPFrame.payload.login_datetime + "' WHERE `pe_DataPlayers_ucid`= '" + TCPFrame.payload.login_ucid + "';";
-            SQLQueryTxt += "INSERT INTO `pe_LogLogins` (`pe_LogLogins_datetime`, `pe_LogLogins_playerid`, `pe_LogLogins_name`, `pe_LogLogins_ip`,`pe_LogLogins_instance`) VALUES ('" + TCPFrame.payload.login_datetime + "', (SELECT pe_DataPlayers_id from pe_DataPlayers WHERE pe_DataPlayers_ucid = '" + TCPFrame.payload.login_ucid + "'), '" + TCPFrame.payload.login_name + "', '" + TCPFrame.payload.login_ipaddr + "','" + TCPFrameInstance + "');";
+            SQLQueryTxt += "UPDATE `pe_DataPlayers` SET  pe_DataPlayers_lastip='" + TCPFrame.payload.login_ipaddr + "', pe_DataPlayers_lastname=@PAR_login_name,pe_DataPlayers_updated='" + TCPFrame.payload.login_datetime + "' WHERE `pe_DataPlayers_ucid`= '" + TCPFrame.payload.login_ucid + "';";
+            SQLQueryTxt += "INSERT INTO `pe_LogLogins` (`pe_LogLogins_datetime`, `pe_LogLogins_playerid`, `pe_LogLogins_name`, `pe_LogLogins_ip`,`pe_LogLogins_instance`) VALUES ('" + TCPFrame.payload.login_datetime + "', (SELECT pe_DataPlayers_id from pe_DataPlayers WHERE pe_DataPlayers_ucid = '" + TCPFrame.payload.login_ucid + "'), @PAR_login_name, '" + TCPFrame.payload.login_ipaddr + "','" + TCPFrameInstance + "');";
        }
        else if (TCPFrameType == "-1")
        {
@@ -91,10 +87,10 @@ public class DatabaseController
        else
        {
            // General definition used for 1-10 type packets
-            TCPFramePayload = JsonConvert.SerializeObject(TCPFrame.payload); // Deserialize payload
+      

            SQLQueryTxt = "INSERT INTO `pe_DataRaw` (`pe_dataraw_type`,`pe_dataraw_instance`) SELECT '" + TCPFrameType + "','" + TCPFrameInstance + "' FROM DUAL WHERE NOT EXISTS (SELECT * FROM `pe_DataRaw` WHERE `pe_dataraw_type` = '" + TCPFrameType + "' AND `pe_dataraw_instance` = " + TCPFrameInstance + ");";
-            SQLQueryTxt += "UPDATE `pe_DataRaw` SET `pe_dataraw_payload` = JSON_QUOTE('" + TCPFramePayload + "'), `pe_dataraw_updated`=" + TCPFrameTimestamp + " WHERE `pe_dataraw_type`=" + TCPFrameType + " AND `pe_dataraw_instance` = " + TCPFrameInstance + ";";
+            SQLQueryTxt += "UPDATE `pe_DataRaw` SET `pe_dataraw_payload` = JSON_QUOTE(@PAR_TCPFramePayload), `pe_dataraw_updated`=" + TCPFrameTimestamp + " WHERE `pe_dataraw_type`=" + TCPFrameType + " AND `pe_dataraw_instance` = " + TCPFrameInstance + ";";
        }

        // Connect to mysql and execute sql
@@ -108,6 +104,28 @@ public class DatabaseController
                DatabaseConnection.Open();
                DatabaseStatus = true;
                MySqlCommand DatabaseCommand = new MySqlCommand(SQLQueryTxt, DatabaseConnection);
+
+                // Add parameters - prevent SQL injection
+                if (TCPFrameType == "50")
+                {
+                    DatabaseCommand.Parameters.AddWithValue("@PAR_payload_player", TCPFrame.payload.player);
+                    DatabaseCommand.Parameters.AddWithValue("@PAR_payload_msg", TCPFrame.payload.msg);
+                }
+                else if (TCPFrameType == "51")
+                {
+                    DatabaseCommand.Parameters.AddWithValue("@PAR_log_content", TCPFrame.payload.log_content);
+                }
+                else if (TCPFrameType == "53")
+                {
+                    DatabaseCommand.Parameters.AddWithValue("@PAR_login_name", TCPFrame.payload.login_name);
+                }
+                else
+                {
+                    TCPFramePayload = JsonConvert.SerializeObject(TCPFrame.payload); // Deserialize payload
+                    DatabaseCommand.Parameters.AddWithValue("@PAR_TCPFramePayload", TCPFramePayload);
+                }
+                // End of add parameters
+
                    MySqlDataReader DatabaseReader = DatabaseCommand.ExecuteReader();

                if (DatabaseReader.HasRows)
@@ -180,19 +198,30 @@ public class DatabaseController
                {
                    case 1042: // Unable to connect to any of the specified MySQL hosts (Check Server,Port)
                        PerunHelper.AddLog(ref Globals.AppLogHistory, "ERROR MySQL - unable to connect, error: " + m_ex.Message,1,1, TCPFrameType);
+                        DatabaseStatus = false;
+                        ReturnValue = 0;
                        break;
                    case 0: // Access denied (Check DB name,username,password)
                        PerunHelper.AddLog(ref Globals.AppLogHistory, "ERROR MySQL - access denied, error: " + m_ex.Message,1,1, TCPFrameType);
+                        DatabaseStatus = false;
+                        ReturnValue = 0;
+                        break;
+                    case 1064: // Incorrect query
+                        PerunHelper.AddLog(ref Globals.AppLogHistory, "ERROR MySQL - query: " + SQLQueryTxt, 1, 1, TCPFrameType);
+                        PerunHelper.AddLog(ref Globals.AppLogHistory, "ERROR MySQL - error: " + m_ex.Message, 1, 1, TCPFrameType);
+                        DatabaseStatus = true; // True as connection is not broken
+                        ReturnValue = 1; // Return a value to remove this query from quae
                        break;
                    default:
                        PerunHelper.AddLog(ref Globals.AppLogHistory, "ERROR MySQL - error id: " + m_ex.Number,1,1, TCPFrameType);
                        PerunHelper.AddLog(ref Globals.AppLogHistory, "ERROR MySQL - query: " + SQLQueryTxt, 1, 1, TCPFrameType);
                        PerunHelper.AddLog(ref Globals.AppLogHistory, "ERROR MySQL - error: " + m_ex.Message,1,1, TCPFrameType);
+                        DatabaseStatus = false;
+                        ReturnValue = 0;
                        break;
                }
                Globals.ErrorsGame++;
-                DatabaseStatus = false;
-                ReturnValue = 0;
+                
            }
            DatabaseConnection.Close();
            Console.WriteLine("Sending data to MySQL - Done");
--- a/02_Windows_App/Perun_v1/01_Classes/PerunHelper.cs
+++ b/02_Windows_App/Perun_v1/01_Classes/PerunHelper.cs
@@ -48,7 +48,7 @@ internal class PerunHelper
            Globals.AppUpdateGUI = true;
        }
        // Add the entry to log file
-        LogController.WriteLog(DateTime.Now.ToString("yyyy-dd-MM ") + " " + DateTime.Now.ToString("HH:mm:ss") + " | Instance: "+ Globals.AppInstanceID + " | " + LogMarker + " | "+ LogDirection + " | "+ strType + " | " + strEntryToAdd);
+        LogController.WriteLog(DateTime.Now.ToString("yyyy-MM-dd ") + " " + DateTime.Now.ToString("HH:mm:ss") + " | Instance: "+ Globals.AppInstanceID + " | " + LogMarker + " | "+ LogDirection + " | "+ strType + " | " + strEntryToAdd);
    }

    public static string GetAppVersion(string strBeginning)
@@ -60,6 +60,7 @@ internal class PerunHelper

    public static int CheckVersions()
    {
+#if !DEBUG
        // Checks the versions of APP, DCS Hook and MySQL database
        Match match = Regex.Match(Globals.VersionPerun, @"^\d+.\d+.\d+", RegexOptions.Compiled | RegexOptions.IgnoreCase);
        string VersionApp = "v" + match.Groups[0].Value;
@@ -90,5 +91,8 @@ internal class PerunHelper
        }

        return ReturnValue;
+#else
+        return 1;
+#endif
    }
 }
--- a/02_Windows_App/Perun_v1/02_Forms/form_Main.Designer.cs
+++ b/02_Windows_App/Perun_v1/02_Forms/form_Main.Designer.cs
@@ -157,11 +157,11 @@
            // label6
            // 
            this.label6.AutoSize = true;
-            this.label6.Location = new System.Drawing.Point(41, 48);
+            this.label6.Location = new System.Drawing.Point(19, 48);
            this.label6.Name = "label6";
-            this.label6.Size = new System.Drawing.Size(59, 13);
+            this.label6.Size = new System.Drawing.Size(81, 13);
            this.label6.TabIndex = 9;
-            this.label6.Text = "Server port";
+            this.label6.Text = "MySQL DB port";
            // 
            // con_txt_mysql_port
            // 
@@ -198,20 +198,20 @@
            // label2
            // 
            this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(47, 74);
+            this.label2.Location = new System.Drawing.Point(18, 74);
            this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(53, 13);
+            this.label2.Size = new System.Drawing.Size(82, 13);
            this.label2.TabIndex = 4;
-            this.label2.Text = "Database";
+            this.label2.Text = "Database name";
            // 
            // label1
            // 
            this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(22, 22);
+            this.label1.Location = new System.Drawing.Point(3, 22);
            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(78, 13);
+            this.label1.Size = new System.Drawing.Size(100, 13);
            this.label1.TabIndex = 3;
-            this.label1.Text = "Server address";
+            this.label1.Text = "MySQL DB address";
            // 
            // con_txt_mysql_database
            // 
@@ -359,11 +359,11 @@
            // label8
            // 
            this.label8.AutoSize = true;
-            this.label8.Location = new System.Drawing.Point(41, 45);
+            this.label8.Location = new System.Drawing.Point(7, 45);
            this.label8.Name = "label8";
-            this.label8.Size = new System.Drawing.Size(62, 13);
+            this.label8.Size = new System.Drawing.Size(93, 13);
            this.label8.TabIndex = 12;
-            this.label8.Text = "Instance ID";
+            this.label8.Text = "Perun Instance ID";
            // 
            // con_txt_dcs_instance
            // 
@@ -375,11 +375,11 @@
            // label7
            // 
            this.label7.AutoSize = true;
-            this.label7.Location = new System.Drawing.Point(41, 19);
+            this.label7.Location = new System.Drawing.Point(44, 19);
            this.label7.Name = "label7";
-            this.label7.Size = new System.Drawing.Size(59, 13);
+            this.label7.Size = new System.Drawing.Size(56, 13);
            this.label7.TabIndex = 10;
-            this.label7.Text = "Server port";
+            this.label7.Text = "Perun port";
            // 
            // con_txt_dcs_server_port
            // 
--- a/02_Windows_App/Perun_v1/02_Forms/form_Main.cs
+++ b/02_Windows_App/Perun_v1/02_Forms/form_Main.cs
@@ -506,46 +506,40 @@ namespace Perun_v1
                        ExtSRSJson = System.IO.File.ReadAllText(con_txt_3rd_srs.Text);
                        dynamic raw_lotatc = JsonConvert.DeserializeObject(ExtSRSJson);

-                        for (int i = 0; i < raw_lotatc.Count; i++)
+                        for (int i = 0; i < raw_lotatc.Clients.Count; i++)
                        {

-                            if (raw_lotatc[i].RadioInfo != null)
+                            if (raw_lotatc.Clients[i].RadioInfo != null)
                            {

-                                int temp = raw_lotatc[i].RadioInfo.radios.Count - 1;
+                                int temp = raw_lotatc.Clients[i].RadioInfo.radios.Count - 1;
                                for (int j = temp; j >= 0; j--)
                                {
-                                    raw_lotatc[i].RadioInfo.radios[j].enc.Parent.Remove();
-                                    raw_lotatc[i].RadioInfo.radios[j].encKey.Parent.Remove();
-                                    raw_lotatc[i].RadioInfo.radios[j].encMode.Parent.Remove();
-                                    raw_lotatc[i].RadioInfo.radios[j].freqMax.Parent.Remove();
-                                    raw_lotatc[i].RadioInfo.radios[j].freqMin.Parent.Remove();
-                                    raw_lotatc[i].RadioInfo.radios[j].modulation.Parent.Remove();
-                                    raw_lotatc[i].RadioInfo.radios[j].freqMode.Parent.Remove();
-                                    raw_lotatc[i].RadioInfo.radios[j].volMode.Parent.Remove();
-                                    raw_lotatc[i].RadioInfo.radios[j].expansion.Parent.Remove();
-                                    raw_lotatc[i].RadioInfo.radios[j].channel.Parent.Remove();
-                                    raw_lotatc[i].RadioInfo.radios[j].simul.Parent.Remove();
+                                    raw_lotatc.Clients[i].RadioInfo.radios[j].enc.Parent.Remove();
+                                    raw_lotatc.Clients[i].RadioInfo.radios[j].encKey.Parent.Remove();
+                                    raw_lotatc.Clients[i].RadioInfo.radios[j].encMode.Parent.Remove();
+                                    raw_lotatc.Clients[i].RadioInfo.radios[j].freqMax.Parent.Remove();
+                                    raw_lotatc.Clients[i].RadioInfo.radios[j].freqMin.Parent.Remove();
+                                    raw_lotatc.Clients[i].RadioInfo.radios[j].modulation.Parent.Remove();
+                                    raw_lotatc.Clients[i].RadioInfo.radios[j].freqMode.Parent.Remove();
+                                    raw_lotatc.Clients[i].RadioInfo.radios[j].volMode.Parent.Remove();
+                                    raw_lotatc.Clients[i].RadioInfo.radios[j].expansion.Parent.Remove();
+                                    raw_lotatc.Clients[i].RadioInfo.radios[j].channel.Parent.Remove();
+                                    raw_lotatc.Clients[i].RadioInfo.radios[j].simul.Parent.Remove();

-                                    if (raw_lotatc[i].RadioInfo.radios[j].name == "No Radio")
+                                    if (raw_lotatc.Clients[i].RadioInfo.radios[j].name == "No Radio")
                                    {
-                                        raw_lotatc[i].RadioInfo.radios[j].Remove();
+                                        raw_lotatc.Clients[i].RadioInfo.radios[j].Remove();
                                    }
                                }
-                                raw_lotatc[i].ClientChannelId.Parent.Remove();
-                                raw_lotatc[i].RadioInfo.simultaneousTransmission.Parent.Remove();
+                                raw_lotatc.Clients[i].ClientChannelId.Parent.Remove();
+                                raw_lotatc.Clients[i].RadioInfo.simultaneousTransmission.Parent.Remove();
                            }
                        }

-                        if (raw_lotatc.Count > 0)
-                        {
                        ExtSRSJson = JsonConvert.SerializeObject(raw_lotatc);
                        ExtSRSJson = "{'type':'100','instance':'" + Int32.Parse(con_txt_dcs_instance.Text) + "','payload':'" + ExtSRSJson + "'}";
-                        }
-                        else
-                        {
-                            ExtSRSJson = "{'type':'100','instance':'" + Int32.Parse(con_txt_dcs_instance.Text) + "','payload':{'ignore':'false'}}"; // No SRS clients connected
-                        }
+
                        ExtSRSUseDefault = false;
                        PerunHelper.AddLog(ref Globals.AppLogHistory, "SRS data loaded", 3, 0, "100", true);
                        ExtSRSStatus = true;
@@ -563,8 +557,11 @@ namespace Perun_v1
                {
                    ExtSRSJson = "{'type':'100','instance':'" + Int32.Parse(con_txt_dcs_instance.Text) + "','payload':{'ignore':'true'}}";
                }
+                if (ExtSRSStatus)
+                {
                    DatabaseConnection.SendToMySql(ExtSRSJson);
                }
+            }

            // Handle LotATC 
            if (Globals.StatusConnection)
@@ -594,8 +591,11 @@ namespace Perun_v1
                {
                    ExtLotATCJson = "{'type':'101','instance':'" + Int32.Parse(con_txt_dcs_instance.Text) + "','payload':{'ignore':'true'}}";   // No LotATC controller connected
                }
+                if (ExtLotATCStatus)
+                {
                    DatabaseConnection.SendToMySql(ExtLotATCJson);
                }
+            }

            // Let's do not risk int overload
            Globals.ErrorsDatabase = (Globals.ErrorsDatabase > 999) ? 999 : Globals.ErrorsDatabase;
--- a/02_Windows_App/Perun_v1/Perun_v1.csproj
+++ b/02_Windows_App/Perun_v1/Perun_v1.csproj
@@ -12,29 +12,27 @@
    <FileAlignment>512</FileAlignment>
    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
    <Deterministic>true</Deterministic>
-    <IsWebBootstrapper>true</IsWebBootstrapper>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
    <TargetFrameworkProfile />
-    <PublishUrl>ftp://s18.mydevil.net/perun/</PublishUrl>
+    <PublishUrl>C:\Users\DCS\Desktop\Perun\</PublishUrl>
    <Install>true</Install>
-    <InstallFrom>Web</InstallFrom>
-    <UpdateEnabled>true</UpdateEnabled>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
    <UpdateMode>Foreground</UpdateMode>
    <UpdateInterval>7</UpdateInterval>
    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
    <UpdatePeriodically>false</UpdatePeriodically>
    <UpdateRequired>false</UpdateRequired>
    <MapFileExtensions>true</MapFileExtensions>
-    <InstallUrl>http://share.porwolik.com/ftp/perun/</InstallUrl>
    <SupportUrl>https://github.com/szporwolik/perun</SupportUrl>
    <ErrorReportUrl>https://github.com/szporwolik/perun</ErrorReportUrl>
    <TargetCulture>en</TargetCulture>
    <ProductName>Perun for DCS World</ProductName>
    <PublisherName>szporwolik</PublisherName>
    <SuiteName>Perun</SuiteName>
-    <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
    <WebPage>Perun.htm</WebPage>
    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>0.8.3.%2a</ApplicationVersion>
+    <ApplicationVersion>0.9.3.%2a</ApplicationVersion>
    <UseApplicationTrust>false</UseApplicationTrust>
    <CreateDesktopShortcut>true</CreateDesktopShortcut>
    <PublishWizardCompleted>true</PublishWizardCompleted>
--- a/02_Windows_App/Perun_v1/Properties/AssemblyInfo.cs
+++ b/02_Windows_App/Perun_v1/Properties/AssemblyInfo.cs
@@ -33,7 +33,7 @@ using System.Runtime.InteropServices;
 // Możesz określić wszystkie wartości lub użyć domyślnych numerów kompilacji i poprawki
 // przy użyciu symbolu „*”, tak jak pokazano poniżej:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.8.3.0")]
-[assembly: AssemblyFileVersion("0.8.3.0")]
+[assembly: AssemblyVersion("0.9.3.0")]
+[assembly: AssemblyFileVersion("0.9.3.0")]
 [assembly: NeutralResourcesLanguage("en")]

--- a/03_MySQL/m1081_perun.sql
+++ b/03_MySQL/m1081_perun.sql
@@ -8,35 +8,6 @@ SET time_zone = "+00:00";
 /*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
 /*!40101 SET NAMES utf8mb4 */;

-CREATE DATABASE IF NOT EXISTS `m1081_perun` DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci;
-USE `m1081_perun`;
-
-DELIMITER $$
-DROP PROCEDURE IF EXISTS `sp_CleanDatabase`$$
-CREATE DEFINER=`m1081`@`%.devil` PROCEDURE `sp_CleanDatabase` ()  MODIFIES SQL DATA
-BEGIN
-	DELETE FROM pe_DataMissionHashes;
-    DELETE FROM pe_DataPlayers;
-    DELETE FROM pe_DataRaw;
-    DELETE FROM pe_LogChat;
-    DELETE FROM pe_LogEvent;
-    DELETE FROM pe_LogLogins;
-    DELETE FROM pe_LogStats;
-    
-    ALTER TABLE pe_DataMissionHashes AUTO_INCREMENT = 1;
-    ALTER TABLE pe_DataPlayers AUTO_INCREMENT = 1;
-    ALTER TABLE pe_DataRaw AUTO_INCREMENT = 1;
-    ALTER TABLE pe_LogChat AUTO_INCREMENT = 1;
-    ALTER TABLE pe_LogEvent AUTO_INCREMENT = 1;
-    ALTER TABLE pe_LogLogins AUTO_INCREMENT = 1;
-    ALTER TABLE pe_LogStats AUTO_INCREMENT = 1;
-   	
-END$$
-
-DROP PROCEDURE IF EXISTS `sp_SyncForumGame`$$
-$$
-
-DELIMITER ;

 DROP TABLE IF EXISTS `pe_Config`;
 CREATE TABLE IF NOT EXISTS `pe_Config` (
@@ -46,7 +17,7 @@ CREATE TABLE IF NOT EXISTS `pe_Config` (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;

 INSERT INTO `pe_Config` (`pe_Config_id`, `pe_Config_payload`) VALUES
-(1, 'v0.8.3');
+(1, 'v0.9.3');

 DROP TABLE IF EXISTS `pe_DataMissionHashes`;
 CREATE TABLE IF NOT EXISTS `pe_DataMissionHashes` (
@@ -57,26 +28,29 @@ CREATE TABLE IF NOT EXISTS `pe_DataMissionHashes` (
  PRIMARY KEY (`pe_DataMissionHashes_id`),
  UNIQUE KEY `UNIQUE_hash` (`pe_DataMissionHashes_hash`),
  KEY `pe_DataMissionHashes_instance` (`pe_DataMissionHashes_instance`)
-) ENGINE=InnoDB AUTO_INCREMENT=818 DEFAULT CHARSET=utf8;
+ENGINE=InnoDB DEFAULT CHARSET=utf8;

 DROP TABLE IF EXISTS `pe_DataPlayers`;
 CREATE TABLE IF NOT EXISTS `pe_DataPlayers` (
  `pe_DataPlayers_id` bigint(20) NOT NULL AUTO_INCREMENT,
  `pe_DataPlayers_ucid` varchar(150) NOT NULL,
-  `pe_DataPlayers_lastname` varchar(150) NOT NULL,
-  `pe_DataPlayers_lastip` varchar(100) NOT NULL,
+  `pe_DataPlayers_lastname` varchar(150) DEFAULT NULL,
+  `pe_DataPlayers_lastip` varchar(100) DEFAULT NULL,
  `pe_DataPlayers_updated` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
  PRIMARY KEY (`pe_DataPlayers_id`),
  UNIQUE KEY `UNIQUE_UCID` (`pe_DataPlayers_ucid`)
-) ENGINE=InnoDB AUTO_INCREMENT=219 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+

 DROP TABLE IF EXISTS `pe_DataRaw`;
 CREATE TABLE IF NOT EXISTS `pe_DataRaw` (
  `pe_dataraw_type` tinyint(4) NOT NULL,
  `pe_dataraw_instance` smallint(5) UNSIGNED NOT NULL,
-  `pe_dataraw_payload` text NOT NULL,
+  `pe_dataraw_payload` text,
  `pe_dataraw_updated` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-  PRIMARY KEY (`pe_dataraw_type`,`pe_dataraw_instance`)
+  PRIMARY KEY (`pe_dataraw_type`,`pe_dataraw_instance`),
+  KEY `pe_dataraw_type_pe_dataraw_instance` (`pe_dataraw_type`,`pe_dataraw_instance`),
+  KEY `pe_dataraw_updated` (`pe_dataraw_updated`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;

 DROP TABLE IF EXISTS `pe_DataTypes`;
@@ -86,7 +60,7 @@ CREATE TABLE IF NOT EXISTS `pe_DataTypes` (
  `pe_DataTypes_update` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
  PRIMARY KEY (`pe_DataTypes_id`),
  UNIQUE KEY `UNIQUE_TYPE_NAME` (`pe_DataTypes_name`)
-) ENGINE=InnoDB AUTO_INCREMENT=57 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;

 DROP TABLE IF EXISTS `pe_LogChat`;
 CREATE TABLE IF NOT EXISTS `pe_LogChat` (
@@ -99,8 +73,9 @@ CREATE TABLE IF NOT EXISTS `pe_LogChat` (
  PRIMARY KEY (`pe_LogChat_id`),
  KEY `pe_LogChat_missionhash_id` (`pe_LogChat_missionhash_id`),
  KEY `pe_LogChat_playerid` (`pe_LogChat_playerid`),
-  KEY `pe_LogChat_datetime` (`pe_LogChat_datetime`)
-) ENGINE=InnoDB AUTO_INCREMENT=19739 DEFAULT CHARSET=utf8;
+  KEY `pe_LogChat_datetime` (`pe_LogChat_datetime`),
+  KEY `pe_LogChat_all` (`pe_LogChat_all`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;

 DROP TABLE IF EXISTS `pe_LogEvent`;
 CREATE TABLE IF NOT EXISTS `pe_LogEvent` (
@@ -111,10 +86,12 @@ CREATE TABLE IF NOT EXISTS `pe_LogEvent` (
  `pe_LogEvent_content` text NOT NULL,
  `pe_LogEvent_arg1` varchar(150) DEFAULT NULL,
  `pe_LogEvent_arg2` varchar(150) DEFAULT NULL,
+  `pe_LogEvent_argPlayers` varchar(150) DEFAULT NULL,
  PRIMARY KEY (`pe_LogEvent_id`),
  KEY `pe_LogEvent_missionhash_id` (`pe_LogEvent_missionhash_id`),
-  KEY `pe_LogEvent_datetime` (`pe_LogEvent_datetime`)
-) ENGINE=InnoDB AUTO_INCREMENT=93657 DEFAULT CHARSET=utf8;
+  KEY `pe_LogEvent_datetime` (`pe_LogEvent_datetime`),
+  KEY `pe_LogEvent_type_2` (`pe_LogEvent_type`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;

 DROP TABLE IF EXISTS `pe_LogLogins`;
 CREATE TABLE IF NOT EXISTS `pe_LogLogins` (
@@ -126,8 +103,9 @@ CREATE TABLE IF NOT EXISTS `pe_LogLogins` (
  `pe_LogLogins_ip` varchar(100) NOT NULL,
  PRIMARY KEY (`pe_LogLogins_id`),
  KEY `pe_LogLogins_playerid` (`pe_LogLogins_playerid`),
-  KEY `pe_LogLogins_datetime` (`pe_LogLogins_datetime`)
-) ENGINE=InnoDB AUTO_INCREMENT=10742 DEFAULT CHARSET=utf8;
+  KEY `pe_LogLogins_datetime` (`pe_LogLogins_datetime`),
+  KEY `pe_LogLogins_instance` (`pe_LogLogins_instance`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;

 DROP TABLE IF EXISTS `pe_LogStats`;
 CREATE TABLE IF NOT EXISTS `pe_LogStats` (
@@ -136,7 +114,8 @@ CREATE TABLE IF NOT EXISTS `pe_LogStats` (
  `pe_LogStats_missionhash_id` bigint(20) DEFAULT NULL,
  `pe_LogStats_playerid` bigint(20) DEFAULT NULL,
  `pe_LogStats_typeid` int(11) DEFAULT NULL,
-  `ps_kills` int(11) UNSIGNED NOT NULL DEFAULT '0',
+  `pe_LogStats_masterslot` int(11) DEFAULT NULL,
+  `pe_LogStats_seat` int(10) DEFAULT NULL,
  `ps_pvp` int(11) UNSIGNED NOT NULL DEFAULT '0',
  `ps_deaths` int(11) UNSIGNED NOT NULL DEFAULT '0',
  `ps_ejections` int(11) UNSIGNED NOT NULL DEFAULT '0',
@@ -159,41 +138,32 @@ CREATE TABLE IF NOT EXISTS `pe_LogStats` (
  `ps_farp_landings` int(11) UNSIGNED NOT NULL DEFAULT '0',
  `ps_other_landings` int(10) UNSIGNED NOT NULL DEFAULT '0',
  `ps_other_takeoffs` int(10) UNSIGNED NOT NULL DEFAULT '0',
+  `ps_time` int(10) UNSIGNED NOT NULL DEFAULT '0',
  `pe_LogStats_mstatus` enum('?','RTB','MIA','KIA') DEFAULT NULL,
-  `ps_takeoffs` int(10) UNSIGNED DEFAULT '0',
-  `ps_landings` int(10) UNSIGNED DEFAULT '0',
-  `ps_kills_AA` int(10) UNSIGNED DEFAULT '0',
-  `ps_kills_AG` int(10) UNSIGNED DEFAULT '0',
-  `ps_kills_AS` int(10) UNSIGNED DEFAULT '0',
-  `ps_kills_AAA` int(10) UNSIGNED DEFAULT '0',
  PRIMARY KEY (`pe_LogStats_id`),
  UNIQUE KEY `UNIQUE_STATS_PER_MISSION_AND_UCID_AND_TYPE` (`pe_LogStats_playerid`,`pe_LogStats_missionhash_id`,`pe_LogStats_typeid`) USING BTREE,
  KEY `pe_LogStats_missionhash_id` (`pe_LogStats_missionhash_id`),
  KEY `pe_LogStats_playerid` (`pe_LogStats_playerid`),
-  KEY `pe_LogStats_typeid` (`pe_LogStats_typeid`)
-) ENGINE=InnoDB AUTO_INCREMENT=9595 DEFAULT CHARSET=utf8;
+  KEY `pe_LogStats_typeid` (`pe_LogStats_typeid`),
+  KEY `pe_LogStats_masterslot` (`pe_LogStats_masterslot`),
+  KEY `pe_LogStats_mstatus` (`pe_LogStats_mstatus`),
+  KEY `pe_LogStats_seat` (`pe_LogStats_seat`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
 DROP TRIGGER IF EXISTS `pe_LogStats_UPDATE`;
 DELIMITER $$
 CREATE TRIGGER `pe_LogStats_UPDATE` BEFORE UPDATE ON `pe_LogStats` FOR EACH ROW BEGIN
-
-	SET NEW.ps_takeoffs = NEW.ps_airfield_takeoffs + NEW.ps_farp_takeoffs + NEW.ps_other_takeoffs + NEW.ps_ship_takeoffs;
-    SET NEW.ps_landings = NEW.ps_airfield_landings + NEW.ps_farp_landings + NEW.ps_other_landings + NEW.ps_ship_landings;
-    SET NEW.ps_kills_AA =  NEW.ps_kills_planes + NEW.ps_kills_helicopters;
-    SET NEW.ps_kills_AG =  NEW.ps_kills_armor + NEW.ps_kills_unarmed + NEW.ps_kills_fortification;
-    SET NEW.ps_kills_AS =  NEW.ps_kills_ships;
-    SET NEW.ps_kills_AAA =  NEW.ps_kills_air_defense;
-
    IF NEW.ps_ejections > 0 THEN
    	SET NEW.pe_LogStats_mstatus = "MIA";
    ELSEIF NEW.ps_deaths > 0 THEN
    	SET NEW.pe_LogStats_mstatus = "KIA";
-    ELSEIF NEW.ps_landings >= NEW.ps_takeoffs THEN
-    	IF NEW.ps_takeoffs > 0 or NEW.ps_landings > 0 THEN
+    ELSEIF (NEW.ps_airfield_landings + NEW.ps_farp_landings + NEW.ps_other_landings + NEW.ps_ship_landings) >= (NEW.ps_airfield_takeoffs + NEW.ps_farp_takeoffs + NEW.ps_other_takeoffs + NEW.ps_ship_takeoffs) THEN
+    	IF (NEW.ps_airfield_takeoffs + NEW.ps_farp_takeoffs + NEW.ps_other_takeoffs + NEW.ps_ship_takeoffs) > 0 or (NEW.ps_airfield_landings + NEW.ps_farp_landings + NEW.ps_other_landings + NEW.ps_ship_landings) > 0 THEN
    		SET NEW.pe_LogStats_mstatus = "RTB";
        ELSE 
        	SET NEW.pe_LogStats_mstatus = "?";
        END IF;
-    ELSEIF NEW.ps_takeoffs > NEW.ps_landings and NEW.ps_ejections=0 and NEW.ps_deaths=0 THEN
+    ELSEIF (NEW.ps_airfield_takeoffs + NEW.ps_farp_takeoffs + NEW.ps_other_takeoffs + NEW.ps_ship_takeoffs) > (NEW.ps_airfield_landings + NEW.ps_farp_landings + NEW.ps_other_landings + NEW.ps_ship_landings) and NEW.ps_ejections=0 and NEW.ps_deaths=0 THEN
 SET NEW.pe_LogStats_mstatus = "MIA";
    ELSE
    	SET NEW.pe_LogStats_mstatus = "?";
@@ -203,7 +173,13 @@ $$
 DELIMITER ;


+ALTER TABLE `pe_DataMissionHashes` ADD FULLTEXT KEY `pe_DataMissionHashes_hash` (`pe_DataMissionHashes_hash`);
+
 ALTER TABLE `pe_DataPlayers` ADD FULLTEXT KEY `pe_DataPlayers_ucid` (`pe_DataPlayers_ucid`);
+
+ALTER TABLE `pe_DataTypes` ADD FULLTEXT KEY `pe_DataTypes_name` (`pe_DataTypes_name`);
+
+ALTER TABLE `pe_LogChat` ADD FULLTEXT KEY `pe_LogChat_msg` (`pe_LogChat_msg`);
 COMMIT;

 /*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
--- a/README.md
+++ b/README.md
@@ -1,3 +1,4 @@
+![Discord](https://img.shields.io/discord/641759751780302866)
 ![alt text](https://img.shields.io/github/license/szporwolik/perun.svg "MIT")
 ![alt text](https://img.shields.io/github/release-pre/szporwolik/perun.svg "Latest release")
 ![alt text](https://img.shields.io/github/release-date-pre/szporwolik/perun.svg "Latest release date")
@@ -5,20 +6,19 @@
 ![Perun logo](https://i.imgur.com/JkeHYjJ.png)

 # Perun for DCS World
-Included lua script extracts data from DCS World multiplayer server and sends information to TCP port and JSON file for further processing. 
+Included lua script extracts data from DCS World multiplayer server and sends information to TCP port for further processing. 

 Provided windows app puts received TCP packets to MySQL database; additionaly Perun windows application can be used to merge LotATC and DCS SRS data in one database making Perun for DCS World wannabe ultimate integration tool for the server admins.

-However, this software is intended to be used by experienced users - the output is MySQL data and/or JSON file; you will need to process/display it yourself.
+However, this software is intended to be used by experienced users - the output is MySQL data; you will need to process/display it yourself.

-![Perun in action](https://i.imgur.com/MieyBej.png)
+![Perun in action](https://i.imgur.com/JIlLENa.png)
 ![Data flow](https://i.imgur.com/JbNu77l.png)

+Discord server: https://discord.gg/MTahREx
+
 ## Prerequisites
 Core:
- * For JSON Export:
-   * DCS World stable or DCS World beta
- * **(Optional)** For MySQL Export:
   * MySQL database with read/write access running at min. 5.7 server (tested with v5.7.21; native JSON support is required)
   * .NET Framework 4.8.0

@@ -29,13 +29,12 @@ Core:
 ## Installing
 * Download latest [release](https://github.com/szporwolik/perun/releases)
 * Copy contents of [01_DCS](https://github.com/szporwolik/perun/tree/master/01_DCS) to your \Scripts folder (located inside DCS folder in your Saved Games)
-* **optionaly** create MySQL database using SQL script located in [03_MySQL](https://github.com/szporwolik/perun/tree/master/03_MySQL); note that you need just a one database per DCS server machine - multiple instances pushing data to the one database are supported
+* Create MySQL database using SQL script located in [03_MySQL](https://github.com/szporwolik/perun/tree/master/03_MySQL); note that you need just a one database per DCS server machine - multiple instances pushing data to the one database are supported

 ## Running
 * Start DCS World and host multiplayer session
-  * by default the JSON is written into Scripts\Json folder located in your Saved Games DCS folder tree
-  * by default the TCP port 48620 is in use as target port
-* **optionaly** run the Win32 application
+  * by default the TCP port 48620 is in use as target port - ensure that port and instance ID in the options sections of the Lua file matches data 
+* run the Win32 application
 	* set MySQL connection data
 	* **optionaly** point LotATC json file location
 	* **optionaly** point DCS SRS json file location
@@ -55,6 +54,12 @@ Example for windows shortcut:
 ```
 C:\Perun_v1\Perun.exe 48621 1 "G:\DCS SRS\clients-list.json" "C:\Users\DCS\Saved Games\DCS\Mods\tech\LotAtc\stats.json"
 ```
+## Displaying data
+Data displaying and handling is not in the current scope of this project. Since the end of 2018 the Perun data displaying has been  hardcoded at forum.gildia.org , website for the Polish DCS community; examples:
+![Who is online](https://i.imgur.com/5lVwsJw.png)
+![Mission statistics](https://i.imgur.com/uiRSa9e.png)
+Due to resource limitations, "Perun for DCS World" will focus on pulling the data from DCS (and external modules) and pushing it to MySQL server, but if anyone would like to develop open sourced PHP applets for data/statistics displaying we're willing to cooperate and support such projects. Unfortunetly it's not possible to share the hardcoded code from forum.gildia.org.
+
 ## Troubleshooting - FAQ
 - [I keep getting 1305 MySQL error](#i-keep-getting-1305-mysql-error)
 - [Carrier landing are not tracked correctly](#carrier-landing-are-not-tracked-correctly)
@@ -62,8 +67,11 @@ C:\Perun_v1\Perun.exe 48621 1 "G:\DCS SRS\clients-list.json" "C:\Users\DCS\Saved
 ### I keep getting 1305 MySQL error
 That probably means that your database does not support JSON functions, you shall upgrade your MySQL server to at lease 5.7 version.

+### I keep getting 1364 MySQL error
+Make sure that STRICT_TRANS_TABLES is disabled at your MySQL server, see: https://stackoverflow.com/questions/37964325/how-to-find-and-disable-mysql-strict-mode
+
 ### Carrier landing are not tracked correctly
-DCS API does not track carrier landing natively, so there is a trick to achive that. You shall set your carrier to a propoer group name to have landings tracked.
+DCS API does not track carrier or FARP operations natively, so there is a trick to achive that. At this point of time to detect FARP operations, the FARPs shall have "FARP" string in the group name (set in mission editor). For carrier operations the string "SHIP" is required within group name.

 # API documentation (for expert users)
 ## MySQL database structure
@@ -106,7 +114,7 @@ DCS API does not track carrier landing natively, so there is a trick to achive t
 * [Notepad++](https://notepad-plus-plus.org/)

 ## Contributing
-Please contact me if you'd like to contribute.
+Please contact me if you'd like to contribute. Short rule is that all pull request shall come to "dev" branch, pull requests to "master" will be deleted.

 ## Versioning
 We use [SemVer](http://semver.org/) for versioning. For the versions available, see the [tags on this repository](https://github.com/szporwolik/perun/tags).
Author	SHA1	Message	Date
VladMordock	f42a3e60a2	Merge pull request #28 from szporwolik/dev 9.3	2019-12-23 13:52:16 +01:00
VladMordock	ff78ba1cfe	Merge branch 'master' into dev	2019-12-23 13:52:02 +01:00
szporowolik	a117d37bc0	Update and sync with 0.9.3	2019-12-23 13:48:50 +01:00
szporowolik	c36befd5a0	Changes related to #27 . This shall prevent SQL injection.	2019-12-23 13:43:19 +01:00
VladMordock	1cadd04092	Fix for error when MySQL is running in TRADITIONAL mode https://www.got-it.ai/solutions/sqlquerychat/sql-help/data-manipulation/handling-overflow-and-out-of-range-errors-in-mysql/	2019-11-18 18:26:14 +01:00
szporowolik	4cca5ee405	v0.9.3 preparation	2019-11-18 01:50:17 +01:00
szporowolik	ca48b4bc0a	v0.9.3 preparation	2019-11-18 01:49:46 +01:00
szporowolik	c55c4efaf8	9.2 final	2019-11-18 01:48:03 +01:00
VladMordock	30502e6fcc	Merge pull request #26 from szporwolik/dev v0.9.2	2019-11-18 01:37:48 +01:00
VladMordock	7d16dc197c	Merge branch 'master' into dev	2019-11-18 01:37:27 +01:00
szporowolik	7ad493f5f0	Shall be ready for final testing and v0.9.2 release	2019-11-11 02:46:45 +01:00
szporowolik	2821ee9cd6	Final fix for #25 ; all stats cache mechanism was improved.	2019-11-11 02:25:43 +01:00
szporowolik	946d60c5f5	Database upgrade to add feature #25	2019-11-11 00:22:17 +01:00
szporowolik	c831835dfa	First approach for feature request #25 - shall work, testing is required	2019-11-11 00:20:38 +01:00
szporowolik	28b614662b	Minor fixes	2019-11-08 00:04:42 +01:00
szporowolik	5fbd071b9b	Commented pulling of all mission data, shall improve performance.	2019-11-07 23:53:39 +01:00
szporowolik	26bf326e0a	Code clean up for takeoffs and landings	2019-11-07 23:39:20 +01:00
szporowolik	fc6b1d9629	Deleted JSON export	2019-11-07 23:22:55 +01:00
szporowolik	c1fc566f03	Removed json export	2019-11-07 23:22:31 +01:00
VladMordock	382def09da	Update README.md Removed references about JSON export.	2019-11-07 23:17:38 +01:00
szporowolik	fdcb82cafa	Fixed issue #19 - disconnect event	2019-11-07 23:11:00 +01:00
szporowolik	fe2b9cd3f1	Changes trying to get player disconnect event hanlder to work	2019-11-07 01:18:23 +01:00
szporowolik	15707672d2	Fixed date format in Perun log file	2019-11-07 01:12:39 +01:00
VladMordock	63fbb0b3bb	Update m1081_perun.sql Another trouble with MySQL compatibility fixed	2019-11-07 00:58:14 +01:00
szporowolik	885bbf2989	Shall fix the lag issue when connection is not available.	2019-11-07 00:20:01 +01:00
VladMordock	9349309645	Update m1081_perun.sql Fix for "ERROR MySQL - error id: 1364" on specific MySQL config	2019-11-06 23:46:45 +01:00
VladMordock	8c6e87120e	Update README.md Update about 1364 mysql error.	2019-11-06 23:32:31 +01:00
VladMordock	18bebf887b	Update README.md	2019-11-06 23:19:42 +01:00
VladMordock	5b22ddd66e	Update README.md	2019-11-06 23:18:20 +01:00
VladMordock	01d8b6ceba	Update README.md	2019-11-06 23:12:37 +01:00
VladMordock	4d989167ba	Update README.md Updated to avoid confusion.	2019-11-06 16:59:39 +01:00
szporowolik	1c13b8896a	Preparation for 0.9.2	2019-11-04 00:33:42 +01:00
VladMordock	a9e87b1049	Update README.md	2019-11-03 01:17:12 +01:00
VladMordock	c8b7abc41c	Merge pull request #21 from szporwolik/dev Dev	2019-11-02 23:18:00 +01:00
szporowolik	7270ff8bab	v0.9.1	2019-11-02 23:13:40 +01:00
szporowolik	ed8ed6d62a	Db update for v0.9.1	2019-11-02 23:10:41 +01:00
szporowolik	9b54a0be8d	Fix for disconnects not beeing tracked	2019-11-02 18:25:06 +01:00
szporowolik	becbce25c0	v0.9.1 preparation	2019-11-02 18:23:04 +01:00
szporowolik	7c1b533d79	Version check will not run for DEBUG builds	2019-11-02 18:22:20 +01:00
szporowolik	6c10f5bace	Update for DCS SRS 1.7.2 ( SRS's JSON file format was changed)	2019-11-02 18:18:40 +01:00
szporowolik	c2b5f6258b	Update build information	2019-11-02 17:29:11 +01:00
VladMordock	61d2a1b16e	Update README.md Added information about stats for FARP and Carrier operations.	2019-10-31 23:32:12 +01:00
VladMordock	7f9a74f57b	Merge pull request #18 from szporwolik/dev Pull requst of v0.9.0	2019-10-31 23:20:15 +01:00
VladMordock	0385aa8ee5	Update README.md Information about contributing edited.	2019-10-31 23:19:30 +01:00
szporowolik	6423f6534c	DB structure upadated and frozen for v0.9.0	2019-10-31 10:28:00 +01:00
szporowolik	ddd72adea3	Fixed "landed at" bug	2019-10-31 10:25:06 +01:00
VladMordock	a6e809a3b1	Update m1081_perun.sql Fixed landing bug	2019-10-29 00:07:51 +01:00
VladMordock	c01d5da10f	Update README.md Readme fix	2019-10-28 17:05:48 +01:00
VladMordock	087dbe84af	Update README.md Update with information about data display	2019-10-28 17:04:41 +01:00
szporowolik	078ba09cc7	MySQL structure cleanup	2019-10-28 16:49:02 +01:00
szporowolik	14c5a8896f	DCS will now inform that Perun connection is broken	2019-10-28 16:48:05 +01:00
szporowolik	57f90954d3	Fixes for multicrew support	2019-10-28 00:11:53 +01:00
VladMordock	a341d06dc8	Changed screenshot	2019-10-27 21:12:18 +01:00
szporowolik	75f1e0d316	Database update to v0.9.0	2019-10-26 21:15:18 +02:00
szporowolik	4bd536f556	Occupied seat will be stored in the database, for easier displaying	2019-10-25 13:03:24 +02:00
szporowolik	fcdf6ed0be	Multicrew support in the decent form was added	2019-10-24 01:49:30 +02:00
szporowolik	6d64f7f6e0	Huge Lua improvments for multicrew support	2019-10-24 00:30:31 +02:00
szporowolik	5b0ee02e11	v0.9.0 & code cleanup in lua file	2019-10-23 20:19:25 +02:00
szporowolik	55fe32f0fd	Code clean up	2019-10-23 01:34:41 +02:00
szporowolik	ec1d6b3a5e	v9.0.0 config	2019-10-23 00:10:48 +02:00