Skip to content

Commit c45e4b9

Browse files
HanashiHanashi
committed
Kompatibilitätsproblem gefixt
1 parent 656e421 commit c45e4b9

6 files changed

Lines changed: 48 additions & 26 deletions

File tree

‎files/lib/system/steam/SteamAPI.class.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* method documentation is from original documentations
1414
*
1515
* @see https://openid.net/specs/openid-authentication-2_0.html
16-
* @see https://api.steampowered.com/ISteamWebAPIUtil/GetSupportedAPIList/v1/?key=<STEAM_API_KEY>
16+
* @see https://api.steampowered.com/ISteamWebAPIUtil/GetSupportedAPIList/v1/?key=<HA_STEAM_API_KEY>
1717
*
1818
* @author Peter Lohse <hanashi@hanashi.eu>
1919
* @copyright Hanashi Development
@@ -33,11 +33,11 @@ class SteamAPI {
3333
* @return array/string returns an array or a string of Steam API answer
3434
*/
3535
public static function execute(string $interface, string $method, int $version, array $data = [], string $httpmethod = 'GET', bool $useJSON = false) {
36-
if (!STEAM_API_KEY) throw new SteamException('Steam API key not configured.');
36+
if (!HA_STEAM_API_KEY) throw new SteamException('Steam API key not configured.');
3737

3838
$parameters = [
3939
'format' => 'json',
40-
'key' => STEAM_API_KEY
40+
'key' => HA_STEAM_API_KEY
4141
];
4242
if ($useJSON && count($data)) {
4343
$parameters['input_json'] = JSON::encode($data);

‎language/de.xml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<language xmlns="https://www.woltlab.com" xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://www.woltlab.com https://www.woltlab.com/XSD/2019/language.xsd" languagecode="de">
33
<category name="wcf.acp.option">
4-
<item name="wcf.acp.option.category.steam"><![CDATA[Steam]]></item>
5-
<item name="wcf.acp.option.category.steam.api"><![CDATA[API]]></item>
6-
<item name="wcf.acp.option.steam_api_key"><![CDATA[Web-API-Schlüssel]]></item>
7-
<item name="wcf.acp.option.steam_api_key.description"><![CDATA[Vor der Benutzung der Steam-API muss der API-Schlüssel eingefügt werden. Der API-Schlüssel kann <a href="https://steamcommunity.com/dev/apikey" class="externalURL" rel="nofollow"{if EXTERNAL_LINK_TARGET_BLANK} target="_blank"{/if}>hier</a> abgerufen werden.]]></item>
4+
<item name="wcf.acp.option.category.ha_steam"><![CDATA[Steam]]></item>
5+
<item name="wcf.acp.option.category.ha_steam.api"><![CDATA[API]]></item>
6+
<item name="wcf.acp.option.ha_steam_api_key"><![CDATA[Web-API-Schlüssel]]></item>
7+
<item name="wcf.acp.option.ha_steam_api_key.description"><![CDATA[Vor der Benutzung der Steam-API muss der API-Schlüssel eingefügt werden. Der API-Schlüssel kann <a href="https://steamcommunity.com/dev/apikey" class="externalURL" rel="nofollow"{if EXTERNAL_LINK_TARGET_BLANK} target="_blank"{/if}>hier</a> abgerufen werden.]]></item>
88
</category>
99
<category name="wcf.acp.group">
10-
<item name="wcf.acp.group.option.category.user.steam"><![CDATA[Steam]]></item>
11-
<item name="wcf.acp.group.option.category.mod.steam"><![CDATA[Steam]]></item>
12-
<item name="wcf.acp.group.option.category.admin.steam"><![CDATA[Steam]]></item>
10+
<item name="wcf.acp.group.option.category.user.ha_steam"><![CDATA[Steam]]></item>
11+
<item name="wcf.acp.group.option.category.mod.ha_steam"><![CDATA[Steam]]></item>
12+
<item name="wcf.acp.group.option.category.admin.ha_steam"><![CDATA[Steam]]></item>
1313
</category>
1414
</language>

‎language/en.xml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<language xmlns="https://www.woltlab.com" xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://www.woltlab.com https://www.woltlab.com/XSD/2019/language.xsd" languagecode="en">
33
<category name="wcf.acp.option">
4-
<item name="wcf.acp.option.category.steam"><![CDATA[Steam]]></item>
5-
<item name="wcf.acp.option.category.steam.api"><![CDATA[API]]></item>
6-
<item name="wcf.acp.option.steam_api_key"><![CDATA[Web API Key]]></item>
7-
<item name="wcf.acp.option.steam_api_key.description"><![CDATA[Before using the Steam API, the API key must be inserted. The API key can be retrieved <a href="https://steamcommunity.com/dev/apikey" class="externalURL" rel="nofollow"{if EXTERNAL_LINK_TARGET_BLANK} target="_blank"{/if}>here</a>.]]></item>
4+
<item name="wcf.acp.option.category.ha_steam"><![CDATA[Steam]]></item>
5+
<item name="wcf.acp.option.category.ha_steam.api"><![CDATA[API]]></item>
6+
<item name="wcf.acp.option.ha_steam_api_key"><![CDATA[Web API Key]]></item>
7+
<item name="wcf.acp.option.ha_steam_api_key.description"><![CDATA[Before using the Steam API, the API key must be inserted. The API key can be retrieved <a href="https://steamcommunity.com/dev/apikey" class="externalURL" rel="nofollow"{if EXTERNAL_LINK_TARGET_BLANK} target="_blank"{/if}>here</a>.]]></item>
88
</category>
99
<category name="wcf.acp.group">
10-
<item name="wcf.acp.group.option.category.user.steam"><![CDATA[Steam]]></item>
11-
<item name="wcf.acp.group.option.category.mod.steam"><![CDATA[Steam]]></item>
12-
<item name="wcf.acp.group.option.category.admin.steam"><![CDATA[Steam]]></item>
10+
<item name="wcf.acp.group.option.category.user.ha_steam"><![CDATA[Steam]]></item>
11+
<item name="wcf.acp.group.option.category.mod.ha_steam"><![CDATA[Steam]]></item>
12+
<item name="wcf.acp.group.option.category.admin.ha_steam"><![CDATA[Steam]]></item>
1313
</category>
1414
</language>

‎option.xml‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,25 @@
22
<data xmlns="https://www.woltlab.com" xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://www.woltlab.com https://www.woltlab.com/XSD/2019/option.xsd">
33
<import>
44
<categories>
5-
<category name="steam">
5+
<category name="ha_steam">
66
<parent />
77
</category>
8-
<category name="steam.api">
9-
<parent>steam</parent>
8+
<category name="ha_steam.api">
9+
<parent>ha_steam</parent>
1010
</category>
1111
</categories>
1212
<options>
13-
<option name="steam_api_key">
14-
<categoryname>steam.api</categoryname>
13+
<option name="ha_steam_api_key">
14+
<categoryname>ha_steam.api</categoryname>
1515
<optiontype>text</optiontype>
1616
<!-- TODO: delete key -->
1717
<defaultvalue>411C7A63AF279374C9D8554B898AC0B5</defaultvalue>
1818
</option>
1919
</options>
2020
</import>
21+
<delete>
22+
<category name="steam.api" />
23+
<category name="steam" />
24+
<option name="steam_api_key" />
25+
</delete>
2126
</data>

‎package.xml‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<packagename language="de"><![CDATA[Steam-API]]></packagename>
66
<packagedescription><![CDATA[Api package for Steam.]]></packagedescription>
77
<packagedescription language="de"><![CDATA[API-Paket für Steam.]]></packagedescription>
8-
<version>1.0.0</version>
8+
<version>1.0.1</version>
99
<date>2020-01-22</date>
1010
</packageinformation>
1111

@@ -33,4 +33,16 @@
3333
<instruction type="userGroupOption" />
3434
<instruction type="option" />
3535
</instructions>
36+
37+
<instructions type="update" fromversion="1.0.0">
38+
<!-- files -->
39+
<instruction type="file" />
40+
41+
<!-- language -->
42+
<instruction type="language"/>
43+
44+
<!-- config -->
45+
<instruction type="userGroupOption" />
46+
<instruction type="option" />
47+
</instructions>
3648
</package>

‎userGroupOption.xml‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,20 @@
22
<data xmlns="https://www.woltlab.com" xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://www.woltlab.com https://www.woltlab.com/XSD/2019/userGroupOption.xsd">
33
<import>
44
<categories>
5-
<category name="user.steam">
5+
<category name="user.ha_steam">
66
<parent>user</parent>
77
</category>
8-
<category name="mod.steam">
8+
<category name="mod.ha_steam">
99
<parent>mod</parent>
1010
</category>
11-
<category name="admin.steam">
11+
<category name="admin.ha_steam">
1212
<parent>admin</parent>
1313
</category>
1414
</categories>
1515
</import>
16+
<delete>
17+
<category name="user.steam" />
18+
<category name="mod.steam" />
19+
<category name="admin.steam" />
20+
</delete>
1621
</data>

0 commit comments

Comments
 (0)