Changeset 2512:446ce952707d for admin/media.php

Timestamp:

11/05/13 09:50:09 (12 years ago)

Author:

Dsls

Branch:

2.6

Message:

Fixed messages when deleting a directory. Closes #1839

File:

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

admin/media.php

@@ -111 +111 @@
           $zip->addExclusion('#(^|/).(.*?)_(m|s|sq|t).jpg$#');
           $zip->addDirectory($core->media->root.'/'.$d,'',true);
-          
+
           header('Content-Disposition: attachment;filename='.($d ? $d : 'media').'.zip');
           header('Content-Type: application/x-zip');
@@ -210 +210 @@
 {
      $_POST['remove'] = rawurldecode($_POST['remove']);
-     
+
      try {
+          if (is_dir(path::real($core->media->getPwd().'/'.path::clean($_POST['remove'])))) {
+               $msg = __('Directory has been successfully removed.');
+          } else {
+               $msg = __('File has been successfully removed.');
+          }
           $core->media->removeItem($_POST['remove']);
-
-          dcPage::addSuccessNotice(__('File has been successfully removed.'));
+          dcPage::addSuccessNotice($msg);
           http::redirect($page_url.'&d='.rawurlencode($d));
      } catch (Exception $e) {
@@ -250 +254 @@
           )
      );
-     
+
      echo
      '<form action="'.html::escapeURL($page_url).'" method="post">'.
@@ -261 +265 @@
      form::hidden('remove',html::escapeHTML($_GET['remove'])).'</p>'.
      '</form>';
-     
+
      call_user_func($close_f);
      exit;
@@ -372 +376 @@
 if (count($items) == 0)
 {
-     echo 
+     echo
      '<p>'.__('No file.').'</p>'.
      sprintf($fmt_form_media,'',' hide'); // need for jsUpload to append new media
@@ -379 +383 @@
 {
      $pager = new dcPager($page,count($items),$nb_per_page,10);
-     
+
      echo
      '<form action="media.php" method="get" id="filters-form">'.
@@ -403 +407 @@
           }
      }
-     
-     echo 
+
+     echo
      ($dgroup != '' ? '<div class="folders-group">'.$dgroup.'</div>' : '').
      sprintf($fmt_form_media,$fgroup,'');
-     
+
      echo $pager->getLinks();
 }
@@ -420 +424 @@
      echo
      '<div class="vertical-separator">'.
-     '<h3 class="out-of-screen-if-js">'.sprintf(__('In %s:'),($d == '' ? '“'.__('Media manager').'”' : '“'.$d.'”')).'</h3>'; 
-}
-
-$core_media_archivable = $core->auth->check('media_admin',$core->blog->id) && 
+     '<h3 class="out-of-screen-if-js">'.sprintf(__('In %s:'),($d == '' ? '“'.__('Media manager').'”' : '“'.$d.'”')).'</h3>';
+}
+
+$core_media_archivable = $core->auth->check('media_admin',$core->blog->id) &&
      !(count($items) == 0 || (count($items) == 1 && $items[0]->parent));
 
 if ($core_media_writable || $core_media_archivable) {
-     echo 
+     echo
      '<div class="two-boxes odd">';
 
@@ -457 +461 @@
      }
 
-     echo 
+     echo
      '</div>';
 }
@@ -464 +468 @@
 {
      echo
-     '<div class="two-boxes fieldset even">';     
+     '<div class="two-boxes fieldset even">';
      if ($user_ui_enhanceduploader) {
           echo
@@ -527 +531 @@
 
 if ($core_media_writable || $core_media_archivable) {
-     echo 
+     echo
      '</div>';
 }
@@ -542 +546 @@
 {
      global $core, $page_url, $popup, $post_id;
-     
+
      $fname = $f->basename;
-     
+
      $class = 'media-item media-col-'.($i%2);
-     
+
      if ($f->d) {
           $link = html::escapeURL($page_url).'&amp;d='.html::sanitizeURL($f->relname);
@@ -559 +563 @@
           'media_item.php?id='.$f->media_id.'&amp;popup='.$popup.'&amp;post_id='.$post_id;
      }
-     
+
      $maxchars = 36;
      if (strlen($fname) > $maxchars) {
@@ -569 +573 @@
 
      $lst = '';
-     
+
      if (!$f->d) {
           $lst .=
@@ -579 +583 @@
           '</li>';
      }
-     
+
      $act = '';
-     
+
      if ($post_id && !$f->d) {
-          $act .= 
+          $act .=
           '<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">'.
@@ -589 +593 @@
           '</a>';
      }
-     
+
      if ($popup && !$f->d) {
           $act .= '<a href="'.$link.'"><img src="images/plus.png" alt="'.__('Insert this file into entry').'" '.
           'title="'.__('Insert this file into entry').'" /></a> ';
      }
-     
+
      if ($f->del) {
           if (!$popup && !$f->d) {
@@ -605 +609 @@
           }
      }
-     
+
      $lst .= ($act != '' ? '<li class="media-action">&nbsp;'.$act.'</li>' : '');
-     
+
      if ($f->type == 'audio/mpeg3') {
           $lst .= '<li>'.dcMedia::mp3player($f->file_url,'index.php?pf=player_mp3.swf').'</li>';
      }
-     
+
      $res .=   ($lst != '' ? '<ul>'.$lst.'</ul>' : '');
 
      $res .= '</div>';
-     
+
      return $res;
 }