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

Fix: Error in download attached file on project

Browse Source
This commit is contained in:
Laurent Destailleur 2010-08-14 02:22:32 +00:00
parent cd86d03d35
commit b86537f122
1 changed files with 49 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
htdocs/projet/tasks/document.php
View File

@ -24,25 +24,28 @@
*/ */
require('../../main.inc.php'); require('../../main.inc.php');
require_once(DOL_DOCUMENT_ROOT."/projet/project.class.php"); require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php");
require_once(DOL_DOCUMENT_ROOT."/projet/tasks/task.class.php"); require_once(DOL_DOCUMENT_ROOT."/projet/class/task.class.php");
require_once(DOL_DOCUMENT_ROOT.'/lib/project.lib.php'); require_once(DOL_DOCUMENT_ROOT.'/lib/project.lib.php');
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
require_once(DOL_DOCUMENT_ROOT."/html.formfile.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php");
if (!$user->rights->projet->lire) accessforbidden();
$langs->load('projects'); $langs->load('projects');
$langs->load('other'); $langs->load('other');
$id=empty($_GET['id']) ? 0 : intVal($_GET['id']);
$action=empty($_GET['action']) ? (empty($_POST['action']) ? '' : $_POST['action']) : $_GET['action']; $action=empty($_GET['action']) ? (empty($_POST['action']) ? '' : $_POST['action']) : $_GET['action'];
$mine = $_REQUEST['mode']=='mine' ? 1 : 0;
//if (! $user->rights->projet->all->lire) $mine=1; // Special for projects
$id = isset($_GET["id"])?$_GET["id"]:'';
// Security check // Security check
$socid=0; $socid=0;
$id = isset($_GET["id"])?$_GET["id"]:''; if ($user->societe_id > 0) $socid = $user->societe_id;
if ($user->societe_id) $socid=$user->societe_id;
//$result=restrictedArea($user,'projet',$id,''); //$result=restrictedArea($user,'projet',$id,'');
if (!$user->rights->projet->lire) accessforbidden();
// Get parameters // Get parameters
$page=$_GET["page"]; $page=$_GET["page"];
@ -84,27 +87,30 @@ else
// Envoi fichier // Envoi fichier
if ($_POST["sendit"] && ! empty($conf->global->MAIN_UPLOAD_DOC)) if ($_POST["sendit"] && ! empty($conf->global->MAIN_UPLOAD_DOC))
{ {
if (! is_dir($upload_dir)) create_exdir($upload_dir); require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
if (is_dir($upload_dir)) if (create_exdir($upload_dir) >= 0)
{ {
$result = dol_move_uploaded_file($_FILES['userfile']['tmp_name'], $upload_dir . "/" . $_FILES['userfile']['name'],0); $resupload=dol_move_uploaded_file($_FILES['userfile']['tmp_name'], $upload_dir . "/" . $_FILES['userfile']['name'],0,0,$_FILES['userfile']['error']);
if ($result > 0) if (is_numeric($resupload) && $resupload > 0)
{
$mesg = '<div class="ok">'.$langs->trans("FileTransferComplete").'</div>';
//print_r($_FILES);
}
else if ($result == -99)
{
// Files infected by a virus
$langs->load("errors");
$mesg = '<div class="error">'.$langs->trans("ErrorFileIsInfectedWithAVirus").'</div>';
}
else if ($result < 0)
{ {
// Echec transfert (fichier depassant la limite ?) $mesg = '<div class="ok">'.$langs->trans("FileTransferComplete").'</div>';
$mesg = '<div class="error">'.$langs->trans("ErrorFileNotUploaded").'</div>'; }
// print_r($_FILES); else
{
$langs->load("errors");
if ($resupload < 0) // Unknown error
{
$mesg = '<div class="error">'.$langs->trans("ErrorFileNotUploaded").'</div>';
}
else if (preg_match('/ErrorFileIsInfectedWithAVirus/',$resupload)) // Files infected by a virus
{
$mesg = '<div class="error">'.$langs->trans("ErrorFileIsInfectedWithAVirus").'</div>';
}
else // Known error
{
$mesg = '<div class="error">'.$langs->trans($resupload).'</div>';
}
} }
} }
} }
@ -122,14 +128,19 @@ if ($action=='delete')
* View * View
*/ */
llxHeader('',$langs->trans('Project'),'EN:Customers_Orders|FR:Commandes_Clients|ES:Pedidos de clientes');
$form = new Form($db); $form = new Form($db);
$project = new Project($db);
llxHeader('',$langs->trans('Project'));
if ($id > 0 || ! empty($ref)) if ($id > 0 || ! empty($ref))
{ {
// To verify role of users $project = new Project($db);
$userAccess = $projectstatic->restrictedProjectArea($user); $project->fetch($task->fk_project);
// To verify role of users
//$userAccess = $projectstatic->restrictedProjectArea($user); // We allow task affected to user even if a not allowed project
//$arrayofuseridoftask=$task->getListContactId('internal');
$head = task_prepare_head($task); $head = task_prepare_head($task);
dol_fiche_head($head, 'document', $langs->trans("Task"), 0, 'projecttask'); dol_fiche_head($head, 'document', $langs->trans("Task"), 0, 'projecttask');
@ -148,6 +159,8 @@ if ($id > 0 || ! empty($ref))
print '<tr><td width="30%">'; print '<tr><td width="30%">';
print $langs->trans("Ref"); print $langs->trans("Ref");
print '</td><td colspan="3">'; print '</td><td colspan="3">';
$projectsListId = $project->getProjectsAuthorizedForUser($user,$mine,1);
$task->next_prev_filter=" fk_projet in (".$projectsListId.")";
print $form->showrefnav($task,'id','',1,'rowid','ref','',''); print $form->showrefnav($task,'id','',1,'rowid','ref','','');
print '</td>'; print '</td>';
print '</tr>'; print '</tr>';
@ -183,7 +196,7 @@ if ($id > 0 || ! empty($ref))
// List of document // List of document
$param='&id='.$task->id; $param='&id='.$task->id;
$formfile->list_of_documents($filearray,$task,'projet',$param); $formfile->list_of_documents($filearray,$task,'projet',$param,0,dol_sanitizeFileName($project->ref).'/'.dol_sanitizeFileName($task->ref).'/');
} }
else else