Merge pull request #270 from ORelio/master

Update Facebook, add Debug whitelist ability
This commit is contained in:
Mitsu 2016-06-18 14:08:25 +02:00 committed by GitHub
commit d624d0de92
2 changed files with 30 additions and 10 deletions

View file

@ -146,7 +146,7 @@ class FacebookBridge extends BridgeAbstract{
} }
//No captcha? We can carry on retrieving page contents :) //No captcha? We can carry on retrieving page contents :)
$element = $html->find('[id^=PagePostsSectionPagelet-]')[0]->children(0)->children(0)->children(0); $element = $html->find('#pagelet_timeline_main_column')[0]->children(0)->children(0)->children(0)->next_sibling()->children(0);
if(isset($element)) { if(isset($element)) {
@ -158,7 +158,7 @@ class FacebookBridge extends BridgeAbstract{
$item = new \Item(); $item = new \Item();
if($post->hasAttribute("data-time")) { if (count($post->find('abbr')) > 0) {
//Retrieve post contents //Retrieve post contents
$content = preg_replace('/(?i)><div class=\"clearfix([^>]+)>(.+?)div\ class=\"userContent\"/i', '', $post); $content = preg_replace('/(?i)><div class=\"clearfix([^>]+)>(.+?)div\ class=\"userContent\"/i', '', $post);
@ -198,9 +198,10 @@ class FacebookBridge extends BridgeAbstract{
$title = substr($title, 0, strpos(wordwrap($title, 64), "\n")).'...'; $title = substr($title, 0, strpos(wordwrap($title, 64), "\n")).'...';
//Use first image as thumbnail if available, or profile pic fallback //Use first image as thumbnail if available, or profile pic fallback
$thumbnail = $post->find('img', 1)->src; $thumbnail = $post->find('img', 1);
if (strlen($thumbnail) == 0) if (is_object($thumbnail))
$thumbnail = $profilePic; $thumbnail = $thumbnail->src;
else $thumbnail = $profilePic;
//Build and add final item //Build and add final item
$item->uri = 'https://facebook.com'.$post->find('abbr')[0]->parent()->getAttribute('href'); $item->uri = 'https://facebook.com'.$post->find('abbr')[0]->parent()->getAttribute('href');

View file

@ -15,11 +15,30 @@ TODO :
date_default_timezone_set('UTC'); date_default_timezone_set('UTC');
error_reporting(0); error_reporting(0);
if(file_exists("DEBUG")) { /*
Create a file named 'DEBUG' for enabling debug mode.
ini_set('display_errors','1'); error_reporting(E_ALL); //Report all errors For further security, you may put whitelisted IP addresses
define("DEBUG", "true"); in the 'DEBUG' file, one IP per line. Empty file allows anyone (!).
Debugging allows displaying PHP error messages and bypasses the cache: this can allow a malicious
client to retrieve data about your server and hammer a provider throught your rss-bridge instance.
*/
if (file_exists('DEBUG')) {
$debug_enabled = true;
$debug_whitelist = trim(file_get_contents('DEBUG'));
if (strlen($debug_whitelist) > 0) {
$debug_enabled = false;
foreach (explode("\n", $debug_whitelist) as $allowed_ip) {
if (trim($allowed_ip) === $_SERVER['REMOTE_ADDR']) {
$debug_enabled = true;
break;
}
}
}
if ($debug_enabled) {
ini_set('display_errors', '1');
error_reporting(E_ALL);
define('DEBUG', 'true');
}
} }
require_once __DIR__ . '/lib/RssBridge.php'; require_once __DIR__ . '/lib/RssBridge.php';