Add maximum number of queries

aXenDeveloper · May 19, 2021 · b75fab1 · b75fab1
1 parent ecf4f03
commit b75fab1
Show file tree

Hide file tree

Showing 11 changed files with 38 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -31,7 +31,8 @@ Server table showing server information about the status, name, number of player
 ## 🏷️ Requirements
 
 - [IPS Community Suite: 4.5 or 4.6 version](https://invisioncommunity.com/)
-- PHP 7.3+
+- PHP 7.3+ - For IPS 4.5
+- PHP 7.4+ - For IPS 4.6
 - [Bzip2](https://www.php.net/manual/en/book.bzip2.php) - Used for A2S Compressed responses,
 - ❗❗ Unlocked external ports on the website server
 
@@ -166,6 +167,7 @@ If server is offline you can see what's is going on by debug tool [===> Click <=
 ![7](https://files.axendev.net/projects/ips/applications/serverlist/7.png)
 ![8](https://files.axendev.net/projects/ips/applications/serverlist/8.png)
 ![9](https://files.axendev.net/projects/ips/applications/serverlist/9.png)
+![10](https://files.axendev.net/projects/ips/applications/serverlist/10.png)
 
 ## 🔌 Download from other sources
 

diff --git a/data/build.xml b/data/build.xml
@@ -23,6 +23,7 @@
  <setting key="aXenServerList_settings_scroll_height"><![CDATA[{"key":"aXenServerList_settings_scroll_height","default":"250"}]]></setting>
  <setting key="aXenServerList_settings_scroll_mobile"><![CDATA[{"key":"aXenServerList_settings_scroll_mobile","default":"1"}]]></setting>
  <setting key="aXenServerList_settings_scroll_mobile_value"><![CDATA[{"key":"aXenServerList_settings_scroll_mobile_value","default":"250"}]]></setting>
+ <setting key="aXenServerList_settings_serverQuery_maxQuery"><![CDATA[{"key":"aXenServerList_settings_serverQuery_maxQuery","default":"3"}]]></setting>
  <widget key="aXenServerListWidget"><![CDATA[{"class":"\\IPS\\Widget","restrict":["sidebar","cms"],"default_area":"","allow_reuse":false,"menu_style":"menu","embeddable":true}]]></widget>
  <hook key="loadJSandCSS"><![CDATA[{"type":"C","class":"\\IPS\\Dispatcher\\Standard"}]]></hook>
 </build>
diff --git a/data/lang.xml b/data/lang.xml
@@ -102,5 +102,8 @@
   <word key="axenserverlist_custom_connect" js="0">Enable your own link to connect to the server?</word>
   <word key="axenserverlist_custom_connect_link" js="0">Own link to connect to the server</word>
   <word key="axenserverlist_custom_connect_link_desc" js="0"><![CDATA[<span style="color: red;">There must be a URL link here that you can paste into your browser!</span>]]></word>
+  <word key="axenserverlist_header_serverQuery" js="0">Server query</word>
+  <word key="aXenServerList_settings_serverQuery_maxQuery" js="0">Maximum number of queries</word>
+  <word key="aXenServerList_settings_serverQuery_maxQuery_desc" js="0"><![CDATA[When the server does not respond, the application will ask the server as many times as is set in the settings.<br><span style="color: red;">This value too high may affect the speed of the server your community is running on!</span>]]></word>
  </app>
 </language>
diff --git a/data/settings.json b/data/settings.json
@@ -78,5 +78,9 @@
     {
         "key": "aXenServerList_settings_scroll_mobile_value",
         "default": "250"
+    },
+    {
+        "key": "aXenServerList_settings_serverQuery_maxQuery",
+        "default": "3"
     }
 ]
diff --git a/dev/lang.php b/dev/lang.php
@@ -101,5 +101,8 @@
 	'axenserverlist_tab_debug' => 'Debug mode',
 	'axenserverlist_custom_connect' => 'Enable your own link to connect to the server?',
 	'axenserverlist_custom_connect_link' => 'Own link to connect to the server',
-	'axenserverlist_custom_connect_link_desc' => '<span style="color: red;">There must be a URL link here that you can paste into your browser!</span>'
+	'axenserverlist_custom_connect_link_desc' => '<span style="color: red;">There must be a URL link here that you can paste into your browser!</span>',
+	'axenserverlist_header_serverQuery' => 'Server query',
+	'aXenServerList_settings_serverQuery_maxQuery' => 'Maximum number of queries',
+	'aXenServerList_settings_serverQuery_maxQuery_desc' => 'When the server does not respond, the application will ask the server as many times as is set in the settings.<br><span style="color: red;">This value too high may affect the speed of the server your community is running on!</span>'
 );
diff --git a/modules/admin/servers/settings.php b/modules/admin/servers/settings.php
@@ -62,6 +62,8 @@ protected function manage()
 		$form->add(new \IPS\Helpers\Form\Color('aXenServerList_settings_colors_61_80', \IPS\Settings::i()->aXenServerList_settings_colors_61_80, FALSE, [], NULL, NULL, NULL, 'aXenServerList_settings_colors_61_80'));
 		$form->add(new \IPS\Helpers\Form\Color('aXenServerList_settings_colors_81_100', \IPS\Settings::i()->aXenServerList_settings_colors_81_100, FALSE, [], NULL, NULL, NULL, 'aXenServerList_settings_colors_81_100'));
 
+		$form->addHeader('axenserverlist_header_serverQuery');
+		$form->add(new \IPS\Helpers\Form\Number('aXenServerList_settings_serverQuery_maxQuery', \IPS\Settings::i()->aXenServerList_settings_serverQuery_maxQuery, TRUE, ['min' => 1, 'max' => 5]));
 
 		$form->addTab('axenserverlist_tab_personalization');
 		$form->add(new \IPS\Helpers\Form\YesNo(

diff --git a/setup/upg_10012/data.json b/setup/upg_10012/data.json
@@ -10,7 +10,7 @@
         "emailTemplates": false,
         "hooks": false,
         "acpSearchKeywords": false,
-        "settings": false,
+        "settings": true,
         "tasks": false,
         "modules": true,
         "widgets": false,

diff --git a/setup/upg_10012/javascript.json b/setup/upg_10012/javascript.json
@@ -2,6 +2,7 @@
     "files": {
         "added": [],
         "edited": [
+            "axenserverlist\/front\/controllers\/axenserverlist\/aXenServerList.js",
             "axenserverlist\/front\/controllers\/axenserverlist\/aXenServerList.js",
             "axenserverlist\/front\/controllers\/axenserverlist\/aXenServerList.js",
             "axenserverlist\/front\/controllers\/axenserverlist\/aXenServerList.js"

diff --git a/setup/upg_10012/lang.json b/setup/upg_10012/lang.json
@@ -6,7 +6,10 @@
             "axenserverlist_tab_debug",
             "axenserverlist_custom_connect",
             "axenserverlist_custom_connect_link",
-            "axenserverlist_custom_connect_link_desc"
+            "axenserverlist_custom_connect_link_desc",
+            "axenserverlist_header_serverQuery",
+            "aXenServerList_settings_serverQuery_maxQuery",
+            "aXenServerList_settings_serverQuery_maxQuery_desc"
         ],
         "edited": [
             "axenserverlist_debug"

diff --git a/setup/upg_10012/settings.json b/setup/upg_10012/settings.json
@@ -0,0 +1,7 @@
+{
+    "added": [
+        "aXenServerList_settings_serverQuery_maxQuery"
+    ],
+    "edited": [],
+    "removed": []
+}
diff --git a/setup/upg_10012/theme.json b/setup/upg_10012/theme.json
@@ -22,13 +22,21 @@
             "front\/servers\/more",
             "front\/servers\/row",
             "front\/servers\/title",
+            "front\/widgets\/aXenServerListWidget",
+            "front\/pages\/aXenServerListPage",
+            "front\/servers\/debugTotal",
+            "front\/servers\/footer",
+            "front\/servers\/more",
+            "front\/servers\/row",
+            "front\/servers\/title",
             "front\/widgets\/aXenServerListWidget"
         ],
         "removed": []
     },
     "css": {
         "added": [],
         "edited": [
+            "front\/widget.css",
             "front\/widget.css",
             "front\/widget.css",
             "front\/widget.css"