Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

ChangeLog

@@ -35,6 +35,8 @@ For users:
        Differentiate text and img.
        Use label into quick search form.
        Use accesskey on form search.
+- New: Intervention documents are now available in ECM module
+- New: Add attachments on user card + in ECM module
 - New: Can add __PROJECT_REF__ and __TIHRPARTY_NAME__ into email topic or content template.       
 - Fix: [ bug #1487 ] PAYMENT_DELETE trigger does not intercept trigger action
 - Fix: [ bug #1470, #1472, #1473] User trigger problem

htdocs/core/ajax/ajaxdirpreview.php

@@ -153,7 +153,7 @@ if ($type == 'directory')
     $sorting = (strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC);
 
     // Right area. If module is defined, we are in automatic ecm.
-    $automodules = array('company', 'invoice', 'invoice_supplier', 'propal', 'order', 'order_supplier', 'contract', 'product', 'tax', 'project');
+    $automodules = array('company', 'invoice', 'invoice_supplier', 'propal', 'order', 'order_supplier', 'contract', 'product', 'tax', 'project', 'fichinter', 'user');
 
     // TODO change for multicompany sharing
     // Auto area for suppliers invoices
@@ -184,6 +184,10 @@ if ($type == 'directory')
     else if ($module == 'tax') $upload_dir = $conf->tax->dir_output;
     // Auto area for projects
     else if ($module == 'project') $upload_dir = $conf->projet->dir_output;
+    // Auto area for interventions
+    else if ($module == 'fichinter') $upload_dir = $conf->ficheinter->dir_output;
+    // Auto area for users
+    else if ($module == 'user') $upload_dir = $conf->user->dir_output;
 
     if (in_array($module, $automodules))
     {

htdocs/core/class/html.formfile.class.php

@@ -936,6 +936,16 @@ class FormFile
         	include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
         	$object_instance=new Project($this->db);
         }
+        else if ($modulepart == 'fichinter')
+        {
+        	include_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
+        	$object_instance=new Fichinter($this->db);
+        }
+        else if ($modulepart == 'user')
+        {
+        	include_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
+        	$object_instance=new User($this->db);
+        }
 
         $var=true;
         foreach($filearray as $key => $file)
@@ -962,7 +972,9 @@ class FormFile
                 if ($modulepart == 'contract')         { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $ref=(isset($reg[1])?$reg[1]:''); }
                 if ($modulepart == 'product')          { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $ref=(isset($reg[1])?$reg[1]:''); }
                 if ($modulepart == 'tax')              { preg_match('/(\d+)\/[^\/]+$/',$relativefile,$reg); $id=(isset($reg[1])?$reg[1]:''); }
-                if ($modulepart == 'project')            { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $ref=(isset($reg[1])?$reg[1]:'');}
+                if ($modulepart == 'project')          { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $ref=(isset($reg[1])?$reg[1]:'');}
+                if ($modulepart == 'fichinter')        { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $ref=(isset($reg[1])?$reg[1]:'');}
+                if ($modulepart == 'user')             { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $id=(isset($reg[1])?$reg[1]:'');}
 
                 if (! $id && ! $ref) continue;
 

htdocs/core/lib/files.lib.php

@@ -1582,6 +1582,16 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
 		$original_file=$conf->projet->dir_output.'/'.$original_file;
 		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."projet WHERE ref='".$db->escape($refname)."' AND entity=".$conf->entity;
 	}
+	// Wrapping for interventions
+	else if ($modulepart == 'fichinter')
+	{
+		if ($fuser->rights->ficheinter->lire || preg_match('/^specimen/i',$original_file))
+		{
+			$accessallowed=1;
+		}
+		$original_file=$conf->ficheinter->dir_output.'/'.$original_file;
+		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."fichinter WHERE ref='".$db->escape($refname)."' AND entity=".$conf->entity;
+	}
 
 	// Wrapping pour les commandes fournisseurs
 	else if ($modulepart == 'commande_fournisseur' || $modulepart == 'order_supplier')

htdocs/core/lib/usergroups.lib.php

@@ -88,10 +88,24 @@ function user_prepare_head($object)
     //Info on users is visible only by internal user
     if (empty($user->societe_id))
     {
-    	$head[$h][0] = DOL_URL_ROOT.'/user/note.php?id='.$object->id;
-    	$head[$h][1] = $langs->trans("Note");
-    	$head[$h][2] = 'note';
-    	$h++;
+		// Notes
+        $nbNote = 0;
+        if(!empty($object->note)) $nbNote++;
+        $head[$h][0] = DOL_URL_ROOT.'/user/note.php?id='.$object->id;
+        $head[$h][1] = $langs->trans("Note");
+		if($nbNote > 0) $head[$h][1].= ' ('.$nbNote.')';
+        $head[$h][2] = 'note';
+        $h++;
+
+        // Attached files
+        require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+        $upload_dir = $conf->user->dir_output . "/" . $object->id;
+        $nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview\.png)$'));
+        $head[$h][0] = DOL_URL_ROOT.'/user/document.php?userid='.$object->id;
+        $head[$h][1] = $langs->trans("Documents");
+        if($nbFiles > 0) $head[$h][1].= ' ('.$nbFiles.')';
+        $head[$h][2] = 'document';
+        $h++;
 
     	$head[$h][0] = DOL_URL_ROOT.'/user/info.php?id='.$object->id;
     	$head[$h][1] = $langs->trans("Info");

htdocs/ecm/index_auto.php

@@ -409,6 +409,9 @@ if (! empty($conf->global->ECM_AUTO_TREE_ENABLED))
 	if (! empty($conf->fournisseur->enabled)) { $rowspan++; $sectionauto[]=array('level'=>1, 'module'=>'invoice_supplier', 'test'=>$conf->fournisseur->enabled, 'label'=>$langs->trans("SuppliersInvoices"),   'desc'=>$langs->trans("ECMDocsByInvoices")); }
 	if (! empty($conf->tax->enabled))         { $langs->load("compta"); $rowspan++; $sectionauto[]=array('level'=>1, 'module'=>'tax', 'test'=>$conf->tax->enabled, 'label'=>$langs->trans("SocialContributions"),     'desc'=>$langs->trans("ECMDocsBySocialContributions")); }
 	if (! empty($conf->projet->enabled))      { $rowspan++; $sectionauto[]=array('level'=>1, 'module'=>'project', 'test'=>$conf->projet->enabled, 'label'=>$langs->trans("Projects"),     'desc'=>$langs->trans("ECMDocsByProjects")); }
+	if (! empty($conf->ficheinter->enabled))      { $rowspan++; $sectionauto[]=array('level'=>1, 'module'=>'fichinter', 'test'=>$conf->ficheinter->enabled, 'label'=>$langs->trans("Interventions"),     'desc'=>$langs->trans("ECMDocsByInterventions")); }
+	$rowspan++; $sectionauto[]=array('level'=>1, 'module'=>'user', 'test'=>1, 'label'=>$langs->trans("Users"),     'desc'=>$langs->trans("ECMDocsByUsers"));
+	
 }
 
 print_fiche_titre($langs->trans("ECMArea").' - '.$langs->trans("ECMFileManager"));

htdocs/user/document.php

@@ -0,0 +1,174 @@
+<?php
+/* Copyright (C) 2002-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
+ * Copyright (C) 2010      Juanjo Menent        <jmenent@2byte.es>
+ * Copyright (C) 2013      Cédric Salvador      <csalvador@gpcsolutions.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *  \file       htdocs/user/document.php
+ *  \brief      Tab for documents linked to user
+ *  \ingroup    user
+ */
+
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
+
+$langs->load("users");
+$langs->load('other');
+
+
+$action=GETPOST('action');
+$confirm=GETPOST('confirm');
+$id=(GETPOST('userid','int') ? GETPOST('userid','int') : GETPOST('id','int'));
+$ref = GETPOST('ref', 'alpha');
+
+// Define value to know what current user can do on users
+$canadduser=(! empty($user->admin) || $user->rights->user->user->creer);
+$canreaduser=(! empty($user->admin) || $user->rights->user->user->lire);
+$canedituser=(! empty($user->admin) || $user->rights->user->user->creer);
+$candisableuser=(! empty($user->admin) || $user->rights->user->user->supprimer);
+$canreadgroup=$canreaduser;
+$caneditgroup=$canedituser;
+if (! empty($conf->global->MAIN_USE_ADVANCED_PERMS))
+{
+    $canreadgroup=(! empty($user->admin) || $user->rights->user->group_advance->read);
+    $caneditgroup=(! empty($user->admin) || $user->rights->user->group_advance->write);
+}
+// Define value to know what current user can do on properties of edited user
+if ($id)
+{
+    // $user est le user qui edite, $id est l'id de l'utilisateur edite
+    $caneditfield=((($user->id == $id) && $user->rights->user->self->creer)
+    || (($user->id != $id) && $user->rights->user->user->creer));
+    $caneditpassword=((($user->id == $id) && $user->rights->user->self->password)
+    || (($user->id != $id) && $user->rights->user->user->password));
+}
+
+// Security check
+$socid=0;
+if ($user->societe_id > 0) $socid = $user->societe_id;
+$feature2='user';
+if ($user->id == $id) { $feature2=''; $canreaduser=1; } // A user can always read its own card
+if (!$canreaduser) {
+	$result = restrictedArea($user, 'user', $id, '&user', $feature2);
+}
+if ($user->id <> $id && ! $canreaduser) accessforbidden();
+
+// Get parameters
+$sortfield = GETPOST("sortfield",'alpha');
+$sortorder = GETPOST("sortorder",'alpha');
+$page = GETPOST("page",'int');
+if ($page == -1) { $page = 0; }
+$offset = $conf->liste_limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+if (! $sortorder) $sortorder="ASC";
+if (! $sortfield) $sortfield="name";
+
+$object = new User($db);
+if ($id > 0 || ! empty($ref))
+{
+	$result = $object->fetch($id, $ref);
+
+	$upload_dir = $conf->user->multidir_output[$object->entity] . "/" . $object->id ;
+}
+
+
+/*
+ * Actions
+ */
+
+include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_pre_headers.tpl.php';
+
+
+/*
+ * View
+ */
+
+$form = new Form($db);
+
+$help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
+llxHeader('',$langs->trans("ThirdParty").' - '.$langs->trans("Files"),$help_url);
+
+if ($object->id)
+{
+	/*
+	 * Affichage onglets
+	 */
+	if (! empty($conf->notification->enabled)) $langs->load("mails");
+	$head = user_prepare_head($object);
+
+	$form=new Form($db);
+
+	dol_fiche_head($head, 'document', $langs->trans("User"),0,'user');
+
+
+	// Construit liste des fichiers
+	$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
+	$totalsize=0;
+	foreach($filearray as $key => $file)
+	{
+		$totalsize+=$file['size'];
+	}
+
+
+	print '<table class="border"width="100%">';
+
+    // Reference
+	print '<tr><td width="20%">'.$langs->trans('Ref').'</td>';
+	print '<td colspan="3">';
+	print $form->showrefnav($object,'id','',$user->rights->user->user->lire || $user->admin);
+	print '</td>';
+	print '</tr>';
+
+    // Lastname
+    print '<tr><td>'.$langs->trans("Lastname").'</td><td class="valeur" colspan="3">'.$object->lastname.'&nbsp;</td>';
+	print '</tr>';
+
+    // Firstname
+    print '<tr><td>'.$langs->trans("Firstname").'</td><td class="valeur" colspan="3">'.$object->firstname.'&nbsp;</td></tr>';
+
+    // Login
+    print '<tr><td>'.$langs->trans("Login").'</td><td class="valeur" colspan="3">'.$object->login.'&nbsp;</td></tr>';
+
+	// Nbre fichiers
+	print '<tr><td>'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
+
+	//Total taille
+	print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.$totalsize.' '.$langs->trans("bytes").'</td></tr>';
+
+	print '</table>';
+
+	print '</div>';
+
+	$modulepart = 'societe';
+	$permission = $user->rights->societe->creer;
+	$param = '&id=' . $object->id;
+	include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_post_headers.tpl.php';
+}
+else
+{
+	accessforbidden('',0,0);
+}
+
+
+llxFooter();
+$db->close();