瀏覽代碼

fix various html parse errors

tags/2.32
Friendika 9 年之前
父節點
當前提交
01164c8c2f
共有 6 個檔案被更改,包括 42 行新增15 行删除
  1. +20
    -7
      include/Scrape.php
  2. +6
    -1
      include/event.php
  3. +6
    -1
      include/network.php
  4. +2
    -0
      library/HTML5/TreeBuilder.php
  5. +5
    -3
      mod/parse_url.php
  6. +3
    -3
      view/diaspora_vcard.tpl

+ 20
- 7
include/Scrape.php 查看文件

@@ -30,8 +30,11 @@ function scrape_dfrn($url) {
}
}


$dom = HTML5_Parser::parse($s);
try {
$dom = HTML5_Parser::parse($s);
} catch (DOMException $e) {
logger('scrape_dfrn: parse error: ' . $e);
}

if(! $dom)
return $ret;
@@ -132,9 +135,11 @@ function scrape_meta($url) {
}
}



$dom = HTML5_Parser::parse($s);
try {
$dom = HTML5_Parser::parse($s);
} catch (DOMException $e) {
logger('scrape_meta: parse error: ' . $e);
}

if(! $dom)
return $ret;
@@ -177,7 +182,11 @@ function scrape_vcard($url) {
}
}

$dom = HTML5_Parser::parse($s);
try {
$dom = HTML5_Parser::parse($s);
} catch (DOMException $e) {
logger('scrape_vcard: parse error: ' . $e);
}

if(! $dom)
return $ret;
@@ -243,7 +252,11 @@ function scrape_feed($url) {
}
}

$dom = HTML5_Parser::parse($s);
try {
$dom = HTML5_Parser::parse($s);
} catch (DOMException $e) {
logger('scrape_feed: parse error: ' . $e);
}

if(! $dom)
return $ret;


+ 6
- 1
include/event.php 查看文件

@@ -53,7 +53,12 @@ function parse_event($h) {

$ret = array();

$dom = HTML5_Parser::parse($h);

try {
$dom = HTML5_Parser::parse($h);
} catch (DOMException $e) {
logger('parse_event: parse error: ' . $e);
}

if(! $dom)
return $ret;


+ 6
- 1
include/network.php 查看文件

@@ -429,7 +429,12 @@ function lrdd($uri) {
// don't try and parse raw xml as html
if(! strstr($html,'<?xml')) {
require_once('library/HTML5/Parser.php');
$dom = @HTML5_Parser::parse($html);

try {
$dom = HTML5_Parser::parse($html);
} catch (DOMException $e) {
logger('lrdd: parse error: ' . $e);
}

if($dom) {
$items = $dom->getElementsByTagName('link');


+ 2
- 0
library/HTML5/TreeBuilder.php 查看文件

@@ -3041,6 +3041,8 @@ class HTML5_TreeBuilder {

if (!empty($token['attr'])) {
foreach($token['attr'] as $attr) {
// mike@macgirvin.com 2011-10-21, stray double quotes cause everything to abort
$attr['name'] = str_replace('"','',$attr['name']);
if(!$el->hasAttribute($attr['name'])) {
$el->setAttribute($attr['name'], $attr['value']);
}


+ 5
- 3
mod/parse_url.php 查看文件

@@ -88,9 +88,11 @@ function parse_url_content(&$a) {
$purifier = new HTMLPurifier($config);
$s = $purifier->purify($s);

// logger('parse_url: purified: ' . $s, LOGGER_DATA);

$dom = @HTML5_Parser::parse($s);
try {
$dom = HTML5_Parser::parse($s);
} catch (DOMException $e) {
logger('scrape_dfrn: parse error: ' . $e);
}

if(! $dom) {
echo sprintf($template,$url,$url,'') . $str_tags;


+ 3
- 3
view/diaspora_vcard.tpl 查看文件

@@ -33,19 +33,19 @@
<dl class="entity_photo">
<dt>Photo</dt>
<dd>
<img class="photo avatar" height="300px" width="300px" src="$diaspora.photo300">
<img class="photo avatar" height="300" width="300" src="$diaspora.photo300">
</dd>
</dl>
<dl class="entity_photo_medium">
<dt>Photo</dt>
<dd>
<img class="photo avatar" height="100px" width="100px" src="$diaspora.photo100">
<img class="photo avatar" height="100" width="100" src="$diaspora.photo100">
</dd>
</dl>
<dl class="entity_photo_small">
<dt>Photo</dt>
<dd>
<img class="photo avatar" height="50px" width="50px" src="$diaspora.photo50">
<img class="photo avatar" height="50" width="50" src="$diaspora.photo50">
</dd>
</dl>
<dl class="entity_searchable">


Loading…
取消
儲存