This commit is contained in:
Jeremy
2015-01-31 19:09:34 +01:00
parent 1990517b22
commit 7df80cb32c
47 changed files with 153 additions and 183 deletions

View File

@ -8,8 +8,8 @@ class Content
private $body;
public function __constructor() {
public function __constructor()
{
}
public function getTitle()
@ -31,4 +31,4 @@ class Content
{
$this->body = $body;
}
}
}

View File

@ -2,9 +2,6 @@
namespace Wallabag\CoreBundle\Helper;
class Entries {
}
class Entries
{
}

View File

@ -2,9 +2,6 @@
namespace Wallabag\CoreBundle\Helper;
use \RecursiveIteratorIterator;
use \RecursiveDirectoryIterator;
final class Tools
{
/**
@ -18,7 +15,7 @@ final class Tools
$timeout = 15;
$useragent = "Mozilla/5.0 (Windows NT 5.1; rv:18.0) Gecko/20100101 Firefox/18.0";
if (in_array ('curl', get_loaded_extensions())) {
if (in_array('curl', get_loaded_extensions())) {
# Fetch feed from URL
$curl = curl_init();
curl_setopt($curl, CURLOPT_URL, $url);
@ -30,8 +27,8 @@ final class Tools
curl_setopt($curl, CURLOPT_HEADER, false);
# for ssl, do not verified certificate
curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, FALSE);
curl_setopt($curl, CURLOPT_AUTOREFERER, TRUE );
curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false);
curl_setopt($curl, CURLOPT_AUTOREFERER, true);
# FeedBurner requires a proper USER-AGENT...
curl_setopt($curl, CURL_HTTP_VERSION_1_1, true);
@ -48,13 +45,13 @@ final class Tools
array(
'http' => array(
'timeout' => $timeout,
'header' => "User-Agent: " . $useragent,
'follow_location' => true
'header' => "User-Agent: ".$useragent,
'follow_location' => true,
),
'ssl' => array(
'verify_peer' => false,
'allow_self_signed' => true
)
'allow_self_signed' => true,
),
)
);
@ -62,13 +59,12 @@ final class Tools
$data = @file_get_contents($url, false, $context, -1, 4000000);
if (isset($http_response_header) and isset($http_response_header[0])) {
$httpcodeOK = isset($http_response_header) and isset($http_response_header[0]) and ((strpos($http_response_header[0], '200 OK') !== FALSE) or (strpos($http_response_header[0], '301 Moved Permanently') !== FALSE));
$httpcodeOK = isset($http_response_header) and isset($http_response_header[0]) and ((strpos($http_response_header[0], '200 OK') !== false) or (strpos($http_response_header[0], '301 Moved Permanently') !== false));
}
}
# if response is not empty and response is OK
if (isset($data) and isset($httpcodeOK) and $httpcodeOK) {
# take charset of page and get it
preg_match('#<meta .*charset=.*>#Usi', $data, $meta);
@ -77,19 +73,20 @@ final class Tools
preg_match('#charset="?(.*)"#si', $meta[0], $encoding);
# if charset is found set it otherwise, set it to utf-8
$html_charset = (!empty($encoding[1])) ? strtolower($encoding[1]) : 'utf-8';
if (empty($encoding[1])) $encoding[1] = 'utf-8';
if (empty($encoding[1])) {
$encoding[1] = 'utf-8';
}
} else {
$html_charset = 'utf-8';
$encoding[1] = '';
}
# replace charset of url to charset of page
$data = str_replace('charset=' . $encoding[1], 'charset=' . $html_charset, $data);
$data = str_replace('charset='.$encoding[1], 'charset='.$html_charset, $data);
return $data;
}
else {
return FALSE;
} else {
return false;
}
}
@ -101,7 +98,7 @@ final class Tools
*/
public static function encodeString($string)
{
return sha1($string . SALT);
return sha1($string.SALT);
}
public static function generateToken()
@ -113,12 +110,10 @@ final class Tools
} else {
$token = substr(base64_encode(file_get_contents('/dev/urandom', false, null, 0, 20)), 0, 15);
}
}
else {
} else {
$token = substr(base64_encode(uniqid(mt_rand(), true)), 0, 20);
}
return str_replace('+', '', $token);
}
}

View File

@ -6,20 +6,23 @@ class Url
{
public $url;
function __construct($url)
public function __construct($url)
{
$this->url = base64_decode($url);
}
public function getUrl() {
public function getUrl()
{
return $this->url;
}
public function setUrl($url) {
public function setUrl($url)
{
$this->url = $url;
}
public function isCorrect() {
return filter_var($this->url, FILTER_VALIDATE_URL) !== FALSE;
public function isCorrect()
{
return filter_var($this->url, FILTER_VALIDATE_URL) !== false;
}
}
}