Changeset 2751:a96ec5640056 for admin/media.php

Timestamp:

09/09/14 16:30:31 (11 years ago)

Author:

Nicolas <nikrou77@…>

Branch:

default

Message:

Each editor (ckeditor, legacy ones) loads its own context when it is active.
Add plugin_id parameter to transmit that context
Remove call of ckeditorExtraPlugins behavior until a good solution is found.
Closes #1983

File:

• admin/media.php (modified) (9 diffs)

admin/media.php

@@ -28 +28 @@
 }
 $d = isset($_REQUEST['d']) ? $_REQUEST['d'] : null;
+$plugin_id = isset($_REQUEST['plugin_id']) ? html::sanitizeURL($_REQUEST['plugin_id']) : '';
 $dir = null;
 
@@ -74 +75 @@
 $popup = (integer) !empty($_GET['popup']);
 
-$page_url = $core->adminurl->get("admin.media",array('popup' => $popup,'post_id' => $post_id));
+$page_url = $core->adminurl->get("admin.media",array('popup' => $popup,'post_id' => $post_id, 'plugin_id' => $plugin_id));
 if (($temp = $core->callBehavior('adminMediaURL',$page_url))!='') {
      $page_url = $temp;
@@ -144 +145 @@
 # Adding a file
 if ($dir && !empty($_FILES['upfile'])) {
-  // only one file per request : @see option singleFileUploads in admin/js/jsUpload/jquery.fileupload
+     // only one file per request : @see option singleFileUploads in admin/js/jsUpload/jquery.fileupload
      $upfile = array('name' => $_FILES['upfile']['name'][0],
           'type' => $_FILES['upfile']['type'][0],
@@ -160 +161 @@
                $new_file_id = $core->media->uploadFile($upfile['tmp_name'], $upfile['name']);
 
-               $message['files'][] = array('name' => $upfile['name'],
+               $message['files'][] = array(
+                    'name' => $upfile['name'],
                     'size' => $upfile['size'],
-                    'html' => mediaItemLine($core->media->getFile($new_file_id), 1)
-                    );
+                    'html' => mediaItemLine($core->media->getFile($new_file_id), 1, $plugin_id)
+               );
           } catch (Exception $e) {
                $message['files'][] = array('name' => $upfile['name'],
@@ -379 +381 @@
 $fmt_form_media = '<form action="'.$core->adminurl->get("admin.media").'" method="post" id="form-medias">'.
      '<div class="files-group">%s</div>'.
-     '<p class="hidden">'.$core->formNonce() . form::hidden(array('d'),$d).'</p>';
+     '<p class="hidden">'.$core->formNonce() . form::hidden(array('d'),$d).form::hidden(array('plugin_id'),$plugin_id).'</p>';
 
 if (!$popup) {
@@ -410 +412 @@
      '<input type="submit" value="'.__('OK').'" />'.
      form::hidden(array('popup'),$popup).
+     form::hidden(array('plugin_id'),$plugin_id).
      form::hidden(array('post_id'),$post_id).
      '</p>'.
@@ -420 +423 @@
      {
           if ($items[$i]->d) {
-               $dgroup .= mediaItemLine($items[$i],$j);
+               $dgroup .= mediaItemLine($items[$i],$j,$plugin_id);
           } else {
-               $fgroup .= mediaItemLine($items[$i],$j);
+               $fgroup .= mediaItemLine($items[$i],$j,$plugin_id);
           }
      }
@@ -561 +564 @@
 
 /* ----------------------------------------------------- */
-function mediaItemLine($f,$i)
+function mediaItemLine($f,$i,$plugin_id)
 {
      global $core, $page_url, $popup, $post_id;
@@ -578 +581 @@
           }
      } else {
-          $link = $core->adminurl->get("admin.media.item", array('id' => $f->media_id,'popup' => $popup,'post_id' => $post_id));
-        if (($temp = $core->callBehavior('adminMediaURL',$link))!='') {
-            $link = $temp;
-        }
+          $link = $core->adminurl->get(
+               'admin.media.item',
+               array(
+                    'id' => $f->media_id,
+                    'plugin_id' => $plugin_id,
+                    'popup' => $popup,
+                    'post_id' => $post_id
+               )
+          );
+          if (($temp = $core->callBehavior('adminMediaURL',$link))!='') {
+               $link = $temp;
+          }
      }