Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Feeds
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
MickGe
Feeds
Commits
9fd58133
Commit
9fd58133
authored
10 years ago
by
Andrew Dolgov
Browse files
Options
Downloads
Patches
Plain Diff
fetch_file_contents: support retarded schema-less urls
af_comics_dilbert: fix for new dilbert.com shenanigans
parent
2681f684
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
include/functions.php
+3
-0
3 additions, 0 deletions
include/functions.php
plugins/af_comics/filters/af_comics_dilbert.php
+16
-6
16 additions, 6 deletions
plugins/af_comics/filters/af_comics_dilbert.php
with
19 additions
and
6 deletions
include/functions.php
+
3
−
0
View file @
9fd58133
...
@@ -357,6 +357,9 @@
...
@@ -357,6 +357,9 @@
$url
=
ltrim
(
$url
,
' '
);
$url
=
ltrim
(
$url
,
' '
);
$url
=
str_replace
(
' '
,
'%20'
,
$url
);
$url
=
str_replace
(
' '
,
'%20'
,
$url
);
if
(
strpos
(
$url
,
"//"
)
===
0
)
$url
=
'http:'
.
$url
;
if
(
!
defined
(
'NO_CURL'
)
&&
function_exists
(
'curl_init'
))
{
if
(
!
defined
(
'NO_CURL'
)
&&
function_exists
(
'curl_init'
))
{
$fetch_curl_used
=
true
;
$fetch_curl_used
=
true
;
...
...
This diff is collapsed.
Click to expand it.
plugins/af_comics/filters/af_comics_dilbert.php
+
16
−
6
View file @
9fd58133
...
@@ -6,23 +6,33 @@ class Af_Comics_Dilbert extends Af_ComicFilter {
...
@@ -6,23 +6,33 @@ class Af_Comics_Dilbert extends Af_ComicFilter {
}
}
function
process
(
&
$article
)
{
function
process
(
&
$article
)
{
$owner_uid
=
$article
[
"owner_uid"
];
if
(
strpos
(
$article
[
"guid"
],
"dilbert.com"
)
!==
FALSE
)
{
if
(
strpos
(
$article
[
"guid"
],
"dilbert.com"
)
!==
FALSE
)
{
$res
=
fetch_file_contents
(
$article
[
"link"
],
false
,
false
,
false
,
false
,
false
,
0
,
"Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.1; WOW64; Trident/6.0)"
);
global
$fetch_last_error_content
;
if
(
!
$res
&&
$fetch_last_error_content
)
$res
=
$fetch_last_error_content
;
$doc
=
new
DOMDocument
();
$doc
=
new
DOMDocument
();
@
$doc
->
loadHTML
(
fetch_file_contents
(
$article
[
"link"
])
);
@
$doc
->
loadHTML
(
$res
);
$basenode
=
false
;
$basenode
=
false
;
if
(
$doc
)
{
if
(
$doc
)
{
$xpath
=
new
DOMXPath
(
$doc
);
$xpath
=
new
DOMXPath
(
$doc
);
$entries
=
$xpath
->
query
(
'(//img[@src])'
);
// we might also check for img[@class='strip'] I guess...
$basenode
=
$xpath
->
query
(
'//div[@class="STR_Image"]'
)
->
item
(
0
);
/* $entries = $xpath->query('(//img[@src])'); // we might also check for img[@class='strip'] I guess...
$matches = array();
$matches = array();
foreach ($entries as $entry) {
foreach ($entries as $entry) {
if
(
preg_match
(
"/dyn\/str_strip\/.*
zoom
\.gif$/"
,
$entry
->
getAttribute
(
"src"
),
$matches
))
{
if (preg_match("/dyn\/str_strip\/.*
strip
\.gif$/", $entry->getAttribute("src"), $matches)) {
$entry->setAttribute("src",
$entry->setAttribute("src",
rewrite_relative_url("http://dilbert.com/",
rewrite_relative_url("http://dilbert.com/",
...
@@ -31,7 +41,7 @@ class Af_Comics_Dilbert extends Af_ComicFilter {
...
@@ -31,7 +41,7 @@ class Af_Comics_Dilbert extends Af_ComicFilter {
$basenode = $entry;
$basenode = $entry;
break;
break;
}
}
}
}
*/
if
(
$basenode
)
{
if
(
$basenode
)
{
$article
[
"content"
]
=
$doc
->
saveXML
(
$basenode
);
$article
[
"content"
]
=
$doc
->
saveXML
(
$basenode
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment