diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100755 index 0000000..2c095c8 --- /dev/null +++ b/LICENSE.txt @@ -0,0 +1,274 @@ +GNU GENERAL PUBLIC LICENSE + + Version 2, June 1991 + +Copyright (C) 1989, 1991 Free Software Foundation, Inc. 675 Mass Ave, +Cambridge, MA 02139, USA. Everyone is permitted to copy and distribute +verbatim copies of this license document, but changing it is not allowed. + + Preamble + +The licenses for most software are designed to take away your freedom to +share and change it. By contrast, the GNU General Public License is +intended to guarantee your freedom to share and change free software--to +make sure the software is free for all its users. This General Public License +applies to most of the Free Software Foundation's software and to any other +program whose authors commit to using it. (Some other Free Software +Foundation software is covered by the GNU Library General Public License +instead.) You can apply it to your programs, too. + +When we speak of free software, we are referring to freedom, not price. Our +General Public Licenses are designed to make sure that you have the +freedom to distribute copies of free software (and charge for this service if +you wish), that you receive source code or can get it if you want it, that you +can change the software or use pieces of it in new free programs; and that +you know you can do these things. + +To protect your rights, we need to make restrictions that forbid anyone to +deny you these rights or to ask you to surrender the rights. These restrictions +translate to certain responsibilities for you if you distribute copies of the +software, or if you modify it. + +For example, if you distribute copies of such a program, whether gratis or for +a fee, you must give the recipients all the rights that you have. You must make +sure that they, too, receive or can get the source code. And you must show +them these terms so they know their rights. + +We protect your rights with two steps: (1) copyright the software, and (2) +offer you this license which gives you legal permission to copy, distribute +and/or modify the software. + +Also, for each author's protection and ours, we want to make certain that +everyone understands that there is no warranty for this free software. If the +software is modified by someone else and passed on, we want its recipients +to know that what they have is not the original, so that any problems +introduced by others will not reflect on the original authors' reputations. + +Finally, any free program is threatened constantly by software patents. We +wish to avoid the danger that redistributors of a free program will individually +obtain patent licenses, in effect making the program proprietary. To prevent +this, we have made it clear that any patent must be licensed for everyone's +free use or not licensed at all. + +The precise terms and conditions for copying, distribution and modification +follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND + MODIFICATION + +0. This License applies to any program or other work which contains a notice +placed by the copyright holder saying it may be distributed under the terms +of this General Public License. The "Program", below, refers to any such +program or work, and a "work based on the Program" means either the +Program or any derivative work under copyright law: that is to say, a work +containing the Program or a portion of it, either verbatim or with +modifications and/or translated into another language. (Hereinafter, translation +is included without limitation in the term "modification".) Each licensee is +addressed as "you". + +Activities other than copying, distribution and modification are not covered +by this License; they are outside its scope. The act of running the Program is +not restricted, and the output from the Program is covered only if its contents +constitute a work based on the Program (independent of having been made +by running the Program). Whether that is true depends on what the Program +does. + +1. You may copy and distribute verbatim copies of the Program's source +code as you receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice and +disclaimer of warranty; keep intact all the notices that refer to this License +and to the absence of any warranty; and give any other recipients of the +Program a copy of this License along with the Program. + +You may charge a fee for the physical act of transferring a copy, and you +may at your option offer warranty protection in exchange for a fee. + +2. You may modify your copy or copies of the Program or any portion of it, +thus forming a work based on the Program, and copy and distribute such +modifications or work under the terms of Section 1 above, provided that you +also meet all of these conditions: + +a) You must cause the modified files to carry prominent notices stating that +you changed the files and the date of any change. + +b) You must cause any work that you distribute or publish, that in whole or in +part contains or is derived from the Program or any part thereof, to be +licensed as a whole at no charge to all third parties under the terms of this +License. + +c) If the modified program normally reads commands interactively when run, +you must cause it, when started running for such interactive use in the most +ordinary way, to print or display an announcement including an appropriate +copyright notice and a notice that there is no warranty (or else, saying that +you provide a warranty) and that users may redistribute the program under +these conditions, and telling the user how to view a copy of this License. +(Exception: if the Program itself is interactive but does not normally print such +an announcement, your work based on the Program is not required to print +an announcement.) + +These requirements apply to the modified work as a whole. If identifiable +sections of that work are not derived from the Program, and can be +reasonably considered independent and separate works in themselves, then +this License, and its terms, do not apply to those sections when you distribute +them as separate works. But when you distribute the same sections as part +of a whole which is a work based on the Program, the distribution of the +whole must be on the terms of this License, whose permissions for other +licensees extend to the entire whole, and thus to each and every part +regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest your rights to +work written entirely by you; rather, the intent is to exercise the right to +control the distribution of derivative or collective works based on the +Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of a +storage or distribution medium does not bring the other work under the scope +of this License. + +3. You may copy and distribute the Program (or a work based on it, under +Section 2) in object code or executable form under the terms of Sections 1 +and 2 above provided that you also do one of the following: + +a) Accompany it with the complete corresponding machine-readable source +code, which must be distributed under the terms of Sections 1 and 2 above +on a medium customarily used for software interchange; or, + +b) Accompany it with a written offer, valid for at least three years, to give +any third party, for a charge no more than your cost of physically performing +source distribution, a complete machine-readable copy of the corresponding +source code, to be distributed under the terms of Sections 1 and 2 above on +a medium customarily used for software interchange; or, + +c) Accompany it with the information you received as to the offer to distribute +corresponding source code. (This alternative is allowed only for +noncommercial distribution and only if you received the program in object +code or executable form with such an offer, in accord with Subsection b +above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source code +means all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation and +installation of the executable. However, as a special exception, the source +code distributed need not include anything that is normally distributed (in +either source or binary form) with the major components (compiler, kernel, +and so on) of the operating system on which the executable runs, unless that +component itself accompanies the executable. + +If distribution of executable or object code is made by offering access to +copy from a designated place, then offering equivalent access to copy the +source code from the same place counts as distribution of the source code, +even though third parties are not compelled to copy the source along with the +object code. + +4. You may not copy, modify, sublicense, or distribute the Program except as +expressly provided under this License. Any attempt otherwise to copy, +modify, sublicense or distribute the Program is void, and will automatically +terminate your rights under this License. However, parties who have received +copies, or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + +5. You are not required to accept this License, since you have not signed it. +However, nothing else grants you permission to modify or distribute the +Program or its derivative works. These actions are prohibited by law if you +do not accept this License. Therefore, by modifying or distributing the +Program (or any work based on the Program), you indicate your acceptance +of this License to do so, and all its terms and conditions for copying, +distributing or modifying the Program or works based on it. + +6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the original +licensor to copy, distribute or modify the Program subject to these terms and +conditions. You may not impose any further restrictions on the recipients' +exercise of the rights granted herein. You are not responsible for enforcing +compliance by third parties to this License. + +7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), conditions +are imposed on you (whether by court order, agreement or otherwise) that +contradict the conditions of this License, they do not excuse you from the +conditions of this License. If you cannot distribute so as to satisfy +simultaneously your obligations under this License and any other pertinent +obligations, then as a consequence you may not distribute the Program at all. +For example, if a patent license would not permit royalty-free redistribution +of the Program by all those who receive copies directly or indirectly through +you, then the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply and +the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any patents or +other property right claims or to contest validity of any such claims; this +section has the sole purpose of protecting the integrity of the free software +distribution system, which is implemented by public license practices. Many +people have made generous contributions to the wide range of software +distributed through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing to +distribute software through any other system and a licensee cannot impose +that choice. + +This section is intended to make thoroughly clear what is believed to be a +consequence of the rest of this License. + +8. If the distribution and/or use of the Program is restricted in certain +countries either by patents or by copyrighted interfaces, the original copyright +holder who places the Program under this License may add an explicit +geographical distribution limitation excluding those countries, so that +distribution is permitted only in or among countries not thus excluded. In such +case, this License incorporates the limitation as if written in the body of this +License. + +9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will be +similar in spirit to the present version, but may differ in detail to address new +problems or concerns. + +Each version is given a distinguishing version number. If the Program specifies +a version number of this License which applies to it and "any later version", +you have the option of following the terms and conditions either of that +version or of any later version published by the Free Software Foundation. If +the Program does not specify a version number of this License, you may +choose any version ever published by the Free Software Foundation. + +10. If you wish to incorporate parts of the Program into other free programs +whose distribution conditions are different, write to the author to ask for +permission. For software which is copyrighted by the Free Software +Foundation, write to the Free Software Foundation; we sometimes make +exceptions for this. Our decision will be guided by the two goals of +preserving the free status of all derivatives of our free software and of +promoting the sharing and reuse of software generally. + + NO WARRANTY + +11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, +THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT +PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE +STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT +WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, +INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND +PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL +NECESSARY SERVICING, REPAIR OR CORRECTION. + +12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR +AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR +ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE +LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, +SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES +ARISING OUT OF THE USE OR INABILITY TO USE THE +PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA +OR DATA BEING RENDERED INACCURATE OR LOSSES +SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE +PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN +IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF +THE POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS diff --git a/MediaFlickrStreamWrapper.inc b/MediaFlickrStreamWrapper.inc deleted file mode 100644 index fc97319..0000000 --- a/MediaFlickrStreamWrapper.inc +++ /dev/null @@ -1,28 +0,0 @@ -parameters['p'])) { - return $this->base_url . 'photos/' . check_plain($this->parameters['u']) . '/' . check_plain($this->parameters['p']); - } - } - - function getTarget($f) { - return FALSE; - } - - static function getMimeType($uri, $mapping = NULL) { - return 'image/jpeg'; - } -} diff --git a/README.txt b/README.txt old mode 100644 new mode 100755 diff --git a/images/stream-flickr.png b/images/stream-flickr.png old mode 100644 new mode 100755 diff --git a/includes/MediaFlickrStreamWrapper.inc b/includes/MediaFlickrStreamWrapper.inc new file mode 100755 index 0000000..452e828 --- /dev/null +++ b/includes/MediaFlickrStreamWrapper.inc @@ -0,0 +1,51 @@ +parameters['p'])) { + return $this->base_url . 'photos/' . check_plain($this->parameters['u']) . '/' . check_plain($this->parameters['p']); + } + } + + function getTarget($f) { + return FALSE; + } + /* + * get the url of the original image + */ + function getExternalUrl(){ + module_load_include('inc', 'media_flickr', 'media_flickr.utilities'); + $url = _media_flickr_photo_url(basename($this->uri)); + return $url; + } + function getOriginalThumbnailPath() { + module_load_include('inc', 'media_flickr', 'media_flickr.utilities'); + $url = _media_flickr_photo_url(basename($this->uri)); + return $url; + } + + function getLocalThumbnailPath() { + $parts = $this->get_parameters(); + $local_path = 'public://media-flickr/u/' . check_plain($parts['u']) . '/p/' . check_plain($parts['p']) . '.jpg'; + if (!file_exists($local_path)) { + $dirname = drupal_dirname($local_path); + file_prepare_directory($dirname, FILE_CREATE_DIRECTORY | FILE_MODIFY_PERMISSIONS); + @copy($this->getOriginalThumbnailPath(), $local_path); + } + return $local_path; + } + static function getMimeType($uri, $mapping = NULL) { + return 'image/jpeg'; + } +} diff --git a/includes/MediaFlickrStyles.inc b/includes/MediaFlickrStyles.inc new file mode 100755 index 0000000..91e3408 --- /dev/null +++ b/includes/MediaFlickrStyles.inc @@ -0,0 +1,24 @@ +get('imageUri')) { + return $image_uri; + } + $object = $this->getObject(); + if ($object->uri) { + $wrapper = file_stream_wrapper_get_instance_by_uri($object->uri); + return $wrapper->getLocalThumbnailPath(); + } + } + function flickr_image($effect) { + $variables = array( + 'uri' => $this->getUri(), + 'width' => $this->getWidth(), + 'height' => $this->getHeight(), + ); + $variables = array_merge($variables, $this->variables); + $this->setOutput(theme('media_flickr_embed', $variables)); + } +} +?> \ No newline at end of file diff --git a/includes/MediaInternetFlickrHandler.inc b/includes/MediaInternetFlickrHandler.inc new file mode 100755 index 0000000..5170eea --- /dev/null +++ b/includes/MediaInternetFlickrHandler.inc @@ -0,0 +1,48 @@ +parse($embedCode)) { + return TRUE; + } + } + + public function validate() { + // @todo Media module currently fails when two files try to have the same + // URI, so catch that in the validation step. Some day, it would be nice + // to allow it, however. See http://drupal.org/node/952422. + $uri = $this->parse($this->embedCode); + $existing_files = file_load_multiple(array(), array('uri' => $uri)); + if (count($existing_files)) { + throw new MediaInternetValidationException(t('You have entered a URL for a image that is already in your library.')); + } + } + + public function save() { + $file = $this->getFileObject(); + file_save($file); + return $file; + } + + public function getFileObject() { + $uri = $this->parse($this->embedCode); + //@todo: this is terribly broken in some ways because the function is really + // made for local files which are 'real' + return file_uri_to_object($uri); + } +} +?> diff --git a/includes/media_flickr.styles.inc b/includes/media_flickr.styles.inc new file mode 100755 index 0000000..661cdea --- /dev/null +++ b/includes/media_flickr.styles.inc @@ -0,0 +1,125 @@ + array( + 'containers' => array( + 'media_flickr' => array( + 'class' => 'MediaFlickrStyles', + 'name' => 'media_flickr', + 'label' => t('Flickr'), + 'preview' => 'media_flickr_preview_style', + ), + ), + ), + ); +} + +/** + * Implementation of Styles module hook_styles_default_presets(). + */ +function media_flickr_styles_default_presets() { + $presets = array( + 'file' => array( + 'containers' => array( + 'media_flickr' => array( + 'default preset' => 'unlinked_thumbnail', + 'styles' => array( + 'original' => array( + 'default preset' => 'flickr_image', + ), + 'thumbnail' => array( + 'default preset' => 'thumb_flickr_image', + ), + 'square_thumbnail' => array( + 'default preset' => 'linked_square_thumbnail', + ), + 'medium' => array( + 'default preset' => 'medium_flickr_image', + ), + 'large' => array( + 'default preset' => 'large_flickr_image', + ), + ), + 'presets' => array( + 'flickr_image' => array( + array( + 'name' => 'flickr_image', + 'settings' => array(), + ), + ), + 'thumb_flickr_image' => array( + array( + 'name' => 'resize', + 'settings' => array( + 'width' => 100, + ), + ), + array( + 'name' => 'flickr_image', + 'settings' => array(), + ), + ), + 'medium_flickr_image' => array( + array( + 'name' => 'resize', + 'settings' => array( + 'width' => 220, + ), + ), + array( + 'name' => 'flickr_image', + 'settings' => array(), + ), + ), + 'large_flickr_image' => array( + array( + 'name' => 'resize', + 'settings' => array( + 'width' => 640, + ), + ), + array( + 'name' => 'flickr_image', + 'settings' => array(), + ), + ), + ), + ), + ), + ), + ); + // Allow any image style to be applied to the thumbnail. + foreach (image_styles() as $style_name => $image_style) { + $presets['file']['containers']['media_flickr']['presets']['linked_' . $style_name] = array( + array( + 'name' => 'linkToMedia', + 'settings' => array(), + ), + array( + 'name' => 'imageStyle', + 'settings' => array( + 'image_style' => $style_name, + ), + ), + array( + 'name' => 'thumbnail', + 'settings' => array(), + ), + ); + $presets['file']['containers']['media_flickr']['presets']['unlinked_' . $style_name] = $presets['file']['containers']['media_flickr']['presets']['linked_' . $style_name]; + array_shift($presets['file']['containers']['media_flickr']['presets']['unlinked_' . $style_name]); + } + return $presets; +} + diff --git a/includes/media_flickr.variables.inc b/includes/media_flickr.variables.inc old mode 100644 new mode 100755 index a193eb1..dfb80e8 --- a/includes/media_flickr.variables.inc +++ b/includes/media_flickr.variables.inc @@ -105,6 +105,9 @@ function media_flickr_variable_default($name = NULL) { if (!isset($defaults)) { $defaults = array( + 'width' => 560, + 'height' =>340, + 'preview_uri' => 'flickr://u/56854677@N02/p/5247285379', ); } diff --git a/includes/themes/media_flickr.theme.inc b/includes/themes/media_flickr.theme.inc new file mode 100755 index 0000000..fbf7abf --- /dev/null +++ b/includes/themes/media_flickr.theme.inc @@ -0,0 +1,81 @@ +uri; + $variables['style_name'] = $style['name']; + return theme('media_flickr_embed', $variables); +} + +function theme_media_flickr_embed($variables) { + + if(isset($variables['preset']) && isset($variables['object'])){ + //get preset information from the variables object + $preset_name = $variables[(string)'preset']; + $all_presets = $variables[(string)'presets']; + + $preset = array( + 'effects' => $all_presets[(string)'presets'][(string)$preset_name], + ); + + if (!empty($preset)) { + // Build the URL for display. + $uri = $variables['uri']; + $wrapper = file_stream_wrapper_get_instance_by_uri($uri); + $parts = $wrapper->get_parameters(); + $url = 'http://flickr.com/photos/' . check_plain($parts['u']) . '/' . check_plain($parts['p']); + + + $width = $height = 0; + + foreach ($preset['effects'] as $effect) { + switch ($effect['name']) { + case 'resize': + $width = isset($effect['settings']['width']) ? $effect['settings']['width'] : NULL; + $height = isset($effect['settings']['height']) ? $effect['settings']['height'] : NULL; + break; + } + } + if (isset($variables['object']->override)) { + $override = $variables['object']->override; + if (isset($override['width'])) { + $width = $override['width']; + } + if (isset($override['height'])) { + $height = $override['height']; + } + } + + $attributes = array(); + if ($width) { + $attributes['width'] = $width; + } + if ($height) { + $attributes['height'] = $height; + } + $output = theme('image', array( + 'path' => media_flickr_image_url($parts['p'], $width, $height), + 'alt' => $variables['alt'], + 'title' => $variables['title'], + 'attributes' => $attributes, + 'getsize' => FALSE, + )); + return $output; + } + } +} + +function theme_media_flickr_field_formatter_styles($variables) { + $element = $variables['element']; + $style = $variables['style']; + $variables['file'] = $element['#item']; + $variables['uri'] = $variables['file']['uri']; + $variables['style_name'] = $style['name']; + return theme('media_flickr_embed', $variables); +} \ No newline at end of file diff --git a/javascript/media_flickr.fromurl.js b/javascript/media_flickr.fromurl.js old mode 100644 new mode 100755 diff --git a/media_flickr.admin.inc b/media_flickr.admin.inc old mode 100644 new mode 100755 diff --git a/media_flickr.info b/media_flickr.info old mode 100644 new mode 100755 index fb0d8f4..47aff12 --- a/media_flickr.info +++ b/media_flickr.info @@ -1,10 +1,19 @@ name = Media: Flickr description = Integrates Flickr.com photos and photosets with Media. +package = "Media" core = 7.x -dependencies[] = media_internet files[] = media_flickr.module -files[] = MediaFlickrStreamWrapper.inc files[] = media_flickr.admin.inc files[] = media_flickr.utilities.inc -package = "Media" +files[] = includes/MediaFlickrStreamWrapper.inc +files[] = includes/MediaFlickrStyles.inc +files[] = includes/MediaInternetFlickrHandler.inc +dependencies[] = media_internet + +; Information added by drupal.org packaging script on 2011-02-25 +version = "7.x-1.x-dev" +core = "7.x" +project = "media_flickr" +datestamp = "1298619620" + diff --git a/media_flickr.install b/media_flickr.install new file mode 100755 index 0000000..335c740 --- /dev/null +++ b/media_flickr.install @@ -0,0 +1,23 @@ + $value) { + media_flickr_variable_del($variable); + } + return array(array('success' => TRUE, 'query' => "Deleted all variables in the Media: Flickr namespace.")); +} diff --git a/media_flickr.module b/media_flickr.module old mode 100644 new mode 100755 index 574a27f..5bd6ee8 --- a/media_flickr.module +++ b/media_flickr.module @@ -9,6 +9,9 @@ // A registry of variable_get defaults. include_once('includes/media_flickr.variables.inc'); +// Hooks and callbacks for integrating with Styles module for display. +include_once('includes/media_flickr.styles.inc'); + /** * Implement hook_menu(). */ @@ -46,7 +49,6 @@ function media_flickr_menu() { * Create stream wrapper for Flickr videos. */ function media_flickr_stream_wrappers() { - stream_wrapper_register('flickr', 'MediaFlickrStreamWrapper'); return array( 'flickr' => array( 'name' => t('Flickr photos'), @@ -61,31 +63,49 @@ function media_flickr_stream_wrappers() { */ function media_flickr_theme($existing, $type, $theme, $path) { return array( - 'media_flickr_preview_style_old' => array( - 'variables' => array('style' => NULL), - ), 'media_flickr_preview_style' => array( 'variables' => array('field_type' => NULL, 'container_name' => NULL, 'style_name' => NULL), + 'file' => 'media_flickr.theme.inc', + 'path' => $path . '/includes/themes', ), 'media_flickr_field_formatter_styles' => array( 'variables' => array('element' => NULL, 'style' => NULL), + 'file' => 'media_flickr.theme.inc', + 'path' => $path . '/includes/themes', ), 'media_flickr_embed' => array( 'variables' => array('style_name' => NULL, 'uri' => NULL, 'alt' => NULL, 'title' => NULL), + 'file' => 'media_flickr.theme.inc', + 'path' => $path . '/includes/themes', ), 'media_flickr_styles' => array( 'variables' => array('element' => NULL, 'style' => NULL), + 'file' => 'media_flickr.theme.inc', + 'path' => $path . '/includes/themes', ), ); } - -function theme_media_flickr_field_formatter_styles($variables) { - $element = $variables['element']; - $style = $variables['style']; - $variables['file'] = $element['#item']; - $variables['uri'] = $variables['file']['uri']; - $variables['style_name'] = $style['name']; - return theme('media_flickr_embed', $variables); +/** + * Implementation of Styles module hook_styles_register(). + */ +function media_flickr_styles_register() { + return array( + 'MediaFlickrStyles' => array( + 'field_types' => 'file', + 'name' => t('MediaFlickr'), + 'description' => t('Media Flickr styles.'), + 'path' => drupal_get_path('module', 'media_flickr') .'/includes', + 'file' => 'media_flickr.styles.inc', + ), + ); +} +/** + * Implementation of the File Styles module's hook_file_styles_filter(). + */ +function media_flickr_file_styles_filter($object) { + if ((file_uri_scheme($object->uri) == 'flickr') && ($object->filemime == 'image/jpeg')) { + return 'media_flickr'; + } } /** @@ -98,77 +118,6 @@ function media_flickr_formatter_filter($variables) { } } -function theme_media_flickr_preview_style($variables) { - $variables['uri'] = variable_get('media_flickr_preview_uri', 'flickr://u/esmerel/p/3910304052'); - return theme('media_flickr_embed', $variables); -} - -function theme_media_flickr_styles($variables) { - $style = $variables['style']; - $variables['file'] = $variables['object']; - $variables['uri'] = $variables['object']->uri; - $variables['style_name'] = $style['name']; - return theme('media_flickr_embed', $variables); -} - -function theme_media_flickr_embed($variables) { - $preset_name = $variables['preset_name']; - $preset = styles_containers_available_styles('file', 'media_flickr', $preset_name); - if (!empty($preset)) { - // Build the URL for display. - $uri = $variables['uri']; - $wrapper = file_stream_wrapper_get_instance_by_uri($uri); - $parts = $wrapper->get_parameters(); - $url = 'http://flickr.com/photos/' . check_plain($parts['u']) . '/' . check_plain($parts['p']); - - $fullscreen_value = $autoplay = 'false'; - $in_browser = $thumbnail = FALSE; - - $width = $height = 0; - - foreach ($preset['effects'] as $effect) { - switch ($effect['name']) { - case 'resize': - $width = isset($effect['data']['width']) ? $effect['data']['width'] : NULL; - $height = isset($effect['data']['height']) ? $effect['data']['height'] : NULL; - break; - } - } - if (isset($variables['object']->override)) { - $override = $variables['object']->override; - if (isset($override['width'])) { - $width = $override['width']; - } - if (isset($override['height'])) { - $height = $override['height']; - } - if (isset($override['browser']) && $override['browser']) { - $in_browser = TRUE; - } - } - - $attributes = array(); - if ($width) { - $attributes['width'] = $width; - } - if ($height) { - $attributes['height'] = $height; - } - $output = theme('image', array( - 'path' => media_flickr_image_url($parts['p'], $width, $height), - 'alt' => $variables['alt'], - 'title' => $variables['title'], - 'attributes' => $attributes, - 'getsize' => FALSE, - )); - if ($in_browser) { - // Add an overlay that says 'Flickr' to media library browser thumbnails. - $output .= ''; - } - return $output; - } -} - /** * Based on the Photo ID of a Flickr image, this will return the URL to the * image itself. @@ -207,139 +156,10 @@ function media_flickr_media_internet_providers() { $path = drupal_get_path('module', 'media_flickr'); return array( 'MediaInternetFlickrHandler' => array( - 'title' => 'youtube', + 'title' => 'flickr', 'image' => $path . '/images/stream-flickr.png' ), ); } -class MediaInternetFlickrHandler extends MediaInternetBaseHandler { - public function claim($embedCode) { - if (media_flickr_media_parse($embedCode)) { - return TRUE; - } - } - public function save() { - $file = $this->getFileObject(); - file_save($file); - return $file; - } - - public function getFileObject() { - $uri = media_flickr_media_parse($this->embedCode); - //@todo: this is terribly broken in some ways because the function is really - // made for local files which are 'real' - return file_uri_to_object($uri); - } -} - -/** - * @DEPRECATED - * Implements hook_styles_containers(). - */ -function media_flickr_styles_containers() { - return array( - 'file' => array( - 'containers' => array( - 'media_flickr' => array( - 'label' => t('Flickr Styles'), - 'data' => array( - 'streams' => array( - 'flickr', - ), - 'mimetypes' => array( - // @TODO: Add image mimetypes here... -// 'application/octet-stream', - ), - ), - 'weight' => 0, - 'filter callback' => 'media_flickr_formatter_filter', - 'themes' => array( - 'field_formatter_styles' => 'media_flickr_field_formatter_styles', - 'styles' => 'media_flickr_styles', - 'preview' => 'media_flickr_preview_style', - ), - 'description' => t('Flickr Styles will display embedded Flickr photos to your choosing, such as by resizing. You can !manage.', array('!manage' => l(t('manage your Flickr styles here'), 'admin/config/media/media-flickr-styles'))), - ), - ), - ), - ); -} - -/** - * @DEPRECATED - * Implements hook_styles_styles(). - */ -function media_flickr_styles_styles() { - return array( - 'file' => array( - 'containers' => array( - 'media_flickr' => array( - 'styles' => array( - 'flickr_thumbnail' => array( - 'name' => 'flickr_thumbnail', - 'effects' => array( - array('label' => t('Resize'), 'name' => 'resize', 'data' => array('width' => 100, 'height' => 75)), - ), - ), - 'flickr_small' => array( - 'name' => 'flickr_small', - 'effects' => array( - array('label' => t('Resize'), 'name' => 'resize', 'data' => array('width' => 220)), - ), - ), - 'flickr_large' => array( - 'name' => 'flickr_large', - 'effects' => array( - array('label' => t('Resize'), 'name' => 'resize', 'data' => array('width' => 640)), - ), - ), - 'flickr_original' => array( - 'name' => 'flickr_original', - 'effects' => array( - ), - ), - ), - ), - ), - ), - ); -} - -/** - * @DEPRECATED - * Implements hook_styles_presets(). - */ -function media_flickr_styles_presets() { - $presets = array( - 'file' => array( - 'square_thumbnail' => array( - 'media_flickr' => array( - 'flickr_thumbnail', - ), - ), - 'thumbnail' => array( - 'media_flickr' => array( - 'flickr_thumbnail', - ), - ), - 'small' => array( - 'media_flickr' => array( - 'flickr_small', - ), - ), - 'large' => array( - 'media_flickr' => array( - 'flickr_large', - ), - ), - 'original' => array( - 'media_flickr' => array( - 'flickr_original', - ), - ), - ), - ); - return $presets; -} diff --git a/media_flickr.utilities.inc b/media_flickr.utilities.inc old mode 100644 new mode 100755 index 07eb206..4141fef --- a/media_flickr.utilities.inc +++ b/media_flickr.utilities.inc @@ -29,12 +29,12 @@ function _media_flickr_photo_url($photo_code, $width = 0, $height = 0, $cached = */ function _media_flickr_photo_remote_url($photo_code, $size) { $getsize = _media_flickr_sets_request('flickr.photos.getSizes', array('photo_id' => $photo_code)); - - if ($getsize) { + + if ($getsize/* && $getsize['@attributes']['stat'] != 'fail'*/) { // For small images, there may not be the sizes 0..4 that // media_flickr_guess_size assumes, so: $size = min($size, count($getsize['sizes']['size'])-1); - + return $getsize['sizes']['size'][$size]['@attributes']['source']; } } @@ -108,26 +108,27 @@ function _media_flickr_guess_size($width = 0, $height = 0) { } function _media_flickr_photo_url_from_size($photo_code, $size = 5) { - if ($photo_code) { -// // If we're storing our files locally, then grab the filepath now. -// if ($store = variable_get('media_flickr_store_local', FALSE)) { -// $filepath = db_result(db_query("SELECT f.filepath FROM {files} f INNER JOIN {media_flickr_sizes} m ON m.fid = f.fid AND m.code = '%s' AND m.size = %d", $photo_code, $size)); -// } -// // If we don't have a filepath, it's either because we're not storing -// // them locally, or it hasn't been saved locally yet. -// if (!$filepath && $store) { -// // Let's attempt to store our file locally. -// $filepath = media_flickr_store_local($photo_code, $size); -// } -// // We're not storing locally, or have otherwise failed, -// // so now we'll just grab the remote URL. -// if (!$filepath) { - $filepath = _media_flickr_photo_remote_url($photo_code, $size); -// } - // URLize that path... - $filepath = url($filepath, array('absolute' => TRUE)); - return $filepath; - } + //check to make sure we have a valid photo code + if (is_numeric($photo_code)) { + // // If we're storing our files locally, then grab the filepath now. + // if ($store = variable_get('media_flickr_store_local', FALSE)) { + // $filepath = db_result(db_query("SELECT f.filepath FROM {files} f INNER JOIN {media_flickr_sizes} m ON m.fid = f.fid AND m.code = '%s' AND m.size = %d", $photo_code, $size)); + // } + // // If we don't have a filepath, it's either because we're not storing + // // them locally, or it hasn't been saved locally yet. + // if (!$filepath && $store) { + // // Let's attempt to store our file locally. + // $filepath = media_flickr_store_local($photo_code, $size); + // } + // // We're not storing locally, or have otherwise failed, + // // so now we'll just grab the remote URL. + // if (!$filepath) { + $filepath = _media_flickr_photo_remote_url($photo_code, $size); + // } + // URLize that path... + $filepath = url($filepath, array('absolute' => TRUE)); + return $filepath; + } } // function _media_flickr_store_local($photo_code, $size) { diff --git a/media_flickr.wysiwyg.css b/media_flickr.wysiwyg.css old mode 100644 new mode 100755