Changeset 2529:458ab23d308f

Timestamp:

11/09/13 08:41:13 (12 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

2.6

Message:

Media manager notices should be displayed inside its popups (media and media-item) rather than on the caller page.

Location:

admin

Files:

• media.php (modified) (1 diff)
• media_item.php (modified) (31 diffs)

admin/media.php

@@ -314 +314 @@
      );
 
+if ($popup) {
+     // Display notices
+     echo dcPage::notices();
+}
+
 if (!$core_media_writable) {
      dcPage::warning(__('You do not have sufficient permissions to write to this folder.'));

admin/media_item.php

@@ -46 +46 @@
 {
      $core->media = new dcMedia($core);
-     
+
      if ($id) {
           $file = $core->media->getFile($id);
      }
-     
+
      if ($file === null) {
           throw new Exception(__('Not a valid file'));
      }
-     
+
      $core->media->chdir(dirname($file->relname));
      $core_media_writable = $core->media->writable();
-     
+
      # Prepare directories combo box
      $dirs_combo = array();
@@ -93 +93 @@
 {
      $newFile = clone $file;
-     
+
      $newFile->basename = $_POST['media_file'];
-     
+
      if ($_POST['media_path']) {
           $newFile->dir = $_POST['media_path'];
@@ -107 +107 @@
      $newFile->media_dtstr = $_POST['media_dt'];
      $newFile->media_priv = !empty($_POST['media_private']);
-     
+
      try {
           $core->media->updateFile($file,$newFile);
@@ -124 +124 @@
           $foo = null;
           $core->media->mediaFireRecreateEvent($file);
-          
+
           dcPage::addSuccessNotice(__('Thumbnails have been successfully updated.'));
           http::redirect($page_url.'&id='.$id.'&tab=media-details-tab');
@@ -137 +137 @@
      try {
           $unzip_dir = $core->media->inflateZipFile($file,$_POST['inflate_mode'] == 'new');
-          
+
           dcPage::addSuccessNotice(__('Zip file has been successfully extracted.'));
           http::redirect($media_page_url.'&d='.$unzip_dir);
@@ -162 +162 @@
           $core->blog->settings->system->put('media_img_default_link',($_POST['pref_insertion'] == 'link'));
      }
-     
+
      dcPage::addSuccessNotice(__('Default media insertion settings have been successfully updated.'));
      http::redirect($page_url.'&id='.$id);
@@ -173 +173 @@
      $pattern = preg_split('/\s*;;\s*/',$pattern);
      $sep = ', ';
-     
+
      foreach ($pattern as $v) {
           if ($v == 'Title') {
@@ -200 +200 @@
 /* DISPLAY Main page
 -------------------------------------------------------- */
-$starting_scripts = 
+$starting_scripts =
      '<script type="text/javascript">'."\n".
      "//<![CDATA["."\n".
@@ -228 +228 @@
 );
 
+if ($popup) {
+     // Display notices
+     echo dcPage::notices();
+}
+
 if ($file === null) {
      call_user_func($close_f);
@@ -247 +252 @@
 {
      $media_desc = $file->media_title;
-     
+
      echo
      '<div id="media-insert" class="multi-part" title="'.__('Insert media item').'">'.
      '<h3>'.__('Insert media item').'</h3>'.
      '<form id="media-insert-form" action="" method="get">';
-     
+
      $media_img_default_size = $core->blog->settings->system->media_img_default_size;
      if ($media_img_default_size == '') {
@@ -275 +280 @@
           echo
           '<h3>'.__('Image size:').'</h3> ';
-          
+
           $s_checked = false;
           echo '<p>';
@@ -288 +293 @@
           form::radio(array('src'),$file->file_url,$s_checked).' '.__('original').'</label><br /> ';
           echo '</p>';
-          
-          echo
-          '<div class="two-boxes">'.         
+
+          echo
+          '<div class="two-boxes">'.
           '<h3>'.__('Image alignment').'</h3>';
           $i_align = array(
@@ -298 +303 @@
                'center' => array(__('Center'),($media_img_default_alignment == 'center' ? 1 : 0))
           );
-          
+
           echo '<p>';
           foreach ($i_align as $k => $v) {
@@ -306 +311 @@
           echo '</p>';
           echo '</div>';
-          
+
           echo
           '<div class="two-boxes">'.
@@ -321 +326 @@
      {
           $media_type = 'mp3';
-          
-          echo 
+
+          echo
           '<div class="two-boxes">'.
           '<h3>'.__('MP3 disposition').'</h3>';
           dcPage::message(__("Please note that you cannot insert mp3 files with visual editor."),false);
-          
+
           $i_align = array(
                'none' => array(__('None'),($media_img_default_alignment == 'none' ? 1 : 0)),
@@ -333 +338 @@
                'center' => array(__('Center'),($media_img_default_alignment == 'center' ? 1 : 0))
           );
-          
+
           echo '<p>';
           foreach ($i_align as $k => $v) {
@@ -339 +344 @@
                form::radio(array('alignment'),$k,$v[1]).' '.$v[0].'</label><br /> ';
           }
-          
+
           $public_player_style = unserialize($core->blog->settings->themes->mp3player_style);
           $public_player = dcMedia::mp3player($file->file_url,$core->blog->getQmarkURL().'pf=player_mp3.swf',$public_player_style);
@@ -349 +354 @@
      {
           $media_type = 'flv';
-          
+
           dcPage::message(__("Please note that you cannot insert video files with visual editor."),false);
-          
+
           echo
           '<div class="two-boxes">'.
@@ -362 +367 @@
           '</div>';
 
-          
-          echo 
+
+          echo
           '<div class="two-boxes">'.
           '<h3>'.__('Video disposition').'</h3>';
-          
+
           $i_align = array(
                'none' => array(__('None'),($media_img_default_alignment == 'none' ? 1 : 0)),
@@ -373 +378 @@
                'center' => array(__('Center'),($media_img_default_alignment == 'center' ? 1 : 0))
           );
-          
+
           echo '<p>';
           foreach ($i_align as $k => $v) {
@@ -379 +384 @@
                form::radio(array('alignment'),$k,$v[1]).' '.$v[0].'</label><br /> ';
           }
-          
+
           $public_player_style = unserialize($core->blog->settings->themes->flvplayer_style);
           $public_player = dcMedia::flvplayer($file->file_url,$core->blog->getQmarkURL().'pf=player_flv.swf',$public_player_style);
@@ -401 +406 @@
      form::hidden(array('url'),$file->file_url).
      '</p>';
-     
+
      echo '</form>';
 
@@ -437 +442 @@
 {
      $thumb_size = !empty($_GET['size']) ? $_GET['size'] : 's';
-     
+
      if (!isset($core->media->thumb_sizes[$thumb_size]) && $thumb_size != 'o') {
           $thumb_size = 's';
      }
-     
+
      if (isset($file->media_thumb[$thumb_size])) {
           echo '<p><img src="'.$file->media_thumb[$thumb_size].'?'.time()*rand().'" alt="" /></p>';
@@ -450 +455 @@
           echo '<p id="media-original-image"'.$class.'><img src="'.$file->file_url.'?'.time()*rand().'" alt="" /></p>';
      }
-     
+
      echo '<p>'.__('Available sizes:').' ';
      foreach (array_reverse($file->media_thumb) as $s => $v)
@@ -498 +503 @@
                "OR post_excerpt_xhtml LIKE '%".$core->con->escape($file->relname)."%' "
      );
-     
+
      if ($file->media_image)
      { # We look for thumbnails too
@@ -512 +517 @@
           }
      }
-     
+
      $params['sql'] .= ') ';
-     
+
      $rs = $core->blog->getPosts($params);
-     
+
      if ($rs->isEmpty())
      {
@@ -552 +557 @@
 {
      echo '<h3>'.__('Image details').'</h3>';
-     
+
      $details = '';
      if (count($file->media_meta) > 0)
@@ -587 +592 @@
           '</form>';
      }
-     
+
      if ($file->type == 'application/zip')
      {
@@ -594 +599 @@
                __('Extract in current directory') => 'current'
           );
-          
+
           echo
           '<form class="clear fieldset" id="file-unzip" action="'.html::escapeURL($page_url).'" method="post">'.
@@ -611 +616 @@
           '</form>';
      }
-     
+
      echo
      '<form class="clear fieldset" action="'.html::escapeURL($page_url).'" method="post">'.
@@ -629 +634 @@
      $core->formNonce().'</p>'.
      '</form>';
-     
+
      echo
      '<form class="clear fieldset" action="'.html::escapeURL($page_url).'" method="post" enctype="multipart/form-data">'.