Doc

Fix extrafieldsline insert

ChangeLog

@@ -2,6 +2,9 @@
 English Dolibarr ChangeLog
 --------------------------------------------------------------
 
+***** ChangeLog for 5.0.6 compared to 5.0.5 *****
+FIX: Removed a bad symbolic link into custom directory.
+FIX: Renaming a resouce ref rename also the directory of attached files.
 
 ***** ChangeLog for 5.0.5 compared to 5.0.4 *****
 FIX: #7075 : bad path for document

build/makepack-dolibarr.pl

@@ -334,7 +334,7 @@ foreach my $target (sort keys %CHOOSEDTARGET) {
 }
 foreach my $target (sort keys %CHOOSEDPUBLISH) {
 	if ($CHOOSEDPUBLISH{$target} < 0) { next; }
-	if ($target eq 'ASSO') { $nbofpublishneedchangelog++; $nbofpublishneedtag++; }
+	if ($target eq 'ASSO') { $nbofpublishneedchangelog++; }
 	if ($target eq 'SF') { $nbofpublishneedchangelog++; $nbofpublishneedtag++; }
 	$nboftargetok++;
 }
@@ -594,7 +594,9 @@ if ($nboftargetok) {
         
         print "Remove subdir of custom dir\n";
    	    print "find $BUILDROOT/$PROJECT/htdocs/custom/* -type d -exec rm -fr {} \\;\n";
-   	    $ret=`find $BUILDROOT/$PROJECT/htdocs/custom/* -type d -exec rm -fr {} \\; >/dev/null 2>&1`;	# For custom we want to keep dir
+   	    $ret=`find $BUILDROOT/$PROJECT/htdocs/custom/* -type d -exec rm -fr {} \\; >/dev/null 2>&1`;	# For custom we want to keep files only
+   	    print "find $BUILDROOT/$PROJECT/htdocs/custom/* -type l -exec rm -fr {} \\;\n";
+   	    $ret=`find $BUILDROOT/$PROJECT/htdocs/custom/* -type l -exec rm -fr {} \\; >/dev/null 2>&1`;	# For custom we want to keep files only
 	}
 
 	# Build package for each target

htdocs/compta/bank/index.php

@@ -57,7 +57,7 @@ $limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
@@ -127,9 +127,9 @@ if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETP
     $search_number='';
     $search_statut='';
 }
-    
+
-    
+
-    
+
 /*
  * View
  */
@@ -299,9 +299,9 @@ if (! empty($arrayfields['toreconcile']['checked']))      print_liste_field_titr
 // Extra fields
 if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
 {
-   foreach($extrafields->attribute_label as $key => $val) 
+   foreach($extrafields->attribute_label as $key => $val)
    {
-       if (! empty($arrayfields["ef.".$key]['checked'])) 
+       if (! empty($arrayfields["ef.".$key]['checked']))
        {
 			$align=$extrafields->getAlignFlag($key);
 			print_liste_field_titre($extralabels[$key],$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
@@ -435,7 +435,7 @@ $var=true;
 foreach ($accounts as $key=>$type)
 {
 	if ($i >= $limit) break;
-	
+
     $found++;
 
 	$acc = new Account($db);
@@ -452,7 +452,7 @@ foreach ($accounts as $key=>$type)
 	{
 		$lastcurrencycode=$acc->currency_code;
 	}
-	
+
 	print '<tr '.$bc[$var].'>';
 
     // Ref
@@ -461,14 +461,14 @@ foreach ($accounts as $key=>$type)
         print '<td>'.$acc->getNomUrl(1).'</td>';
 	    if (! $i) $totalarray['nbfield']++;
     }
-    
+
     // Label
     if (! empty($arrayfields['b.label']['checked']))
     {
 		print '<td>'.$acc->label.'</td>';
         if (! $i) $totalarray['nbfield']++;
     }
-    
+
     // Account type
     if (! empty($arrayfields['accountype']['checked']))
     {
@@ -477,14 +477,14 @@ foreach ($accounts as $key=>$type)
 		print '</td>';
         if (! $i) $totalarray['nbfield']++;
     }
-    
+
     // Number
     if (! empty($arrayfields['b.number']['checked']))
     {
         print '<td>'.$acc->number.'</td>';
 	    if (! $i) $totalarray['nbfield']++;
     }
-    
+
     // Account number
     if (! empty($arrayfields['b.account_number']['checked']))
     {
@@ -492,7 +492,7 @@ foreach ($accounts as $key=>$type)
         print '<td>'.length_accountg($acc->account_number).'</td>';
 	    if (! $i) $totalarray['nbfield']++;
     }
-    
+
     // Accountancy journal
     if (! empty($arrayfields['b.accountancy_journal']['checked']))
     {
@@ -500,7 +500,7 @@ foreach ($accounts as $key=>$type)
         print '<td>'.length_accountg($acc->accountancy_journal).'</td>';
 	    if (! $i) $totalarray['nbfield']++;
     }
-    
+
     // Transactions to reconcile
     if (! empty($arrayfields['toreconcile']['checked']))
     {
@@ -519,13 +519,13 @@ foreach ($accounts as $key=>$type)
 	    print '</td>';
 	    if (! $i) $totalarray['nbfield']++;
     }
-    
+
 	// Extra fields
 	if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
 	{
-	   foreach($extrafields->attribute_label as $key => $val) 
+	   foreach($extrafields->attribute_label as $key => $val)
 	   {
-			if (! empty($arrayfields["ef.".$key]['checked'])) 
+			if (! empty($arrayfields["ef.".$key]['checked']))
 			{
 				print '<td';
 				$align=$extrafields->getAlignFlag($key);
@@ -558,14 +558,14 @@ foreach ($accounts as $key=>$type)
         print '</td>';
 	    if (! $i) $totalarray['nbfield']++;
     }
-    
+
     // Statut
     if (! empty($arrayfields['b.clos']['checked']))
     {
 		print '<td align="center">'.$acc->getLibStatut(5).'</td>';
 	    if (! $i) $totalarray['nbfield']++;
     }
-    
+
     // Balance
     if (! empty($arrayfields['balance']['checked']))
     {
@@ -576,7 +576,7 @@ foreach ($accounts as $key=>$type)
 		if (! $i) $totalarray['totalbalancefield']=$totalarray['nbfield'];
 	    $totalarray['totalbalance'] += $solde;
     }
-    
+
 	// Action column
 	print '<td class="nowrap" align="center">';
 	if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
@@ -587,7 +587,7 @@ foreach ($accounts as $key=>$type)
 	}
 	print '</td>';
 	if (! $i) $totalarray['nbfield']++;
-	
+
 	print '</tr>';
 
 	$total[$acc->currency_code] += $solde;

htdocs/resource/class/dolresource.class.php

@@ -43,6 +43,8 @@ class Dolresource extends CommonObject
 	var $type_label;
 	var $tms='';
 
+	var $oldcopy;
+
     /**
      *  Constructor
      *
@@ -230,85 +232,108 @@ class Dolresource extends CommonObject
      *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
      *  @return int     		   	 <0 if KO, >0 if OK
      */
-    function update($user=null, $notrigger=0)
+	function update($user=null, $notrigger=0)
-    {
+	{
-    	global $conf, $langs, $hookmanager;
+		global $conf, $langs, $hookmanager;
-    	$error=0;
+		$error=0;
 
-    	// Clean parameters
+		// Clean parameters
-    	if (isset($this->ref)) $this->ref=trim($this->ref);
+		if (isset($this->ref)) $this->ref=trim($this->ref);
-    	if (isset($this->fk_code_type_resource)) $this->fk_code_type_resource=trim($this->fk_code_type_resource);
+		if (isset($this->fk_code_type_resource)) $this->fk_code_type_resource=trim($this->fk_code_type_resource);
-    	if (isset($this->description)) $this->description=trim($this->description);
+		if (isset($this->description)) $this->description=trim($this->description);
 
-    	// Update request
+		if (empty($this->oldcopy))
-    	$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET";
+		{
-    	$sql.= " ref=".(isset($this->ref)?"'".$this->db->escape($this->ref)."'":"null").",";
+			$org=new self($this->db);
-    	$sql.= " description=".(isset($this->description)?"'".$this->db->escape($this->description)."'":"null").",";
+			$org->fetch($this->id);
-    	$sql.= " fk_code_type_resource=".(isset($this->fk_code_type_resource)?"'".$this->db->escape($this->fk_code_type_resource)."'":"null").",";
+			$this->oldcopy=$org;
-    	$sql.= " tms=".(dol_strlen($this->tms)!=0 ? "'".$this->db->idate($this->tms)."'" : 'null')."";
+		}
-    	$sql.= " WHERE rowid=".$this->id;
 
-    	$this->db->begin();
+		// Update request
+		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET";
+		$sql.= " ref=".(isset($this->ref)?"'".$this->db->escape($this->ref)."'":"null").",";
+		$sql.= " description=".(isset($this->description)?"'".$this->db->escape($this->description)."'":"null").",";
+		$sql.= " fk_code_type_resource=".(isset($this->fk_code_type_resource)?"'".$this->db->escape($this->fk_code_type_resource)."'":"null").",";
+		$sql.= " tms=".(dol_strlen($this->tms)!=0 ? "'".$this->db->idate($this->tms)."'" : 'null')."";
+		$sql.= " WHERE rowid=".$this->id;
 
-    	dol_syslog(get_class($this)."::update", LOG_DEBUG);
+		$this->db->begin();
-    	$resql = $this->db->query($sql);
-    	if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
 
-    	if (! $error)
+		dol_syslog(get_class($this)."::update", LOG_DEBUG);
-    	{
+		$resql = $this->db->query($sql);
-    		if (! $notrigger)
+		if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
-    		{
-    			// Uncomment this and change MYOBJECT to your own tag if you
-    			// want this action calls a trigger.
 
-    			//// Call triggers
+		if (! $error)
-    			include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+		{
-    			$interface=new Interfaces($this->db);
+			if (! $notrigger)
-    			$result=$interface->run_triggers('RESOURCE_MODIFY',$this,$user,$langs,$conf);
+			{
-    			if ($result < 0) { $error++; $this->errors=$interface->errors; }
+				// Call trigger
-    			//// End call triggers
+				$result=$this->call_trigger('RESOURCE_MODIFY',$user);
-    		}
+				if ($result < 0) $error++;
-    	}
+				// End call triggers
-    	if (! $error)
+			}
-    	{
+		}
-	    	$action='update';
 
-	    	// Actions on extra fields (by external module or standard code)
+		if (! $error && (is_object($this->oldcopy) && $this->oldcopy->ref !== $this->ref))
-	    	// TODO le hook fait double emploi avec le trigger !!
+		{
-	    	$hookmanager->initHooks(array('actioncommdao'));
+			// We remove directory
-	    	$parameters=array('actcomm'=>$this->id);
+			if (! empty($conf->resource->dir_output))
-	    	$reshook=$hookmanager->executeHooks('insertExtraFields',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+			{
-	    	if (empty($reshook))
+				$olddir = $conf->resource->dir_output . "/" . dol_sanitizeFileName($this->oldcopy->ref);
-	    	{
+				$newdir = $conf->resource->dir_output . "/" . dol_sanitizeFileName($this->ref);
-	    		if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
+				if (file_exists($olddir))
-	    		{
+				{
-	    			$result=$this->insertExtraFields();
+					$res = @rename($olddir, $newdir);
-	    			if ($result < 0)
+					if (! $res)
-	    			{
+					{
-	    				$error++;
+						$langs->load("errors");
-	    			}
+						$this->error=$langs->trans('ErrorFailToRenameDir',$olddir,$newdir);
-	    		}
+						$error++;
-	    	}
+					}
-	    	else if ($reshook < 0) $error++;
+				}
-    	}
+			}
+		}
 
-    	// Commit or rollback
+		if (! $error)
-    	if ($error)
+		{
-    	{
+			$action='update';
-    		foreach($this->errors as $errmsg)
+
-    		{
+			// Actions on extra fields (by external module or standard code)
-    			dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
+			// TODO le hook fait double emploi avec le trigger !!
-    			$this->error.=($this->error?', '.$errmsg:$errmsg);
+			$hookmanager->initHooks(array('actioncommdao'));
-    		}
+			$parameters=array('actcomm'=>$this->id);
-    		$this->db->rollback();
+			$reshook=$hookmanager->executeHooks('insertExtraFields',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
-    		return -1*$error;
+			if (empty($reshook))
-    	}
+			{
-    	else
+				if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
-    	{
+				{
-    		$this->db->commit();
+					$result=$this->insertExtraFields();
-    		return 1;
+					if ($result < 0)
-    	}
+					{
-    }
+						$error++;
+					}
+				}
+			}
+			else if ($reshook < 0) $error++;
+		}
+
+		// Commit or rollback
+		if ($error)
+		{
+			foreach($this->errors as $errmsg)
+			{
+				dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
+				$this->error.=($this->error?', '.$errmsg:$errmsg);
+			}
+			$this->db->rollback();
+			return -1*$error;
+		}
+		else
+		{
+			$this->db->commit();
+			return 1;
+		}
+	}
 
     /**
      *    Load object in memory from database
@@ -375,65 +400,84 @@ class Dolresource extends CommonObject
      *    @param	int		$notrigger		Disable all triggers
      *    @return   int						>0 if OK, <0 if KO
      */
-    function delete($rowid, $notrigger=0)
+	function delete($rowid, $notrigger=0)
-    {
+	{
-        global $user,$langs,$conf;
+		global $user,$langs,$conf;
 
-        $error=0;
+		$error=0;
 
-        $this->db->begin();
+		$this->db->begin();
 
-        $sql = "DELETE FROM ".MAIN_DB_PREFIX.$this->table_element;
+		$sql = "DELETE FROM ".MAIN_DB_PREFIX.$this->table_element;
-        $sql.= " WHERE rowid =".$rowid;
+		$sql.= " WHERE rowid =".$rowid;
 
-        dol_syslog(get_class($this), LOG_DEBUG);
+		dol_syslog(get_class($this), LOG_DEBUG);
-        if ($this->db->query($sql))
+		if ($this->db->query($sql))
-        {
+		{
-            $sql = "DELETE FROM ".MAIN_DB_PREFIX."element_resources";
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX."element_resources";
-            $sql.= " WHERE element_type='resource' AND resource_id =".$this->db->escape($rowid);
+			$sql.= " WHERE element_type='resource' AND resource_id =".$this->db->escape($rowid);
-            dol_syslog(get_class($this)."::delete", LOG_DEBUG);
+			dol_syslog(get_class($this)."::delete", LOG_DEBUG);
-            $resql=$this->db->query($sql);
+			$resql=$this->db->query($sql);
-            if (!$resql)
+			if (!$resql)
-            {
+			{
-            	$this->error=$this->db->lasterror();
+				$this->error=$this->db->lasterror();
-            	$error++;
+				$error++;
-            }
+			}
-        }
+		}
-        else
+		else
-        {
+		{
-            $this->error=$this->db->lasterror();
+			$this->error=$this->db->lasterror();
-            $error++;
+			$error++;
-        }
+		}
 
-        // Removed extrafields
+		// Removed extrafields
-        if (! $error) {
+		if (! $error) {
-        	$result=$this->deleteExtraFields();
+			$result=$this->deleteExtraFields();
-        	if ($result < 0)
+			if ($result < 0)
-        	{
+			{
-        		$error++;
+				$error++;
-        		dol_syslog(get_class($this)."::delete error -3 ".$this->error, LOG_ERR);
+				dol_syslog(get_class($this)."::delete error -3 ".$this->error, LOG_ERR);
-        	}
+			}
-        }
+		}
 
-        if (! $notrigger)
+		if (! $notrigger)
-        {
+		{
-        	// Call trigger
+			// Call trigger
-        	$result=$this->call_trigger('RESOURCE_DELETE',$user);
+			$result=$this->call_trigger('RESOURCE_DELETE',$user);
-        	if ($result < 0) $error++;
+			if ($result < 0) $error++;
-        	// End call triggers
+			// End call triggers
-        }
+		}
 
-        if (! $error)
+		if (! $error)
-        {
+		{
-        	$this->db->commit();
+			// We remove directory
-        	return 1;
+			$ref = dol_sanitizeFileName($this->ref);
-        }
+			if (! empty($conf->resource->dir_output))
-        else
+			{
-        {
+				$dir = $conf->resource->dir_output . "/" . dol_sanitizeFileName($this->ref);
-        	$this->db->rollback();
+				if (file_exists($dir))
-        	return -1;
+				{
-        }
+					$res=@dol_delete_dir_recursive($dir);
-    }
+					if (! $res)
+					{
+						$this->errors[] = 'ErrorFailToDeleteDir';
+						$error++;
+					}
+				}
+			}
+		}
+
+		if (! $error)
+		{
+			$this->db->commit();
+			return 1;
+		}
+		else
+		{
+			$this->db->rollback();
+			return -1;
+		}
+	}
 
     /**
      *	Load resource objects into $this->lines