/ - Diff - EDIT - EDIT Project Management

« Previous | Next »

Revision 9f07f8ae

Added by Andreas Kohlbecker almost 3 years ago

ID 9f07f8aee34610e9daa01fb979cd006e75cb4087
Parent efcd579e
Child b5ab5eed

ref #8028 support wor web-apps in media gallery
- refactoring procedural code to classes
- better differentiation of thumbnail-, full-size-image and web-app

      * eu.etaxonomy.cdm.model.media.MediaUtils.filterAndOrderMediaRepresentations()
+     *
      * @param object $media
      * @param array $mimeTypes
      * @param array $mime_types
      *    an array of mimetypes in their order of preference. e.g:
      *    array('application/pdf', 'image/png', 'image/jpeg', 'image/gif', 'text/html')
      * @param int $width
      *    The width of the optimal image. If null, the method will return the representation with the biggest expansion
      * @param int $height
      *    The height of the optimal image. If null, the method will return the representation with the biggest expansion
+     *
      * @param bool $mime_types_filter_excludes
      *    Toggles the mode of the $mime_types filter to exclude when set to TRUE
      * @param bool $strict_size_limit
      *    Width an height parameters are treated as maximum values when this parameter is enabled.
      * @return array
      *   An array with preferred media representations or else an empty array.
      */
     function cdm_preferred_media_representations($media, array $mimeTypes, $width = NULL, $height = NULL) {
       $prefRepr = array();
     function cdm_preferred_media_representations($media, array $mime_types, $width = NULL, $height = NULL, $mime_types_filter_excludes = FALSE, $strict_size_limit = FALSE) {
       $matching_representations_by_rank = [];
       if (!isset($media->representations[0])) {
         return $prefRepr;
         return $matching_representations_by_rank;
+      }
       while (count($mimeTypes) > 0) {
         // getRepresentationByMimeType
         $mimeType = array_shift($mimeTypes);
         foreach ($media->representations as &$representation) {
           // If the mimetype is not known, try inferring it.
-...
               $representation->mimeType = infer_mime_type($representation->parts[0]->uri);
+            }
+          }
           if ($representation->mimeType == $mimeType) {
             // Preferred mimetype found -> erase all remaining mimetypes
             // to end loop.
             $mimeTypes = array();
             $expansionDeltaSum = 0;
           $mime_type_match = array_search($representation->mimeType, $mime_types);
           $match_per_mime_type_filter = $mime_types_filter_excludes ? !$mime_type_match : $mime_type_match;
           if ($match_per_mime_type_filter) {
             $expansion_delta_sum = 0;
             $valid_parts_cnt = 0;
             // Look for part with the best matching size.
             foreach ($representation->parts as $part) {
-...
                 // skip part if URI is missing
                 continue;
+              }
               $valid_parts_cnt++;
               $expansionDelta = PHP_INT_MAX; // biggest delta for unknown sizes
               // determine the optimal size
               if (isset($part->width) && isset($part->height)) {
                 $expansion = $part->width * $part->height;
                 if ($width != null && $height != null) {
                   $optimalExpansion = $height * $width;
                 } else {
                   $optimalExpansion = PHP_INT_MAX;
               if($strict_size_limit){
                 if (isset($part->width) && isset($part->height) && $part->width <= $width && $part->height <= $height) {
                   $valid_parts_cnt++;
+                }
                 // determine the difference
                 $expansionDelta = $expansion > $optimalExpansion ? $expansion - $optimalExpansion : $optimalExpansion - $expansion;
               } else {
                 // calculate expansion delta
                 $valid_parts_cnt++;
                 $expansion_delta = PHP_INT_MAX; // biggest delta for unknown sizes
                 // determine the optimal size
                 if (isset($part->width) && isset($part->height)) {
                   $expansion = $part->width * $part->height;
                   if ($width != null && $height != null) {
                     $optimalExpansion = $height * $width;
                   } else {
                     $optimalExpansion = PHP_INT_MAX;
+                  }
                   // determine the difference
                   $expansion_delta = $expansion > $optimalExpansion ? $expansion - $optimalExpansion : $optimalExpansion - $expansion;
+                }
                 // sum up the expansionDeltas of all parts contained in the representation
                 $expansion_delta_sum += $expansion_delta;
+              }
               // sum up the expansionDeltas of all parts contained in the representation
               $expansionDeltaSum += $expansionDelta;
+            }
             if($valid_parts_cnt > 0){
               $expansionDeltaSum = $expansionDeltaSum / $valid_parts_cnt;
               $prefRepr[$expansionDeltaSum] = $representation;
               $expansion_delta_sum = $expansion_delta_sum / $valid_parts_cnt;
               $matching_representations_by_rank[$expansion_delta_sum] = $representation;
+            }
+          }
+        }
+      }
       // Sort the array so that the smallest key value is the first in the array
       ksort($prefRepr);
       return $prefRepr;
       ksort($matching_representations_by_rank);
       return $matching_representations_by_rank;
+    }
     /**
-...
           $obj = NULL;
+        }
         $reponse_data = NULL;
         $response_data = NULL;
         if (function_exists('compose_' . $hook)){
           // call compose hook
           $elements =  call_user_func('compose_' . $hook, $obj);
           // pass the render array to drupal_render()
           $reponse_data = drupal_render($elements);
           $response_data = drupal_render($elements);
         } else {
           // call theme hook
-...
                 'tree_node_callback' => isset($args[2]) ? $args[2] : FALSE,
                 'element_name'=> isset($args[3]) ? $args[3] : FALSE,
                 );
               $reponse_data = theme($hook, $variables);
               $response_data = theme($hook, $variables);
               break;
             case 'cdm_list_of_taxa':
-...
                   'records' => $obj,
                   'freetextSearchResults' => isset($args[0]) ? $args[0] : array(),
                   'show_classification' => isset($args[1]) ? $args[1] : FALSE);
                 $reponse_data = theme($hook, $variables);
                 $response_data = theme($hook, $variables);
                 break;
             case 'cdm_media_caption':
               $variables = $arg;
               $variables['media'] = $obj;
               $reponse_data = theme($hook, $variables);
               break;
             default:
               drupal_set_message(t(
               'Theme !theme is not yet supported by the function !function.', array(
-...
         if($do_gzip){
           $reponse_data = gzencode($reponse_data, 2, FORCE_GZIP);
           $response_data = gzencode($response_data, 2, FORCE_GZIP);
           drupal_add_http_header('Content-Encoding', 'gzip');
+        }
         drupal_add_http_header('Content-Type', 'text/html; charset=utf-8');
         drupal_add_http_header('Content-Length', strlen($reponse_data));
         drupal_add_http_header('Content-Length', strlen($response_data));
         print $reponse_data;
         print $response_data;
       } // END of handle $hook either as compose ot theme hook
+    }

     files[] = classes/AnnotationsAndSources.php
     files[] = classes/NameRenderConfiguration.php
     files[] = classes/DerivationTreeComposer.php
     files[] = classes/GalleryItemMedia.php
     files[] = classes/MediaSize.php
     files[] = classes/ImageMediaItem.php
     files[] = lib/FaviconDownloader.php
     configure = admin/config/cdm_dataportal/settings

       module_load_include('inc', 'cdm_dataportal', 'includes/media');
       module_load_include('inc', 'cdm_dataportal', 'includes/maps');
       module_load_include('inc', 'cdm_dataportal', 'includes/occurrences');
       module_load_include('inc', 'cdm_dataportal', 'includes/occurrences_new'); // tmp file, shoud be merged later with occurrences.inc
       module_load_include('inc', 'cdm_dataportal', 'includes/occurrences_new'); // tmp file, should be merged later with occurrences.inc
       module_load_include('inc', 'cdm_dataportal', 'includes/descriptions');
       module_load_include('inc', 'cdm_dataportal', 'includes/pre-drupal8');
-...
       module_load_include('php', 'cdm_dataportal', 'classes/footnotekey');
       module_load_include('php', 'cdm_dataportal', 'classes/renderhints');
       /* ============================ java script functions ============================= */

     <?php
     /**
      * Class GalleryItemMedia filters suitable MediaRepresentations from a CDM Media
      * object and prepares them for to be used as item in a MediaGallery.
      */
     class GalleryItemMedia {
       public static $OK = 0;
       public static $ACCESS_DENIED = -1;
       public static $ERROR = -2;
       public static $image_mime_type_list_default =  [
         'image/jpg',
         'image/jpeg',
         'image/png',
         'image/gif',
       ];
       private $image_mime_type_list;
       private $thumbnail_width;
       private $thumbnail_height;
       private $thumbnail_representation = null;
       private $full_size_representation = null;
       private $web_app_representation = null;
       private $first_representation = null;
       /**
        * GalleryItemMedia constructor.
        */
       public function __construct($media, $thumbnail_width, $thumbnail_height, $image_mime_type_list = null) {
         if(!$image_mime_type_list){
           $this->image_mime_type_list  =  self::$image_mime_type_list_default;
+        }
         $this->thumbnail_width = $thumbnail_width;
         $this->thumbnail_height =$thumbnail_height;
         $this->findRepresentations($media);
+      }
       private function findRepresentations($media) {
         if (isset($media->representations[0]->parts[0])) {
           $thumbnail_representations = cdm_preferred_media_representations($media, $this->image_mime_type_list,
             $this->thumbnail_width, $this->thumbnail_height, FALSE, TRUE
           );
           $full_size_representations = cdm_preferred_media_representations($media, $this->image_mime_type_list);
           $web_app_representations = cdm_preferred_media_representations($media, $this->image_mime_type_list, NULL, NULL, TRUE);
           if (isset_not_empty($media->representations)) {
             // can be used as last resort fall back
             $this->first_representation = $media->representations[0];
+          }
           if (isset_not_empty($this->thumbnail_representation)) {
             $this->thumbnail_representation = array_shift($thumbnail_representations);
+          }
           if (isset_not_empty($full_size_representations)) {
             $this->full_size_representation = array_shift($full_size_representations);
+          }
           if (isset_not_empty($web_app_representations)) {
             $this->web_app_representation = array_shift($web_app_representations);
+          }
+        }
+      }
       public function getThumbnailImageMediaItem() {
         $url = $this->getThumbnailImageUrl();
         if($url){
           return new ImageMediaItem($this->getThumbnailImageUrl(), $this->getThumbnailSize());
+        }
         return null;
+      }
       /**
        * Provides the size of the thumbnail image if available.
        * In case this GalleryItemMedia contains as web app url the favicon
        * default size is returned.
+       *
        * @return object|null
        */
       private function getThumbnailSize() {
         $repr = $this->getThumbnailRepresentation();
         if($repr){
           return $this->sizeOf($repr);
         } else  if($this->hasWebAppItem()) {
           // returning the favicon size, actual size is not important, in this case!
           return new MediaSize(64,64);
+        }
         return null;
+      }
       /**
        * The url of the thumbnail image if this is available. In case this
        * GalleryItemMedia contains as web app url the according favicon is returned
        * as thumbnail url.
+       *
        * @return string|null
        *   The URL
        */
       private function getThumbnailImageUrl() {
         $repr = $this->getThumbnailRepresentation();
         if($repr){
           return $this->urlOf($repr);
         } else if($this->hasWebAppItem()) {
           return $this->webAppIcon($this->getWebAppUrl());
+        }
         return null;
+      }
       public function getWebAppUrl() {
         return $this->urlOf($this->web_app_representation);
+      }
       public function hasWebAppItem(){
         return is_string($this->getWebAppUrl());
+      }
       public function getFullSizeImageUrl() {
         if($this->full_size_representation){
           return $this->urlOf($this->full_size_representation);
+        }
+      }
       public function hasFullSizeImage(){
         return is_string($this->getFullSizeImageUrl());
+      }
       /**
        * Provides the ULR to be used for showing the the item
        * in an overlay widget.
+       *
        * This is currently limited to images only.
+       *
        * @return string
        */
       public function getOverlayImageUrl(){
         if($this->hasFullSizeImage()){
           return $this->getFullSizeImageUrl();
+        }
         return null;
+      }
       /**
        * Provides the URL to be used for linking directly to the item.
        * Such links will open the item directly in the browser window.
        * WebApp urls are preferred over full-size-image urls.
        * The media item can be a web-app or image.
+       *
        * @return mixed
        */
       public function getOpenItemUrl(){
         if($this->hasWebAppItem()){
           $url = $this->getWebAppUrl();
           if($this->urlIsAccessible($url) == self::$OK){
             return $url;
+          }
+        }
         if($this->hasFullSizeImage()){
           $url = $this->getFullSizeImageUrl();
           if($this->urlIsAccessible($url) == self::$OK){
             return $url;
+          }
+        }
         return null;
+      }
       private function getThumbnailRepresentation() {
         if ($this->thumbnail_representation) {
           return $this->thumbnail_representation;
         } else {
           // use fallback strategy
           if ($this->full_size_representation) {
             return $this->full_size_representation;
           } else if(!$this->web_app_representation->uuid || $this->first_representation->uuid !== $this->web_app_representation->uuid){
             return $this->first_representation;
+          }
+        }
+      }
       /**
        * @param $media_representation
        *  The CDM MediaRepresentation
+       *
        * @return string|null
        *  The fist URL found in the representation parts or null
        */
       private function urlOf($media_representation){
         if(isset($media_representation->parts)){
           foreach($media_representation->parts as $part){
             if(isset($part->uri)){
               return $part->uri;
+            }
+          }
+        }
         return null;
+      }
       /**
        * @param $url
+       *
        * @return false|mixed|string
+       *
        * function found at https://stackoverflow.com/questions/5701593/how-to-get-a-websites-favicon-with-php#5702084
        */
       private function webAppIcon($url){
         $favicon = new FaviconDownloader($url);
         if ($favicon->icoExists) {
           return $favicon->icoUrl;
+        }
         return null;
+      }
       /**
        * @param $url
+       *
        * @return int
        *  One of the GalleryItemMedia constants: $OK, $ACCESS_DENIED, $ERROR
        */
       private function urlIsAccessible($url){
         $result = drupal_http_request($url, ['method' => 'HEAD']);
         if($result->code == 200){
           return GalleryItemMedia::$OK;
         } else if($result->code >= 401 && $result->code <= 403) {
           return GalleryItemMedia::$ACCESS_DENIED;
         } else {
           return GalleryItemMedia::$ERROR;
+        }
+      }
       /**
        * @param $media_representation
+       *
        * @return MediaSize object
        *    A MediaSize object with the fields
        *    - width: may be unset
        *    - height: may be unset
        *   or null if no size information is available
        */
       private function sizeOf($media_representation){
         if(isset($media_representation->parts[0])){
           $part = $media_representation->parts[0];
           if (isset_not_empty($part->width) || isset_not_empty($part->height)) {
             return new MediaSize(
               @$media_representation->parts[0]->width,
               @$media_representation->parts[0]->height
             );
+          }
+        }
         return null;
+      }
+    }

     <?php
     class ImageMediaItem {
       private $size;
       private $url;
       /**
        * ImageMediaItem constructor.
        */
       public function __construct($url, MediaSize $size = null) {
         $this->size = $size;
         $this->url = $url;
+      }
       public static function fromMediaRepresentationPart($mediaRepresentationPart){
         $h = @$mediaRepresentationPart->height;
         $w = @$mediaRepresentationPart->width;
         return new ImageMediaItem($mediaRepresentationPart->url, new MediaSize($w, $h));
+      }
       /**
        * @return \MediaSize
        */
       public function getSize() {
         return $this->size;
+      }
       /**
        * @return mixed
        */
       public function getUrl() {
         return $this->url;
+      }
+    }

     <?php
     class MediaSize {
       public $width, $height;
       /**
        * MediaSize constructor.
        */
       public function __construct($width, $height) {
         $this->width = $width;
         $this->height = $height;
+      }
+    }

         $captionElements = array('title', 'rights');
         if (isset($media_list[0]) && isset($gallery_settings['cdm_dataportal_media_maxextend']) && isset($gallery_settings['cdm_dataportal_media_cols'])) {
           $gallery = compose_cdm_media_gallerie(array(
           $gallery = compose_cdm_media_gallery(array(
             'mediaList' => $media_list,
             'galleryName' => CDM_DATAPORTAL_DESCRIPTION_GALLERY_NAME . '_' . $feature_node->term->uuid,
             'maxExtend' => $gallery_settings['cdm_dataportal_media_maxextend'],
-...
+     *
      * @return string
      *    The markup
+     *
+     *
      * @ingroup compose
      */
     function cdm_description_element_media($descriptionElement, $mimeTypePreference) {

      *   A render array for the image gallery
      * @ingroup: compose
      */
     function compose_cdm_media_gallerie($configuration) {
     function compose_cdm_media_gallery($configuration) {
       $mediaList = $configuration['mediaList'];
-...
         array(
           'mediaList' => NULL,
           'galleryName' => NULL,
           'maxExtend' => 150,
           'max_extend' => 150,
           'cols' => 4,
           'maxRows' => FALSE,
           'captionElements' => array('title'),
           'mediaLinkType' => 'LIGHTBOX',
           'alternativeMediaUri' => NULL,
           'alternative_media_uri' => NULL,
           'galleryLinkUri' => NULL,
           'showCaption' => TRUE,
         ),
         $configuration);
         $image_mime_type_list = [
           'image/jpg',
           'image/jpeg',
           'image/png',
           'image/gif',
         ];
       $galleryName = $configuration['galleryName'];
       $maxExtend = $configuration['maxExtend'];
       $max_extend = $configuration['max_extend'];
       $cols = $configuration['cols'];
       $maxRows = $configuration['maxRows'];
       $captionElements = $configuration['captionElements'];
       $mediaLinkType = $configuration['mediaLinkType'];
       $alternativeMediaUri = $configuration['alternativeMediaUri'];
       $alternative_media_uri = $configuration['alternative_media_uri'];
       $galleryLinkUri = $configuration['galleryLinkUri'];
       $showCaption = $configuration['showCaption'];
       $caption_link_uri = '';
       $do_link_to_media = '';
       if(isset($captionElements['#uri'])){
         $caption_link_uri = $captionElements['#uri'];
         $do_link_to_media = $captionElements['#uri'];
         unset($captionElements['#uri']);
+      }
       if (!is_array($captionElements) || count($captionElements) == 0) {
-...
           $complete_media = cdm_ws_get(CDM_WS_MEDIA, $media->uuid);
           if (isset($complete_media->representations[0]->parts[0])) {
               //
               // Find preferred representation.
               //
               $thumbnail_representations = cdm_preferred_media_representations($complete_media, array(
                   'image/jpg',
                   'image/jpeg',
                   'image/png',
                   'image/gif',
               ),
                   $maxExtend,
                   $maxExtend
               );
               // due to a bug the portal/taxon/{uuid}/media service only delivers a filtered media object
               // which only contains the thumbnail representation even if the height and width filters are not set.
               // --> #6970
               // to get hold of the full resolution images we send a separate request :
               // $complete_media = cdm_ws_get(CDM_WS_MEDIA, $media->uuid);
               $full_size_representations = cdm_preferred_media_representations($complete_media, array(
                       'image/jpg',
                       'image/jpeg',
                       'image/png',
                       'image/gif',
+                  )
               );
               if (count($thumbnail_representations) == 0) {
                   // Fallback to using the first one in the list.
                   $thumbnail_representations = $media->representations;
                   $full_size_representations = $media->representations;
+              }
               $thumbnail_representation = array_shift($thumbnail_representations);
               $full_size_representation = array_shift($full_size_representations);
               // $preferred_media_representation->parts[0]->uri =
               // "http://127.0.0.1/images/palmae/palm_tc_14415_1.jpg";
               $contentTypeDirectory = media_content_type_dir($thumbnail_representation, 'application');
               switch($contentTypeDirectory) {
                 case 'image':
                   $mediaPartHtml = cdm_media_gallerie_entry_image($thumbnail_representation->parts[0], $maxExtend, TRUE);
                   break;
                 case 'video':
                 case 'audio':
                 case 'video':
                 case 'application':
                 case 'text':
                 default:
                   $mediaPartHtml = cdm_media_gallerie_entry_webapp($thumbnail_representation->parts[0], $maxExtend, TRUE);
+              }
               // --- Compose Media Link.
               $mediaLinkUri = FALSE;
               if ($alternativeMediaUri) {
                   if (isset($alternativeMediaUri[$mediaIndex])) {
                       $mediaLinkUri = $alternativeMediaUri[$mediaIndex];
+                  }
                   if (is_string($alternativeMediaUri)) {
                       $mediaLinkUri = $alternativeMediaUri;
+                  }
               } else {
                   $mediaLinkUri = $full_size_representation->parts[0]->uri;
+              }
               $mediaIndex++;
               // media captions will be loaded via AHAH
               _add_js_ahah();
               $content_url = cdm_compose_ws_url(CDM_WS_PORTAL_MEDIA, $media->uuid);
               //if $captionElements == null, set $captionPartHtml = '' otherwise the loading image is shown but nothing is loaded.
               if ($captionElements) {
                   $cdm_proxy_url_caption = url('cdm_api/proxy/' . urlencode($content_url) . "/cdm_media_caption/" . serialize($captionElements));
                   $ahah_media_caption = '<div class="ahah-content" data-cdm-ahah-url="' . $cdm_proxy_url_caption . '">'
                       . '<span class="loading" style="display: none;">' . loading_image_html() . '</span></div>';
                 // preparing the part link (= click on image itself) which can be handled in two ways
                 //
                 //  1. open image in lightbox, the captions in the lightbox will be loaded via AHAH
                 //  2. open the media in a new window with target 'specimen'
                 if ($mediaLinkType == 'LIGHTBOX' && $contentTypeDirectory == 'image') {
                   $mediaPartLinkAttributes['class'] = array('lightbox');
                 } else {
                   $mediaPartLinkAttributes['target'] = "specimen";
                   $openMediaLinkAttributes['target'] = "specimen";
             $gallery_media_item = new GalleryItemMedia($complete_media, $max_extend, $max_extend);
     //        if($gallery_media_item->hasWebAppItem()) {
     //            $media_part_markup = cdm_media_gallerie_entry_webapp($gallery_media_item, $max_extend, TRUE);
     //        } else {
             $thumbnail_item = $gallery_media_item->getThumbnailImageMediaItem();
                 $media_part_markup = cdm_media_gallery_entry_image($thumbnail_item, $max_extend, TRUE);
     //        }
             // --- Compose Media Link.
             $media_link_uri = FALSE;
             if ($alternative_media_uri) {
                 if (isset($alternative_media_uri[$mediaIndex])) {
                     $media_link_uri = $alternative_media_uri[$mediaIndex];
+                }
                 $mediaPartLinkAttributes['alt'] = htmlentities($ahah_media_caption);
                 // --- preparing the media caption
                 /* old comment: "no caption elements to show up here except the $caption_link_uri, if at all"
+                 *
                  * a.kohlbecker 2013-03-14 :
                  *   It is unclear why no caption elements should be shown, Was it a technical reason?
                  *   see commit r16723 740177eb-a1d8-4ec3-a630-accd905eb3da
                  *   If not problems arise with this remove it after some weeks
                  */
                 $captionPartHtml = $ahah_media_caption;
               }else{
                   $captionPartHtml = '';
                 if (is_string($alternative_media_uri)) {
                     $media_link_uri = $alternative_media_uri;
+                }
             } else {
                 $media_link_uri = $gallery_media_item->getOpenItemUrl();
+            }
             $mediaIndex++;
             // media captions will be loaded via AHAH
             _add_js_ahah();
             $content_url = cdm_compose_ws_url(CDM_WS_PORTAL_MEDIA, $media->uuid);
             //if $captionElements == null, set $caption_part_markup = '' otherwise the loading image is shown but nothing is loaded.
             if ($captionElements) {
               $cdm_proxy_url_caption = url('cdm_api/proxy/' . urlencode($content_url) . "/cdm_media_caption/" . serialize($captionElements));
               $ahah_media_caption = '<div class="ahah-content" data-cdm-ahah-url="' . $cdm_proxy_url_caption . '">'
                   . '<span class="loading" style="display: none;">' . loading_image_html() . '</span></div>';
             // preparing the part link (= click on image itself) which can be handled in two ways
             //
             //  1. open image in lightbox, the captions in the lightbox will be loaded via AHAH
             //  2. open the media in a new window with target 'specimen'
             if ($mediaLinkType == 'LIGHTBOX' && $gallery_media_item->hasFullSizeImage()) {
               $mediaPartLinkAttributes['class'] = array('lightbox');
             } else {
               $mediaPartLinkAttributes['target'] = "specimen";
               $openMediaLinkAttributes['target'] = "specimen";
+            }
             $mediaPartLinkAttributes['alt'] = htmlentities($ahah_media_caption);
             // --- preparing the media caption
             /* old comment: "no caption elements to show up here except the $caption_link_uri, if at all"
+             *
              * a.kohlbecker 2013-03-14 :
              *   It is unclear why no caption elements should be shown, Was it a technical reason?
              *   see commit r16723 740177eb-a1d8-4ec3-a630-accd905eb3da
              *   If not problems arise with this remove it after some weeks
              */
             $caption_part_markup = $ahah_media_caption;
           }else{
               // no caption_elements --> empty caption
               $caption_part_markup = '';
+          }
             if ($do_link_to_media) {
               if ($gallery_media_item->hasFullSizeImage()) {
                 // it is an image, so open it in the media page
                 $caption_part_markup .= '<div class="media-caption-link">' . l("Open in viewer " . custom_icon_font_markup('icon-interal-link-alt-solid'), path_to_media($media->uuid), array(
                     'attributes' => array(), 'html' => TRUE,
                         )) . '</div>';
+              }
               if ($caption_link_uri) {
                   if ($contentTypeDirectory == 'image') {
                     // it is an image, so open it in the media page
                     $captionPartHtml .= '<div class="media-caption-link">' . l($caption_link_uri, path_to_media($media->uuid), array(
                         'attributes' => array(), 'html' => TRUE,
                             )) . '</div>';
+                  }
                   else {
                     // otherwise open it directly and let the the browser handle the media type
                     $openMediaLinkAttributes['absolute'] = TRUE;
                     $captionPartHtml .= '<div class="media-caption-link">' . l($caption_link_uri, $mediaLinkUri, array(
                         'attributes' => $openMediaLinkAttributes, 'html' => TRUE,
                       )) . '</div>';
+                  }
               if ($gallery_media_item->hasWebAppItem()) {
                 // otherwise open it directly and let the the browser handle the media type
                 $openMediaLinkAttributes['absolute'] = TRUE;
                 $caption_part_markup .= '<div class="media-caption-link">' . l("Open external page " . font_awesome_icon_markup('fa-external-link-alt', array('class' => array('superscript'))), $gallery_media_item->getWebAppUrl(), array(
                     'attributes' => $openMediaLinkAttributes, 'html' => TRUE,
                   )) . '</div>';
+              }
+            }
               $captionParts[] = $captionPartHtml;
           $captionParts[] = $caption_part_markup;
                 // --- Surround imagePart with link, this .
               if ($doLink) {
                 $mediaPartHtml = l($mediaPartHtml, $mediaLinkUri, array(
                     'attributes' => $mediaPartLinkAttributes, 'html' => TRUE,
                 ));
+              }
+          }
           else {
             $mediaPartHtml = '';
           // --- Surround imagePart with link, this .
             if ($doLink) {
               $media_part_markup = l($media_part_markup, $gallery_media_item->getOverlayImageUrl(), array(
                   'attributes' => $mediaPartLinkAttributes, 'html' => TRUE,
               ));
+            }
           } else {
             $media_part_markup = '';
             $captionParts[] = '';
+          }
           $out .= '<td class="media">' . $mediaPartHtml . '</td>';
           $out .= '<td class="media">' . $media_part_markup . '</td>';
+        }
         $out .= '</tr>'; // End of media parts.
         if ($showCaption) {
           if ( (is_array($captionElements) && count($captionElements) > 0) || $caption_link_uri) {
           if ( (is_array($captionElements) && count($captionElements) > 0) || $do_link_to_media) {
             $out .= '<tr class="caption-row">';
             // Add caption row.
             foreach ($captionParts as $captionPartHtml) {
               $out .= '<td class="caption">' . $captionPartHtml . '</td>';
             foreach ($captionParts as $caption_part_markup) {
               $out .= '<td class="caption">' . $caption_part_markup . '</td>';
+            }
             $out .= '</tr>';
+          }
-...
     /**
      * Creates markup for a CDM MediaRepresentation which is referencing an image.
+     *
      * @param $mediaRepresentationPart
      * @param \ImageMediaItem $thumbnailImage
      * @param $maxExtend
      * @param $addPassePartout
      * @param $attributes
      *   An array of attributes for the img tag.
+     *
      * @return string
      *   The markup for the media representation
      */
     function cdm_media_gallerie_entry_image($mediaRepresentationPart, $maxExtend, $addPassePartout, $attributes = array()) {
     function cdm_media_gallery_entry_image($thumbnailImage, $maxExtend, $addPassePartout, $attributes = array()) {
       $out = '';
       // TODO merge with theme_cdm_media_mime_image?
       if (isset($mediaRepresentationPart)) {
       if (isset($thumbnailImage)) {
         $h = @$mediaRepresentationPart->height;
         $w = @$mediaRepresentationPart->width;
         $size = $thumbnailImage->getSize();
         $h = @$size->height;
         $w = @$size->width;
         $thumbnail_image_uri = $thumbnailImage->getUrl();
         if (!($w && $h)) {
           // Take url and replace spaces.
           $image_uri = str_replace(' ', '%20', $mediaRepresentationPart->uri);
           $imageDimensions = getimagesize_remote($image_uri);
           // TODO this should go into the ImageMediaItem
           $imageDimensions = getimagesize_remote(str_replace(' ', '%20', $thumbnail_image_uri));
           if (!$imageDimensions) {
             return '<div>' . t('Image unavailable, uri: ') . $mediaRepresentationPart->uri . '</div>';
             return '<div>' . t('Image unavailable, uri: ') . $thumbnail_image_uri . '</div>';
+          }
           $w = $imageDimensions[0];
           $h = $imageDimensions[1];
-...
           $attributes = array();
+        }
         if(!isset($attributes['alt'])){
           $attributes['alt'] = check_plain($mediaRepresentationPart->uri);
           $attributes['alt'] = check_plain($thumbnail_image_uri);
+        }
         $attrStr = ' ';
         // $attributes['title'] = 'h:'.$h.', w:'.$w.',ratio:'.$ratio;
-...
         if ($addPassePartout) {
           $out .= '<div class="image-passe-partout" style="width:' . $maxExtend . 'px; height:' . $maxExtend . 'px;">';
+        }
         else {
           // Do not add margins if no pass partout is shown.
         } else {
           // Do not add margins if no pass-partout is shown.
           $margins = '';
+        }
         $out .= '<img src="' . $mediaRepresentationPart->uri . '" width="' . $displayWidth . '" height="' . $displayHeight . '" style="' . $margins . '"' . $attrStr . ' />';
         $out .= '<img src="' . $thumbnail_image_uri . '" width="' . $displayWidth . '" height="' . $displayHeight . '" style="' . $margins . '"' . $attrStr . ' />';
         if ($addPassePartout) {
           $out .= '</div>';
+        }
-...
     /**
      * Creates markup for a CDM MediaRepresentation which is referencing an web application.
+     *
      * @param $mediaRepresentationPart
      * @param ImageMediaItem $galleryItemMedia
      * @param $maxExtend
      * @param $addPassePartout
      * @param $attributes
+     *
      * @return string
      *   The markup for the media representation
      */
     function cdm_media_gallerie_entry_webapp($mediaRepresentationPart, $maxExtend, $addPassePartout, $attributes = array()) {
     function cdm_media_gallerie_entry_webapp($galleryItemMedia, $maxExtend, $addPassePartout, $attributes = array()) {
       $out = '';
       if (isset($mediaRepresentationPart)) {
         $out = '<div class="application">Link to external media resource or web application</div>';
       if (isset($galleryItemMedia)) {
         $out = '<div class="application"><image src="' . $galleryItemMedia->getUrl() . '"></div>';
         if ($addPassePartout) {
           $out .= '<div class="image-passe-partout" style="width:' . $maxExtend . 'px; height:' . $maxExtend . 'px;">' . $out .'</div>';
+        }
-...
         $gallery_settings = getGallerySettings(CDM_DATAPORTAL_TAXON_MEDIA_GALLERY_NAME_TAB);
         $out = '<div class="image-gallerie">';
         $out .= compose_cdm_media_gallerie(array(
         $out .= compose_cdm_media_gallery(array(
           'mediaList' => $media,
           'galleryName' => $gallery_name,
           'maxExtend' => $gallery_settings['cdm_dataportal_media_maxextend'],
-...
+    }
     /**
      * @todo Please document this function.
      * @see http://drupal.org/node/1354
      * Extracts the content type directory from the mime type of the passed
      * CDM MediaRepresentation.
      */
     function media_content_type_dir($media_representation, $default = FALSE) {
       if ($media_representation->mimeType) {
         return substr($media_representation->mimeType, 0, stripos($media_representation->mimeType, '/'));
+      }
       else {
       if (isset_not_empty($media_representation->mimeType)) {
         $ctd = substr($media_representation->mimeType, 0, stripos($media_representation->mimeType, '/'));
         return $ctd;
       } else {
         return $default;
+      }
+    }
-...
      *         example:
      *          Show 'title', 'description', 'file', 'filename' in the caption:
      *          array('title', 'description', 'file', 'filename')
      * @return string
      *   the markup
      * @return array
      *   A drupal render array
+     *
      * @ingroup compose
      */
-...
       $doRights = !$elements || array_search('rights', $elements) !== FALSE;
       $descriptionPrefix = "";
       $footnote_list_key = 'media-' . $media->uuid;
       $footnote_list_key = cdm_media_foot_note_key($media);
       // handle sources and annotations
       cdm_lazyload_array_field('media', 'annotations', $media);
-...
         $media, NULL, $footnote_list_key
       );
       $out = '';
       $render_array = [];
       // Title.
       if ($doTitle) {
-...
           // Use filename as fallback option if no description and no source citations are available.
           $title_string = $media_metadata['filename'];
+        }
         $out .= '<div class="title">' . $title_string . '</div>';
         $render_array['title'] = markup_to_render_array('<div class="title">' . $title_string . '</div>');
+      }
       // Description.
       if ($media_metadata['description'] && $doDescription) {
         $out .= '<p class="description">' . $media_metadata['description'] . '</p>';
         $render_array['description'] = markup_to_render_array('<p class="description">' . $media_metadata['description'] . '</p>');
+      }
       $groups = array();
       //  $render_array['dl']  = markup_to_render_array('<dl class="media-caption">');
       $out .= '<dl class="media-caption">';
       $groups = array();
       // Artist.
       if ($media_metadata['artist'] && $doArtist) {
         _description_list_group_add($groups, t('Artist') . ':', $media_metadata['artist'] );
-...
       // TODO add all other metadata elements generically.
       $description_list_item = array(
       $description_list = array(
         '#theme' => 'description_list',
         '#groups' => $groups,
         '#attributes' => array('class' => 'media-caption')
       );
       $out .= drupal_render($description_list_item);
       $out .= render_footnotes($footnote_list_key);
       return $out;
       $render_array['description_list'] = $description_list;
       $render_array['footnotes'] = markup_to_render_array(render_footnotes(cdm_media_foot_note_key($media)));
       return $render_array;
+    }
     /**
      * @param $media
+     *
      * @return string
      */
     function cdm_media_foot_note_key($media) {
       return 'media-' . $media->uuid;
+    }

                 'elements' => array('-none-'),
                 'sources_as_content' => true
               );
               $media = compose_cdm_media_gallerie(array(
               $media = compose_cdm_media_gallery(array(
                 'mediaList' => array($mediaSpecimen),
                 'galleryName' => CDM_DATAPORTAL_TYPE_SPECIMEN_GALLERY_NAME . '_' . $type_designation_entity_ref->uuid,
                 'maxExtend' => $gallery_settings['cdm_dataportal_media_maxextend'],

             $gallery_html = compose_cdm_media_gallerie(array(
             $gallery_html = compose_cdm_media_gallery(array(
                 'mediaList' => $images,
                 'galleryName' => $galleryName,
                 'maxExtend' => $gallery_settings['cdm_dataportal_media_maxextend'],
-...
                                 $captionElements = array(
                                     '#uri' => t('open media'),
                                 );
                                 $gallery_html = compose_cdm_media_gallerie(array(
                                 $gallery_html = compose_cdm_media_gallery(array(
                                     'mediaList' => $value, // WARNING: this is either a List<Media> or List<MediaDTO>, see above ~line 361
                                     'galleryName' => $specimen_or_observation->titleCache,
                                     'maxExtend' => $gallery_settings['cdm_dataportal_media_maxextend'],
-...
                     case 'chromatograms':
                         @_description_list_group_add($groups, cdm_occurrence_field_name_label($field),
                             array(
                                 '#markup' => compose_cdm_media_gallerie(array('medialist' => $value)),
                                 '#markup' => compose_cdm_media_gallery(array('medialist' => $value)),
                             ),
                             NULL,
 );
-...
                             'title',
                             '#uri' => t('open media'),
                         );
                         $gallery_html = compose_cdm_media_gallerie(array(
                         $gallery_html = compose_cdm_media_gallery(array(
                             'mediaList' => $value,
                             'galleryName' => $specimen_or_observation_dto->uuid,
                             'maxExtend' => $gallery_settings['cdm_dataportal_media_maxextend'],
-...
               '#uri' => t('open media'),
             );
             $gallery_html = compose_cdm_media_gallerie(array(
             $gallery_html = compose_cdm_media_gallery(array(
               'mediaList' => $mediaList,
               'galleryName' => $gallery_name,
               'maxExtend' => $gallery_settings['cdm_dataportal_media_maxextend'],
-...
               '#uri' => t('open media'),
             );
             $gallery_html = compose_cdm_media_gallerie(array(
             $gallery_html = compose_cdm_media_gallery(array(
               'mediaList' => $mediaList,
               'galleryName' => $gallery_name,
               'maxExtend' => $gallery_settings['cdm_dataportal_media_maxextend'],

         'title',
         '#uri' => t('open media'),
       );
       $gallery_markup = compose_cdm_media_gallerie(array(
       $gallery_markup = compose_cdm_media_gallery(array(
         'mediaList' => $listOfMedia,
         'galleryName' => $sob_dto->uuid,
         'maxExtend' => $gallery_settings['cdm_dataportal_media_maxextend'],

+        }
         if (isset($representationPart->uri)) {
           $profile_image = cdm_media_gallerie_entry_image($representationPart, $taxon_profile_image_settings['maxextend'], FALSE, $attributes);
           $profile_image = cdm_media_gallery_entry_image(
             ImageMediaItem::fromMediaRepresentationPart($representationPart),
             $taxon_profile_image_settings['maxextend'],
             FALSE,
             $attributes
           );
           // NOTE: style="width:${maxextend}px' is needed for IE8 !!!
           $max_extend_with = $taxon_profile_image_settings['maxextend'] . 'px';
           $render_array['taxon_profile_image'] = markup_to_render_array('<div id="taxonProfileImage" style="width:' . $max_extend_with . '">' . $profile_image . '</div>',

     <?php
     /**
      * FaviconDownloader - find favicon URL and download it easy
      * Requirements : PHP 5.3+ with curl extension
+     *
      * @author Vincent Paré (www.finalclap.com)
      * @copyright © 2014-2015 Vincent Paré
      * @license http://opensource.org/licenses/Apache-2.0
      * @package FaviconDownloader
      * @version 1.0.0
      * @tutorial http://www.finalclap.com/faq/477-php-favicon-find-download
      */
     #namespace Vincepare\FaviconDownloader;
     class FaviconDownloader
+    {
         // URL types
         const URL_TYPE_ABSOLUTE = 1;
         const URL_TYPE_ABSOLUTE_SCHEME = 2;
         const URL_TYPE_ABSOLUTE_PATH = 3;
         const URL_TYPE_RELATIVE = 4;
         const URL_TYPE_EMBED_BASE64 = 5;
         public $url;          // (string) Page URL
         public $pageUrl;      // (string) Page URL, after prospective redirects
         public $siteUrl;      // (string) Site root URL (homepage), based on $pageUrl
         public $icoUrl;       // (string) full URI to favicon
         public $icoType;      // (string) favicon type (file extension, ex: ico|gif|png)
         public $findMethod;   // (string) favicon url determination method (default /favicon.ico or found in head>link tag)
         public $error;        // (string) details, in case of failure...
         public $icoExists;    // (bool)   tell if the favicon exists (set after calling downloadFavicon)
         public $icoMd5;       // (string) md5 of $icoData
         public $icoData;      // (binary) favicon binary data
         public $debugInfo;    // (array)  additionnal debug info
         protected $httpProxy; // (string) HTTP proxy (ex: localhost:8888)
         protected $sslVerify; // (bool)   SSL verify peer (default: true)
         /**
          * Create a new FaviconDownloader object, search & download favicon if $auto is true
+         *
          * @param string $url Page URL
          * @param array $options Optional settings
          * @param bool $auto Search & download favicon on instantiation
          */
         public function __construct($url, $options = null, $auto = true)
+        {
             if (!$url) {
                 throw new \InvalidArgumentException("url is empty");
+            }
             if (self::urlType($url) != self::URL_TYPE_ABSOLUTE) {
                 throw new \InvalidArgumentException("'".$url."' is not an absolute url");
+            }
             $this->url = $url;
             $this->httpProxy = isset($options['httpProxy']) ? $options['httpProxy'] : null;
             $this->sslVerify = isset($options['sslVerify']) && $options['sslVerify'] === false ? false : true;
             if ($auto) {
                 $this->getFaviconUrl();
                 $this->downloadFavicon();
+            }
+        }
         /**
          * Download page and search html to find favicon URL. Returns favicon URL.
          * HTML parsing is achieved using regular expressions (http://blog.codinghorror.com/parsing-html-the-cthulhu-way/)
          * to get it work on all kinds of web documents (including non w3c compliance), which an XML parser can't do.
          */
         public function getFaviconUrl()
+        {
             // If already executed, don't need to search again
             if (!empty($this->icoUrl)) {
                 return $this->icoUrl;
+            }
             // Check URL to search
             if (empty($this->url)) {
                 throw new \Exception("url is empty");
+            }
             // Removing fragment (hash) from URL
             $url = $this->url;
             $urlInfo = parse_url($this->url);
             if (isset($urlInfo['fragment'])) {
                 $url = str_replace('#'.$urlInfo['fragment'], '', $url);
+            }
             // Downloading the page
             $html = $this->downloadAs($url, $info);
             if ($info['curl_errno'] !== CURLE_OK) {
                 $this->error = $info['curl_error'];
                 $this->debugInfo['document_curl_errno'] = $info['curl_errno'];
                 return false;
+            }
             // Saving final URL (after prospective redirects) and get root URL
             $this->pageUrl = $info['effective_url'];
             $pageUrlInfo = parse_url($this->pageUrl);
             if (!empty($pageUrlInfo['scheme']) && !empty($pageUrlInfo['host'])) {
                 $this->siteUrl = $pageUrlInfo['scheme'].'://'.$pageUrlInfo['host'].'/';
+            }
             // Default favicon URL
             $this->icoUrl = $this->siteUrl.'favicon.ico';
             $this->findMethod = 'default';
             // HTML <head> tag extraction
             preg_match('#^(.*)<\s*body#isU', $html, $matches);
             $htmlHead = isset($matches[1]) ? $matches[1] : $html;
             // HTML <base> tag href extraction
             $base_href = null;
             if (preg_match('#<base[^>]+href=(["\'])([^>]+)\1#i', $htmlHead, $matches)) {
                 $base_href = rtrim($matches[2], '/').'/';
                 $this->debugInfo['base_href'] = $base_href;
+            }
             // HTML <link> icon tag analysis
             if (preg_match('#<\s*link[^>]*(rel=(["\'])[^>\2]*icon[^>\2]*\2)[^>]*>#i', $htmlHead, $matches)) {
                 $link_tag = $matches[0];
                 $this->debugInfo['link_tag'] = $link_tag;
                 // HTML <link> icon tag href analysis
                 if (preg_match('#href\s*=\s*(["\'])(.*?)\1#i', $link_tag, $matches)) {
                     $ico_href = trim($matches[2]);
                     $this->debugInfo['ico_href'] = $ico_href;
                     $this->findMethod = 'head';
                     // Building full absolute URL
                     $urlType = self::urlType($ico_href);
                     switch($urlType){
                         case self::URL_TYPE_ABSOLUTE:
                             $this->findMethod .= ' absolute';
                             $this->icoUrl = $ico_href;
                             $this->icoType = self::getExtension($this->icoUrl);
                             break;
                         case self::URL_TYPE_ABSOLUTE_SCHEME:
                             $this->findMethod .= ' absolute_scheme';
                             $this->icoUrl = $pageUrlInfo['scheme'].':'.$ico_href;
                             $this->icoType = self::getExtension($this->icoUrl);
                             break;
                         case self::URL_TYPE_ABSOLUTE_PATH:
                             $this->findMethod .= ' absolute_path';
                             if (isset($base_href)) {
                                 $baseHrefType = self::urlType($base_href);
                                 if ($baseHrefType != self::URL_TYPE_ABSOLUTE) {
                                     throw new \Exception("Base href is not an absolute URL");
+                                }
                                 $baseUrlInfo = parse_url($base_href);
                                 $this->icoUrl = $baseUrlInfo['scheme'].'://'.$baseUrlInfo['host'].$ico_href;
                                 $this->findMethod .= ' with base href';
                             } else {
                                 $this->icoUrl = rtrim($this->siteUrl, '/').'/'.ltrim($ico_href, '/');
                                 $this->findMethod .= ' without base href';
+                            }
                             $this->icoType = self::getExtension($this->icoUrl);
                             break;
                         case self::URL_TYPE_RELATIVE:
                             $this->findMethod .= ' relative';
                             $path = preg_replace('#/[^/]+?$#i', '/', $pageUrlInfo['path']);
                             if (isset($base_href)) {
                                 $this->icoUrl = $base_href.$ico_href;
                                 $this->findMethod .= ' with base href';
                             } else {
                                 $this->icoUrl = $pageUrlInfo['scheme'].'://'.$pageUrlInfo['host'].$path.$ico_href;
                                 $this->findMethod .= ' without base href';
+                            }
                             $this->icoType = self::getExtension($this->icoUrl);
                             break;
                         case self::URL_TYPE_EMBED_BASE64:
                             $this->findMethod .= ' base64';
                             $this->icoUrl = $ico_href;
                             break;
+                    }
+                }
+            }
             return $this->icoUrl;
+        }
         /**
          * Download the favicon if available
          */
         public function downloadFavicon()
+        {
             // Check params
             if (empty($this->icoUrl)) {
                 return false;
+            }
             // Prevent useless re-download
             if (!empty($this->icoData)) {
                 return false;
+            }
             // Base64 embed favicon
             if (preg_match('/^\s*data:(.*?);base64,(.*)/i', $this->icoUrl, $matches)) {
                 $content = base64_decode($matches[2]);
                 if ($content === false) {
                     $this->error = "base64 decode error";
                     return false;
+                }
                 $this->icoData   = $content;
                 $this->icoMd5    = md5($content);
                 $this->icoExists = true;
                 $this->icoType   = self::getExtensionFromMimeType($matches[1]);
                 return true;
+            }
             // Download favicon
             $content = $this->downloadAs($this->icoUrl, $info);
             $this->debugInfo['favicon_download_metadata'] = $info;
             // Failover : if getting a 404 with favicon URL found in HTML source, trying with the default favicon URL
             $doFailover = $content === false
                 && $info['http_code'] == 404
                 && $this->findMethod != 'default'
                 && !isset($this->debugInfo['failover']);
             if ($doFailover) {
                 $this->debugInfo['failoverBefore_icoUrl'] = $this->icoUrl;
                 $this->debugInfo['failoverBefore_findMethod'] = $this->findMethod;
                 $this->icoUrl = $this->siteUrl.'favicon.ico';
                 $this->findMethod = 'default';
                 $this->icoType = self::getExtension($this->icoUrl);
                 $this->debugInfo['failover'] = true;
                 return $this->downloadFavicon();
+            }
             // Download error
             if ($content === false) {
                 $this->error = 'Favicon download error (HTTP '.$info['http_code'].')';
                 return false;
+            }
             // Check favicon content
             if (strlen($content) == 0) {
                 $this->error = "Empty content";
                 return false;
+            }
             $textTypes = array('text/html', 'text/plain');
             if (in_array($info['content_type'], $textTypes) || preg_match('#(</html>|</b>)#i', $content)) {
                 $this->error = "Seems to be a text document";
                 return false;
+            }
             // All right baby !
             $this->icoData   = $content;
             $this->icoMd5    = md5($content);
             $this->icoExists = true;
             return true;
+        }
         /**
          * Download URL as Firefox with cURL
          * Details available in $info if provided
+         *
          * @param string $url URL to download
          * @param array $info Download metadata
          */
         public function downloadAs($url, &$info = null)
+        {
             $ch = curl_init($url);
             curl_setopt($ch, CURLOPT_HEADER, false);
             curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
             curl_setopt($ch, CURLOPT_BINARYTRANSFER, true);
             curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);  // Follow redirects (302, 301)
             curl_setopt($ch, CURLOPT_MAXREDIRS, 20);         // Follow up to 20 redirects
             curl_setopt($ch, CURLOPT_USERAGENT, 'Mozilla/5.0 (Windows NT 6.1; WOW64; rv:38.0) Gecko/20100101 Firefox/38.0');
             // Don't check SSL certificate to allow autosigned certificate
             if ($this->sslVerify === false) {
                 curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
+            }
             // Set HTTP proxy
             if ($this->httpProxy) {
                 curl_setopt($ch, CURLOPT_PROXY, $this->httpProxy);
+            }
             $content = curl_exec($ch);
             $info['curl_errno'] = curl_errno($ch);
             $info['curl_error'] = curl_error($ch);
             $info['http_code'] = curl_getinfo($ch, CURLINFO_HTTP_CODE);
             $info['effective_url'] = curl_getinfo($ch, CURLINFO_EFFECTIVE_URL);
             $info['redirect_count'] = curl_getinfo($ch, CURLINFO_REDIRECT_COUNT);
             $info['content_type'] = curl_getinfo($ch, CURLINFO_CONTENT_TYPE);
             curl_close($ch);
             if ($info['curl_errno'] !== CURLE_OK || in_array($info['http_code'], array(403, 404, 500, 503))) {
                 return false;
+            }
             return $content;
+        }
         /**
          * Return file extension from an URL or a file path
+         *
          * @param string $url
          */
         public static function getExtension($url)
+        {
             if (preg_match('#^(https?|ftp)#i', $url)) {
                 $purl = parse_url($url);
                 $url = $purl['path'];
+            }
             $info = pathinfo($url);
             return $info['extension'];
+        }
         /**
          * Return file extension from MIME type
+         *
          * @param string $mimeType
          */
         public static function getExtensionFromMimeType($mimeType)
+        {
             $typeMapping = array(
                 'ico' => '#image/(x-icon|ico)#i',
                 'png' => '#image/png#i',
                 'gif' => '#image/gif#i',
                 'jpg' => '#image/jpe?g#i',
             );
             foreach ($typeMapping as $key => $val) {
                 if (preg_match($val, $mimeType)) {
                     return $key;
+                }
+            }
             return 'ico';
+        }
         /**
          * Return URL type, either :

... This diff was truncated because it exceeds the maximum size that can be displayed.

Also available in: Unified diff

Project

General

Profile

EDIT

Revision 9f07f8ae

Added by Andreas Kohlbecker almost 3 years ago

Related issues