Changeset 2320:89c91e538879

Timestamp:

10/09/13 09:30:33 (12 years ago)

Author:

Nicolas <nikrou77@…>

Branch:

default

Children:

2322:a75984c93a86, 2406:325f49056c79

Message:

Fix invalid html for media page (in attachment context) because of nested form.
Closes #1761

Location:

admin

Files:

• js/_media.js (modified) (1 diff)
• media.php (modified) (2 diffs)
• post_media.php (modified) (2 diffs)
• style/default.css (modified) (1 diff)

admin/js/_media.js

@@ -144 +144 @@
      });
 
+     // attach media
+     $('#form-medias').on('click', '.media-item .attach-media', function(e) {
+          var parts = $(this).prop('href').split('?');
+          var str_params = parts[1].split('&');
+          var postData = {};
+
+          for (var n=0;n<str_params.length;n++) {
+               kv = str_params[n].split('=');
+               postData[kv[0]] = kv[1];
+          }
+          postData.xd_check = dotclear.nonce;
+
+          $.post(parts[0], postData, function(data) {
+               if (data.url !== undefined) {
+                    document.location = data.url;
+               }
+          });
+
+          e.preventDefault();
+     });
+
      // Replace remove links by a POST on hidden form
      fileRemoveAct();

admin/media.php

@@ -584 +584 @@
      if ($post_id && !$f->d) {
           $act .= 
-          '<form action="post_media.php" method="post">'.
-          '<input type="image" src="images/plus.png" alt="'.__('Attach this file to entry').'" '.
-          'title="'.__('Attach this file to entry').'" /> '.
-          form::hidden('media_id',$f->media_id).
-          form::hidden('post_id',$post_id).
-          form::hidden('attach',1).
-          $core->formNonce().
-          '</form>';
+          '<a class="attach-media" title="'.__('Attach this file to entry').'" href="post_media.php?media_id='.$f->media_id.
+          '&amp;post_id='.$post_id.'&amp;attach=1">'.
+          '<img src="images/plus.png" alt="'.__('Attach this file to entry').'"/>'.
+          '</a>';
      }
      
@@ -622 +618 @@
      return $res;
 }
-?>

admin/post_media.php

@@ -27 +27 @@
 
 try {
-     if ($post_id && $media_id && !empty($_POST['attach']))
+     if ($post_id && $media_id && !empty($_REQUEST['attach']))
      {
           $core->media = new dcMedia($core);
           $core->media->addPostMedia($post_id,$media_id);
-          http::redirect($core->getPostAdminURL($rs->post_type,$post_id,false));
+        if (!empty($_SERVER['HTTP_X_REQUESTED_WITH'])) {
+            header('Content-type: application/json');
+            echo json_encode(array('url' => $core->getPostAdminURL($rs->post_type,$post_id,false)));
+            exit();
+        } else {
+            http::redirect($core->getPostAdminURL($rs->post_type,$post_id,false));
+        }
      }
 
@@ -79 +85 @@
      }
 }
-?>

admin/style/default.css

@@ -1795 +1795 @@
      border: none;
      }
+li.media-action a.attach-media {
+     margin-right: 5px;
+     }
 li.media-action form {
      display: inline;