From 9fe063022e08a4b6fa5f5935f8f185d5d95814a4 Mon Sep 17 00:00:00 2001 From: Sem Date: Wed, 25 Apr 2012 19:09:22 +0200 Subject: Upgraded to Elgg 1.8.4. --- mod/file/graphics/icons/application.gif | Bin 2543 -> 2465 bytes mod/file/graphics/icons/application_lrg.gif | Bin 7916 -> 7781 bytes mod/file/graphics/icons/archive.gif | Bin 2479 -> 2419 bytes mod/file/graphics/icons/archive_lrg.gif | Bin 8080 -> 7918 bytes mod/file/graphics/icons/excel.gif | Bin 2632 -> 2509 bytes mod/file/graphics/icons/excel_lrg.gif | Bin 8098 -> 7571 bytes mod/file/graphics/icons/general.gif | Bin 1528 -> 1528 bytes mod/file/graphics/icons/general_lrg.gif | Bin 4731 -> 4594 bytes mod/file/graphics/icons/music.gif | Bin 2524 -> 2297 bytes mod/file/graphics/icons/music_lrg.gif | Bin 7397 -> 6748 bytes mod/file/graphics/icons/openoffice.gif | Bin 2502 -> 2313 bytes mod/file/graphics/icons/openoffice_lrg.gif | Bin 7265 -> 6617 bytes mod/file/graphics/icons/pages.gif | Bin 3098 -> 2766 bytes mod/file/graphics/icons/pages_lrg.gif | Bin 11394 -> 10234 bytes mod/file/graphics/icons/pdf.gif | Bin 2345 -> 2197 bytes mod/file/graphics/icons/pdf_lrg.gif | Bin 6770 -> 6014 bytes mod/file/graphics/icons/ppt.gif | Bin 2556 -> 2495 bytes mod/file/graphics/icons/ppt_lrg.gif | Bin 7964 -> 7423 bytes mod/file/graphics/icons/text.gif | Bin 2896 -> 2881 bytes mod/file/graphics/icons/text_lrg.gif | Bin 10928 -> 9855 bytes mod/file/graphics/icons/vcard.gif | Bin 2536 -> 2385 bytes mod/file/graphics/icons/vcard_lrg.gif | Bin 7504 -> 6798 bytes mod/file/graphics/icons/video.gif | Bin 2722 -> 2603 bytes mod/file/graphics/icons/video_lrg.gif | Bin 7868 -> 7319 bytes mod/file/graphics/icons/word.gif | Bin 2642 -> 2479 bytes mod/file/graphics/icons/word_lrg.gif | Bin 7925 -> 7350 bytes mod/file/languages/en.php | 10 +++++++++- mod/file/start.php | 19 ++++++++----------- 28 files changed, 17 insertions(+), 12 deletions(-) (limited to 'mod/file') diff --git a/mod/file/graphics/icons/application.gif b/mod/file/graphics/icons/application.gif index f78903c0a..bfba76a97 100644 Binary files a/mod/file/graphics/icons/application.gif and b/mod/file/graphics/icons/application.gif differ diff --git a/mod/file/graphics/icons/application_lrg.gif b/mod/file/graphics/icons/application_lrg.gif index c6955f749..65f8eadb4 100644 Binary files a/mod/file/graphics/icons/application_lrg.gif and b/mod/file/graphics/icons/application_lrg.gif differ diff --git a/mod/file/graphics/icons/archive.gif b/mod/file/graphics/icons/archive.gif index 044cd042a..2213cdadd 100644 Binary files a/mod/file/graphics/icons/archive.gif and b/mod/file/graphics/icons/archive.gif differ diff --git a/mod/file/graphics/icons/archive_lrg.gif b/mod/file/graphics/icons/archive_lrg.gif index 0d0856cdd..6e3df3fd4 100644 Binary files a/mod/file/graphics/icons/archive_lrg.gif and b/mod/file/graphics/icons/archive_lrg.gif differ diff --git a/mod/file/graphics/icons/excel.gif b/mod/file/graphics/icons/excel.gif index f74f74fd7..ecd1d57d2 100644 Binary files a/mod/file/graphics/icons/excel.gif and b/mod/file/graphics/icons/excel.gif differ diff --git a/mod/file/graphics/icons/excel_lrg.gif b/mod/file/graphics/icons/excel_lrg.gif index 9b53d6dc7..84d1375d5 100644 Binary files a/mod/file/graphics/icons/excel_lrg.gif and b/mod/file/graphics/icons/excel_lrg.gif differ diff --git a/mod/file/graphics/icons/general.gif b/mod/file/graphics/icons/general.gif index cd5cf467a..20958b9a4 100644 Binary files a/mod/file/graphics/icons/general.gif and b/mod/file/graphics/icons/general.gif differ diff --git a/mod/file/graphics/icons/general_lrg.gif b/mod/file/graphics/icons/general_lrg.gif index 7c7a3c80a..3458915e5 100644 Binary files a/mod/file/graphics/icons/general_lrg.gif and b/mod/file/graphics/icons/general_lrg.gif differ diff --git a/mod/file/graphics/icons/music.gif b/mod/file/graphics/icons/music.gif index c44d7c987..5e9df08bc 100644 Binary files a/mod/file/graphics/icons/music.gif and b/mod/file/graphics/icons/music.gif differ diff --git a/mod/file/graphics/icons/music_lrg.gif b/mod/file/graphics/icons/music_lrg.gif index 780a252d6..1c0792cc3 100644 Binary files a/mod/file/graphics/icons/music_lrg.gif and b/mod/file/graphics/icons/music_lrg.gif differ diff --git a/mod/file/graphics/icons/openoffice.gif b/mod/file/graphics/icons/openoffice.gif index 3cfdc7196..053ad5bb5 100644 Binary files a/mod/file/graphics/icons/openoffice.gif and b/mod/file/graphics/icons/openoffice.gif differ diff --git a/mod/file/graphics/icons/openoffice_lrg.gif b/mod/file/graphics/icons/openoffice_lrg.gif index 5cdb13353..da28607fa 100644 Binary files a/mod/file/graphics/icons/openoffice_lrg.gif and b/mod/file/graphics/icons/openoffice_lrg.gif differ diff --git a/mod/file/graphics/icons/pages.gif b/mod/file/graphics/icons/pages.gif index 2e4ee761a..7efcb7278 100644 Binary files a/mod/file/graphics/icons/pages.gif and b/mod/file/graphics/icons/pages.gif differ diff --git a/mod/file/graphics/icons/pages_lrg.gif b/mod/file/graphics/icons/pages_lrg.gif index 2e41e4739..234a52672 100644 Binary files a/mod/file/graphics/icons/pages_lrg.gif and b/mod/file/graphics/icons/pages_lrg.gif differ diff --git a/mod/file/graphics/icons/pdf.gif b/mod/file/graphics/icons/pdf.gif index e7854b1e0..94362a4f0 100644 Binary files a/mod/file/graphics/icons/pdf.gif and b/mod/file/graphics/icons/pdf.gif differ diff --git a/mod/file/graphics/icons/pdf_lrg.gif b/mod/file/graphics/icons/pdf_lrg.gif index 5cd62b69c..aff869d04 100644 Binary files a/mod/file/graphics/icons/pdf_lrg.gif and b/mod/file/graphics/icons/pdf_lrg.gif differ diff --git a/mod/file/graphics/icons/ppt.gif b/mod/file/graphics/icons/ppt.gif index 44aef679b..88ab26d5c 100644 Binary files a/mod/file/graphics/icons/ppt.gif and b/mod/file/graphics/icons/ppt.gif differ diff --git a/mod/file/graphics/icons/ppt_lrg.gif b/mod/file/graphics/icons/ppt_lrg.gif index 71965711d..075590fd8 100644 Binary files a/mod/file/graphics/icons/ppt_lrg.gif and b/mod/file/graphics/icons/ppt_lrg.gif differ diff --git a/mod/file/graphics/icons/text.gif b/mod/file/graphics/icons/text.gif index 107e7ca37..897aa77f9 100644 Binary files a/mod/file/graphics/icons/text.gif and b/mod/file/graphics/icons/text.gif differ diff --git a/mod/file/graphics/icons/text_lrg.gif b/mod/file/graphics/icons/text_lrg.gif index 5f7c95519..d42ea4de1 100644 Binary files a/mod/file/graphics/icons/text_lrg.gif and b/mod/file/graphics/icons/text_lrg.gif differ diff --git a/mod/file/graphics/icons/vcard.gif b/mod/file/graphics/icons/vcard.gif index f7fdda9c0..202df68dd 100644 Binary files a/mod/file/graphics/icons/vcard.gif and b/mod/file/graphics/icons/vcard.gif differ diff --git a/mod/file/graphics/icons/vcard_lrg.gif b/mod/file/graphics/icons/vcard_lrg.gif index 6cd4c45e0..68ced88d2 100644 Binary files a/mod/file/graphics/icons/vcard_lrg.gif and b/mod/file/graphics/icons/vcard_lrg.gif differ diff --git a/mod/file/graphics/icons/video.gif b/mod/file/graphics/icons/video.gif index 09abfad3b..56aca7589 100644 Binary files a/mod/file/graphics/icons/video.gif and b/mod/file/graphics/icons/video.gif differ diff --git a/mod/file/graphics/icons/video_lrg.gif b/mod/file/graphics/icons/video_lrg.gif index b23dbad91..69cc706d9 100644 Binary files a/mod/file/graphics/icons/video_lrg.gif and b/mod/file/graphics/icons/video_lrg.gif differ diff --git a/mod/file/graphics/icons/word.gif b/mod/file/graphics/icons/word.gif index f906c75bd..6f7dff340 100644 Binary files a/mod/file/graphics/icons/word.gif and b/mod/file/graphics/icons/word.gif differ diff --git a/mod/file/graphics/icons/word_lrg.gif b/mod/file/graphics/icons/word_lrg.gif index 018c8e334..4c39108de 100644 Binary files a/mod/file/graphics/icons/word_lrg.gif and b/mod/file/graphics/icons/word_lrg.gif differ diff --git a/mod/file/languages/en.php b/mod/file/languages/en.php index 278076927..b3344cb43 100644 --- a/mod/file/languages/en.php +++ b/mod/file/languages/en.php @@ -22,7 +22,6 @@ $english = array( 'file:gallery_list' => "Gallery or list view", 'file:num_files' => "Number of files to display", 'file:user:gallery'=>'View %s gallery', - 'file:via' => 'via files', 'file:upload' => "Upload a file", 'file:replace' => 'Replace file content (leave blank to not change file)', 'file:list:title' => "%s's %s %s", @@ -79,6 +78,15 @@ $english = array( 'item:object:file' => 'Files', 'file:newupload' => 'A new file has been uploaded', + 'file:notification' => +'%s uploaded a new file: + +%s +%s + +View and comment on the new file: +%s +', /** * Embed media diff --git a/mod/file/start.php b/mod/file/start.php index 6c1501bd2..120129276 100644 --- a/mod/file/start.php +++ b/mod/file/start.php @@ -122,6 +122,7 @@ function file_page_handler($page) { include "$file_dir/friends.php"; break; case 'view': + case 'read': // Elgg 1.7 compatibility set_input('guid', $page[1]); include "$file_dir/view.php"; break; @@ -199,9 +200,13 @@ function file_notify_message($hook, $entity_type, $returnvalue, $params) { if (($entity instanceof ElggEntity) && ($entity->getSubtype() == 'file')) { $descr = $entity->description; $title = $entity->title; - $url = elgg_get_site_url() . "view/" . $entity->guid; $owner = $entity->getOwnerEntity(); - return $owner->name . ' ' . elgg_echo("file:via") . ': ' . $entity->title . "\n\n" . $descr . "\n\n" . $entity->getURL(); + return elgg_echo('file:notification', array( + $owner->name, + $title, + $descr, + $entity->getURL() + )); } return null; } @@ -232,14 +237,6 @@ function file_owner_block_menu($hook, $type, $return, $params) { * @return string The overall type */ function file_get_simple_type($mimetype) { - - if($type = elgg_trigger_plugin_hook('file_simple_type', 'object', $params, null)) { - return $type; - } - - if($type = elgg_trigger_plugin_hook('file_simple_type', 'object', $params, null)) { - return $type; - } switch ($mimetype) { case "application/msword": @@ -405,4 +402,4 @@ function file_icon_url_override($hook, $type, $returnvalue, $params) { $url = elgg_trigger_plugin_hook('file:icon:url', 'override', $params, $url); return $url; } -} +} \ No newline at end of file -- cgit v1.2.3