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

FIX #6885

Browse Source
This commit is contained in:
Laurent Destailleur 2017-06-20 12:31:08 +02:00
parent a7fb411a42
commit 3ec0e6f7ef
2 changed files with 33 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
htdocs/core/ajax/ajaxdirpreview.php
View File

@ -162,21 +162,13 @@ if ($type == 'directory')
// Auto area for suppliers invoices // Auto area for suppliers invoices
else if ($module == 'invoice') $upload_dir = $conf->facture->dir_output; else if ($module == 'invoice') $upload_dir = $conf->facture->dir_output;
// Auto area for suppliers invoices // Auto area for suppliers invoices
else if ($module == 'invoice_supplier') else if ($module == 'invoice_supplier') $upload_dir = $conf->fournisseur->facture->dir_output;
{
$relativepath='facture';
$upload_dir = $conf->fournisseur->dir_output.'/'.$relativepath;
}
// Auto area for customers orders // Auto area for customers orders
else if ($module == 'propal') $upload_dir = $conf->propal->dir_output; else if ($module == 'propal') $upload_dir = $conf->propal->dir_output;
// Auto area for customers orders // Auto area for customers orders
else if ($module == 'order') $upload_dir = $conf->commande->dir_output; else if ($module == 'order') $upload_dir = $conf->commande->dir_output;
// Auto area for suppliers orders // Auto area for suppliers orders
else if ($module == 'order_supplier') else if ($module == 'order_supplier') $upload_dir = $conf->fournisseur->commande->dir_output;
{
$relativepath='commande';
$upload_dir = $conf->fournisseur->dir_output.'/'.$relativepath;
}
// Auto area for suppliers invoices // Auto area for suppliers invoices
else if ($module == 'contract') $upload_dir = $conf->contrat->dir_output; else if ($module == 'contract') $upload_dir = $conf->contrat->dir_output;
// Auto area for products // Auto area for products
@ -197,10 +189,12 @@ if ($type == 'directory')
$param.='&module='.$module; $param.='&module='.$module;
$textifempty=($section?$langs->trans("NoFileFound"):($showonrightsize=='featurenotyetavailable'?$langs->trans("FeatureNotYetAvailable"):$langs->trans("NoFileFound"))); $textifempty=($section?$langs->trans("NoFileFound"):($showonrightsize=='featurenotyetavailable'?$langs->trans("FeatureNotYetAvailable"):$langs->trans("NoFileFound")));
if ($module == 'company') $excludefiles[]='^contact$'; // The subdir 'contact' contains files of contacts with no id of thirdparty.
$filearray=dol_dir_list($upload_dir,"files",1,'', $excludefiles, $sortfield, $sorting,1); $filearray=dol_dir_list($upload_dir,"files",1,'', $excludefiles, $sortfield, $sorting,1);
$formfile->list_of_autoecmfiles($upload_dir,$filearray,$module,$param,1,'',$user->rights->ecm->upload,1,$textifempty,$maxlengthname,$url); $formfile->list_of_autoecmfiles($upload_dir,$filearray,$module,$param,1,'',$user->rights->ecm->upload,1,$textifempty,$maxlengthname,$url);
} }
//Manual area // Manual area
else else
{ {
$relativepath=$ecmdir->getRelativePath(); $relativepath=$ecmdir->getRelativePath();

56
htdocs/core/class/html.formfile.class.php
View File

@ -331,11 +331,11 @@ class FormFile
jQuery(\'#togglemassfilesarea\').text("('.dol_escape_js($langs->trans("Hide")).')"); jQuery(\'#togglemassfilesarea\').text("('.dol_escape_js($langs->trans("Hide")).')");
} }
return false; return false;
}); });
}); });
</script>'; </script>';
} }
$titletoshow=$langs->trans("Documents"); $titletoshow=$langs->trans("Documents");
if (! empty($title)) $titletoshow=$title; if (! empty($title)) $titletoshow=$title;
@ -556,7 +556,7 @@ class FormFile
if (empty($noform)) $out.= '<form action="'.$urlsource.(empty($conf->global->MAIN_JUMP_TAG)?'':'#builddoc').'" name="'.$forname.'" id="'.$forname.'_form" method="post">'; if (empty($noform)) $out.= '<form action="'.$urlsource.(empty($conf->global->MAIN_JUMP_TAG)?'':'#builddoc').'" name="'.$forname.'" id="'.$forname.'_form" method="post">';
$out.= '<input type="hidden" name="action" value="builddoc">'; $out.= '<input type="hidden" name="action" value="builddoc">';
$out.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'; $out.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
$out.= load_fiche_titre($titletoshow, '', ''); $out.= load_fiche_titre($titletoshow, '', '');
$out.= '<table class="liste formdoc noborder" summary="listofdocumentstable" width="100%">'; $out.= '<table class="liste formdoc noborder" summary="listofdocumentstable" width="100%">';
@ -644,9 +644,9 @@ class FormFile
$sortfield = $sortorder = null; $sortfield = $sortorder = null;
$res = $link->fetchAll($link_list, $object->element, $object->id, $sortfield, $sortorder); $res = $link->fetchAll($link_list, $object->element, $object->id, $sortfield, $sortorder);
} }
$out.= '<!-- html.formfile::showdocuments -->'."\n"; $out.= '<!-- html.formfile::showdocuments -->'."\n";
// Show title of array if not already shown // Show title of array if not already shown
if ((! empty($file_list) || ! empty($link_list) || preg_match('/^massfilesarea/', $modulepart)) && ! $headershown) if ((! empty($file_list) || ! empty($link_list) || preg_match('/^massfilesarea/', $modulepart)) && ! $headershown)
{ {
@ -671,7 +671,7 @@ class FormFile
$documenturl = DOL_URL_ROOT.'/document.php'; $documenturl = DOL_URL_ROOT.'/document.php';
if (isset($conf->global->DOL_URL_ROOT_DOCUMENT_PHP)) $documenturl=$conf->global->DOL_URL_ROOT_DOCUMENT_PHP; if (isset($conf->global->DOL_URL_ROOT_DOCUMENT_PHP)) $documenturl=$conf->global->DOL_URL_ROOT_DOCUMENT_PHP;
// Show file name with link to download // Show file name with link to download
$out.= '<td class="nowrap">'; $out.= '<td class="nowrap">';
$out.= '<a data-ajax="false" href="'.$documenturl.'?modulepart='.$modulepart.'&amp;file='.urlencode($relativepath).($param?'&'.$param:'').'"'; $out.= '<a data-ajax="false" href="'.$documenturl.'?modulepart='.$modulepart.'&amp;file='.urlencode($relativepath).($param?'&'.$param:'').'"';
@ -737,11 +737,11 @@ class FormFile
if (is_array($link_list)) if (is_array($link_list))
{ {
$colspan=2; $colspan=2;
foreach($link_list as $file) foreach($link_list as $file)
{ {
$var=!$var; $var=!$var;
$out.= "<tr ".$bc[$var].">"; $out.= "<tr ".$bc[$var].">";
$out.='<td colspan="'.$colspan.'" class="maxwidhtonsmartphone">'; $out.='<td colspan="'.$colspan.'" class="maxwidhtonsmartphone">';
$out.='<a data-ajax="false" href="' . $link->url . '" target="_blank">'; $out.='<a data-ajax="false" href="' . $link->url . '" target="_blank">';
@ -756,7 +756,7 @@ class FormFile
} }
$this->numoffiles++; $this->numoffiles++;
} }
if (count($file_list) == 0 && count($link_list) == 0 && $headershown) if (count($file_list) == 0 && count($link_list) == 0 && $headershown)
{ {
$out.='<tr '.$bc[0].'><td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td></tr>'; $out.='<tr '.$bc[0].'><td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
@ -799,7 +799,7 @@ class FormFile
$this->infofiles=array('nboffiles'=>0,'extensions'=>array(),'files'=>array()); $this->infofiles=array('nboffiles'=>0,'extensions'=>array(),'files'=>array());
if (! empty($conf->dol_use_jmobile)) return ''; if (! empty($conf->dol_use_jmobile)) return '';
$file_list=dol_dir_list($filedir, 'files', 0, preg_quote(basename($modulesubdir),'/').'[^\-]+', '\.meta$|\.png$'); // Get list of files starting with name of ref (but not followed by "-" to discard uploaded files) $file_list=dol_dir_list($filedir, 'files', 0, preg_quote(basename($modulesubdir),'/').'[^\-]+', '\.meta$|\.png$'); // Get list of files starting with name of ref (but not followed by "-" to discard uploaded files)
// For ajax treatment // For ajax treatment
@ -919,7 +919,7 @@ class FormFile
if ($user->rights->service->creer && $object->type == Product::TYPE_SERVICE) $permtoeditline=1; if ($user->rights->service->creer && $object->type == Product::TYPE_SERVICE) $permtoeditline=1;
} }
} }
if (empty($conf->global->MAIN_UPLOAD_DOC)) if (empty($conf->global->MAIN_UPLOAD_DOC))
{ {
$permtoeditline=0; $permtoeditline=0;
$permonobject=0; $permonobject=0;
@ -928,7 +928,7 @@ class FormFile
// Show list of existing files // Show list of existing files
if (empty($useinecm)) print load_fiche_titre($title?$title:$langs->trans("AttachedFiles")); if (empty($useinecm)) print load_fiche_titre($title?$title:$langs->trans("AttachedFiles"));
if (empty($url)) $url=$_SERVER["PHP_SELF"]; if (empty($url)) $url=$_SERVER["PHP_SELF"];
print '<!-- html.formfile::list_of_documents -->'."\n"; print '<!-- html.formfile::list_of_documents -->'."\n";
if (GETPOST('action') == 'editfile' && $permtoeditline) if (GETPOST('action') == 'editfile' && $permtoeditline)
{ {
@ -938,7 +938,7 @@ class FormFile
print '<input type="hidden" name="modulepart" value="'.$modulepart.'">'; print '<input type="hidden" name="modulepart" value="'.$modulepart.'">';
} }
print '<table width="100%" class="'.($useinecm?'liste noborderbottom':'liste').'">'."\n"; print '<table width="100%" class="'.($useinecm?'liste noborderbottom':'liste').'">'."\n";
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print_liste_field_titre($langs->trans("Documents2"),$url,"name","",$param,'align="left"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("Documents2"),$url,"name","",$param,'align="left"',$sortfield,$sortorder);
print_liste_field_titre($langs->trans("Size"),$url,"size","",$param,'align="right"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("Size"),$url,"size","",$param,'align="right"',$sortfield,$sortorder);
@ -971,13 +971,13 @@ class FormFile
$relativepath=preg_replace('/^.*\/produit\//','',$file['path']).'/'; $relativepath=preg_replace('/^.*\/produit\//','',$file['path']).'/';
} }
$var=!$var; $var=!$var;
$editline=0; $editline=0;
print '<!-- Line list_of_documents '.$key.' -->'."\n"; print '<!-- Line list_of_documents '.$key.' -->'."\n";
print '<tr '.$bc[$var].'>'; print '<tr '.$bc[$var].'>';
print '<td class="tdoverflow">'; print '<td class="tdoverflow">';
//print "XX".$file['name']; //$file['name'] must be utf8 //print "XX".$file['name']; //$file['name'] must be utf8
print '<a data-ajax="false" href="'.DOL_URL_ROOT.'/document.php?modulepart='.$modulepart; print '<a data-ajax="false" href="'.DOL_URL_ROOT.'/document.php?modulepart='.$modulepart;
if ($forcedownload) print '&attachment=1'; if ($forcedownload) print '&attachment=1';
@ -1007,7 +1007,7 @@ class FormFile
print $file['name']; print $file['name'];
print '</a>'; print '</a>';
} }
if (! $editline) print $this->showPreview($file,$modulepart,$filepath); if (! $editline) print $this->showPreview($file,$modulepart,$filepath);
print "</td>\n"; print "</td>\n";
@ -1038,7 +1038,7 @@ class FormFile
// Delete or view link // Delete or view link
// ($param must start with &) // ($param must start with &)
print '<td class="valignmiddle right"><!-- action on files -->'; print '<td class="valignmiddle right"><!-- action on files -->';
if ($useinecm) if ($useinecm)
{ {
print '<a href="'.DOL_URL_ROOT.'/ecm/docfile.php?urlfile='.urlencode($file['name']).$param.'" class="editfilelink" rel="'.urlencode($file['name']).'">'.img_view('default', 0, 'class="paddingrightonly"').'</a>'; print '<a href="'.DOL_URL_ROOT.'/ecm/docfile.php?urlfile='.urlencode($file['name']).$param.'" class="editfilelink" rel="'.urlencode($file['name']).'">'.img_view('default', 0, 'class="paddingrightonly"').'</a>';
} }
@ -1046,10 +1046,10 @@ class FormFile
{ {
$newmodulepart=$modulepart; $newmodulepart=$modulepart;
if (in_array($modulepart, array('product','produit','service'))) $newmodulepart='produit|service'; if (in_array($modulepart, array('product','produit','service'))) $newmodulepart='produit|service';
$disablecrop=1; $disablecrop=1;
if (in_array($modulepart, array('product','produit','service','holiday','project'))) $disablecrop=0; if (in_array($modulepart, array('product','produit','service','holiday','project'))) $disablecrop=0;
if (! $disablecrop && image_format_supported($file['name']) > 0) if (! $disablecrop && image_format_supported($file['name']) > 0)
{ {
if ($permtoeditline) if ($permtoeditline)
@ -1058,7 +1058,7 @@ class FormFile
print '<a href="'.DOL_URL_ROOT.'/core/photos_resize.php?modulepart='.urlencode($newmodulepart).'&id='.$object->id.'&file='.urlencode($relativepath.$fileinfo['filename'].'.'.strtolower($fileinfo['extension'])).'" title="'.dol_escape_htmltag($langs->trans("Resize")).'">'.img_picto($langs->trans("Resize"),DOL_URL_ROOT.'/theme/common/transform-crop-and-resize','class="paddingrightonly"',1).'</a>'; print '<a href="'.DOL_URL_ROOT.'/core/photos_resize.php?modulepart='.urlencode($newmodulepart).'&id='.$object->id.'&file='.urlencode($relativepath.$fileinfo['filename'].'.'.strtolower($fileinfo['extension'])).'" title="'.dol_escape_htmltag($langs->trans("Resize")).'">'.img_picto($langs->trans("Resize"),DOL_URL_ROOT.'/theme/common/transform-crop-and-resize','class="paddingrightonly"',1).'</a>';
} }
} }
if ($permtoeditline) if ($permtoeditline)
{ {
print '<a href="'.(($useinecm && $useajax)?'#':$url.'?action=editfile&urlfile='.urlencode($filepath).$param).'" class="editfilelink" rel="'.$filepath.'">'.img_edit('default',0,'class="paddingrightonly"').'</a>'; print '<a href="'.(($useinecm && $useajax)?'#':$url.'?action=editfile&urlfile='.urlencode($filepath).$param).'" class="editfilelink" rel="'.$filepath.'">'.img_edit('default',0,'class="paddingrightonly"').'</a>';
@ -1076,7 +1076,7 @@ class FormFile
if (! empty($conf->dol_use_jmobile)) $useajax=0; if (! empty($conf->dol_use_jmobile)) $useajax=0;
if (empty($conf->use_javascript_ajax)) $useajax=0; if (empty($conf->use_javascript_ajax)) $useajax=0;
if (! empty($conf->global->MAIN_ECM_DISABLE_JS)) $useajax=0; if (! empty($conf->global->MAIN_ECM_DISABLE_JS)) $useajax=0;
print '<a href="'.(($useinecm && $useajax)?'#':$url.'?action=delete&urlfile='.urlencode($filepath).$param).'" class="deletefilelink" rel="'.$filepath.'">'.img_delete().'</a>'; print '<a href="'.(($useinecm && $useajax)?'#':$url.'?action=delete&urlfile='.urlencode($filepath).$param).'" class="deletefilelink" rel="'.$filepath.'">'.img_delete().'</a>';
} }
print "</td>"; print "</td>";
@ -1103,7 +1103,7 @@ class FormFile
{ {
print '</form>'; print '</form>';
} }
return $nboffiles; return $nboffiles;
} }
} }
@ -1489,11 +1489,11 @@ class FormFile
return $nboflinks; return $nboflinks;
} }
/** /**
* Show detail icon with link for preview * Show detail icon with link for preview
* *
* @param array $file File * @param array $file File
* @param string $modulepart propal, facture, facture_fourn, ... * @param string $modulepart propal, facture, facture_fourn, ...
* @param string $relativepath Relative path of docs * @param string $relativepath Relative path of docs