Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
mahara
mahara
Commits
fec9fb08
Commit
fec9fb08
authored
Sep 06, 2018
by
Cecilia Vela Gurovic
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bug 1757551: Removing panoramio external gallery support
behatnotneeded Change-Id: I9a46effa541a741dd525de66f8bec654b9d011d7
parent
ff1e04e0
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
1 addition
and
65 deletions
+1
-65
htdocs/artefact/file/blocktype/gallery/lang/en.utf8/blocktype.gallery.php
...file/blocktype/gallery/lang/en.utf8/blocktype.gallery.php
+1
-7
htdocs/artefact/file/blocktype/gallery/lang/en.utf8/help/forms/instconf.external.html
...pe/gallery/lang/en.utf8/help/forms/instconf.external.html
+0
-1
htdocs/artefact/file/blocktype/gallery/lib.php
htdocs/artefact/file/blocktype/gallery/lib.php
+0
-49
htdocs/theme/raw/images/gallery/panoramio.png
htdocs/theme/raw/images/gallery/panoramio.png
+0
-0
htdocs/theme/raw/plugintype/artefact/file/blocktype/gallery/templates/panoramioshow.tpl
...tefact/file/blocktype/gallery/templates/panoramioshow.tpl
+0
-5
htdocs/theme/raw/plugintype/artefact/file/blocktype/gallery/templates/supported.tpl
...e/artefact/file/blocktype/gallery/templates/supported.tpl
+0
-3
No files found.
htdocs/artefact/file/blocktype/gallery/lang/en.utf8/blocktype.gallery.php
View file @
fec9fb08
...
...
@@ -52,12 +52,6 @@ $string['pbapikeydesc'] = 'To show photo albums from Photobucket, you\'ll need a
$string
[
'pbapiprivatekey'
]
=
'Photobucket API private key'
;
$string
[
'photobucketphotosandalbums'
]
=
'Photobucket user photos and albums'
;
// Panoramio
$string
[
'Photo'
]
=
'Photo'
;
$string
[
'by'
]
=
'by'
;
$string
[
'panoramiocopyright'
]
=
'Photos provided by Panoramio are under the copyright of their owners.'
;
$string
[
'panoramiouserphotos'
]
=
'Panoramio user photos'
;
$string
[
'picasaalbums'
]
=
'Picasa albums'
;
$string
[
'windowslivephotoalbums'
]
=
'Windows Live photo gallery albums'
;
...
...
@@ -75,4 +69,4 @@ $string['FULL_SCREEN'] = "Full screen";
$string
[
'THUMBS'
]
=
"Thumbnails"
;
$string
[
'DOWNLOAD'
]
=
"Download"
;
$string
[
'SHARE'
]
=
"Share"
;
$string
[
'ZOOM'
]
=
"Zoom"
;
\ No newline at end of file
$string
[
'ZOOM'
]
=
"Zoom"
;
htdocs/artefact/file/blocktype/gallery/lang/en.utf8/help/forms/instconf.external.html
View file @
fec9fb08
...
...
@@ -8,7 +8,6 @@
<ul>
<li>
Flickr, e.g. https://www.flickr.com/photos/12345678@N01/sets/98765432123456789/
</li>
<li>
Picasa, e.g. http://picasaweb.google.com/user.name/AlbumName#
</li>
<li>
Panoramio, e.g. http://www.panoramio.com/user/123456
</li>
<li>
Photobucket, e.g. http://s1234.photobucket.com/albums/ee123/username/ or http://s1234.photobucket.com/albums/ee123/username/AlbumName/
</li>
<li>
Windows Live Photo Gallery, e.g. http://cid-123456ab7890cd12.photos.live.com/self.aspx/AlbumName/photo.jpg
</li>
</ul>
...
...
htdocs/artefact/file/blocktype/gallery/lib.php
View file @
fec9fb08
...
...
@@ -222,47 +222,6 @@ class PluginBlocktypeGallery extends MaharaCoreBlocktype {
}
}
break
;
case
'panoramio'
:
// Slideshow
if
(
$style
==
1
)
{
$height
=
round
(
$width
*
0.75
);
$images
=
array
(
'user'
=>
$var1
);
$template
=
'panoramioshow'
;
}
// Thumbnails
else
{
$copyright
=
get_string
(
'panoramiocopyright'
,
'blocktype.file/gallery'
);
$URL
=
'http://www.panoramio.com/map/get_panoramas.php?set='
.
$var1
.
'&from=0&to=50&size=original&mapfilter=true'
;
$config
=
array
(
CURLOPT_URL
=>
$URL
,
CURLOPT_RETURNTRANSFER
=>
true
,
);
$result
=
mahara_http_request
(
$config
);
$data
=
json_decode
(
$result
->
data
,
true
);
foreach
(
$data
[
'photos'
]
as
$photo
)
{
$link
=
str_replace
(
'/original/'
,
'/large/'
,
$photo
[
'photo_file_url'
]);
// If the Thumbnails should be Square...
if
(
$style
==
2
)
{
$thumb
=
str_replace
(
'/original/'
,
'/square/'
,
$photo
[
'photo_file_url'
]);
$width
=
60
;
// Currently only square thumbnail size, that Panoramio supports
}
else
{
$thumb
=
str_replace
(
'/original/'
,
'/thumbnail/'
,
$photo
[
'photo_file_url'
]);
}
$title
=
(
!
empty
(
$photo
[
'photo_title'
])
?
$photo
[
'photo_title'
]
:
get_string
(
'Photo'
,
'blocktype.file/gallery'
));
$description
=
'<a href="'
.
$photo
[
'photo_url'
]
.
'">'
.
$title
.
'</a>'
.
' '
.
get_string
(
'by'
,
'blocktype.file/gallery'
)
.
' '
.
'<a href="'
.
$photo
[
'owner_url'
]
.
'">'
.
$photo
[
'owner_name'
]
.
'</a>'
;
$images
[]
=
array
(
'link'
=>
$link
,
'source'
=>
$thumb
,
'title'
=>
$description
,
'fancybox'
=>
$fancyboxattr
);
}
}
break
;
case
'photobucket'
:
// Slideshow
if
(
$style
==
1
)
{
...
...
@@ -788,14 +747,6 @@ class PluginBlocktypeGallery extends MaharaCoreBlocktype {
'var1'
=>
'$1'
,
'var2'
=>
'$2'
,
),
// Panoramio User Photos (direct link)
array
(
'match'
=>
'#.*www.panoramio.com/user/(\d+).*#'
,
'url'
=>
'http://www.panoramio.com/user/$1/'
,
'type'
=>
'panoramio'
,
'var1'
=>
'$1'
,
'var2'
=>
null
,
),
// Photobucket User Photos (direct link)
array
(
'match'
=>
'#.*([a-zA-Z0-9]+).photobucket.com/albums/([a-zA-Z0-9]+)/([a-zA-Z0-9\.\,\:\;\@\-\_\+\ ]+).*#'
,
...
...
htdocs/theme/raw/images/gallery/panoramio.png
deleted
100644 → 0
View file @
ff1e04e0
559 Bytes
htdocs/theme/raw/plugintype/artefact/file/blocktype/gallery/templates/panoramioshow.tpl
deleted
100644 → 0
View file @
ff1e04e0
{
if
$images
}
<iframe
marginheight=
"0"
marginwidth=
"0"
width=
"
{
$width
}
"
height=
"
{
$height
}
"
scrolling=
"no"
frameborder=
"0"
src=
"http://www.panoramio.com/user/
{
$images.user
}
/slideshow"
></iframe>
{
else
}
{
str
tag
=
cannotdisplayslideshow
section
=
blocktype
.
file
/
gallery
}
{/
if
}
htdocs/theme/raw/plugintype/artefact/file/blocktype/gallery/templates/supported.tpl
View file @
fec9fb08
...
...
@@ -4,9 +4,6 @@
<a
href=
"http://picasaweb.google.com/"
>
<img
src=
"
{
$THEME
->
get_image_url
(
'gallery/picasa'
)
}
"
alt=
""
width=
"16"
height=
"16"
title=
"
{
str
tag
=
picasaalbums
section
=
blocktype
.
file
/
gallery
}
"
>
</a>
<a
href=
"http://www.panoramio.com/"
>
<img
src=
"
{
$THEME
->
get_image_url
(
'gallery/panoramio'
)
}
"
alt=
""
width=
"16"
height=
"16"
title=
"
{
str
tag
=
panoramiouserphotos
section
=
blocktype
.
file
/
gallery
}
"
>
</a>
<a
href=
"http://www.photobucket.com/"
>
<img
src=
"
{
$THEME
->
get_image_url
(
'gallery/photobucket'
)
}
"
alt=
""
width=
"16"
height=
"16"
title=
"
{
str
tag
=
photobucketphotosandalbums
section
=
blocktype
.
file
/
gallery
}
"
>
</a>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment