beu/TrackManiaControl
1
0
Fork 0
Code Issues 11 Pull Requests Releases Wiki Activity

small fix

Browse Source
This commit is contained in:
kremsy 2014-02-16 13:35:48 +01:00 committed by Steffen Schröder
parent deeb05e681
commit 40002c0ecd
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
application/core/ManiaExchange/MXMapInfo.php
View File

@ -15,7 +15,7 @@ class MXMapInfo {
public $titlepack, $style, $envir, $mood, $dispcost, $lightmap, $modname, $exever; public $titlepack, $style, $envir, $mood, $dispcost, $lightmap, $modname, $exever;
public $exebld, $routes, $length, $unlimiter, $laps, $difficulty, $lbrating, $trkvalue; public $exebld, $routes, $length, $unlimiter, $laps, $difficulty, $lbrating, $trkvalue;
public $replaytyp, $replayid, $replaycnt, $acomment, $awards, $comments, $rating; public $replaytyp, $replayid, $replaycnt, $acomment, $awards, $comments, $rating;
public $ratingex, $ratingcnt, $pageurl, $replayurl, $imageurl, $thumburl, $dloadurl; public $ratingex, $ratingcnt, $pageurl, $replayurl, $imageurl, $thumburl, $downLoadUrl;
/** /**
* Returns map object with all available data from MX map data * Returns map object with all available data from MX map data
@ -36,10 +36,10 @@ class MXMapInfo {
if ($this->prefix == 'tm' || !property_exists($mx, "MapID")) { if ($this->prefix == 'tm' || !property_exists($mx, "MapID")) {
$this->id = $mx->TrackID; $this->id = $mx->TrackID;
$this->uid = isset($mx->TrackUID) ? $mx->TrackUID : ''; $this->uid = isset($mx->TrackUID) ? $mx->TrackUID : '';
} else { } else {
$this->id = $mx->MapID; $this->id = $mx->MapID;
$this->uid = isset($mx->MapUID) ? $mx->MapUID : ''; $this->uid = isset($mx->MapUID) ? $mx->MapUID : '';
} }
if (!isset($mx->GbxMapName) || $mx->GbxMapName == '?') { if (!isset($mx->GbxMapName) || $mx->GbxMapName == '?') {
@ -91,10 +91,10 @@ class MXMapInfo {
$this->acomment = str_ireplace($search, $replace, $this->acomment); $this->acomment = str_ireplace($search, $replace, $this->acomment);
$this->acomment = preg_replace('/\[url=.*\]/', '<i>', $this->acomment); $this->acomment = preg_replace('/\[url=.*\]/', '<i>', $this->acomment);
$this->pageurl = 'http://' . $this->prefix . '.mania-exchange.com/' . $dir . '/view/' . $this->id; $this->pageurl = 'http://' . $this->prefix . '.mania-exchange.com/' . $dir . '/view/' . $this->id;
$this->imageurl = 'http://' . $this->prefix . '.mania-exchange.com/' . $dir . '/screenshot/normal/' . $this->id; $this->imageurl = 'http://' . $this->prefix . '.mania-exchange.com/' . $dir . '/screenshot/normal/' . $this->id;
$this->thumburl = 'http://' . $this->prefix . '.mania-exchange.com/' . $dir . '/screenshot/small/' . $this->id; $this->thumburl = 'http://' . $this->prefix . '.mania-exchange.com/' . $dir . '/screenshot/small/' . $this->id;
$this->dloadurl = 'http://' . $this->prefix . '.mania-exchange.com/' . $dir . '/download/' . $this->id; $this->downLoadUrl = 'http://' . $this->prefix . '.mania-exchange.com/' . $dir . '/download/' . $this->id;
if ($this->prefix == 'tm' && $this->replayid > 0) { if ($this->prefix == 'tm' && $this->replayid > 0) {
$this->replayurl = 'http://' . $this->prefix . '.mania-exchange.com/replays/download/' . $this->replayid; $this->replayurl = 'http://' . $this->prefix . '.mania-exchange.com/replays/download/' . $this->replayid;

4
application/core/Maps/MapManager.php
View File

@ -502,8 +502,6 @@ class MapManager implements CallbackListener {
$serverInfo = $this->maniaControl->client->getSystemInfo(); $serverInfo = $this->maniaControl->client->getSystemInfo();
$title = strtolower(substr($serverInfo->titleId, 0, 2)); $title = strtolower(substr($serverInfo->titleId, 0, 2));
$url = "http://{$title}.mania-exchange.com/tracks/download/{$mapInfo->id}";
//Download the file //Download the file
$function = function ($file, $error) use (&$login, &$mapInfo, &$mapDir, &$update) { $function = function ($file, $error) use (&$login, &$mapInfo, &$mapDir, &$update) {
if (!$file) { if (!$file) {
@ -513,7 +511,7 @@ class MapManager implements CallbackListener {
} }
$this->processMapFile($file, $mapInfo, $mapDir, $login, $update); $this->processMapFile($file, $mapInfo, $mapDir, $login, $update);
}; };
$this->maniaControl->fileReader->loadFile($url, $function); $this->maniaControl->fileReader->loadFile($mapInfo->downLoadUrl, $function);
}); });
} }
} }