Changeset 3958:5e250cd51362 for admin

Timestamp:

02/20/19 14:35:05 (6 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

No more Flash player (flv, mp3) in Dotclear \o/

Location:

admin

Files:

• blog_pref.php (modified) (2 diffs)
• media.php (modified) (1 diff)
• media_item.php (modified) (8 diffs)

admin/blog_pref.php

@@ -260 +260 @@
         $blog_settings->system->put('media_video_width', $media_video_width);
         $blog_settings->system->put('media_video_height', $media_video_height);
-        $blog_settings->system->put('media_flash_fallback', !empty($_POST['media_flash_fallback']));
         $blog_settings->system->put('media_img_title_pattern', $_POST['media_img_title_pattern']);
         $blog_settings->system->put('media_img_use_dto_first', !empty($_POST['media_img_use_dto_first']));
@@ -587 +586 @@
     ]) .
     '</p>' .
-
-    '<h5>' . __('Flash player') . '</h5>' .
-    '<p><label for="media_flash_fallback">' .
-    form::checkbox('media_flash_fallback', '1', $blog_settings->system->media_flash_fallback) .
-    __('Insert Flash player fallback for video (mp4 or m4v) and audio (mp3) media') . '</label></p>' .
-    '<p class="form-note info">' . __('For flv video, the Flash player will be anyway inserted.') . '</p>' .
     '</div>' .
 

admin/media.php

@@ -261 +261 @@
         // Show player if relevant
         if ($file_type[0] == 'audio') {
-            $lst .= '<li>' . dcMedia::audioPlayer($f->type, $f->file_url, $core->adminurl->get("admin.home", ['pf' => 'player_mp3.swf']), null, $core->blog->settings->system->media_flash_fallback, false) . '</li>';
+            $lst .= '<li>' . dcMedia::audioPlayer($f->type, $f->file_url, null, null, null, false, false) . '</li>';
         }
 

admin/media_item.php

@@ -222 +222 @@
 };
 
-$get_img_desc = function($file, $default = '') {
+$get_img_desc = function ($file, $default = '') {
     if (count($file->media_meta) > 0) {
         foreach ($file->media_meta as $k => $v) {
@@ -291 +291 @@
     // Let user choose thumbnail size if image
     $media_title = $file->media_title;
-    $media_desc = $get_img_desc($file, $media_title);
+    $media_desc  = $get_img_desc($file, $media_title);
 
     echo
@@ -313 +313 @@
 
     if ($file->media_type == 'image') {
-        $media_type = 'image';
+        $media_type  = 'image';
         $media_title = $get_img_title($file,
             $core->blog->settings->system->media_img_title_pattern,
@@ -363 +363 @@
 if ($popup && !$select) {
     $media_title = $file->media_title;
-    $media_desc = $get_img_desc($file, $media_title);
+    $media_desc  = $get_img_desc($file, $media_title);
 
     echo
@@ -385 +385 @@
 
     if ($file->media_type == 'image') {
-        $media_type = 'image';
+        $media_type  = 'image';
         $media_title = $get_img_title($file,
             $core->blog->settings->system->media_img_title_pattern,
@@ -476 +476 @@
         }
 
-        $public_player_style = unserialize($core->blog->settings->themes->mp3player_style);
-        $public_player       = dcMedia::audioPlayer($file->type, $file->file_url, $core->blog->getQmarkURL() . 'pf=player_mp3.swf', $public_player_style, $core->blog->settings->system->media_flash_fallback);
-        echo form::hidden('public_player', html::escapeHTML($public_player));
+        echo form::hidden('public_player', html::escapeHTML(dcMedia::audioPlayer($file->type, $file->file_url)));
         echo '</p>';
         echo '</div>';
@@ -513 +511 @@
         }
 
-        $public_player_style = unserialize($core->blog->settings->themes->flvplayer_style);
-        $public_player       = dcMedia::videoPlayer($file->type, $file->file_url, $core->blog->getQmarkURL() . 'pf=player_flv.swf', $public_player_style, $core->blog->settings->system->media_flash_fallback);
-        echo form::hidden('public_player', html::escapeHTML($public_player));
+        echo form::hidden('public_player', html::escapeHTML(dcMedia::videoPlayer($file->type, $file->file_url)));
         echo '</p>';
         echo '</div>';
@@ -616 +612 @@
 // Show player if relevant
 if ($file_type[0] == 'audio') {
-    echo dcMedia::audioPlayer($file->type, $file->file_url, $core->adminurl->get("admin.home", ['pf' => 'player_mp3.swf']),
-        null, $core->blog->settings->system->media_flash_fallback);
+    echo dcMedia::audioPlayer($file->type, $file->file_url);
 }
 if ($file_type[0] == 'video') {
-    echo dcMedia::videoPlayer($file->type, $file->file_url, $core->adminurl->get("admin.home", ['pf' => 'player_flv.swf']),
-        null, $core->blog->settings->system->media_flash_fallback);
+    echo dcMedia::videoPlayer($file->type, $file->file_url);
 }