malhuda/developer
1
0
Fork 0
mirror of https://github.com/easy-wi/developer.git synced 2025-02-20 11:23:28 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Small corrections

Browse Source
This commit is contained in:
Ulrich Block 2013-10-05 15:45:45 +02:00
parent 1ce1d142c2
commit 93f700908a
3 changed files with 28 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
web/install/update.php
View File

@ -146,6 +146,7 @@ if (versioncheck ($version,'3.40','update_330-340.php',$response,$sql)) $version
if (versioncheck ($version,'3.60','update_340-360.php',$response,$sql)) $version='3.60';
if (versioncheck ($version,'3.70','update_360-370.php',$response,$sql)) $version='3.70';
if (versioncheck ($version,'4.00','update_370-400.php',$response,$sql)) $version='4.00';
if (versioncheck ($version,'4.10','update_400-410.php',$response,$sql)) $version='4.10';
$response->add('Repairing tables if needed.');
include(EASYWIDIR . '/stuff/tables_repair.php');

48
web/stuff/queries_updates.php
View File

@ -38,13 +38,10 @@
* Programm erhalten haben. Wenn nicht, siehe <http://www.gnu.org/licenses/>.
*/
function getCraftBukkitVersion ($follow = 'http://dl.bukkit.org/latest-rb/craftbukkit.jar', $start = false) {
// CaftBukkit does not offer an API where we can retrieve the current version
// But they have redirect in place. So lets follow them and cut out the version
$follow = str_replace('http://', '', $follow);
$splitUrl = preg_split('/\//', $follow, -1, PREG_SPLIT_NO_EMPTY);
function getHttpHeaders ($url) {
$url = str_replace('http://', '', $url);
$splitUrl = preg_split('/\//', $url, -1, PREG_SPLIT_NO_EMPTY);
$domain = $splitUrl[0];
$path = '';
@ -79,28 +76,35 @@ function getCraftBukkitVersion ($follow = 'http://dl.bukkit.org/latest-rb/craftb
// finally a 200 instead of 301 or 302
if (strpos(strtolower($buffer), 'http/1.1 200') !== false or strpos(strtolower($buffer), 'http/1.0 200') ==! false) {
$split = preg_split('/\//', $follow, -1, PREG_SPLIT_NO_EMPTY);
return array('version' => $split[count($split) - 2], 'downloadPath' => 'http://' . $follow);
return array('code' => 200, 'url' => $url);
} else {
} else if (strpos(strtolower($buffer), 'http/1.1 302') !== false or strpos(strtolower($buffer), 'http/1.0 302') ==! false or strpos(strtolower($buffer), 'http/1.1 301') !== false or strpos(strtolower($buffer), 'http/1.0 301') ==! false) {
// Header parsing, the Location attribute is what we want
foreach (explode("\r\n", $buffer) as $info) {
@list($key, $value) = explode(': ', $info);
if ($key == 'Location') {
$redirectedTo = getCraftBukkitVersion($value);
if (is_array($redirectedTo)) {
return $redirectedTo;
} else if ($start == false) {
return $value;
}
return array('code' => 300, 'url' => $value);
}
}
}
}
return false;
return array('code' => 600, 'url' => $url);
}
function getCraftBukkitVersion () {
// CaftBukkit does not offer an API where we can retrieve the current version
// But they have redirect in place. So lets follow them and cut out the version
$response = getHttpHeaders('dl.bukkit.org/latest-rb/craftbukkit.jar');
while (isset($response['code']) and $response['code'] == 300) {
$response = getHttpHeaders($response['url']);
}
$split = preg_split('/\//', $response['url'], -1, PREG_SPLIT_NO_EMPTY);
return array('version' => $split[count($split) - 2], 'downloadPath' => 'http://' . $response['url']);
}
function getMinecraftVersion($release = 'release') {
@ -109,9 +113,5 @@ function getMinecraftVersion($release = 'release') {
$json = @json_decode(cleanFsockOpenRequest($responseBody, '{', '}'));
if ($json) {
return array('version' => $json->latest->$release, 'downloadPath' => 'http://s3.amazonaws.com/Minecraft.Download/versions/' . $json->latest->$release . '/minecraft_server.' . $json->latest->$release . '.jar');
}
return array('version' => '', 'downloadPath' => '');
return ($json) ? array('version' => $json->latest->$release, 'downloadPath' => 'http://s3.amazonaws.com/Minecraft.Download/versions/' . $json->latest->$release . '/minecraft_server.' . $json->latest->$release . '.jar') : array('version' => '', 'downloadPath' => '');
}

6
web/template/default/page_header.tpl
View File

@ -42,9 +42,9 @@
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">Easy-WI.com<b class="caret"></b></a>
<ul class="dropdown-menu">
<li><a href="http://wiki.easy-wi.com" target="_blank">Wiki</a></li>
<li><a href="http://easy-wi.com" target="_blank">About</a></li>
<li><a href="http://forum.easy-wi.com" target="_blank">Forum</a></li>
<li><a href="http://wiki.easy-wi.com" target="_blank" title="easy-wi.com wiki">Wiki</a></li>
<li><a href="https://easy-wi.com" target="_blank" title="free gameserver voiceserver dedicated and virtualserver webinterface easy-wi.com">About</a></li>
<li><a href="https://easy-wi.com/forum/" target="_blank" title="easy-wi.com forum">Forum</a></li>
</ul>
</li>
</ul>