diff --git a/htdocs/compta/bank/graph.php b/htdocs/compta/bank/graph.php
index 1a860649ebd..80d0dcfc1f5 100644
--- a/htdocs/compta/bank/graph.php
+++ b/htdocs/compta/bank/graph.php
@@ -819,11 +819,11 @@ if ($mode == 'standard')
 
 	print '<tr><td align="center">';
 	$file = "movement".$account."-".$year.$month.".png";
-	print '<img src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=bank&file='.$file.'" alt="" title="">';
+	print '<img src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=banque_temp&file='.$file.'" alt="" title="">';
 
 	print '<tr><td align="center">';
 	$file = "balance".$account."-".$year.$month.".png";
-	print '<img src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=bank&file='.$file.'" alt="" title="">';
+	print '<img src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=banque_temp&file='.$file.'" alt="" title="">';
 	print '</td></tr>';
 
 	// For year
@@ -833,12 +833,12 @@ if ($mode == 'standard')
 
 	print '<tr><td align="center">';
 	$file = "movement".$account."-".$year.".png";
-	print '<img src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=bank&file='.$file.'" alt="" title="">';
+	print '<img src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=banque_temp&file='.$file.'" alt="" title="">';
 	print '</td></tr>';
 
 	print '<tr><td align="center">';
 	$file = "balance".$account."-".$year.".png";
-	print '<img src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=bank&file='.$file.'" alt="" title="">';
+	print '<img src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=banque_temp&file='.$file.'" alt="" title="">';
 	print '</td></tr>';
 }
 
@@ -846,7 +846,7 @@ if ($mode == 'showalltime')
 {
 	print '<tr><td align="center">';
 	$file = "balance".$account.".png";
-	print '<img src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=bank&file='.$file.'" alt="" title="">';
+	print '<img src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=bank_temp&file='.$file.'" alt="" title="">';
 	print '</td></tr>';
 }
 
diff --git a/htdocs/viewimage.php b/htdocs/viewimage.php
index 65bf79677ff..6dca3c0f3bf 100644
--- a/htdocs/viewimage.php
+++ b/htdocs/viewimage.php
@@ -65,21 +65,21 @@ if ($modulepart)
 {
 	// Check permissions and define directory
 
-	// Wrapping pour les photo utilisateurs
+	// Wrapping for company logo
 	if ($modulepart == 'companylogo')
 	{
 		$accessallowed=1;
 		$original_file=$conf->mycompany->dir_output.'/logos/'.$original_file;
 	}
 
-	// Wrapping pour les photos utilisateurs
+	// Wrapping for users photos
 	elseif ($modulepart == 'userphoto')
 	{
 		$accessallowed=1;
 		$original_file=$conf->user->dir_output.'/'.$original_file;
 	}
 
-	// Wrapping pour les photos adherents
+	// Wrapping for members photos
 	elseif ($modulepart == 'memberphoto')
 	{
 		$accessallowed=1;
@@ -230,27 +230,6 @@ if ($modulepart)
 		$original_file=$conf->prelevement->dir_output.'/receipts/'.$original_file;
 	}
 
-	// Wrapping pour les graph bank
-	elseif ($modulepart == 'bank')
-	{
-		$accessallowed=1;
-		$original_file=$conf->banque->dir_temp.'/'.$original_file;
-	}
-
-	// Wrapping pour les images wysiwyg
-	elseif ($modulepart == 'fckeditor')
-	{
-		$accessallowed=1;
-		$original_file=$conf->fckeditor->dir_output.'/'.$original_file;
-	}
-
-	// Wrapping pour les images wysiwyg mailing
-	elseif ($modulepart == 'mailing')
-	{
-		$accessallowed=1;
-		$original_file=$conf->mailing->dir_output.'/'.$original_file;
-	}
-
 	// Wrapping pour les graph energie
 	elseif ($modulepart == 'graph_stock')
 	{
@@ -282,13 +261,6 @@ if ($modulepart)
 		$original_file='';
 	}
 
-    // Wrapping pour les icones de background des mailings
-    elseif ($modulepart == 'phpsane')
-    {
-        $accessallowed=1;
-        $original_file=$conf->phpsane->dir_temp.'/'.$user->id.'/'.$original_file;
-    }
-
     // Wrapping pour les icones de background des mailings
 	elseif ($modulepart == 'iconmailing')
 	{
@@ -296,12 +268,33 @@ if ($modulepart)
 		$original_file=$conf->mailing->dir_temp.'/'.$original_file;
 	}
 
-	// Wrapping generique (allows any module to open a file if file is in directory
-	// called DOL_DATA_ROOT/modulepart).
+	// GENERIC Wrapping
+	// If modulepart=module_user_temp	Allows any module to open a file if file is in directory called DOL_DATA_ROOT/modulepart/temp/iduser
+	// If modulepart=module_temp		Allows any module to open a file if file is in directory called DOL_DATA_ROOT/modulepart/temp
+	// If modulepart=module				Allows any module to open a file if file is in directory called DOL_DATA_ROOT/modulepart/iduser
+	// If modulepart=module_user		Allows any module to open a file if file is in directory called DOL_DATA_ROOT/modulepart
 	else
 	{
-		$accessallowed=1;
-		$original_file=DOL_DATA_ROOT.'/'.$modulepart.'/'.$original_file;
+		if (preg_match('/^([a-z]+)_user_temp$/i',$modulepart,$reg))
+		{
+			if ($user->rights->$reg[1]->lire || $user->rights->$reg[1]->read) $accessallowed=1;
+		   	$original_file=$conf->$reg[1]->dir_temp.'/'.$user->id.'/'.$original_file;
+    	}
+		else if (preg_match('/^([a-z]+)_temp$/i',$modulepart,$reg))
+		{
+			if ($user->rights->$reg[1]->lire || $user->rights->$reg[1]->read) $accessallowed=1;
+		   	$original_file=$conf->$reg[1]->dir_temp.'/'.$original_file;
+		}
+		else if (preg_match('/^([a-z]+)_user$/i',$modulepart,$reg))
+		{
+			if ($user->rights->$reg[1]->lire || $user->rights->$reg[1]->read) $accessallowed=1;
+		   	$original_file=$conf->$reg[1]->dir_output.'/'.$user->id.'/'.$original_file;
+    	}
+    	else
+		{
+			if ($user->rights->$reg[1]->lire || $user->rights->$reg[1]->read) $accessallowed=1;
+			$original_file=$conf->$modulepart->dir_output.'/'.$original_file;
+		}
 	}
 }