From 88a71175e3de9e3ad8b20ca9eb710aaf773cb788 Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Thu, 23 Jun 2011 14:16:15 +0300
Subject: media manager auth fix

---
 inc/media.php | 27 +++++++++++++++++++++++----
 1 file changed, 23 insertions(+), 4 deletions(-)

(limited to 'inc/media.php')

diff --git a/inc/media.php b/inc/media.php
index 461a13665..fc7f72941 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -89,9 +89,13 @@ function media_metasave($id,$auth,$data){
  * @author Kate Arzamastseva <pshns@ukr.net>
  */
 function media_metaform($id,$auth,$fullscreen = false){
-    if($auth < AUTH_UPLOAD) return false;
     global $lang, $config_cascade;
 
+    if($auth < AUTH_UPLOAD) {
+        echo '<div class="nothing">'.$lang['media_perm_upload'].'</div>'.NL;
+        return false;
+    }
+
     // load the field descriptions
     static $fields = null;
     if(is_null($fields)){
@@ -637,7 +641,7 @@ function media_tab_files($ns,$auth=null,$jump='') {
 
     $view = $_REQUEST['view'];
     if($auth < AUTH_READ){
-        echo '<div class="nothing">'.$lang['nothingfound'].'</div>'.NL;
+        echo '<div class="nothing">'.$lang['media_perm_read'].'</div>'.NL;
     }else{
         if ($view == 'list') {
             echo '<ul class="mediamanager-file-list mediamanager-list" id="id-mediamanager-file-list">';
@@ -766,6 +770,8 @@ function media_tab_history($image, $ns, $auth=null) {
             $first = isset($_REQUEST['first']) ? intval($_REQUEST['first']) : 0;
             html_revisions($first, $image);
         }
+    } else {
+        echo '<div class="nothing">'.$lang['media_perm_read'].'</div>'.NL;
     }
     echo '</div>';
     echo '</div>';
@@ -778,7 +784,11 @@ function media_tab_history($image, $ns, $auth=null) {
  */
 function media_preview($image, $auth, $rev=false) {
     global $lang;
-    if ($auth < AUTH_READ || !$image) return '';
+    if (!$image) return '';
+    if ($auth < AUTH_READ) {
+        echo '<div class="nothing">'.$lang['media_perm_read'].'</div>'.NL;
+        return '';
+    }
     $info = getimagesize(mediaFN($image));
     $w = (int) $info[0];
 
@@ -810,6 +820,12 @@ function media_preview($image, $auth, $rev=false) {
 function media_details($image, $auth, $rev=false) {
     global $lang, $config_cascade;;
 
+    if (!$image) return '';
+    if ($auth < AUTH_READ) {
+        echo '<div class="nothing">'.$lang['media_perm_read'].'</div>'.NL;
+        return '';
+    }
+
     // load the field descriptions
     static $tags = null;
     if(is_null($tags)){
@@ -1196,7 +1212,10 @@ function media_managerURL($params=false, $amp='&') {
 function media_uploadform($ns, $auth, $fullscreen = false){
     global $lang;
 
-    if($auth < AUTH_UPLOAD) return; //fixme print info on missing permissions?
+    if($auth < AUTH_UPLOAD) {
+        echo '<div class="nothing">'.$lang['media_perm_upload'].'</div>'.NL;
+        return;
+    }
 
     // The default HTML upload form
     $params = array('id'      => 'dw__upload',
-- 
cgit v1.2.3