Changeset 3167:9b0e5988c0eb for admin

Timestamp:

02/11/16 15:35:39 (9 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Cope with sort of "un-attached" media → allows new features as "featured media" plugin. Video and Audio HTML5 element are now used (if possible) rather than Flash object for attachments.

Location:

admin

Files:

• media.php (modified) (4 diffs)
• media_item.php (modified) (2 diffs)
• post_media.php (modified) (4 diffs)

admin/media.php

@@ -31 +31 @@
 $dir = null;
 
+// Attachement type if any
+$link_type = !empty($_REQUEST['link_type']) ? $_REQUEST['link_type'] : null;
+
 $page = !empty($_GET['page']) ? max(1,(integer) $_GET['page']) : 1;
 $nb_per_page = ((integer) $core->auth->user_prefs->interface->media_by_page ? (integer) $core->auth->user_prefs->interface->media_by_page : 30);
@@ -85 +88 @@
 $select = !empty($_REQUEST['select']) ? (integer)$_REQUEST['select'] : 0;  // 0 : none, 1 : single media, >1 : multiple medias
 
-$page_url_params = new ArrayObject(array('popup' => $popup,'select' => $select,'post_id' => $post_id));
+$page_url_params = new ArrayObject(array('popup' => $popup,'select' => $select,'post_id' => $post_id,'link_type' => $link_type));
 if ($d) {
      $page_url_params['d'] = $d;
@@ -774 +777 @@
 function mediaItemLine($f,$i,$query,$table=false)
 {
-     global $core, $page_url, $popup, $select, $post_id, $plugin_id, $page_url_params;
+     global $core, $page_url, $popup, $select, $post_id, $plugin_id, $page_url_params, $link_type;
 
      $fname = $f->basename;
@@ -830 +833 @@
                     $act .=
                     '<a class="attach-media" title="'.__('Attach this file to entry').'" href="'.
-                    $core->adminurl->get("admin.post.media", array('media_id' => $f->media_id, 'post_id' => $post_id,'attach' => 1)).
+                    $core->adminurl->get("admin.post.media",
+                         array('media_id' => $f->media_id, 'post_id' => $post_id,'attach' => 1,'link_type' => $link_type)).
                     '">'.
                     '<img src="images/plus.png" alt="'.__('Attach this file to entry').'"/>'.

admin/media_item.php

@@ -27 +27 @@
 }
 
+// Attachement type if any
+$link_type = !empty($_REQUEST['link_type']) ? $_REQUEST['link_type'] : null;
+
 $file = null;
 $popup = (integer) !empty($_REQUEST['popup']);
@@ -32 +35 @@
 $plugin_id = isset($_REQUEST['plugin_id']) ? html::sanitizeURL($_REQUEST['plugin_id']) : '';
 $page_url_params = array('popup' => $popup,'select' => $select,'post_id' => $post_id);
-$media_page_url_params = array('popup' => $popup,'select' => $select,'post_id' => $post_id);
+$media_page_url_params = array('popup' => $popup,'select' => $select,'post_id' => $post_id,'link_type' => $link_type);
 
 if ($plugin_id != '') {

admin/post_media.php

@@ -17 +17 @@
 $post_id = !empty($_REQUEST['post_id']) ? (integer) $_REQUEST['post_id'] : null;
 $media_id = !empty($_REQUEST['media_id']) ? (integer) $_REQUEST['media_id'] : null;
+$link_type = !empty($_REQUEST['link_type']) ? $_REQUEST['link_type'] : null;
 
 if (!$post_id) {
@@ -30 +31 @@
      {
           $core->media = new dcMedia($core);
-          $core->media->addPostMedia($post_id,$media_id);
+          $core->media->addPostMedia($post_id,$media_id,$link_type);
         if (!empty($_SERVER['HTTP_X_REQUESTED_WITH'])) {
             header('Content-type: application/json');
@@ -41 +42 @@
 
      $core->media = new dcMedia($core);
-     $f = $core->media->getPostMedia($post_id,$media_id);
+     $f = $core->media->getPostMedia($post_id,$media_id,$link_type);
      if (empty($f)) {
           $post_id = $media_id = null;
@@ -56 +57 @@
      if (!empty($_POST['remove']))
      {
-          $core->media->removePostMedia($post_id,$media_id);
+          $core->media->removePostMedia($post_id,$media_id,$link_type);
 
           dcPage::addSuccessNotice(__('Attachment has been successfully removed.'));