From 63375b14ab171fa21e4615c3477a35fa2cd48350 Mon Sep 17 00:00:00 2001 From: Tristan Olive Date: Fri, 30 Mar 2012 02:39:22 -0400 Subject: [PATCH] Added files missed in prior module update --- .../filefield_meta/filefield_meta.token.inc | 59 +++++++++++++++++++ .../views/filefield_handler_field_icon.inc | 24 ++++++++ .../sites/all/modules/flag_friend/INSTALL.txt | 10 ++++ 3 files changed, 93 insertions(+) create mode 100644 drupal/sites/all/modules/filefield/filefield_meta/filefield_meta.token.inc create mode 100644 drupal/sites/all/modules/filefield/views/filefield_handler_field_icon.inc create mode 100644 drupal/sites/all/modules/flag_friend/INSTALL.txt diff --git a/drupal/sites/all/modules/filefield/filefield_meta/filefield_meta.token.inc b/drupal/sites/all/modules/filefield/filefield_meta/filefield_meta.token.inc new file mode 100644 index 0000000000..cda5e1c3a6 --- /dev/null +++ b/drupal/sites/all/modules/filefield/filefield_meta/filefield_meta.token.inc @@ -0,0 +1,59 @@ + $label) { + $tokens['file']['filefield-tag-' . $tag] = t('File ID3 @tag tag', array('@tag' => $label)); + } + + return $tokens; + } +} + +/** + * Implementation of hook_token_values(). + * + * Provide the token values for a given file item. + */ +function filefield_meta_token_values($type, $object = NULL) { + $tokens = array(); + if ($type == 'field' && isset($object[0]['fid'])) { + $item = $object[0]; + + $tokens['filefield-width'] = $item['data']['width'] ; + $tokens['filefield-height'] = $item['data']['height'] ; + $tokens['filefield-duration'] = $item['data']['duration'] ; + $tokens['filefield-audio-format'] = isset($item['data']['audio_format']) ? check_plain($item['data']['audio_format']) : ''; + $tokens['filefield-audio-sample-rate'] = isset($item['data']['sample_rate']) ? check_plain($item['data']['sample_rate']) : ''; + $tokens['filefield-audio-channel-mode'] = isset($item['data']['audio_channel_mode']) ? check_plain($item['data']['audio_channel_mode']) : ''; + $tokens['filefield-audio-bitrate'] = isset($item['data']['audio_bitrate']) ? check_plain($item['data']['audio_bitrate']) : ''; + $tokens['filefield-audio-bitrate-mode'] = isset($item['data']['audio_bitrate_mode']) ? check_plain($item['data']['audio_bitrate_mode']) : ''; + + // ID3 tags. + foreach (filefield_meta_tags() as $tag => $label) { + $tokens['filefield-tag-title'] = isset($item['data']['tags'][$tag]) ? check_plain($item['data']['tags'][$tag]) : ''; + } + } + + return $tokens; +} diff --git a/drupal/sites/all/modules/filefield/views/filefield_handler_field_icon.inc b/drupal/sites/all/modules/filefield/views/filefield_handler_field_icon.inc new file mode 100644 index 0000000000..faa5fafd4f --- /dev/null +++ b/drupal/sites/all/modules/filefield/views/filefield_handler_field_icon.inc @@ -0,0 +1,24 @@ +additional_fields['fid'] = 'fid'; + $this->additional_fields['filename'] = 'filename'; + $this->additional_fields['filesize'] = 'filesize'; + } + + function render($values) { + $pseudo_file = array( + 'fid' => $values->{$this->aliases['fid']}, + 'filemime' => $values->{$this->field_alias}, + 'filename' => $values->{$this->aliases['filename']}, + 'filesize' => $values->{$this->aliases['filesize']}, + ); + return theme('filefield_icon', $pseudo_file); + } +} diff --git a/drupal/sites/all/modules/flag_friend/INSTALL.txt b/drupal/sites/all/modules/flag_friend/INSTALL.txt new file mode 100644 index 0000000000..b7c9862494 --- /dev/null +++ b/drupal/sites/all/modules/flag_friend/INSTALL.txt @@ -0,0 +1,10 @@ +Installation Instructions +===== +- Download the module and place in your /sites/all/modules or wherever you kids are installing your contrib modules these days. +- Go to /admin/build/modules and enable Flag and Flag Friend in the "Flags" category/fieldset. +- Go to /admin/build/flags and enable the 'friend' flag. +- Some default values are entered for you in this flag's configuration. Feel free to modify what is available. +- If you have Views installed, you should see a new tab when you go to your /user/N page titled 'Friends'. Underneath you will have two sub-tabs titled 'Flagged' and 'Pending'. Feel free to modify these views as you see fit, but I wouldn't mess too much with the arguments and/or relationships unless you really know what you are doing. +-- Friends lists your current friend relationships. +-- Flagged lists other users you have flagged and are awaiting a response from. +-- Pending lists other users that have flagged you are are awaiting your response. \ No newline at end of file