lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

New: External modules can use generic wrapper

Browse Source
This commit is contained in:
Laurent Destailleur 2010-11-07 12:14:46 +00:00
parent 1d0a29b64e
commit f20a0e895c
2 changed files with 33 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
htdocs/compta/bank/graph.php
View File

@ -819,11 +819,11 @@ if ($mode == 'standard')
print '<tr><td align="center">'; print '<tr><td align="center">';
$file = "movement".$account."-".$year.$month.".png"; $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">'; print '<tr><td align="center">';
$file = "balance".$account."-".$year.$month.".png"; $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>'; print '</td></tr>';
// For year // For year
@ -833,12 +833,12 @@ if ($mode == 'standard')
print '<tr><td align="center">'; print '<tr><td align="center">';
$file = "movement".$account."-".$year.".png"; $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 '</td></tr>';
print '<tr><td align="center">'; print '<tr><td align="center">';
$file = "balance".$account."-".$year.".png"; $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>'; print '</td></tr>';
} }
@ -846,7 +846,7 @@ if ($mode == 'showalltime')
{ {
print '<tr><td align="center">'; print '<tr><td align="center">';
$file = "balance".$account.".png"; $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>'; print '</td></tr>';
} }

63
htdocs/viewimage.php
View File

@ -65,21 +65,21 @@ if ($modulepart)
{ {
// Check permissions and define directory // Check permissions and define directory
// Wrapping pour les photo utilisateurs // Wrapping for company logo
if ($modulepart == 'companylogo') if ($modulepart == 'companylogo')
{ {
$accessallowed=1; $accessallowed=1;
$original_file=$conf->mycompany->dir_output.'/logos/'.$original_file; $original_file=$conf->mycompany->dir_output.'/logos/'.$original_file;
} }
// Wrapping pour les photos utilisateurs // Wrapping for users photos
elseif ($modulepart == 'userphoto') elseif ($modulepart == 'userphoto')
{ {
$accessallowed=1; $accessallowed=1;
$original_file=$conf->user->dir_output.'/'.$original_file; $original_file=$conf->user->dir_output.'/'.$original_file;
} }
// Wrapping pour les photos adherents // Wrapping for members photos
elseif ($modulepart == 'memberphoto') elseif ($modulepart == 'memberphoto')
{ {
$accessallowed=1; $accessallowed=1;
@ -230,27 +230,6 @@ if ($modulepart)
$original_file=$conf->prelevement->dir_output.'/receipts/'.$original_file; $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 // Wrapping pour les graph energie
elseif ($modulepart == 'graph_stock') elseif ($modulepart == 'graph_stock')
{ {
@ -282,13 +261,6 @@ if ($modulepart)
$original_file=''; $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 // Wrapping pour les icones de background des mailings
elseif ($modulepart == 'iconmailing') elseif ($modulepart == 'iconmailing')
{ {
@ -296,12 +268,33 @@ if ($modulepart)
$original_file=$conf->mailing->dir_temp.'/'.$original_file; $original_file=$conf->mailing->dir_temp.'/'.$original_file;
} }
// Wrapping generique (allows any module to open a file if file is in directory // GENERIC Wrapping
// called DOL_DATA_ROOT/modulepart). // 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 else
{ {
$accessallowed=1; if (preg_match('/^([a-z]+)_user_temp$/i',$modulepart,$reg))
$original_file=DOL_DATA_ROOT.'/'.$modulepart.'/'.$original_file; {
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;
}
} }
} }