diff options
author | Andrew Dolgov <[email protected]> | 2014-07-16 11:49:37 +0400 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2014-07-16 11:49:37 +0400 |
commit | 96ad6edc6c4562636312af3f23fffcdc9d4626a9 (patch) | |
tree | f19d0c80cac3b17524dd64cf6e30a988354e1379 /include | |
parent | 2d3ff643609a6767ca0d47cd3a38a3832350be72 (diff) | |
parent | 1e871938153497d46537fc313a79155717d532d0 (diff) |
Merge branch 'tribut-enclosure-size'
Diffstat (limited to 'include')
-rw-r--r-- | include/functions.php | 2 | ||||
-rw-r--r-- | include/functions2.php | 13 | ||||
-rw-r--r-- | include/rssfuncs.php | 8 |
3 files changed, 18 insertions, 5 deletions
diff --git a/include/functions.php b/include/functions.php index b5d52ccb2..cb91b637e 100644 --- a/include/functions.php +++ b/include/functions.php @@ -1,6 +1,6 @@ <?php define('EXPECTED_CONFIG_VERSION', 26); - define('SCHEMA_VERSION', 125); + define('SCHEMA_VERSION', 126); define('LABEL_BASE_INDEX', -1024); define('PLUGIN_FEED_BASE_INDEX', -128); diff --git a/include/functions2.php b/include/functions2.php index d6a399ffc..07024d38f 100644 --- a/include/functions2.php +++ b/include/functions2.php @@ -1868,6 +1868,8 @@ $url = $line["content_url"]; $ctype = $line["content_type"]; $title = $line["title"]; + $width = $line["width"]; + $height = $line["height"]; if (!$ctype) $ctype = __("unknown type"); @@ -1891,6 +1893,8 @@ $entry["filename"] = $filename; $entry["url"] = $url; $entry["title"] = $title; + $entry["width"] = $width; + $entry["height"] = $height; array_push($entries, $entry); } @@ -1905,9 +1909,15 @@ preg_match("/\.(jpg|png|gif|bmp)/i", $entry["filename"])) { if (!$hide_images) { + $encsize = ''; + if ($entry['height'] > 0) + $encsize .= ' height="' . intval($entry['width']) . '"'; + if ($entry['width'] > 0) + $encsize .= ' width="' . intval($entry['height']) . '"'; $rv .= "<p><img alt=\"".htmlspecialchars($entry["filename"])."\" - src=\"" .htmlspecialchars($entry["url"]) . "\"/></p>"; + src=\"" .htmlspecialchars($entry["url"]) . "\" + " . $encsize . " /></p>"; } else { $rv .= "<p><a target=\"_blank\" href=\"".htmlspecialchars($entry["url"])."\" @@ -2220,6 +2230,7 @@ curl_setopt($curl, CURLOPT_USERAGENT, 'Mozilla/5.0 (Windows NT 5.1; rv:5.0) Gecko/20100101 Firefox/5.0 Firefox/5.0'); curl_setopt($curl, CURLOPT_HTTPHEADER, $header); curl_setopt($curl, CURLOPT_HEADER, true); + curl_setopt($curl, CURLOPT_NOBODY, true); curl_setopt($curl, CURLOPT_REFERER, $url); curl_setopt($curl, CURLOPT_ENCODING, 'gzip,deflate'); curl_setopt($curl, CURLOPT_AUTOREFERER, true); diff --git a/include/rssfuncs.php b/include/rssfuncs.php index 60cb3b2d2..cdc490cb0 100644 --- a/include/rssfuncs.php +++ b/include/rssfuncs.php @@ -989,7 +989,7 @@ if (is_array($encs)) { foreach ($encs as $e) { $e_item = array( - $e->link, $e->type, $e->length, $e->title); + $e->link, $e->type, $e->length, $e->title, $e->width, $e->height); array_push($enclosures, $e_item); } } @@ -1009,14 +1009,16 @@ $enc_type = db_escape_string($enc[1]); $enc_dur = db_escape_string($enc[2]); $enc_title = db_escape_string($enc[3]); + $enc_width = intval($enc[4]); + $enc_height = intval($enc[5]); $result = db_query("SELECT id FROM ttrss_enclosures WHERE content_url = '$enc_url' AND post_id = '$entry_ref_id'"); if (db_num_rows($result) == 0) { db_query("INSERT INTO ttrss_enclosures - (content_url, content_type, title, duration, post_id) VALUES - ('$enc_url', '$enc_type', '$enc_title', '$enc_dur', '$entry_ref_id')"); + (content_url, content_type, title, duration, post_id, width, height) VALUES + ('$enc_url', '$enc_type', '$enc_title', '$enc_dur', '$entry_ref_id', $enc_width, $enc_height)"); } } |