Changeset 3138:fdc62ca291e0 for inc

Timestamp:

11/17/15 13:22:52 (10 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Make Flash player fallback insertion optional, not anymore needed with modern browsers supporting <video> and <audio> HTML5 tags.

Location:

inc

Files:

• core/class.dc.core.php (modified) (1 diff)
• core/class.dc.media.php (modified) (6 diffs)
• dbschema/upgrade.php (modified) (1 diff)

inc/core/class.dc.core.php

@@ -1394 +1394 @@
                     array('media_video_height','integer',300,
                     'Video height in media manager'),
+                    array('media_flash_fallback','boolean',true,
+                    'Flash player fallback for audio and video media'),
                     array('nb_post_for_home','integer',20,
                     'Number of entries on first home page'),

inc/core/class.dc.media.php

@@ -1103 +1103 @@
      Returns HTML code for audio player (HTML5 and if possible fallback Flash player)
 
-     @param  type   <b>string</b>       audio mime type
-     @param    url       <b>string</b>       audio URL to play
-     @param    player    <b>string</b>       Player URL (flash player fallback)
-     @param    args <b>array</b>        Player parameters (flash player fallback)
+     @param  type        <b>string</b>       audio mime type
+     @param    url            <b>string</b>       audio URL to play
+     @param    player         <b>string</b>       Player URL (flash player fallback)
+     @param    args      <b>array</b>        Player parameters (flash player fallback)
+     @param  fallback    <b>boolean</b>      Include Flash player fallback
      @return   <b>string</b>
      */
-     public static function audioPlayer($type,$url,$player=null,$args=null)
+     public static function audioPlayer($type,$url,$player=null,$args=null,$fallback=true)
      {
           $audio =
@@ -1115 +1116 @@
                '<source src="'.$url.'">';
 
-          if ($type == 'audio/mpeg3') {
+          if ($fallback && $type == 'audio/mpeg3') {
                // Include Flash player fallback
                if (!$player) {
@@ -1170 +1171 @@
      Returns HTML code for video player (HTML5 and if possible fallback Flash player)
 
-     @param  type   <b>string</b>       video mime type
-     @param    url       <b>string</b>       video URL to play
-     @param    player    <b>string</b>       Player URL (flash player fallback)
-     @param    args <b>array</b>        Player parameters (flash player fallback)
+     @param  type        <b>string</b>       video mime type
+     @param    url            <b>string</b>       video URL to play
+     @param    player         <b>string</b>       Player URL (flash player fallback)
+     @param    args      <b>array</b>        Player parameters (flash player fallback)
+     @param  fallback    <b>boolean</b>      Include Flash player fallback (if not .flv)
      @return   <b>string</b>
      */
-     public static function videoPlayer($type,$url,$player=null,$args=null)
+     public static function videoPlayer($type,$url,$player=null,$args=null,$fallback=true)
      {
           $video = '';
@@ -1198 +1200 @@
           }
 
-          if ($type == 'video/x-flv' || $type == 'video/mp4' || $type == 'video/x-m4v')
+          if ($type == 'video/x-flv' || ($fallback && ($type == 'video/mp4' || $type == 'video/x-m4v')))
           {
                // Include Flash player fallback
@@ -1256 +1258 @@
      Returns HTML code for MP3 player
 
-     @param    url       <b>string</b>       MP3 URL to play
-     @param    player    <b>string</b>       Player URL
+     @param    url            <b>string</b>       MP3 URL to play
+     @param    player         <b>string</b>       Player URL
      @param    args      <b>array</b>        Player parameters
+     @param  fallback    <b>boolean</b>      Include Flash player fallback
      @return   <b>string</b>
      */
-     public static function mp3player($url,$player=null,$args=null)
+     public static function mp3player($url,$player=null,$args=null,$fallback=true)
      {
           if (!$player) {
@@ -1299 +1302 @@
           '<audio controls preload="auto">'.
           '<source src="'.$url.'" type="audio/mpeg">'.
-          '<object type="application/x-shockwave-flash" '.
-          'data="'.$player.'" '.
-          'width="'.$args['width'].'" height="'.$args['height'].'">'.
-          '<param name="movie" value="'.$player.'" />'.
-          '<param name="wmode" value="transparent" />'.
-          '<param name="FlashVars" value="'.implode('&amp;',$vars).'" />'.
-          __('Embedded Audio Player').
-          '</object>'.
+          ($fallback ?
+               '<object type="application/x-shockwave-flash" '.
+               'data="'.$player.'" '.
+               'width="'.$args['width'].'" height="'.$args['height'].'">'.
+               '<param name="movie" value="'.$player.'" />'.
+               '<param name="wmode" value="transparent" />'.
+               '<param name="FlashVars" value="'.implode('&amp;',$vars).'" />'.
+               __('Embedded Audio Player').
+               '</object>' : '').
           '</audio>';
      }

inc/dbschema/upgrade.php

@@ -467 +467 @@
                }
 
-               if (version_compare($version,'2.9','<'))
+               if (version_compare($version,'2.9','<='))
                {
                     # Some new settings should be initialized, prepare db queries
                     $strReq = 'INSERT INTO '.$core->prefix.'setting'.
                               ' (setting_id,setting_ns,setting_value,setting_type,setting_label)'.
-                              ' VALUES(\'%s\',\'system\',\'%s\',\'integer\',\'%s\')';
-                    $core->con->execute(sprintf($strReq,'media_video_width','400','Media video insertion width'));
-                    $core->con->execute(sprintf($strReq,'media_video_height','300','Media video insertion height'));
+                              ' VALUES(\'%s\',\'system\',\'%s\',\'%s\',\'%s\')';
+                    $core->con->execute(
+                         sprintf($strReq,'media_video_width','400','integer','Media video insertion width'));
+                    $core->con->execute(
+                         sprintf($strReq,'media_video_height','300','integer','Media video insertion height'));
+                    $core->con->execute(
+                         sprintf($strReq,'media_flash_fallback','1','boolean','Flash player fallback for audio and video media'));
                }