mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-18 05:58:34 +01:00
Code Issues Projects Releases Wiki Activity

repository/picasa MDL-17473 Use picasa description as the filename if it exists

Browse Source
This commit is contained in:
moodler 2009-01-19 06:19:26 +00:00
parent 5d2ee15194
commit d44cee76fa
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/googleapi.php
View File

@ -432,14 +432,23 @@ class google_picasa {
//hacky...
$thumbnailinfo = $mediainfo->group->thumbnail[0]->attributes();
$files[] = array('title' => (string) $mediainfo->group->title,
// Derive the nicest file name we can
if (!empty($mediainfo->group->description)) {
$title = shorten_text((string)$mediainfo->group->description, 20, false, '');
$title = clean_filename($title).'.jpg';
} else {
$title = (string)$mediainfo->group->title;
}
$files[] = array(
'title' => $title,
'date' => userdate($gphoto->timestamp),
'size' => (int) $gphoto->size,
'path' => $gphoto->albumid.'/'.$gphoto->id,
'thumbnail' => (string) $thumbnailinfo['url'],
'thumbnail_width' => 72, // 72 is the native maximum dimension
'thumbnail_height' => 72,
'source' => (string) $fullinfo['url'],
'source' => (string) $fullinfo['url']
);
}

3
lib/moodlelib.php
View File

@ -6842,10 +6842,9 @@ function random_string ($length=15) {
* @return string $truncate - shortened string
*/
function shorten_text($text, $ideal=30, $exact = false) {
function shorten_text($text, $ideal=30, $exact = false, $ending='...') {
global $CFG;
$ending = '...';
// if the plain text is shorter than the maximum length, return the whole text
if (strlen(preg_replace('/<.*?>/', '', $text)) <= $ideal) {