minor coding improvements

This commit is contained in:
Steffen Schröder 2014-05-24 21:49:38 +02:00
parent 2666d8b616
commit 02222680e2

View File

@ -13,17 +13,12 @@ use ManiaControl\Utils\Formatter;
* @license http://www.gnu.org/licenses/ GNU General Public License, Version 3 * @license http://www.gnu.org/licenses/ GNU General Public License, Version 3
*/ */
abstract class FileUtil { abstract class FileUtil {
/*
* Constants
*/
const FOLDER_NAME_TEMP = 'temp/';
/** /**
* Load a remote file * Load a remote file
* *
* @param string $url * @param string $url
* @param string $contentType * @param string $contentType
* @return string || null * @return string
*/ */
public static function loadFile($url, $contentType = 'UTF-8') { public static function loadFile($url, $contentType = 'UTF-8') {
if (!$url) { if (!$url) {
@ -31,7 +26,7 @@ abstract class FileUtil {
} }
$urlData = parse_url($url); $urlData = parse_url($url);
$port = (isset($urlData['port']) ? $urlData['port'] : 80); $port = (isset($urlData['port']) ? $urlData['port'] : 80);
$urlQuery = isset($urlData['query']) ? "?" . $urlData['query'] : ""; $urlQuery = (isset($urlData['query']) ? '?' . $urlData['query'] : '');
$fsock = fsockopen($urlData['host'], $port); $fsock = fsockopen($urlData['host'], $port);
stream_set_timeout($fsock, 3); stream_set_timeout($fsock, 3);
@ -55,12 +50,11 @@ abstract class FileUtil {
if ($info['timed_out'] || !$buffer) { if ($info['timed_out'] || !$buffer) {
return null; return null;
} }
if (substr($buffer, 9, 3) != "200") { if (substr($buffer, 9, 3) != '200') {
return null; return null;
} }
$result = explode("\r\n\r\n", $buffer, 2); $result = explode("\r\n\r\n", $buffer, 2);
if (count($result) < 2) { if (count($result) < 2) {
return null; return null;
} }
@ -117,7 +111,7 @@ abstract class FileUtil {
* @return string * @return string
*/ */
public static function getTempFolder($createIfNecessary = true) { public static function getTempFolder($createIfNecessary = true) {
$tempFolder = ManiaControlDir . self::FOLDER_NAME_TEMP; $tempFolder = ManiaControlDir . 'temp' . DIRECTORY_SEPARATOR;
if ($createIfNecessary && !is_dir($tempFolder)) { if ($createIfNecessary && !is_dir($tempFolder)) {
mkdir($tempFolder); mkdir($tempFolder);
} }