Fix PHP Notices
This commit is contained in:
parent
9031423278
commit
15563be5cc
|
@ -11,51 +11,67 @@ function attribute_contains($attr,$s) {
|
||||||
}}
|
}}
|
||||||
|
|
||||||
|
|
||||||
if(! function_exists('noscrape_dfrn')) {
|
if (!function_exists('noscrape_dfrn')) {
|
||||||
function noscrape_dfrn($url) {
|
|
||||||
|
function noscrape_dfrn($url)
|
||||||
|
{
|
||||||
$submit_noscrape_start = microtime(true);
|
$submit_noscrape_start = microtime(true);
|
||||||
$data = fetch_url($url);
|
$data = fetch_url($url);
|
||||||
$submit_noscrape_request_end = microtime(true);
|
$submit_noscrape_request_end = microtime(true);
|
||||||
if(empty($data)) return false;
|
if (empty($data)) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
$parms = json_decode($data, true);
|
$parms = json_decode($data, true);
|
||||||
if(!$parms || !count($parms)) return false;
|
if (!$parms || !count($parms)) {
|
||||||
$parms['tags'] = implode(' ', (array)$parms['tags']);
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (isset($parms['tags'])) {
|
||||||
|
$parms['tags'] = implode(' ', (array) $parms['tags']);
|
||||||
|
} else {
|
||||||
|
$parms['tags'] = '';
|
||||||
|
}
|
||||||
|
|
||||||
$submit_noscrape_end = microtime(true);
|
$submit_noscrape_end = microtime(true);
|
||||||
$parms['_timings'] = array(
|
$parms['_timings'] = array(
|
||||||
'fetch' => round(($submit_noscrape_request_end - $submit_noscrape_start) * 1000),
|
'fetch' => round(($submit_noscrape_request_end - $submit_noscrape_start) * 1000),
|
||||||
'scrape' => round(($submit_noscrape_end - $submit_noscrape_request_end) * 1000)
|
'scrape' => round(($submit_noscrape_end - $submit_noscrape_request_end) * 1000)
|
||||||
);
|
);
|
||||||
|
|
||||||
return $parms;
|
return $parms;
|
||||||
}}
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
if(! function_exists('scrape_dfrn')) {
|
if(! function_exists('scrape_dfrn')) {
|
||||||
function scrape_dfrn($url, $max_nodes=3500) {
|
function scrape_dfrn($url, $max_nodes=3500) {
|
||||||
|
|
||||||
$minNodes = 100; //Lets do at least 100 nodes per type.
|
$minNodes = 100; //Lets do at least 100 nodes per type.
|
||||||
$timeout = 10; //Timeout will affect batch processing.
|
$timeout = 10; //Timeout will affect batch processing.
|
||||||
|
|
||||||
//Try and cheat our way into faster profiles.
|
//Try and cheat our way into faster profiles.
|
||||||
if(strpos($url, 'tab=profile') === false){
|
if(strpos($url, 'tab=profile') === false){
|
||||||
$url .= (strpos($url, '?') > 0 ? '&' : '?').'tab=profile';
|
$url .= (strpos($url, '?') > 0 ? '&' : '?').'tab=profile';
|
||||||
}
|
}
|
||||||
|
|
||||||
$scrape_start = microtime(true);
|
$scrape_start = microtime(true);
|
||||||
|
|
||||||
$ret = array();
|
$ret = array();
|
||||||
$s = fetch_url($url, $timeout);
|
$s = fetch_url($url, $timeout);
|
||||||
|
|
||||||
$scrape_fetch_end = microtime(true);
|
$scrape_fetch_end = microtime(true);
|
||||||
|
|
||||||
if(! $s)
|
if(! $s)
|
||||||
return $ret;
|
return $ret;
|
||||||
|
|
||||||
$dom = HTML5_Parser::parse($s);
|
$dom = HTML5_Parser::parse($s);
|
||||||
|
|
||||||
if(! $dom)
|
if(! $dom)
|
||||||
return $ret;
|
return $ret;
|
||||||
|
|
||||||
$items = $dom->getElementsByTagName('meta');
|
$items = $dom->getElementsByTagName('meta');
|
||||||
|
|
||||||
// get DFRN link elements
|
// get DFRN link elements
|
||||||
$nodes_left = max(intval($max_nodes), $minNodes);
|
$nodes_left = max(intval($max_nodes), $minNodes);
|
||||||
$targets = array('hide', 'comm', 'tags');
|
$targets = array('hide', 'comm', 'tags');
|
||||||
|
@ -89,7 +105,7 @@ function scrape_dfrn($url, $max_nodes=3500) {
|
||||||
$items = $dom->getElementsByTagName('link');
|
$items = $dom->getElementsByTagName('link');
|
||||||
|
|
||||||
// get DFRN link elements
|
// get DFRN link elements
|
||||||
|
|
||||||
$nodes_left = max(intval($max_nodes), $minNodes);
|
$nodes_left = max(intval($max_nodes), $minNodes);
|
||||||
foreach($items as $item) {
|
foreach($items as $item) {
|
||||||
$x = $item->getAttribute('rel');
|
$x = $item->getAttribute('rel');
|
||||||
|
@ -100,7 +116,7 @@ function scrape_dfrn($url, $max_nodes=3500) {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Pull out hCard profile elements
|
// Pull out hCard profile elements
|
||||||
|
|
||||||
$nodes_left = max(intval($max_nodes), $minNodes);
|
$nodes_left = max(intval($max_nodes), $minNodes);
|
||||||
$items = $dom->getElementsByTagName('*');
|
$items = $dom->getElementsByTagName('*');
|
||||||
$targets = array('fn', 'pdesc', 'photo', 'key', 'locality', 'region', 'postal-code', 'country-name');
|
$targets = array('fn', 'pdesc', 'photo', 'key', 'locality', 'region', 'postal-code', 'country-name');
|
||||||
|
@ -146,18 +162,18 @@ function scrape_dfrn($url, $max_nodes=3500) {
|
||||||
$nodes_left--;
|
$nodes_left--;
|
||||||
if($nodes_left <= 0 || $targets_left <= 0) break;
|
if($nodes_left <= 0 || $targets_left <= 0) break;
|
||||||
}
|
}
|
||||||
|
|
||||||
$scrape_end = microtime(true);
|
$scrape_end = microtime(true);
|
||||||
$fetch_time = round(($scrape_fetch_end - $scrape_start) * 1000);
|
$fetch_time = round(($scrape_fetch_end - $scrape_start) * 1000);
|
||||||
$scrape_time = round(($scrape_end - $scrape_fetch_end) * 1000);
|
$scrape_time = round(($scrape_end - $scrape_fetch_end) * 1000);
|
||||||
|
|
||||||
$ret['_timings'] = array(
|
$ret['_timings'] = array(
|
||||||
'fetch' => $fetch_time,
|
'fetch' => $fetch_time,
|
||||||
'scrape' => $scrape_time
|
'scrape' => $scrape_time
|
||||||
);
|
);
|
||||||
|
|
||||||
return $ret;
|
return $ret;
|
||||||
|
|
||||||
}}
|
}}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -131,11 +131,11 @@ function run_submit($url)
|
||||||
`updated` = '%s'
|
`updated` = '%s'
|
||||||
WHERE `id` = %d LIMIT 1",
|
WHERE `id` = %d LIMIT 1",
|
||||||
$params['fn'],
|
$params['fn'],
|
||||||
$params['pdesc'],
|
isset($params['pdesc']) ? $params['pdesc'] : '',
|
||||||
$params['locality'],
|
isset($params['locality']) ? $params['locality'] : '',
|
||||||
$params['region'],
|
isset($params['region']) ? $params['region'] : '',
|
||||||
$params['postal-code'],
|
isset($params['postal-code']) ? $params['postal-code'] : '',
|
||||||
$params['country-name'],
|
isset($params['country-name']) ? $params['country-name'] : '',
|
||||||
dbesc($url),
|
dbesc($url),
|
||||||
dbesc($nurl),
|
dbesc($nurl),
|
||||||
intval($params['comm']),
|
intval($params['comm']),
|
||||||
|
|
|
@ -18,12 +18,9 @@ function photo_init(App $a)
|
||||||
$profile_id = str_replace('.jpg', '', $photo);
|
$profile_id = str_replace('.jpg', '', $photo);
|
||||||
|
|
||||||
$r = q('SELECT * FROM `photo` WHERE `profile-id` = %d LIMIT 1', intval($profile_id));
|
$r = q('SELECT * FROM `photo` WHERE `profile-id` = %d LIMIT 1', intval($profile_id));
|
||||||
|
|
||||||
if (count($r)) {
|
if (count($r)) {
|
||||||
$data = $r[0]['data'];
|
$data = $r[0]['data'];
|
||||||
}
|
} else {
|
||||||
|
|
||||||
if (x($data) === false || (!strlen($data))) {
|
|
||||||
$data = file_get_contents('images/default-profile-sm.jpg');
|
$data = file_get_contents('images/default-profile-sm.jpg');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue