alxarafe / alixar

dolibarr/htdocs/core/lib/geturl.lib.php

Indentation +49 added lines, -49 removed lines

@@ -41,7 +41,7 @@ 
     $PROXY_USER=empty($conf->global->MAIN_PROXY_USER)?0:$conf->global->MAIN_PROXY_USER;
     $PROXY_PASS=empty($conf->global->MAIN_PROXY_PASS)?0:$conf->global->MAIN_PROXY_PASS;
 
-	dol_syslog("getURLContent postorget=".$postorget." URL=".$url." param=".$param);
+    dol_syslog("getURLContent postorget=".$postorget." URL=".$url." param=".$param);
 
     //setting the curl parameters.
     $ch = curl_init();
@@ -52,17 +52,17 @@ 
      exit;*/
     curl_setopt($ch, CURLOPT_URL, $url);
     curl_setopt($ch, CURLOPT_VERBOSE, 1);
-	curl_setopt($ch, CURLOPT_USERAGENT, 'Dolibarr geturl function');
+    curl_setopt($ch, CURLOPT_USERAGENT, 'Dolibarr geturl function');
 
-	@curl_setopt($ch, CURLOPT_FOLLOWLOCATION, ($followlocation?true:false));   // We use @ here because this may return warning if safe mode is on or open_basedir is on
+    @curl_setopt($ch, CURLOPT_FOLLOWLOCATION, ($followlocation?true:false));   // We use @ here because this may return warning if safe mode is on or open_basedir is on
 
-	if (count($addheaders)) curl_setopt($ch, CURLOPT_HTTPHEADER, $addheaders);
-	curl_setopt($ch, CURLINFO_HEADER_OUT, true);	// To be able to retrieve request header and log it
+    if (count($addheaders)) curl_setopt($ch, CURLOPT_HTTPHEADER, $addheaders);
+    curl_setopt($ch, CURLINFO_HEADER_OUT, true);	// To be able to retrieve request header and log it
 
-	// By default use tls decied by PHP.
-	// You can force, if supported a version like TLSv1 or TLSv1.2
-	if (! empty($conf->global->MAIN_CURL_SSLVERSION)) curl_setopt($ch, CURLOPT_SSLVERSION, $conf->global->MAIN_CURL_SSLVERSION);
-	//curl_setopt($ch, CURLOPT_SSLVERSION, 6); for tls 1.2
+    // By default use tls decied by PHP.
+    // You can force, if supported a version like TLSv1 or TLSv1.2
+    if (! empty($conf->global->MAIN_CURL_SSLVERSION)) curl_setopt($ch, CURLOPT_SSLVERSION, $conf->global->MAIN_CURL_SSLVERSION);
+    //curl_setopt($ch, CURLOPT_SSLVERSION, 6); for tls 1.2
 
     //turning off the server and peer verification(TrustManager Concept).
     curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
@@ -75,37 +75,37 @@ 
     curl_setopt($ch, CURLOPT_RETURNTRANSFER,1);		// We want response
     if ($postorget == 'POST')
     {
-    	curl_setopt($ch, CURLOPT_POST, 1);	// POST
-    	curl_setopt($ch, CURLOPT_POSTFIELDS, $param);	// Setting param x=a&y=z as POST fields
+        curl_setopt($ch, CURLOPT_POST, 1);	// POST
+        curl_setopt($ch, CURLOPT_POSTFIELDS, $param);	// Setting param x=a&y=z as POST fields
     }
     else if ($postorget == 'PUT')
     {
-    	curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'PUT'); // HTTP request is 'PUT'
-    	if (! is_array($param)) parse_str($param, $array_param);
-    	else
-    	{
-    	    dol_syslog("parameter param must be a string", LOG_WARNING);
-    	    $array_param=$param;
-    	}
-    	curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query($array_param));	// Setting param x=a&y=z as PUT fields
+        curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'PUT'); // HTTP request is 'PUT'
+        if (! is_array($param)) parse_str($param, $array_param);
+        else
+        {
+            dol_syslog("parameter param must be a string", LOG_WARNING);
+            $array_param=$param;
+        }
+        curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query($array_param));	// Setting param x=a&y=z as PUT fields
     }
     else if ($postorget == 'PUTALREADYFORMATED')
     {
-    	curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'PUT'); // HTTP request is 'PUT'
-    	curl_setopt($ch, CURLOPT_POSTFIELDS, $param);	// param = content of post, like a xml string
+        curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'PUT'); // HTTP request is 'PUT'
+        curl_setopt($ch, CURLOPT_POSTFIELDS, $param);	// param = content of post, like a xml string
     }
     else if ($postorget == 'HEAD')
     {
-    	curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'HEAD'); // HTTP request is 'HEAD'
-    	curl_setopt($ch, CURLOPT_NOBODY, true);
+        curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'HEAD'); // HTTP request is 'HEAD'
+        curl_setopt($ch, CURLOPT_NOBODY, true);
     }
     else if ($postorget == 'DELETE')
     {
-    	curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'DELETE');	// POST
+        curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'DELETE');	// POST
     }
     else
     {
-    	curl_setopt($ch, CURLOPT_POST, 0);			// GET
+        curl_setopt($ch, CURLOPT_POST, 0);			// GET
     }
 
     //if USE_PROXY constant set at begin of this method.
@@ -133,27 +133,27 @@ 
         $rep['content']=$response;
 
         // moving to display page to display curl errors
-		$rep['curl_error_no']=curl_errno($ch);
+        $rep['curl_error_no']=curl_errno($ch);
         $rep['curl_error_msg']=curl_error($ch);
 
-		dol_syslog("getURLContent response array is ".join(',',$rep));
+        dol_syslog("getURLContent response array is ".join(',',$rep));
     }
     else
     {
-    	$info = curl_getinfo($ch);
+        $info = curl_getinfo($ch);
 
-    	// Ad keys to $rep
-    	$rep = $info;
-    	//$rep['header_size']=$info['header_size'];
-    	//$rep['http_code']=$info['http_code'];
-    	dol_syslog("getURLContent http_code=".$rep['http_code']);
+        // Ad keys to $rep
+        $rep = $info;
+        //$rep['header_size']=$info['header_size'];
+        //$rep['http_code']=$info['http_code'];
+        dol_syslog("getURLContent http_code=".$rep['http_code']);
 
         // Add more keys to $rep
         $rep['content']=$response;
-    	$rep['curl_error_no']='';
-    	$rep['curl_error_msg']='';
+        $rep['curl_error_no']='';
+        $rep['curl_error_msg']='';
 
-    	//closing the curl
+        //closing the curl
         curl_close($ch);
     }
 
@@ -170,12 +170,12 @@ 
  */
 function getDomainFromURL($url)
 {
-	$tmpdomain = preg_replace('/^https?:\/\//i', '', $url);				// Remove http(s)://
-	$tmpdomain = preg_replace('/\/.*$/i', '', $tmpdomain);				// Remove part after domain
-	$tmpdomain = preg_replace('/\.[^\.]+$/', '', $tmpdomain);			// Remove first level domain (.com, .net, ...)
-	$tmpdomain = preg_replace('/^[^\.]+\./', '', $tmpdomain);			// Remove part www. before domain name
+    $tmpdomain = preg_replace('/^https?:\/\//i', '', $url);				// Remove http(s)://
+    $tmpdomain = preg_replace('/\/.*$/i', '', $tmpdomain);				// Remove part after domain
+    $tmpdomain = preg_replace('/\.[^\.]+$/', '', $tmpdomain);			// Remove first level domain (.com, .net, ...)
+    $tmpdomain = preg_replace('/^[^\.]+\./', '', $tmpdomain);			// Remove part www. before domain name
 
-	return $tmpdomain;
+    return $tmpdomain;
 }
 
 /**
@@ -188,13 +188,13 @@ 
  */
 function getRootURLFromURL($url)
 {
-	$prefix='';
-	$tmpurl = $url;
-	if (preg_match('/^(https?:\/\/)/i', $tmpurl, $reg)) $prefix = $reg[1];
-	$tmpurl = preg_replace('/^https?:\/\//i', '', $tmpurl);				// Remove http(s)://
-	$tmpurl = preg_replace('/\/.*$/i', '', $tmpurl);					// Remove part after domain
+    $prefix='';
+    $tmpurl = $url;
+    if (preg_match('/^(https?:\/\/)/i', $tmpurl, $reg)) $prefix = $reg[1];
+    $tmpurl = preg_replace('/^https?:\/\//i', '', $tmpurl);				// Remove http(s)://
+    $tmpurl = preg_replace('/\/.*$/i', '', $tmpurl);					// Remove part after domain
 
-	return $prefix.$tmpurl;
+    return $prefix.$tmpurl;
 }
 
 /**
@@ -205,7 +205,7 @@ 
  */
 function removeHtmlComment($content)
 {
-	$content = preg_replace('/<!--[^\-]+-->/', '', $content);
-	return $content;
+    $content = preg_replace('/<!--[^\-]+-->/', '', $content);
+    return $content;
 }
 

dolibarr/htdocs/core/lib/modulebuilder.lib.php

Indentation +67 added lines, -67 removed lines

@@ -46,37 +46,37 @@ 
 
     if (! empty($addfieldentry['arrayofkeyval']) && ! is_array($addfieldentry['arrayofkeyval']))
     {
-    	dol_print_error('', 'Bad parameter addfieldentry with a property arrayofkeyval defined but that is not an array.');
-    	return -1;
+        dol_print_error('', 'Bad parameter addfieldentry with a property arrayofkeyval defined but that is not an array.');
+        return -1;
     }
 
     // Check parameters
     if (count($addfieldentry) > 0)
     {
         if (empty($addfieldentry['name']))
-    	{
-    		setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv("Name")), null, 'errors');
-    		return -2;
-    	}
+        {
+            setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv("Name")), null, 'errors');
+            return -2;
+        }
         if (empty($addfieldentry['label']))
-    	{
-    		setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv("Label")), null, 'errors');
-    		return -2;
-    	}
+        {
+            setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv("Label")), null, 'errors');
+            return -2;
+        }
 
-    	if (! preg_match('/^(price|boolean|sellist|integer|date|timestamp|varchar|double|text|html)/', $addfieldentry['type']))
+        if (! preg_match('/^(price|boolean|sellist|integer|date|timestamp|varchar|double|text|html)/', $addfieldentry['type']))
 
-    	{
-    		setEventMessages($langs->trans('BadFormatForType', $objectname), null, 'errors');
-    		return -2;
-    	}
+        {
+            setEventMessages($langs->trans('BadFormatForType', $objectname), null, 'errors');
+            return -2;
+        }
     }
 
     $pathoffiletoeditsrc=$readdir.'/class/'.strtolower($objectname).'.class.php';
     $pathoffiletoedittarget=$destdir.'/class/'.strtolower($objectname).'.class.php'.($readdir != $destdir ? '.new' : '');
     if (! dol_is_file($pathoffiletoeditsrc))
     {
-    	$langs->load("errors");
+        $langs->load("errors");
         setEventMessages($langs->trans("ErrorFileNotFound", $pathoffiletoeditsrc), null, 'errors');
         return -3;
     }
@@ -96,21 +96,21 @@ 
         // Edit class files
         $contentclass = file_get_contents(dol_osencode($pathoffiletoeditsrc), 'r');
 
-	    // Update ->fields (add or remove entries)
+        // Update ->fields (add or remove entries)
         if (count($object->fields))
         {
-        	if (is_array($addfieldentry) && count($addfieldentry))
-        	{
-				$name=$addfieldentry['name'];
-        		unset($addfieldentry['name']);
-
-        		$object->fields[$name]=$addfieldentry;
-        	}
-        	if (! empty($delfieldentry))
-        	{
-        		$name=$delfieldentry;
-        		unset($object->fields[$name]);
-        	}
+            if (is_array($addfieldentry) && count($addfieldentry))
+            {
+                $name=$addfieldentry['name'];
+                unset($addfieldentry['name']);
+
+                $object->fields[$name]=$addfieldentry;
+            }
+            if (! empty($delfieldentry))
+            {
+                $name=$delfieldentry;
+                unset($object->fields[$name]);
+            }
         }
 
         dol_sort_array($object->fields, 'position');
@@ -143,28 +143,28 @@ 
                 if ($val['showoncombobox']) $texttoinsert.= " 'showoncombobox'=>'".$val['showoncombobox']."',";
                 if ($val['arrayofkeyval'])
                 {
-                	$texttoinsert.= " 'arrayofkeyval'=>array(";
-                	$i=0;
-                	foreach($val['arrayofkeyval'] as $key2 => $val2)
-                	{
-                		if ($i) $texttoinsert.=", ";
-                		$texttoinsert.="'".$key2."'=>'".$val2."'";
-                		$i++;
-                	}
-                	$texttoinsert.= ")";
+                    $texttoinsert.= " 'arrayofkeyval'=>array(";
+                    $i=0;
+                    foreach($val['arrayofkeyval'] as $key2 => $val2)
+                    {
+                        if ($i) $texttoinsert.=", ";
+                        $texttoinsert.="'".$key2."'=>'".$val2."'";
+                        $i++;
+                    }
+                    $texttoinsert.= ")";
                 }
                 $texttoinsert.= "),\n";
             }
         }
 
         $texttoinsert.= "\t".');'."\n";
-		//print ($texttoinsert);exit;
+        //print ($texttoinsert);exit;
 
         if (count($object->fields))
         {
-        	$typetotypephp=array('integer'=>'integer', 'varchar'=>'string');
+            $typetotypephp=array('integer'=>'integer', 'varchar'=>'string');
 
-        	foreach($object->fields as $key => $val)
+            foreach($object->fields as $key => $val)
             {
                 $i++;
                 //$typephp=$typetotypephp[$val['type']];
@@ -224,22 +224,22 @@ 
     // Edit .sql file
     $pathoffiletoeditsrc=$readdir.'/sql/llx_'.strtolower($module).'_'.strtolower($objectname).'.sql';
     $pathoffiletoedittarget=$destdir.'/sql/llx_'.strtolower($module).'_'.strtolower($objectname).'.sql'.($readdir != $destdir ? '.new' : '');
-	if (! dol_is_file($pathoffiletoeditsrc))
+    if (! dol_is_file($pathoffiletoeditsrc))
     {
-    	$langs->load("errors");
-    	setEventMessages($langs->trans("ErrorFileNotFound", $pathoffiletoeditsrc), null, 'errors');
-    	return -1;
+        $langs->load("errors");
+        setEventMessages($langs->trans("ErrorFileNotFound", $pathoffiletoeditsrc), null, 'errors');
+        return -1;
     }
 
     // Load object from myobject.class.php
     try
     {
-    	if (! is_object($object))
-    	{
-    		include_once $pathoffiletoclasssrc;
-        	if (class_exists($objectname)) $object=new $objectname($db);
-        	else return -1;
-    	}
+        if (! is_object($object))
+        {
+            include_once $pathoffiletoclasssrc;
+            if (class_exists($objectname)) $object=new $objectname($db);
+            else return -1;
+        }
     }
     catch(Exception $e)
     {
@@ -270,12 +270,12 @@ 
             if ($key == 'entity') $texttoinsert.= ' DEFAULT 1';
             else
             {
-            	if ($val['default'] != '')
-            	{
-            		if (preg_match('/^null$/i', $val['default'])) $texttoinsert.= " DEFAULT NULL";
-            		else if (preg_match('/varchar/', $type )) $texttoinsert.= " DEFAULT '".$db->escape($val['default'])."'";
-            		else $texttoinsert.= (($val['default'] > 0)?' DEFAULT '.$val['default']:'');
-            	}
+                if ($val['default'] != '')
+                {
+                    if (preg_match('/^null$/i', $val['default'])) $texttoinsert.= " DEFAULT NULL";
+                    else if (preg_match('/varchar/', $type )) $texttoinsert.= " DEFAULT '".$db->escape($val['default'])."'";
+                    else $texttoinsert.= (($val['default'] > 0)?' DEFAULT '.$val['default']:'');
+                }
             }
             $texttoinsert.= (($val['notnull'] > 0)?' NOT NULL':'');
             if ($i < count($object->fields)) $texttoinsert.=", ";
@@ -289,11 +289,11 @@ 
     $result = file_put_contents($pathoffiletoedittarget, $contentsql);
     if ($result)
     {
-    	@chmod($pathoffiletoedittarget, octdec($newmask));
+        @chmod($pathoffiletoedittarget, octdec($newmask));
     }
     else
     {
-    	$error++;
+        $error++;
     }
 
     // Edit .key.sql file
@@ -316,12 +316,12 @@ 
             }
             if (! empty($val['foreignkey']))
             {
-            	$tmp=explode('.',$val['foreignkey']);
-            	if (! empty($tmp[0]) && ! empty($tmp[1]))
-            	{
-            		$texttoinsert.= "ALTER TABLE llx_".strtolower($module).'_'.strtolower($objectname)." ADD CONSTRAINT llx_".strtolower($module).'_'.strtolower($objectname)."_".$key." FOREIGN KEY (".$key.") REFERENCES ".$tmp[0]."(".$tmp[1].");";
-            		$texttoinsert.= "\n";
-            	}
+                $tmp=explode('.',$val['foreignkey']);
+                if (! empty($tmp[0]) && ! empty($tmp[1]))
+                {
+                    $texttoinsert.= "ALTER TABLE llx_".strtolower($module).'_'.strtolower($objectname)." ADD CONSTRAINT llx_".strtolower($module).'_'.strtolower($objectname)."_".$key." FOREIGN KEY (".$key.") REFERENCES ".$tmp[0]."(".$tmp[1].");";
+                    $texttoinsert.= "\n";
+                }
             }
         }
     }
@@ -334,11 +334,11 @@ 
     $result2 = file_put_contents($pathoffiletoedittarget, $contentsql);
     if ($result)
     {
-    	@chmod($pathoffiletoedittarget, octdec($newmask));
+        @chmod($pathoffiletoedittarget, octdec($newmask));
     }
     else
     {
-    	$error++;
+        $error++;
     }
 
     return $error ? -1 : 1;

dolibarr/htdocs/core/lib/member.lib.php

Indentation +86 added lines, -86 removed lines

@@ -32,36 +32,36 @@ 
  */
 function member_prepare_head(Adherent $object)
 {
-	global $db, $langs, $conf, $user;
-
-	$h = 0;
-	$head = array();
-
-	$head[$h][0] = DOL_URL_ROOT.'/adherents/card.php?rowid='.$object->id;
-	$head[$h][1] = $langs->trans("Card");
-	$head[$h][2] = 'general';
-	$h++;
-
-	if ((! empty($conf->ldap->enabled) && ! empty($conf->global->LDAP_MEMBER_ACTIVE))
-		&& (empty($conf->global->MAIN_DISABLE_LDAP_TAB) || ! empty($user->admin)))
-	{
-		$langs->load("ldap");
-
-		$head[$h][0] = DOL_URL_ROOT.'/adherents/ldap.php?id='.$object->id;
-		$head[$h][1] = $langs->trans("LDAPCard");
-		$head[$h][2] = 'ldap';
-		$h++;
-	}
-
-	if (! empty($user->rights->adherent->cotisation->lire))
-	{
-		$nbSubscription = is_array($object->subscriptions)?count($object->subscriptions):0;
-		$head[$h][0] = DOL_URL_ROOT.'/adherents/subscription.php?rowid='.$object->id;
-		$head[$h][1] = $langs->trans("Subscriptions");
-		$head[$h][2] = 'subscription';
-		if ($nbSubscription > 0) $head[$h][1].= ' <span class="badge">'.$nbSubscription.'</span>';
-		$h++;
-	}
+    global $db, $langs, $conf, $user;
+
+    $h = 0;
+    $head = array();
+
+    $head[$h][0] = DOL_URL_ROOT.'/adherents/card.php?rowid='.$object->id;
+    $head[$h][1] = $langs->trans("Card");
+    $head[$h][2] = 'general';
+    $h++;
+
+    if ((! empty($conf->ldap->enabled) && ! empty($conf->global->LDAP_MEMBER_ACTIVE))
+        && (empty($conf->global->MAIN_DISABLE_LDAP_TAB) || ! empty($user->admin)))
+    {
+        $langs->load("ldap");
+
+        $head[$h][0] = DOL_URL_ROOT.'/adherents/ldap.php?id='.$object->id;
+        $head[$h][1] = $langs->trans("LDAPCard");
+        $head[$h][2] = 'ldap';
+        $h++;
+    }
+
+    if (! empty($user->rights->adherent->cotisation->lire))
+    {
+        $nbSubscription = is_array($object->subscriptions)?count($object->subscriptions):0;
+        $head[$h][0] = DOL_URL_ROOT.'/adherents/subscription.php?rowid='.$object->id;
+        $head[$h][1] = $langs->trans("Subscriptions");
+        $head[$h][2] = 'subscription';
+        if ($nbSubscription > 0) $head[$h][1].= ' <span class="badge">'.$nbSubscription.'</span>';
+        $h++;
+    }
 
     // Show more tabs from modules
     // Entries must be declared in modules descriptor with line
@@ -74,10 +74,10 @@ 
     if(!empty($object->note_private)) $nbNote++;
     if(!empty($object->note_public)) $nbNote++;
     $head[$h][0] = DOL_URL_ROOT.'/adherents/note.php?id='.$object->id;
-	$head[$h][1] = $langs->trans("Note");
-	$head[$h][2] = 'note';
+    $head[$h][1] = $langs->trans("Note");
+    $head[$h][2] = 'note';
     if ($nbNote > 0) $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
-	$h++;
+    $h++;
 
     // Attachments
     require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
@@ -91,23 +91,23 @@ 
     $head[$h][2] = 'document';
     $h++;
 
-	// Show agenda tab
-	if (! empty($conf->agenda->enabled))
-	{
-	    $head[$h][0] = DOL_URL_ROOT."/adherents/agenda.php?id=".$object->id;
-	    $head[$h][1] = $langs->trans("Events");
-	    if (! empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read) ))
-	    {
-	        $head[$h][1].= '/';
-	        $head[$h][1].= $langs->trans("Agenda");
-	    }
-	    $head[$h][2] = 'agenda';
-	    $h++;
-	}
-
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'member','remove');
-
-	return $head;
+    // Show agenda tab
+    if (! empty($conf->agenda->enabled))
+    {
+        $head[$h][0] = DOL_URL_ROOT."/adherents/agenda.php?id=".$object->id;
+        $head[$h][1] = $langs->trans("Events");
+        if (! empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read) ))
+        {
+            $head[$h][1].= '/';
+            $head[$h][1].= $langs->trans("Agenda");
+        }
+        $head[$h][2] = 'agenda';
+        $h++;
+    }
+
+    complete_head_from_modules($conf,$langs,$object,$head,$h,'member','remove');
+
+    return $head;
 }
 
 /**
@@ -118,26 +118,26 @@ 
  */
 function member_type_prepare_head(AdherentType $object)
 {
-	global $langs, $conf, $user;
+    global $langs, $conf, $user;
 
-	$h=0;
-	$head = array();
+    $h=0;
+    $head = array();
 
-	$head[$h][0] = DOL_URL_ROOT.'/adherents/type.php?rowid='.$object->id;
-	$head[$h][1] = $langs->trans("Card");
-	$head[$h][2] = 'card';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT.'/adherents/type.php?rowid='.$object->id;
+    $head[$h][1] = $langs->trans("Card");
+    $head[$h][2] = 'card';
+    $h++;
 
-	if ((! empty($conf->ldap->enabled) && ! empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE))
-		&& (empty($conf->global->MAIN_DISABLE_LDAP_TAB) || ! empty($user->admin)))
-	{
-		$langs->load("ldap");
+    if ((! empty($conf->ldap->enabled) && ! empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE))
+        && (empty($conf->global->MAIN_DISABLE_LDAP_TAB) || ! empty($user->admin)))
+    {
+        $langs->load("ldap");
 
-		$head[$h][0] = DOL_URL_ROOT.'/adherents/type_ldap.php?rowid='.$object->id;
-		$head[$h][1] = $langs->trans("LDAPCard");
-		$head[$h][2] = 'ldap';
-		$h++;
-	}
+        $head[$h][0] = DOL_URL_ROOT.'/adherents/type_ldap.php?rowid='.$object->id;
+        $head[$h][1] = $langs->trans("LDAPCard");
+        $head[$h][2] = 'ldap';
+        $h++;
+    }
 
     // Show more tabs from modules
     // Entries must be declared in modules descriptor with line
@@ -145,9 +145,9 @@ 
     // $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to remove a tab
     complete_head_from_modules($conf,$langs,$object,$head,$h,'membertype');
 
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'membertype','remove');
+    complete_head_from_modules($conf,$langs,$object,$head,$h,'membertype','remove');
 
-	return $head;
+    return $head;
 }
 
 /**
@@ -261,28 +261,28 @@ 
  */
 function subscription_prepare_head(Subscription $object)
 {
-	global $db, $langs, $conf, $user;
+    global $db, $langs, $conf, $user;
 
-	$h = 0;
-	$head = array();
+    $h = 0;
+    $head = array();
 
-	$head[$h][0] = DOL_URL_ROOT.'/adherents/subscription/card.php?rowid='.$object->id;
-	$head[$h][1] = $langs->trans("Card");
-	$head[$h][2] = 'general';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT.'/adherents/subscription/card.php?rowid='.$object->id;
+    $head[$h][1] = $langs->trans("Card");
+    $head[$h][2] = 'general';
+    $h++;
 
-	$head[$h][0] = DOL_URL_ROOT.'/adherents/subscription/info.php?rowid='.$object->id;
-	$head[$h][1] = $langs->trans("Info");
-	$head[$h][2] = 'info';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT.'/adherents/subscription/info.php?rowid='.$object->id;
+    $head[$h][1] = $langs->trans("Info");
+    $head[$h][2] = 'info';
+    $h++;
 
-	// Show more tabs from modules
-	// Entries must be declared in modules descriptor with line
-	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
-	// $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to remove a tab
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'subscription');
+    // Show more tabs from modules
+    // Entries must be declared in modules descriptor with line
+    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
+    // $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to remove a tab
+    complete_head_from_modules($conf,$langs,$object,$head,$h,'subscription');
 
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'subscription','remove');
+    complete_head_from_modules($conf,$langs,$object,$head,$h,'subscription','remove');
 
-	return $head;
+    return $head;
 }

dolibarr/htdocs/core/lib/contract.lib.php

Indentation +54 added lines, -54 removed lines

@@ -30,25 +30,25 @@ 
  */
 function contract_prepare_head(Contrat $object)
 {
-	global $db, $langs, $conf;
+    global $db, $langs, $conf;
 	
-	$h = 0;
-	$head = array();
-
-	$head[$h][0] = DOL_URL_ROOT.'/contrat/card.php?id='.$object->id;
-	$head[$h][1] = $langs->trans("ContractCard");
-	$head[$h][2] = 'card';
-	$h++;
-
-	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
-	{
-	    $nbContact = count($object->liste_contact(-1,'internal')) + count($object->liste_contact(-1,'external'));
-	    $head[$h][0] = DOL_URL_ROOT.'/contrat/contact.php?id='.$object->id;
-		$head[$h][1] = $langs->trans("ContactsAddresses");
-		if ($nbContact > 0) $head[$h][1].= ' <span class="badge">'.$nbContact.'</span>';
-		$head[$h][2] = 'contact';
-		$h++;
-	}
+    $h = 0;
+    $head = array();
+
+    $head[$h][0] = DOL_URL_ROOT.'/contrat/card.php?id='.$object->id;
+    $head[$h][1] = $langs->trans("ContractCard");
+    $head[$h][2] = 'card';
+    $h++;
+
+    if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
+    {
+        $nbContact = count($object->liste_contact(-1,'internal')) + count($object->liste_contact(-1,'external'));
+        $head[$h][0] = DOL_URL_ROOT.'/contrat/contact.php?id='.$object->id;
+        $head[$h][1] = $langs->trans("ContactsAddresses");
+        if ($nbContact > 0) $head[$h][1].= ' <span class="badge">'.$nbContact.'</span>';
+        $head[$h][2] = 'contact';
+        $h++;
+    }
 
     // Show more tabs from modules
     // Entries must be declared in modules descriptor with line
@@ -58,35 +58,35 @@ 
 
     if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
     {
-    	$nbNote = 0;
+        $nbNote = 0;
         if(!empty($object->note_private)) $nbNote++;
-		if(!empty($object->note_public)) $nbNote++;
-    	$head[$h][0] = DOL_URL_ROOT.'/contrat/note.php?id='.$object->id;
-    	$head[$h][1] = $langs->trans("Notes");
-		if ($nbNote > 0) $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
-    	$head[$h][2] = 'note';
-    	$h++;
+        if(!empty($object->note_public)) $nbNote++;
+        $head[$h][0] = DOL_URL_ROOT.'/contrat/note.php?id='.$object->id;
+        $head[$h][1] = $langs->trans("Notes");
+        if ($nbNote > 0) $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
+        $head[$h][2] = 'note';
+        $h++;
     }
 
-	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+    require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
     require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
-	$upload_dir = $conf->contrat->dir_output . "/" . dol_sanitizeFileName($object->ref);
-	$nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
+    $upload_dir = $conf->contrat->dir_output . "/" . dol_sanitizeFileName($object->ref);
+    $nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
     $nbLinks=Link::count($db, $object->element, $object->id);
-	$head[$h][0] = DOL_URL_ROOT.'/contrat/document.php?id='.$object->id;
-	$head[$h][1] = $langs->trans("Documents");
-	if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
-	$head[$h][2] = 'documents';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT.'/contrat/document.php?id='.$object->id;
+    $head[$h][1] = $langs->trans("Documents");
+    if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+    $head[$h][2] = 'documents';
+    $h++;
 
-	$head[$h][0] = DOL_URL_ROOT.'/contrat/info.php?id='.$object->id;
-	$head[$h][1] = $langs->trans("Info");
-	$head[$h][2] = 'info';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT.'/contrat/info.php?id='.$object->id;
+    $head[$h][1] = $langs->trans("Info");
+    $head[$h][2] = 'info';
+    $h++;
 
     complete_head_from_modules($conf,$langs,$object,$head,$h,'contract','remove');
 
-	return $head;
+    return $head;
 }
 
 /**
@@ -96,24 +96,24 @@ 
  */
 function contract_admin_prepare_head()
 {
-	global $langs, $conf, $user;
+    global $langs, $conf, $user;
 
-	$h = 0;
-	$head = array();
+    $h = 0;
+    $head = array();
 
-	$head[$h][0] = DOL_URL_ROOT."/admin/contract.php";
-	$head[$h][1] = $langs->trans("Contracts");
-	$head[$h][2] = 'contract';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT."/admin/contract.php";
+    $head[$h][1] = $langs->trans("Contracts");
+    $head[$h][2] = 'contract';
+    $h++;
 
-	// Show more tabs from modules
-	// Entries must be declared in modules descriptor with line
-	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
-	// $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to remove a tab
-	complete_head_from_modules($conf,$langs,null,$head,$h,'contract_admin');
+    // Show more tabs from modules
+    // Entries must be declared in modules descriptor with line
+    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
+    // $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to remove a tab
+    complete_head_from_modules($conf,$langs,null,$head,$h,'contract_admin');
 
-	$head[$h][0] = DOL_URL_ROOT.'/contrat/admin/contract_extrafields.php';
-	$head[$h][1] = $langs->trans("ExtraFields");
+    $head[$h][0] = DOL_URL_ROOT.'/contrat/admin/contract_extrafields.php';
+    $head[$h][1] = $langs->trans("ExtraFields");
     $head[$h][2] = 'attributes';
     $h++;
 
@@ -124,8 +124,8 @@ 
 
 
 
-	complete_head_from_modules($conf,$langs,null,$head,$h,'contract_admin','remove');
+    complete_head_from_modules($conf,$langs,null,$head,$h,'contract_admin','remove');
 
-		return $head;
+        return $head;
 }
 

dolibarr/htdocs/core/lib/format_cards.lib.php

Indentation +1 added lines, -1 removed lines

@@ -64,6 +64,6 @@
 // We add characteristics to the name
 foreach($_Avery_Labels as $key => $val)
 {
-	$_Avery_Labels[$key]['name'].=' ('.$_Avery_Labels[$key]['paper-size'].' - '.$_Avery_Labels[$key]['NX'].'x'.$_Avery_Labels[$key]['NY'].')';
+    $_Avery_Labels[$key]['name'].=' ('.$_Avery_Labels[$key]['paper-size'].' - '.$_Avery_Labels[$key]['NX'].'x'.$_Avery_Labels[$key]['NY'].')';
 }
 

dolibarr/htdocs/core/lib/loan.lib.php

Indentation +25 added lines, -25 removed lines

@@ -36,15 +36,15 @@ 
     $tab = 0;
     $head = array();
 
-	$head[$tab][0] = DOL_URL_ROOT.'/loan/card.php?id='.$object->id;
-	$head[$tab][1] = $langs->trans('Card');
-	$head[$tab][2] = 'card';
-	$tab++;
+    $head[$tab][0] = DOL_URL_ROOT.'/loan/card.php?id='.$object->id;
+    $head[$tab][1] = $langs->trans('Card');
+    $head[$tab][2] = 'card';
+    $tab++;
 	
-	$head[$tab][0] = DOL_URL_ROOT.'/loan/schedule.php?loanid='.$object->id;
-	$head[$tab][1] = $langs->trans('FinancialCommitment');
-	$head[$tab][2] = 'FinancialCommitment';
-	$tab++;
+    $head[$tab][0] = DOL_URL_ROOT.'/loan/schedule.php?loanid='.$object->id;
+    $head[$tab][1] = $langs->trans('FinancialCommitment');
+    $head[$tab][2] = 'FinancialCommitment';
+    $tab++;
 
     // Show more tabs from modules
     // Entries must be declared in modules descriptor with line
@@ -52,26 +52,26 @@ 
     // $this->tabs = array('entity:-tabname);   												to remove a tab
     complete_head_from_modules($conf, $langs, $object, $head, $tab,'loan');
 
-	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+    require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
     require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
-	$upload_dir = $conf->loan->dir_output . "/" . dol_sanitizeFileName($object->ref);
-	$nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
+    $upload_dir = $conf->loan->dir_output . "/" . dol_sanitizeFileName($object->ref);
+    $nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
     $nbLinks=Link::count($db, $object->element, $object->id);
-	$head[$tab][0] = DOL_URL_ROOT.'/loan/document.php?id='.$object->id;
-	$head[$tab][1] = $langs->trans("Documents");
-	if (($nbFiles+$nbLinks) > 0) $head[$tab][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
-	$head[$tab][2] = 'documents';
-	$tab++;
+    $head[$tab][0] = DOL_URL_ROOT.'/loan/document.php?id='.$object->id;
+    $head[$tab][1] = $langs->trans("Documents");
+    if (($nbFiles+$nbLinks) > 0) $head[$tab][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+    $head[$tab][2] = 'documents';
+    $tab++;
 
-	if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
-	{
-		$nbNote = (empty($object->note_private)?0:1)+(empty($object->note_public)?0:1);
-		$head[$tab][0] = DOL_URL_ROOT."/loan/note.php?id=".$object->id;
-		$head[$tab][1] = $langs->trans("Notes");
-		if($nbNote > 0) $head[$tab][1].= ' <span class="badge">'.$nbNote.'</span>';
-		$head[$tab][2] = 'note';
-		$tab++;
-	}
+    if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
+    {
+        $nbNote = (empty($object->note_private)?0:1)+(empty($object->note_public)?0:1);
+        $head[$tab][0] = DOL_URL_ROOT."/loan/note.php?id=".$object->id;
+        $head[$tab][1] = $langs->trans("Notes");
+        if($nbNote > 0) $head[$tab][1].= ' <span class="badge">'.$nbNote.'</span>';
+        $head[$tab][2] = 'note';
+        $tab++;
+    }
 
     $head[$tab][0] = DOL_URL_ROOT.'/loan/info.php?id='.$object->id;
     $head[$tab][1] = $langs->trans("Info");

dolibarr/htdocs/core/lib/images.lib.php

Indentation +394 added lines, -394 removed lines

@@ -74,24 +74,24 @@ 
  */
 function dol_getImageSize($file, $url = false)
 {
-	$ret=array();
+    $ret=array();
 
-	if (image_format_supported($file) < 0) return $ret;
+    if (image_format_supported($file) < 0) return $ret;
 
-	$filetoread = $file;
-	if (!$url)
-	{
-		$filetoread = realpath(dol_osencode($file)); 	// Chemin canonique absolu de l'image
-	}
+    $filetoread = $file;
+    if (!$url)
+    {
+        $filetoread = realpath(dol_osencode($file)); 	// Chemin canonique absolu de l'image
+    }
 
-	if ($filetoread)
-	{
-    	$infoImg = getimagesize($filetoread); // Recuperation des infos de l'image
-    	$ret['width']=$infoImg[0]; // Largeur de l'image
-    	$ret['height']=$infoImg[1]; // Hauteur de l'image
-	}
+    if ($filetoread)
+    {
+        $infoImg = getimagesize($filetoread); // Recuperation des infos de l'image
+        $ret['width']=$infoImg[0]; // Largeur de l'image
+        $ret['height']=$infoImg[1]; // Hauteur de l'image
+    }
 
-	return $ret;
+    return $ret;
 }
 
 
@@ -108,191 +108,191 @@ 
  */
 function dol_imageResizeOrCrop($file, $mode, $newWidth, $newHeight, $src_x=0, $src_y=0)
 {
-	require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-
-	global $conf,$langs;
-
-	dol_syslog("dol_imageResizeOrCrop file=".$file." mode=".$mode." newWidth=".$newWidth." newHeight=".$newHeight." src_x=".$src_x." src_y=".$src_y);
-
-	// Clean parameters
-	$file=trim($file);
-
-	// Check parameters
-	if (! $file)
-	{
-		// Si le fichier n'a pas ete indique
-		return 'Bad parameter file';
-	}
-	elseif (! file_exists($file))
-	{
-		// Si le fichier passe en parametre n'existe pas
-		return $langs->trans("ErrorFileNotFound",$file);
-	}
-	elseif(image_format_supported($file) < 0)
-	{
-		return 'This filename '.$file.' does not seem to be an image filename.';
-	}
-	elseif(!is_numeric($newWidth) && !is_numeric($newHeight))
-	{
-		return 'Wrong value for parameter newWidth or newHeight';
-	}
-	elseif ($mode == 0 && $newWidth <= 0 && $newHeight <= 0)
-	{
-		return 'At least newHeight or newWidth must be defined for resizing';
-	}
-	elseif ($mode == 1 && ($newWidth <= 0 || $newHeight <= 0))
-	{
-		return 'Both newHeight or newWidth must be defined for croping';
-	}
-
-	$filetoread = realpath(dol_osencode($file)); 	// Chemin canonique absolu de l'image
-
-	$infoImg = getimagesize($filetoread); // Recuperation des infos de l'image
-	$imgWidth = $infoImg[0]; // Largeur de l'image
-	$imgHeight = $infoImg[1]; // Hauteur de l'image
-
-	if ($mode == 0)	// If resize, we check parameters
-	{
-		if ($newWidth  <= 0)
-		{
-			$newWidth=intval(($newHeight / $imgHeight) * $imgWidth);	// Keep ratio
-		}
-		if ($newHeight <= 0)
-		{
-			$newHeight=intval(($newWidth / $imgWidth) * $imgHeight);	// Keep ratio
-		}
-	}
-
-	$imgfonction='';
-	switch($infoImg[2])
-	{
-		case 1:	// IMG_GIF
-			$imgfonction = 'imagecreatefromgif';
-			break;
-		case 2:	// IMG_JPG
-			$imgfonction = 'imagecreatefromjpeg';
-			break;
-		case 3:	// IMG_PNG
-			$imgfonction = 'imagecreatefrompng';
-			break;
-		case 4:	// IMG_WBMP
-			$imgfonction = 'imagecreatefromwbmp';
-			break;
-	}
-	if ($imgfonction)
-	{
-		if (! function_exists($imgfonction))
-		{
-			// Fonctions de conversion non presente dans ce PHP
-			return 'Resize not possible. This PHP does not support GD functions '.$imgfonction;
-		}
-	}
-
-	// Initialisation des variables selon l'extension de l'image
-	switch($infoImg[2])
-	{
-		case 1:	// Gif
-			$img = imagecreatefromgif($filetoread);
-			$extImg = '.gif';	// File name extension of image
-			$newquality='NU';	// Quality is not used for this format
-			break;
-		case 2:	// Jpg
-			$img = imagecreatefromjpeg($filetoread);
-			$extImg = '.jpg';
-			$newquality=100;	// % quality maximum
-			break;
-		case 3:	// Png
-			$img = imagecreatefrompng($filetoread);
-			$extImg = '.png';
-			$newquality=0;		// No compression (0-9)
-			break;
-		case 4:	// Bmp
-			$img = imagecreatefromwbmp($filetoread);
-			$extImg = '.bmp';
-			$newquality='NU';	// Quality is not used for this format
-			break;
-	}
-
-	// Create empty image
-	if ($infoImg[2] == 1)
-	{
-		// Compatibilite image GIF
-		$imgThumb = imagecreate($newWidth, $newHeight);
-	}
-	else
-	{
-		$imgThumb = imagecreatetruecolor($newWidth, $newHeight);
-	}
-
-	// Activate antialiasing for better quality
-	if (function_exists('imageantialias'))
-	{
-		imageantialias($imgThumb, true);
-	}
-
-	// This is to keep transparent alpha channel if exists (PHP >= 4.2)
-	if (function_exists('imagesavealpha'))
-	{
-		imagesavealpha($imgThumb, true);
-	}
-
-	// Initialisation des variables selon l'extension de l'image
-	switch($infoImg[2])
-	{
-		case 1:	// Gif
-			$trans_colour = imagecolorallocate($imgThumb, 255, 255, 255); // On procede autrement pour le format GIF
-			imagecolortransparent($imgThumb,$trans_colour);
-			break;
-		case 2:	// Jpg
-			$trans_colour = imagecolorallocatealpha($imgThumb, 255, 255, 255, 0);
-			break;
-		case 3:	// Png
-			imagealphablending($imgThumb,false); // Pour compatibilite sur certain systeme
-			$trans_colour = imagecolorallocatealpha($imgThumb, 255, 255, 255, 127);	// Keep transparent channel
-			break;
-		case 4:	// Bmp
-			$trans_colour = imagecolorallocatealpha($imgThumb, 255, 255, 255, 0);
-			break;
-	}
-	if (function_exists("imagefill")) imagefill($imgThumb, 0, 0, $trans_colour);
-
-	dol_syslog("dol_imageResizeOrCrop: convert image from ($imgWidth x $imgHeight) at position ($src_x x $src_y) to ($newWidth x $newHeight) as $extImg, newquality=$newquality");
-	//imagecopyresized($imgThumb, $img, 0, 0, 0, 0, $thumbWidth, $thumbHeight, $imgWidth, $imgHeight); // Insere l'image de base redimensionnee
-	imagecopyresampled($imgThumb, $img, 0, 0, $src_x, $src_y, $newWidth, $newHeight, ($mode==0?$imgWidth:$newWidth), ($mode==0?$imgHeight:$newHeight)); // Insere l'image de base redimensionnee
-
-	$imgThumbName = $file;
-
-	// Check if permission are ok
-	//$fp = fopen($imgThumbName, "w");
-	//fclose($fp);
-
-	// Create image on disk
-	switch($infoImg[2])
-	{
-		case 1:	// Gif
-			imagegif($imgThumb, $imgThumbName);
-			break;
-		case 2:	// Jpg
-			imagejpeg($imgThumb, $imgThumbName, $newquality);
-			break;
-		case 3:	// Png
-			imagepng($imgThumb, $imgThumbName, $newquality);
-			break;
-		case 4:	// Bmp
-			image2wbmp($imgThumb, $imgThumbName);
-			break;
-	}
-
-	// Set permissions on file
-	if (! empty($conf->global->MAIN_UMASK)) @chmod($imgThumbName, octdec($conf->global->MAIN_UMASK));
-
-	// Free memory. This does not delete image.
+    require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+
+    global $conf,$langs;
+
+    dol_syslog("dol_imageResizeOrCrop file=".$file." mode=".$mode." newWidth=".$newWidth." newHeight=".$newHeight." src_x=".$src_x." src_y=".$src_y);
+
+    // Clean parameters
+    $file=trim($file);
+
+    // Check parameters
+    if (! $file)
+    {
+        // Si le fichier n'a pas ete indique
+        return 'Bad parameter file';
+    }
+    elseif (! file_exists($file))
+    {
+        // Si le fichier passe en parametre n'existe pas
+        return $langs->trans("ErrorFileNotFound",$file);
+    }
+    elseif(image_format_supported($file) < 0)
+    {
+        return 'This filename '.$file.' does not seem to be an image filename.';
+    }
+    elseif(!is_numeric($newWidth) && !is_numeric($newHeight))
+    {
+        return 'Wrong value for parameter newWidth or newHeight';
+    }
+    elseif ($mode == 0 && $newWidth <= 0 && $newHeight <= 0)
+    {
+        return 'At least newHeight or newWidth must be defined for resizing';
+    }
+    elseif ($mode == 1 && ($newWidth <= 0 || $newHeight <= 0))
+    {
+        return 'Both newHeight or newWidth must be defined for croping';
+    }
+
+    $filetoread = realpath(dol_osencode($file)); 	// Chemin canonique absolu de l'image
+
+    $infoImg = getimagesize($filetoread); // Recuperation des infos de l'image
+    $imgWidth = $infoImg[0]; // Largeur de l'image
+    $imgHeight = $infoImg[1]; // Hauteur de l'image
+
+    if ($mode == 0)	// If resize, we check parameters
+    {
+        if ($newWidth  <= 0)
+        {
+            $newWidth=intval(($newHeight / $imgHeight) * $imgWidth);	// Keep ratio
+        }
+        if ($newHeight <= 0)
+        {
+            $newHeight=intval(($newWidth / $imgWidth) * $imgHeight);	// Keep ratio
+        }
+    }
+
+    $imgfonction='';
+    switch($infoImg[2])
+    {
+        case 1:	// IMG_GIF
+            $imgfonction = 'imagecreatefromgif';
+            break;
+        case 2:	// IMG_JPG
+            $imgfonction = 'imagecreatefromjpeg';
+            break;
+        case 3:	// IMG_PNG
+            $imgfonction = 'imagecreatefrompng';
+            break;
+        case 4:	// IMG_WBMP
+            $imgfonction = 'imagecreatefromwbmp';
+            break;
+    }
+    if ($imgfonction)
+    {
+        if (! function_exists($imgfonction))
+        {
+            // Fonctions de conversion non presente dans ce PHP
+            return 'Resize not possible. This PHP does not support GD functions '.$imgfonction;
+        }
+    }
+
+    // Initialisation des variables selon l'extension de l'image
+    switch($infoImg[2])
+    {
+        case 1:	// Gif
+            $img = imagecreatefromgif($filetoread);
+            $extImg = '.gif';	// File name extension of image
+            $newquality='NU';	// Quality is not used for this format
+            break;
+        case 2:	// Jpg
+            $img = imagecreatefromjpeg($filetoread);
+            $extImg = '.jpg';
+            $newquality=100;	// % quality maximum
+            break;
+        case 3:	// Png
+            $img = imagecreatefrompng($filetoread);
+            $extImg = '.png';
+            $newquality=0;		// No compression (0-9)
+            break;
+        case 4:	// Bmp
+            $img = imagecreatefromwbmp($filetoread);
+            $extImg = '.bmp';
+            $newquality='NU';	// Quality is not used for this format
+            break;
+    }
+
+    // Create empty image
+    if ($infoImg[2] == 1)
+    {
+        // Compatibilite image GIF
+        $imgThumb = imagecreate($newWidth, $newHeight);
+    }
+    else
+    {
+        $imgThumb = imagecreatetruecolor($newWidth, $newHeight);
+    }
+
+    // Activate antialiasing for better quality
+    if (function_exists('imageantialias'))
+    {
+        imageantialias($imgThumb, true);
+    }
+
+    // This is to keep transparent alpha channel if exists (PHP >= 4.2)
+    if (function_exists('imagesavealpha'))
+    {
+        imagesavealpha($imgThumb, true);
+    }
+
+    // Initialisation des variables selon l'extension de l'image
+    switch($infoImg[2])
+    {
+        case 1:	// Gif
+            $trans_colour = imagecolorallocate($imgThumb, 255, 255, 255); // On procede autrement pour le format GIF
+            imagecolortransparent($imgThumb,$trans_colour);
+            break;
+        case 2:	// Jpg
+            $trans_colour = imagecolorallocatealpha($imgThumb, 255, 255, 255, 0);
+            break;
+        case 3:	// Png
+            imagealphablending($imgThumb,false); // Pour compatibilite sur certain systeme
+            $trans_colour = imagecolorallocatealpha($imgThumb, 255, 255, 255, 127);	// Keep transparent channel
+            break;
+        case 4:	// Bmp
+            $trans_colour = imagecolorallocatealpha($imgThumb, 255, 255, 255, 0);
+            break;
+    }
+    if (function_exists("imagefill")) imagefill($imgThumb, 0, 0, $trans_colour);
+
+    dol_syslog("dol_imageResizeOrCrop: convert image from ($imgWidth x $imgHeight) at position ($src_x x $src_y) to ($newWidth x $newHeight) as $extImg, newquality=$newquality");
+    //imagecopyresized($imgThumb, $img, 0, 0, 0, 0, $thumbWidth, $thumbHeight, $imgWidth, $imgHeight); // Insere l'image de base redimensionnee
+    imagecopyresampled($imgThumb, $img, 0, 0, $src_x, $src_y, $newWidth, $newHeight, ($mode==0?$imgWidth:$newWidth), ($mode==0?$imgHeight:$newHeight)); // Insere l'image de base redimensionnee
+
+    $imgThumbName = $file;
+
+    // Check if permission are ok
+    //$fp = fopen($imgThumbName, "w");
+    //fclose($fp);
+
+    // Create image on disk
+    switch($infoImg[2])
+    {
+        case 1:	// Gif
+            imagegif($imgThumb, $imgThumbName);
+            break;
+        case 2:	// Jpg
+            imagejpeg($imgThumb, $imgThumbName, $newquality);
+            break;
+        case 3:	// Png
+            imagepng($imgThumb, $imgThumbName, $newquality);
+            break;
+        case 4:	// Bmp
+            image2wbmp($imgThumb, $imgThumbName);
+            break;
+    }
+
+    // Set permissions on file
+    if (! empty($conf->global->MAIN_UMASK)) @chmod($imgThumbName, octdec($conf->global->MAIN_UMASK));
+
+    // Free memory. This does not delete image.
     imagedestroy($img);
-	imagedestroy($imgThumb);
+    imagedestroy($imgThumb);
 
-	clearstatcache();	// File was replaced by a modified one, so we clear file caches.
+    clearstatcache();	// File was replaced by a modified one, so we clear file caches.
 
-	return $imgThumbName;
+    return $imgThumbName;
 }
 
 
@@ -351,247 +351,247 @@ 
  */
 function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName='_small', $quality=50, $outdir='thumbs', $targetformat=0)
 {
-	require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+    require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
-	global $conf,$langs;
+    global $conf,$langs;
 
-	dol_syslog("vignette file=".$file." extName=".$extName." maxWidth=".$maxWidth." maxHeight=".$maxHeight." quality=".$quality." outdir=".$outdir." targetformat=".$targetformat);
+    dol_syslog("vignette file=".$file." extName=".$extName." maxWidth=".$maxWidth." maxHeight=".$maxHeight." quality=".$quality." outdir=".$outdir." targetformat=".$targetformat);
 
-	// Clean parameters
-	$file=trim($file);
+    // Clean parameters
+    $file=trim($file);
 
-	// Check parameters
-	if (! $file)
-	{
-		// Si le fichier n'a pas ete indique
-		return 'ErrorBadParameters';
-	}
-	elseif (! file_exists($file))
-	{
-		// Si le fichier passe en parametre n'existe pas
+    // Check parameters
+    if (! $file)
+    {
+        // Si le fichier n'a pas ete indique
+        return 'ErrorBadParameters';
+    }
+    elseif (! file_exists($file))
+    {
+        // Si le fichier passe en parametre n'existe pas
         dol_syslog($langs->trans("ErrorFileNotFound",$file),LOG_ERR);
-	    return $langs->trans("ErrorFileNotFound",$file);
-	}
-	elseif(image_format_supported($file) < 0)
-	{
+        return $langs->trans("ErrorFileNotFound",$file);
+    }
+    elseif(image_format_supported($file) < 0)
+    {
         dol_syslog('This file '.$file.' does not seem to be an image format file name.',LOG_WARNING);
-	    return 'ErrorBadImageFormat';
-	}
-	elseif(!is_numeric($maxWidth) || empty($maxWidth) || $maxWidth < -1){
-		// Si la largeur max est incorrecte (n'est pas numerique, est vide, ou est inferieure a 0)
+        return 'ErrorBadImageFormat';
+    }
+    elseif(!is_numeric($maxWidth) || empty($maxWidth) || $maxWidth < -1){
+        // Si la largeur max est incorrecte (n'est pas numerique, est vide, ou est inferieure a 0)
         dol_syslog('Wrong value for parameter maxWidth',LOG_ERR);
-	    return 'Error: Wrong value for parameter maxWidth';
-	}
-	elseif(!is_numeric($maxHeight) || empty($maxHeight) || $maxHeight < -1){
-		// Si la hauteur max est incorrecte (n'est pas numerique, est vide, ou est inferieure a 0)
+        return 'Error: Wrong value for parameter maxWidth';
+    }
+    elseif(!is_numeric($maxHeight) || empty($maxHeight) || $maxHeight < -1){
+        // Si la hauteur max est incorrecte (n'est pas numerique, est vide, ou est inferieure a 0)
         dol_syslog('Wrong value for parameter maxHeight',LOG_ERR);
-	    return 'Error: Wrong value for parameter maxHeight';
-	}
-
-	$filetoread = realpath(dol_osencode($file)); 	// Chemin canonique absolu de l'image
-
-	$infoImg = getimagesize($filetoread); // Recuperation des infos de l'image
-	$imgWidth = $infoImg[0]; // Largeur de l'image
-	$imgHeight = $infoImg[1]; // Hauteur de l'image
-
-	if ($maxWidth  == -1) $maxWidth=$infoImg[0];	// If size is -1, we keep unchanged
-	if ($maxHeight == -1) $maxHeight=$infoImg[1];	// If size is -1, we keep unchanged
-
-	// Si l'image est plus petite que la largeur et la hauteur max, on ne cree pas de vignette
-	if ($infoImg[0] < $maxWidth && $infoImg[1] < $maxHeight)
-	{
-		// On cree toujours les vignettes
-		dol_syslog("File size is smaller than thumb size",LOG_DEBUG);
-		//return 'Le fichier '.$file.' ne necessite pas de creation de vignette';
-	}
-
-	$imgfonction='';
-	switch($infoImg[2])
-	{
-		case IMAGETYPE_GIF:	    // 1
-			$imgfonction = 'imagecreatefromgif';
-			break;
-		case IMAGETYPE_JPEG:    // 2
-			$imgfonction = 'imagecreatefromjpeg';
-			break;
-		case IMAGETYPE_PNG:	    // 3
-			$imgfonction = 'imagecreatefrompng';
-			break;
-		case IMAGETYPE_BMP:	    // 6
+        return 'Error: Wrong value for parameter maxHeight';
+    }
+
+    $filetoread = realpath(dol_osencode($file)); 	// Chemin canonique absolu de l'image
+
+    $infoImg = getimagesize($filetoread); // Recuperation des infos de l'image
+    $imgWidth = $infoImg[0]; // Largeur de l'image
+    $imgHeight = $infoImg[1]; // Hauteur de l'image
+
+    if ($maxWidth  == -1) $maxWidth=$infoImg[0];	// If size is -1, we keep unchanged
+    if ($maxHeight == -1) $maxHeight=$infoImg[1];	// If size is -1, we keep unchanged
+
+    // Si l'image est plus petite que la largeur et la hauteur max, on ne cree pas de vignette
+    if ($infoImg[0] < $maxWidth && $infoImg[1] < $maxHeight)
+    {
+        // On cree toujours les vignettes
+        dol_syslog("File size is smaller than thumb size",LOG_DEBUG);
+        //return 'Le fichier '.$file.' ne necessite pas de creation de vignette';
+    }
+
+    $imgfonction='';
+    switch($infoImg[2])
+    {
+        case IMAGETYPE_GIF:	    // 1
+            $imgfonction = 'imagecreatefromgif';
+            break;
+        case IMAGETYPE_JPEG:    // 2
+            $imgfonction = 'imagecreatefromjpeg';
+            break;
+        case IMAGETYPE_PNG:	    // 3
+            $imgfonction = 'imagecreatefrompng';
+            break;
+        case IMAGETYPE_BMP:	    // 6
             // Not supported by PHP GD
-			break;
-		case IMAGETYPE_WBMP:	// 15
-			$imgfonction = 'imagecreatefromwbmp';
-			break;
-	}
-	if ($imgfonction)
-	{
-		if (! function_exists($imgfonction))
-		{
-			// Fonctions de conversion non presente dans ce PHP
-			return 'Error: Creation of thumbs not possible. This PHP does not support GD function '.$imgfonction;
-		}
-	}
-
-	// On cree le repertoire contenant les vignettes
-	$dirthumb = dirname($file).($outdir?'/'.$outdir:''); 	// Chemin du dossier contenant les vignettes
-	dol_mkdir($dirthumb);
-
-	// Initialisation des variables selon l'extension de l'image
-	$img=null;
-	switch($infoImg[2])
-	{
-		case IMAGETYPE_GIF:	    // 1
-			$img = imagecreatefromgif($filetoread);
-			$extImg = '.gif'; // Extension de l'image
-			break;
-		case IMAGETYPE_JPEG:    // 2
-			$img = imagecreatefromjpeg($filetoread);
-			$extImg = (preg_match('/\.jpeg$/',$file)?'.jpeg':'.jpg'); // Extension de l'image
-			break;
-		case IMAGETYPE_PNG:	    // 3
-			$img = imagecreatefrompng($filetoread);
-			$extImg = '.png';
-			break;
-		case IMAGETYPE_BMP:	    // 6
+            break;
+        case IMAGETYPE_WBMP:	// 15
+            $imgfonction = 'imagecreatefromwbmp';
+            break;
+    }
+    if ($imgfonction)
+    {
+        if (! function_exists($imgfonction))
+        {
+            // Fonctions de conversion non presente dans ce PHP
+            return 'Error: Creation of thumbs not possible. This PHP does not support GD function '.$imgfonction;
+        }
+    }
+
+    // On cree le repertoire contenant les vignettes
+    $dirthumb = dirname($file).($outdir?'/'.$outdir:''); 	// Chemin du dossier contenant les vignettes
+    dol_mkdir($dirthumb);
+
+    // Initialisation des variables selon l'extension de l'image
+    $img=null;
+    switch($infoImg[2])
+    {
+        case IMAGETYPE_GIF:	    // 1
+            $img = imagecreatefromgif($filetoread);
+            $extImg = '.gif'; // Extension de l'image
+            break;
+        case IMAGETYPE_JPEG:    // 2
+            $img = imagecreatefromjpeg($filetoread);
+            $extImg = (preg_match('/\.jpeg$/',$file)?'.jpeg':'.jpg'); // Extension de l'image
+            break;
+        case IMAGETYPE_PNG:	    // 3
+            $img = imagecreatefrompng($filetoread);
+            $extImg = '.png';
+            break;
+        case IMAGETYPE_BMP:	    // 6
             // Not supported by PHP GD
-			$extImg = '.bmp';
-			break;
-		case IMAGETYPE_WBMP:	// 15
-			$img = imagecreatefromwbmp($filetoread);
-			$extImg = '.bmp';
-			break;
-	}
+            $extImg = '.bmp';
+            break;
+        case IMAGETYPE_WBMP:	// 15
+            $img = imagecreatefromwbmp($filetoread);
+            $extImg = '.bmp';
+            break;
+    }
     if (! is_resource($img))
     {
         dol_syslog('Failed to detect type of image. We found infoImg[2]='.$infoImg[2], LOG_WARNING);
         return 0;
     }
 
-	// Initialisation des dimensions de la vignette si elles sont superieures a l'original
-	if($maxWidth > $imgWidth){ $maxWidth = $imgWidth; }
-	if($maxHeight > $imgHeight){ $maxHeight = $imgHeight; }
-
-	$whFact = $maxWidth/$maxHeight; // Facteur largeur/hauteur des dimensions max de la vignette
-	$imgWhFact = $imgWidth/$imgHeight; // Facteur largeur/hauteur de l'original
-
-	// Fixe les dimensions de la vignette
-	if($whFact < $imgWhFact)
-	{
-		// Si largeur determinante
-		$thumbWidth  = $maxWidth;
-		$thumbHeight = $thumbWidth / $imgWhFact;
-	}
-	else
-	{
-		// Si hauteur determinante
-		$thumbHeight = $maxHeight;
-		$thumbWidth  = $thumbHeight * $imgWhFact;
-	}
-	$thumbHeight=round($thumbHeight);
-	$thumbWidth=round($thumbWidth);
+    // Initialisation des dimensions de la vignette si elles sont superieures a l'original
+    if($maxWidth > $imgWidth){ $maxWidth = $imgWidth; }
+    if($maxHeight > $imgHeight){ $maxHeight = $imgHeight; }
+
+    $whFact = $maxWidth/$maxHeight; // Facteur largeur/hauteur des dimensions max de la vignette
+    $imgWhFact = $imgWidth/$imgHeight; // Facteur largeur/hauteur de l'original
+
+    // Fixe les dimensions de la vignette
+    if($whFact < $imgWhFact)
+    {
+        // Si largeur determinante
+        $thumbWidth  = $maxWidth;
+        $thumbHeight = $thumbWidth / $imgWhFact;
+    }
+    else
+    {
+        // Si hauteur determinante
+        $thumbHeight = $maxHeight;
+        $thumbWidth  = $thumbHeight * $imgWhFact;
+    }
+    $thumbHeight=round($thumbHeight);
+    $thumbWidth=round($thumbWidth);
 
     // Define target format
     if (empty($targetformat)) $targetformat=$infoImg[2];
 
-	// Create empty image
-	if ($targetformat == IMAGETYPE_GIF)
-	{
-		// Compatibilite image GIF
-		$imgThumb = imagecreate($thumbWidth, $thumbHeight);
-	}
-	else
-	{
-		$imgThumb = imagecreatetruecolor($thumbWidth, $thumbHeight);
-	}
-
-	// Activate antialiasing for better quality
-	if (function_exists('imageantialias'))
-	{
-		imageantialias($imgThumb, true);
-	}
-
-	// This is to keep transparent alpha channel if exists (PHP >= 4.2)
-	if (function_exists('imagesavealpha'))
-	{
-		imagesavealpha($imgThumb, true);
-	}
-
-	// Initialisation des variables selon l'extension de l'image
-	// $targetformat is 0 by default, in such case, we keep original extension
-	switch($targetformat)
-	{
-		case IMAGETYPE_GIF:	    // 1
-			$trans_colour = imagecolorallocate($imgThumb, 255, 255, 255); // On procede autrement pour le format GIF
-			imagecolortransparent($imgThumb,$trans_colour);
+    // Create empty image
+    if ($targetformat == IMAGETYPE_GIF)
+    {
+        // Compatibilite image GIF
+        $imgThumb = imagecreate($thumbWidth, $thumbHeight);
+    }
+    else
+    {
+        $imgThumb = imagecreatetruecolor($thumbWidth, $thumbHeight);
+    }
+
+    // Activate antialiasing for better quality
+    if (function_exists('imageantialias'))
+    {
+        imageantialias($imgThumb, true);
+    }
+
+    // This is to keep transparent alpha channel if exists (PHP >= 4.2)
+    if (function_exists('imagesavealpha'))
+    {
+        imagesavealpha($imgThumb, true);
+    }
+
+    // Initialisation des variables selon l'extension de l'image
+    // $targetformat is 0 by default, in such case, we keep original extension
+    switch($targetformat)
+    {
+        case IMAGETYPE_GIF:	    // 1
+            $trans_colour = imagecolorallocate($imgThumb, 255, 255, 255); // On procede autrement pour le format GIF
+            imagecolortransparent($imgThumb,$trans_colour);
             $extImgTarget = '.gif';
             $newquality='NU';
             break;
-		case IMAGETYPE_JPEG:    // 2
+        case IMAGETYPE_JPEG:    // 2
             $trans_colour = imagecolorallocatealpha($imgThumb, 255, 255, 255, 0);
             $extImgTarget = (preg_match('/\.jpeg$/i',$file)?'.jpeg':'.jpg');
             $newquality=$quality;
             break;
-		case IMAGETYPE_PNG:	    // 3
-			imagealphablending($imgThumb,false); // Pour compatibilite sur certain systeme
-			$trans_colour = imagecolorallocatealpha($imgThumb, 255, 255, 255, 127);	// Keep transparent channel
+        case IMAGETYPE_PNG:	    // 3
+            imagealphablending($imgThumb,false); // Pour compatibilite sur certain systeme
+            $trans_colour = imagecolorallocatealpha($imgThumb, 255, 255, 255, 127);	// Keep transparent channel
             $extImgTarget = '.png';
             $newquality=$quality-100;
             $newquality=round(abs($quality-100)*9/100);
             break;
-		case IMAGETYPE_BMP:	    // 6
+        case IMAGETYPE_BMP:	    // 6
             // Not supported by PHP GD
             $extImgTarget = '.bmp';
             $newquality='NU';
             break;
-		case IMAGETYPE_WBMP:	// 15
-			$trans_colour = imagecolorallocatealpha($imgThumb, 255, 255, 255, 0);
+        case IMAGETYPE_WBMP:	// 15
+            $trans_colour = imagecolorallocatealpha($imgThumb, 255, 255, 255, 0);
             $extImgTarget = '.bmp';
             $newquality='NU';
             break;
-	}
-	if (function_exists("imagefill")) imagefill($imgThumb, 0, 0, $trans_colour);
-
-	dol_syslog("vignette: convert image from ($imgWidth x $imgHeight) to ($thumbWidth x $thumbHeight) as $extImg, newquality=$newquality");
-	//imagecopyresized($imgThumb, $img, 0, 0, 0, 0, $thumbWidth, $thumbHeight, $imgWidth, $imgHeight); // Insere l'image de base redimensionnee
-	imagecopyresampled($imgThumb, $img, 0, 0, 0, 0, $thumbWidth, $thumbHeight, $imgWidth, $imgHeight); // Insere l'image de base redimensionnee
-
-	$fileName = preg_replace('/(\.gif|\.jpeg|\.jpg|\.png|\.bmp)$/i','',$file);	// On enleve extension quelquesoit la casse
-	$fileName = basename($fileName);
-	//$imgThumbName = $dirthumb.'/'.getImageFileNameForSize(basename($file), $extName, $extImgTarget);   // Full path of thumb file
-	$imgThumbName = getImageFileNameForSize($file, $extName, $extImgTarget);   // Full path of thumb file
-
-
-	// Check if permission are ok
-	//$fp = fopen($imgThumbName, "w");
-	//fclose($fp);
-
-	// Create image on disk
-	switch($targetformat)
-	{
-		case IMAGETYPE_GIF:	    // 1
-			imagegif($imgThumb, $imgThumbName);
-			break;
-		case IMAGETYPE_JPEG:    // 2
-			imagejpeg($imgThumb, $imgThumbName, $newquality);
-			break;
-		case IMAGETYPE_PNG:	    // 3
-			imagepng($imgThumb, $imgThumbName, $newquality);
-			break;
-		case IMAGETYPE_BMP:	    // 6
+    }
+    if (function_exists("imagefill")) imagefill($imgThumb, 0, 0, $trans_colour);
+
+    dol_syslog("vignette: convert image from ($imgWidth x $imgHeight) to ($thumbWidth x $thumbHeight) as $extImg, newquality=$newquality");
+    //imagecopyresized($imgThumb, $img, 0, 0, 0, 0, $thumbWidth, $thumbHeight, $imgWidth, $imgHeight); // Insere l'image de base redimensionnee
+    imagecopyresampled($imgThumb, $img, 0, 0, 0, 0, $thumbWidth, $thumbHeight, $imgWidth, $imgHeight); // Insere l'image de base redimensionnee
+
+    $fileName = preg_replace('/(\.gif|\.jpeg|\.jpg|\.png|\.bmp)$/i','',$file);	// On enleve extension quelquesoit la casse
+    $fileName = basename($fileName);
+    //$imgThumbName = $dirthumb.'/'.getImageFileNameForSize(basename($file), $extName, $extImgTarget);   // Full path of thumb file
+    $imgThumbName = getImageFileNameForSize($file, $extName, $extImgTarget);   // Full path of thumb file
+
+
+    // Check if permission are ok
+    //$fp = fopen($imgThumbName, "w");
+    //fclose($fp);
+
+    // Create image on disk
+    switch($targetformat)
+    {
+        case IMAGETYPE_GIF:	    // 1
+            imagegif($imgThumb, $imgThumbName);
+            break;
+        case IMAGETYPE_JPEG:    // 2
+            imagejpeg($imgThumb, $imgThumbName, $newquality);
+            break;
+        case IMAGETYPE_PNG:	    // 3
+            imagepng($imgThumb, $imgThumbName, $newquality);
+            break;
+        case IMAGETYPE_BMP:	    // 6
             // Not supported by PHP GD
-			break;
-		case IMAGETYPE_WBMP:    // 15
-			image2wbmp($imgThumb, $imgThumbName);
-			break;
-	}
+            break;
+        case IMAGETYPE_WBMP:    // 15
+            image2wbmp($imgThumb, $imgThumbName);
+            break;
+    }
 
-	// Set permissions on file
-	if (! empty($conf->global->MAIN_UMASK)) @chmod($imgThumbName, octdec($conf->global->MAIN_UMASK));
+    // Set permissions on file
+    if (! empty($conf->global->MAIN_UMASK)) @chmod($imgThumbName, octdec($conf->global->MAIN_UMASK));
 
     // Free memory. This does not delete image.
     imagedestroy($img);
     imagedestroy($imgThumb);
 
-	return $imgThumbName;
+    return $imgThumbName;
 }

dolibarr/htdocs/core/lib/sendings.lib.php

Indentation +316 added lines, -316 removed lines

@@ -34,80 +34,80 @@ 
  */
 function shipping_prepare_head($object)
 {
-	global $db, $langs, $conf, $user;
+    global $db, $langs, $conf, $user;
 
-	// Load translation files required by the page
+    // Load translation files required by the page
     $langs->loadLangs(array("sendings","deliveries"));
 
-	$h = 0;
-	$head = array();
-
-	$head[$h][0] = DOL_URL_ROOT."/expedition/card.php?id=".$object->id;
-	$head[$h][1] = $langs->trans("SendingCard");
-	$head[$h][2] = 'shipping';
-	$h++;
-
-	if ($conf->livraison_bon->enabled && $user->rights->expedition->livraison->lire)
-	{
-		// delivery link
-		$object->fetchObjectLinked($object->id,$object->element);
-		if (count($object->linkedObjectsIds['delivery']) >  0)		// If there is a delivery
-		{
-		    // Take first one element of array
-		    $tmp = reset($object->linkedObjectsIds['delivery']);
-
-			$head[$h][0] = DOL_URL_ROOT."/livraison/card.php?id=".$tmp;
-			$head[$h][1] = $langs->trans("DeliveryCard");
-			$head[$h][2] = 'delivery';
-			$h++;
-		}
-	}
-
-	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
-	{
-	    $objectsrc = $object;
-	    if ($object->origin == 'commande' && $object->origin_id > 0)
-	    {
-	        $objectsrc = new Commande($db);
-	        $objectsrc->fetch($object->origin_id);
-	    }
-	    $nbContact = count($objectsrc->liste_contact(-1,'internal')) + count($objectsrc->liste_contact(-1,'external'));
-	    $head[$h][0] = DOL_URL_ROOT."/expedition/contact.php?id=".$object->id;
-    	$head[$h][1] = $langs->trans("ContactsAddresses");
-		if ($nbContact > 0) $head[$h][1].= ' <span class="badge">'.$nbContact.'</span>';
-    	$head[$h][2] = 'contact';
-    	$h++;
-	}
-
-	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+    $h = 0;
+    $head = array();
+
+    $head[$h][0] = DOL_URL_ROOT."/expedition/card.php?id=".$object->id;
+    $head[$h][1] = $langs->trans("SendingCard");
+    $head[$h][2] = 'shipping';
+    $h++;
+
+    if ($conf->livraison_bon->enabled && $user->rights->expedition->livraison->lire)
+    {
+        // delivery link
+        $object->fetchObjectLinked($object->id,$object->element);
+        if (count($object->linkedObjectsIds['delivery']) >  0)		// If there is a delivery
+        {
+            // Take first one element of array
+            $tmp = reset($object->linkedObjectsIds['delivery']);
+
+            $head[$h][0] = DOL_URL_ROOT."/livraison/card.php?id=".$tmp;
+            $head[$h][1] = $langs->trans("DeliveryCard");
+            $head[$h][2] = 'delivery';
+            $h++;
+        }
+    }
+
+    if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
+    {
+        $objectsrc = $object;
+        if ($object->origin == 'commande' && $object->origin_id > 0)
+        {
+            $objectsrc = new Commande($db);
+            $objectsrc->fetch($object->origin_id);
+        }
+        $nbContact = count($objectsrc->liste_contact(-1,'internal')) + count($objectsrc->liste_contact(-1,'external'));
+        $head[$h][0] = DOL_URL_ROOT."/expedition/contact.php?id=".$object->id;
+        $head[$h][1] = $langs->trans("ContactsAddresses");
+        if ($nbContact > 0) $head[$h][1].= ' <span class="badge">'.$nbContact.'</span>';
+        $head[$h][2] = 'contact';
+        $h++;
+    }
+
+    require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
     require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
-	$upload_dir = $conf->commande->dir_output . "/" . dol_sanitizeFileName($object->ref);
-	$nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
+    $upload_dir = $conf->commande->dir_output . "/" . dol_sanitizeFileName($object->ref);
+    $nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
     $nbLinks=Link::count($db, $object->element, $object->id);
-	$head[$h][0] = DOL_URL_ROOT.'/expedition/document.php?id='.$object->id;
-	$head[$h][1] = $langs->trans('Documents');
-	if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
-	$head[$h][2] = 'documents';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT.'/expedition/document.php?id='.$object->id;
+    $head[$h][1] = $langs->trans('Documents');
+    if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+    $head[$h][2] = 'documents';
+    $h++;
 
     $nbNote = 0;
     if (!empty($object->note_private)) $nbNote++;
     if (!empty($object->note_public)) $nbNote++;
-	$head[$h][0] = DOL_URL_ROOT."/expedition/note.php?id=".$object->id;
-	$head[$h][1] = $langs->trans("Notes");
-	if ($nbNote > 0) $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
-	$head[$h][2] = 'note';
-	$h++;
-
-	// Show more tabs from modules
-	// Entries must be declared in modules descriptor with line
+    $head[$h][0] = DOL_URL_ROOT."/expedition/note.php?id=".$object->id;
+    $head[$h][1] = $langs->trans("Notes");
+    if ($nbNote > 0) $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
+    $head[$h][2] = 'note';
+    $h++;
+
+    // Show more tabs from modules
+    // Entries must be declared in modules descriptor with line
     // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
     // $this->tabs = array('entity:-tabname);   												to remove a tab
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'delivery');
+    complete_head_from_modules($conf,$langs,$object,$head,$h,'delivery');
 
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'delivery','remove');
+    complete_head_from_modules($conf,$langs,$object,$head,$h,'delivery','remove');
 
-	return $head;
+    return $head;
 }
 
 
@@ -119,39 +119,39 @@ 
  */
 function delivery_prepare_head($object)
 {
-	global $langs, $conf, $user;
+    global $langs, $conf, $user;
 
-	// Load translation files required by the page
+    // Load translation files required by the page
     $langs->loadLangs(array("sendings","deliveries"));
 
-	$h = 0;
-	$head = array();
-
-	if ($conf->expedition_bon->enabled && $user->rights->expedition->lire)
-	{
-		$head[$h][0] = DOL_URL_ROOT."/expedition/card.php?id=".$object->origin_id;
-		$head[$h][1] = $langs->trans("SendingCard");
-		$head[$h][2] = 'shipping';
-		$h++;
-	}
-
-	$head[$h][0] = DOL_URL_ROOT."/livraison/card.php?id=".$object->id;
-	$head[$h][1] = $langs->trans("DeliveryCard");
-	$head[$h][2] = 'delivery';
-	$h++;
-
-	$head[$h][0] = DOL_URL_ROOT."/expedition/contact.php?id=".$object->origin_id;
-	$head[$h][1] = $langs->trans("ContactsAddresses");
-	$head[$h][2] = 'contact';
-	$h++;
-
-	$head[$h][0] = DOL_URL_ROOT."/expedition/note.php?id=".$object->origin_id;
-	$head[$h][1] = $langs->trans("Notes");
-	$head[$h][2] = 'note';
-	$h++;
-
-	// Show more tabs from modules
-	// Entries must be declared in modules descriptor with line
+    $h = 0;
+    $head = array();
+
+    if ($conf->expedition_bon->enabled && $user->rights->expedition->lire)
+    {
+        $head[$h][0] = DOL_URL_ROOT."/expedition/card.php?id=".$object->origin_id;
+        $head[$h][1] = $langs->trans("SendingCard");
+        $head[$h][2] = 'shipping';
+        $h++;
+    }
+
+    $head[$h][0] = DOL_URL_ROOT."/livraison/card.php?id=".$object->id;
+    $head[$h][1] = $langs->trans("DeliveryCard");
+    $head[$h][2] = 'delivery';
+    $h++;
+
+    $head[$h][0] = DOL_URL_ROOT."/expedition/contact.php?id=".$object->origin_id;
+    $head[$h][1] = $langs->trans("ContactsAddresses");
+    $head[$h][2] = 'contact';
+    $h++;
+
+    $head[$h][0] = DOL_URL_ROOT."/expedition/note.php?id=".$object->origin_id;
+    $head[$h][1] = $langs->trans("Notes");
+    $head[$h][2] = 'note';
+    $h++;
+
+    // Show more tabs from modules
+    // Entries must be declared in modules descriptor with line
     // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
     // $this->tabs = array('entity:-tabname);   				to remove a tab
     // complete_head_from_modules  use $object->id for this link so we temporary change it
@@ -160,10 +160,10 @@ 
 
     complete_head_from_modules($conf,$langs,$object,$head,$h,'delivery');
 
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'delivery','remove');
+    complete_head_from_modules($conf,$langs,$object,$head,$h,'delivery','remove');
 
-	$object->id = $tmpObjectId;
-	return $head;
+    $object->id = $tmpObjectId;
+    return $head;
 }
 
 /**
@@ -176,179 +176,179 @@ 
  */
 function show_list_sending_receive($origin,$origin_id,$filter='')
 {
-	global $db, $conf, $langs, $bc;
-	global $form;
-
-	$product_static=new Product($db);
-	$expedition=new Expedition($db);
-	$warehousestatic=new Entrepot($db);
-
-	$sql = "SELECT obj.rowid, obj.fk_product, obj.label, obj.description, obj.product_type as fk_product_type, obj.qty as qty_asked, obj.date_start, obj.date_end,";
-	$sql.= " ed.rowid as edrowid, ed.qty as qty_shipped, ed.fk_expedition as expedition_id, ed.fk_origin_line, ed.fk_entrepot as warehouse_id,";
-	$sql.= " e.rowid as sendingid, e.ref as exp_ref, e.date_creation, e.date_delivery, e.date_expedition,";
-	//if ($conf->livraison_bon->enabled) $sql .= " l.rowid as livraison_id, l.ref as livraison_ref, l.date_delivery, ld.qty as qty_received,";
-	$sql.= ' p.label as product_label, p.ref, p.fk_product_type, p.rowid as prodid, p.tobatch as product_tobatch,';
-	$sql.= ' p.description as product_desc';
-	$sql.= " FROM ".MAIN_DB_PREFIX."expeditiondet as ed";
-	$sql.= ", ".MAIN_DB_PREFIX."expedition as e";
-	$sql.= ", ".MAIN_DB_PREFIX.$origin."det as obj";
-	//if ($conf->livraison_bon->enabled) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."livraison as l ON l.fk_expedition = e.rowid LEFT JOIN ".MAIN_DB_PREFIX."livraisondet as ld ON ld.fk_livraison = l.rowid  AND obj.rowid = ld.fk_origin_line";
-	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON obj.fk_product = p.rowid";
-	//TODO Add link to expeditiondet_batch
-	$sql.= " WHERE e.entity IN (".getEntity('expedition').")";
-	$sql.= " AND obj.fk_".$origin." = ".$origin_id;
-	$sql.= " AND obj.rowid = ed.fk_origin_line";
-	$sql.= " AND ed.fk_expedition = e.rowid";
-	if ($filter) $sql.= $filter;
-
-	$sql.= " ORDER BY obj.fk_product";
-
-	dol_syslog("show_list_sending_receive", LOG_DEBUG);
-	$resql = $db->query($sql);
-	if ($resql)
-	{
-		$num = $db->num_rows($resql);
-		$i = 0;
-
-		if ($num)
-		{
-			if ($filter) print load_fiche_titre($langs->trans("OtherSendingsForSameOrder"));
-			else print load_fiche_titre($langs->trans("SendingsAndReceivingForSameOrder"));
-
-			print '<table class="liste" width="100%">';
-			print '<tr class="liste_titre">';
-			//print '<td align="left">'.$langs->trans("QtyOrdered").'</td>';
-			print '<td align="left">'.$langs->trans("SendingSheet").'</td>';
-			print '<td align="left">'.$langs->trans("Description").'</td>';
-			print '<td align="center">'.$langs->trans("DateCreation").'</td>';
-			print '<td align="center">'.$langs->trans("DateDeliveryPlanned").'</td>';
-			print '<td align="center">'.$langs->trans("QtyPreparedOrShipped").'</td>';
-			if (! empty($conf->stock->enabled))
-			{
+    global $db, $conf, $langs, $bc;
+    global $form;
+
+    $product_static=new Product($db);
+    $expedition=new Expedition($db);
+    $warehousestatic=new Entrepot($db);
+
+    $sql = "SELECT obj.rowid, obj.fk_product, obj.label, obj.description, obj.product_type as fk_product_type, obj.qty as qty_asked, obj.date_start, obj.date_end,";
+    $sql.= " ed.rowid as edrowid, ed.qty as qty_shipped, ed.fk_expedition as expedition_id, ed.fk_origin_line, ed.fk_entrepot as warehouse_id,";
+    $sql.= " e.rowid as sendingid, e.ref as exp_ref, e.date_creation, e.date_delivery, e.date_expedition,";
+    //if ($conf->livraison_bon->enabled) $sql .= " l.rowid as livraison_id, l.ref as livraison_ref, l.date_delivery, ld.qty as qty_received,";
+    $sql.= ' p.label as product_label, p.ref, p.fk_product_type, p.rowid as prodid, p.tobatch as product_tobatch,';
+    $sql.= ' p.description as product_desc';
+    $sql.= " FROM ".MAIN_DB_PREFIX."expeditiondet as ed";
+    $sql.= ", ".MAIN_DB_PREFIX."expedition as e";
+    $sql.= ", ".MAIN_DB_PREFIX.$origin."det as obj";
+    //if ($conf->livraison_bon->enabled) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."livraison as l ON l.fk_expedition = e.rowid LEFT JOIN ".MAIN_DB_PREFIX."livraisondet as ld ON ld.fk_livraison = l.rowid  AND obj.rowid = ld.fk_origin_line";
+    $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON obj.fk_product = p.rowid";
+    //TODO Add link to expeditiondet_batch
+    $sql.= " WHERE e.entity IN (".getEntity('expedition').")";
+    $sql.= " AND obj.fk_".$origin." = ".$origin_id;
+    $sql.= " AND obj.rowid = ed.fk_origin_line";
+    $sql.= " AND ed.fk_expedition = e.rowid";
+    if ($filter) $sql.= $filter;
+
+    $sql.= " ORDER BY obj.fk_product";
+
+    dol_syslog("show_list_sending_receive", LOG_DEBUG);
+    $resql = $db->query($sql);
+    if ($resql)
+    {
+        $num = $db->num_rows($resql);
+        $i = 0;
+
+        if ($num)
+        {
+            if ($filter) print load_fiche_titre($langs->trans("OtherSendingsForSameOrder"));
+            else print load_fiche_titre($langs->trans("SendingsAndReceivingForSameOrder"));
+
+            print '<table class="liste" width="100%">';
+            print '<tr class="liste_titre">';
+            //print '<td align="left">'.$langs->trans("QtyOrdered").'</td>';
+            print '<td align="left">'.$langs->trans("SendingSheet").'</td>';
+            print '<td align="left">'.$langs->trans("Description").'</td>';
+            print '<td align="center">'.$langs->trans("DateCreation").'</td>';
+            print '<td align="center">'.$langs->trans("DateDeliveryPlanned").'</td>';
+            print '<td align="center">'.$langs->trans("QtyPreparedOrShipped").'</td>';
+            if (! empty($conf->stock->enabled))
+            {
                 print '<td>'.$langs->trans("Warehouse").'</td>';
-			}
-			/*TODO Add link to expeditiondet_batch
+            }
+            /*TODO Add link to expeditiondet_batch
 			if (! empty($conf->productbatch->enabled))
 			{
 			    print '<td>';
 			    print '</td>';
 			}*/
-			if (! empty($conf->livraison_bon->enabled))
-			{
-				print '<td>'.$langs->trans("DeliveryOrder").'</td>';
-				//print '<td align="center">'.$langs->trans("QtyReceived").'</td>';
-				print '<td align="right">'.$langs->trans("DeliveryDate").'</td>';
-			}
-			print "</tr>\n";
-
-			while ($i < $num)
-			{
-				$objp = $db->fetch_object($resql);
-
-				print '<tr class="oddeven">';
-
-				// Sending id
-				print '<td align="left" class="nowrap">';
-				print '<a href="'.DOL_URL_ROOT.'/expedition/card.php?id='.$objp->expedition_id.'">'.img_object($langs->trans("ShowSending"),'sending').' '.$objp->exp_ref.'<a>';
-				print '</td>';
-
-				// Description
-				if ($objp->fk_product > 0)
-				{
-					// Define output language
-					if (! empty($conf->global->MAIN_MULTILANGS) && ! empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE))
-					{
-						$object = new $origin($db);
-						$object->fetch($origin_id);
-						$object->fetch_thirdparty();
-
-						$prod = new Product($db);
-						$prod->id=$objp->fk_product;
-						$prod->getMultiLangs();
-
-						$outputlangs = $langs;
-						$newlang='';
-						if (empty($newlang) && ! empty($_REQUEST['lang_id'])) $newlang=$_REQUEST['lang_id'];
-						if (empty($newlang)) $newlang=$object->thirdparty->default_lang;
-						if (! empty($newlang))
-						{
-							$outputlangs = new Translate("",$conf);
-							$outputlangs->setDefaultLang($newlang);
-						}
-
-						$label = (! empty($prod->multilangs[$outputlangs->defaultlang]["label"])) ? $prod->multilangs[$outputlangs->defaultlang]["label"] : $objp->product_label;
-					}
-					else
-					{
-						$label = (! empty($objp->label)?$objp->label:$objp->product_label);
-					}
-
-					print '<td>';
-
-					// Show product and description
-					$product_static->type=$objp->fk_product_type;
-					$product_static->id=$objp->fk_product;
-					$product_static->ref=$objp->ref;
-					$product_static->status_batch=$objp->product_tobatch;
-					$text=$product_static->getNomUrl(1);
-					$text.= ' - '.$label;
-					$description=(! empty($conf->global->PRODUIT_DESC_IN_FORM)?'':dol_htmlentitiesbr($objp->description));
-					print $form->textwithtooltip($text,$description,3,'','',$i);
-
-					// Show range
-					print_date_range($objp->date_start,$objp->date_end);
-
-					// Add description in form
-					if (! empty($conf->global->PRODUIT_DESC_IN_FORM))
-					{
-						print (! empty($objp->description) && $objp->description!=$objp->product)?'<br>'.dol_htmlentitiesbr($objp->description):'';
-					}
-
-					print '</td>';
-				}
-				else
-				{
-					print "<td>";
-					if ($objp->fk_product_type==1) $text = img_object($langs->trans('Service'),'service');
-					else $text = img_object($langs->trans('Product'),'product');
-
-					if (! empty($objp->label)) {
-						$text.= ' <strong>'.$objp->label.'</strong>';
-						print $form->textwithtooltip($text,$objp->description,3,'','',$i);
-					} else {
-						print $text.' '.nl2br($objp->description);
-					}
-
-					// Show range
-					print_date_range($objp->date_start,$objp->date_end);
-					print "</td>\n";
-				}
-
-				//print '<td align="center">'.$objp->qty_asked.'</td>';
-
-				// Date creation
-				print '<td align="center" class="nowrap">'.dol_print_date($db->jdate($objp->date_creation),'day').'</td>';
-
-				// Date shipping creation
-				print '<td align="center" class="nowrap">'.dol_print_date($db->jdate($objp->date_delivery),'day').'</td>';
-
-				// Qty shipped
-				print '<td align="center">'.$objp->qty_shipped.'</td>';
-
-				// Warehouse
-				if (! empty($conf->stock->enabled))
-				{
-				    print '<td>';
-    				if ($objp->warehouse_id > 0)
-    				{
-        				$warehousestatic->fetch($objp->warehouse_id);
-        				print $warehousestatic->getNomUrl(1);
-    				}
-    				print '</td>';
-				}
-
-				// Batch number managment
-				/*TODO Add link to expeditiondet_batch
+            if (! empty($conf->livraison_bon->enabled))
+            {
+                print '<td>'.$langs->trans("DeliveryOrder").'</td>';
+                //print '<td align="center">'.$langs->trans("QtyReceived").'</td>';
+                print '<td align="right">'.$langs->trans("DeliveryDate").'</td>';
+            }
+            print "</tr>\n";
+
+            while ($i < $num)
+            {
+                $objp = $db->fetch_object($resql);
+
+                print '<tr class="oddeven">';
+
+                // Sending id
+                print '<td align="left" class="nowrap">';
+                print '<a href="'.DOL_URL_ROOT.'/expedition/card.php?id='.$objp->expedition_id.'">'.img_object($langs->trans("ShowSending"),'sending').' '.$objp->exp_ref.'<a>';
+                print '</td>';
+
+                // Description
+                if ($objp->fk_product > 0)
+                {
+                    // Define output language
+                    if (! empty($conf->global->MAIN_MULTILANGS) && ! empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE))
+                    {
+                        $object = new $origin($db);
+                        $object->fetch($origin_id);
+                        $object->fetch_thirdparty();
+
+                        $prod = new Product($db);
+                        $prod->id=$objp->fk_product;
+                        $prod->getMultiLangs();
+
+                        $outputlangs = $langs;
+                        $newlang='';
+                        if (empty($newlang) && ! empty($_REQUEST['lang_id'])) $newlang=$_REQUEST['lang_id'];
+                        if (empty($newlang)) $newlang=$object->thirdparty->default_lang;
+                        if (! empty($newlang))
+                        {
+                            $outputlangs = new Translate("",$conf);
+                            $outputlangs->setDefaultLang($newlang);
+                        }
+
+                        $label = (! empty($prod->multilangs[$outputlangs->defaultlang]["label"])) ? $prod->multilangs[$outputlangs->defaultlang]["label"] : $objp->product_label;
+                    }
+                    else
+                    {
+                        $label = (! empty($objp->label)?$objp->label:$objp->product_label);
+                    }
+
+                    print '<td>';
+
+                    // Show product and description
+                    $product_static->type=$objp->fk_product_type;
+                    $product_static->id=$objp->fk_product;
+                    $product_static->ref=$objp->ref;
+                    $product_static->status_batch=$objp->product_tobatch;
+                    $text=$product_static->getNomUrl(1);
+                    $text.= ' - '.$label;
+                    $description=(! empty($conf->global->PRODUIT_DESC_IN_FORM)?'':dol_htmlentitiesbr($objp->description));
+                    print $form->textwithtooltip($text,$description,3,'','',$i);
+
+                    // Show range
+                    print_date_range($objp->date_start,$objp->date_end);
+
+                    // Add description in form
+                    if (! empty($conf->global->PRODUIT_DESC_IN_FORM))
+                    {
+                        print (! empty($objp->description) && $objp->description!=$objp->product)?'<br>'.dol_htmlentitiesbr($objp->description):'';
+                    }
+
+                    print '</td>';
+                }
+                else
+                {
+                    print "<td>";
+                    if ($objp->fk_product_type==1) $text = img_object($langs->trans('Service'),'service');
+                    else $text = img_object($langs->trans('Product'),'product');
+
+                    if (! empty($objp->label)) {
+                        $text.= ' <strong>'.$objp->label.'</strong>';
+                        print $form->textwithtooltip($text,$objp->description,3,'','',$i);
+                    } else {
+                        print $text.' '.nl2br($objp->description);
+                    }
+
+                    // Show range
+                    print_date_range($objp->date_start,$objp->date_end);
+                    print "</td>\n";
+                }
+
+                //print '<td align="center">'.$objp->qty_asked.'</td>';
+
+                // Date creation
+                print '<td align="center" class="nowrap">'.dol_print_date($db->jdate($objp->date_creation),'day').'</td>';
+
+                // Date shipping creation
+                print '<td align="center" class="nowrap">'.dol_print_date($db->jdate($objp->date_delivery),'day').'</td>';
+
+                // Qty shipped
+                print '<td align="center">'.$objp->qty_shipped.'</td>';
+
+                // Warehouse
+                if (! empty($conf->stock->enabled))
+                {
+                    print '<td>';
+                    if ($objp->warehouse_id > 0)
+                    {
+                        $warehousestatic->fetch($objp->warehouse_id);
+                        print $warehousestatic->getNomUrl(1);
+                    }
+                    print '</td>';
+                }
+
+                // Batch number managment
+                /*TODO Add link to expeditiondet_batch
 				if (! empty($conf->productbatch->enabled))
 				{
 				    var_dump($objp->edrowid);
@@ -379,60 +379,60 @@ 
 				    }
 				}*/
 
-				// Informations on receipt
-				if (! empty($conf->livraison_bon->enabled))
-				{
-					include_once DOL_DOCUMENT_ROOT.'/livraison/class/livraison.class.php';
-					$expedition->id=$objp->sendingid;
-					$expedition->fetchObjectLinked($expedition->id,$expedition->element);
-					//var_dump($expedition->linkedObjects);
-
-					$receiving='';
-					if (count($expedition->linkedObjects['delivery']) > 0) $receiving=reset($expedition->linkedObjects['delivery']);   // Take first link
-
-					if (! empty($receiving))
-					{
-						// $expedition->fk_origin_line = id of det line of order
-						// $receiving->fk_origin_line = id of det line of order
-						// $receiving->origin may be 'shipping'
-						// $receiving->origin_id may be id of shipping
-
-						// Ref
-						print '<td>';
-						print $receiving->getNomUrl($db);
-						//print '<a href="'.DOL_URL_ROOT.'/livraison/card.php?id='.$livraison_id.'">'.img_object($langs->trans("ShowReceiving"),'sending').' '.$objp->livraison_ref.'<a>';
-						print '</td>';
-						// Qty received
-						//print '<td align="center">';
-						// TODO No solution for the moment to link a line det of receipt with a line det of shipping,
-						// so no way to know the qty received for this line of shipping.
-						//print $langs->trans("FeatureNotYetAvailable");
-						//print '</td>';
-						// Date shipping real
-						print '<td align="right">';
-						print dol_print_date($receiving->date_delivery,'day');
-						print '</td>';
-					}
-					else
-					{
-						//print '<td>&nbsp;</td>';
-						print '<td>&nbsp;</td>';
-						print '<td>&nbsp;</td>';
-					}
-				}
-				print '</tr>';
-				$i++;
-			}
-
-			print '</table>';
-		}
-		$db->free($resql);
-	}
-	else
-	{
-		dol_print_error($db);
-	}
-
-	return 1;
+                // Informations on receipt
+                if (! empty($conf->livraison_bon->enabled))
+                {
+                    include_once DOL_DOCUMENT_ROOT.'/livraison/class/livraison.class.php';
+                    $expedition->id=$objp->sendingid;
+                    $expedition->fetchObjectLinked($expedition->id,$expedition->element);
+                    //var_dump($expedition->linkedObjects);
+
+                    $receiving='';
+                    if (count($expedition->linkedObjects['delivery']) > 0) $receiving=reset($expedition->linkedObjects['delivery']);   // Take first link
+
+                    if (! empty($receiving))
+                    {
+                        // $expedition->fk_origin_line = id of det line of order
+                        // $receiving->fk_origin_line = id of det line of order
+                        // $receiving->origin may be 'shipping'
+                        // $receiving->origin_id may be id of shipping
+
+                        // Ref
+                        print '<td>';
+                        print $receiving->getNomUrl($db);
+                        //print '<a href="'.DOL_URL_ROOT.'/livraison/card.php?id='.$livraison_id.'">'.img_object($langs->trans("ShowReceiving"),'sending').' '.$objp->livraison_ref.'<a>';
+                        print '</td>';
+                        // Qty received
+                        //print '<td align="center">';
+                        // TODO No solution for the moment to link a line det of receipt with a line det of shipping,
+                        // so no way to know the qty received for this line of shipping.
+                        //print $langs->trans("FeatureNotYetAvailable");
+                        //print '</td>';
+                        // Date shipping real
+                        print '<td align="right">';
+                        print dol_print_date($receiving->date_delivery,'day');
+                        print '</td>';
+                    }
+                    else
+                    {
+                        //print '<td>&nbsp;</td>';
+                        print '<td>&nbsp;</td>';
+                        print '<td>&nbsp;</td>';
+                    }
+                }
+                print '</tr>';
+                $i++;
+            }
+
+            print '</table>';
+        }
+        $db->free($resql);
+    }
+    else
+    {
+        dol_print_error($db);
+    }
+
+    return 1;
 }
 

dolibarr/htdocs/core/lib/reception.lib.php

Indentation +53 added lines, -53 removed lines

@@ -34,45 +34,45 @@ 
  */
 function reception_prepare_head(Reception $object)
 {
-	global $db, $langs, $conf, $user;
+    global $db, $langs, $conf, $user;
 
-	$langs->load("sendings");
-	$langs->load("deliveries");
+    $langs->load("sendings");
+    $langs->load("deliveries");
 
-	$h = 0;
-	$head = array();
+    $h = 0;
+    $head = array();
 
-	$head[$h][0] = DOL_URL_ROOT."/reception/card.php?id=".$object->id;
-	$head[$h][1] = $langs->trans("ReceptionCard");
-	$head[$h][2] = 'reception';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT."/reception/card.php?id=".$object->id;
+    $head[$h][1] = $langs->trans("ReceptionCard");
+    $head[$h][2] = 'reception';
+    $h++;
 
 	
 
-	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
-	{
-	    $objectsrc = $object;
-	    if ($object->origin == 'commande' && $object->origin_id > 0)
-	    {
-	        $objectsrc = new Commande($db);
-	        $objectsrc->fetch($object->origin_id);
-	    }
-	    $nbContact = count($objectsrc->liste_contact(-1,'internal')) + count($objectsrc->liste_contact(-1,'external'));
-	    $head[$h][0] = DOL_URL_ROOT."/reception/contact.php?id=".$object->id;
-    	$head[$h][1] = $langs->trans("ContactsAddresses");
-		if ($nbContact > 0) $head[$h][1].= ' <span class="badge">'.$nbContact.'</span>';
-    	$head[$h][2] = 'contact';
-    	$h++;
-	}
+    if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
+    {
+        $objectsrc = $object;
+        if ($object->origin == 'commande' && $object->origin_id > 0)
+        {
+            $objectsrc = new Commande($db);
+            $objectsrc->fetch($object->origin_id);
+        }
+        $nbContact = count($objectsrc->liste_contact(-1,'internal')) + count($objectsrc->liste_contact(-1,'external'));
+        $head[$h][0] = DOL_URL_ROOT."/reception/contact.php?id=".$object->id;
+        $head[$h][1] = $langs->trans("ContactsAddresses");
+        if ($nbContact > 0) $head[$h][1].= ' <span class="badge">'.$nbContact.'</span>';
+        $head[$h][2] = 'contact';
+        $h++;
+    }
 	
     $nbNote = 0;
     if (!empty($object->note_private)) $nbNote++;
     if (!empty($object->note_public)) $nbNote++;
-	$head[$h][0] = DOL_URL_ROOT."/reception/note.php?id=".$object->id;
-	$head[$h][1] = $langs->trans("Notes");
-	if ($nbNote > 0) $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
-	$head[$h][2] = 'note';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT."/reception/note.php?id=".$object->id;
+    $head[$h][1] = $langs->trans("Notes");
+    if ($nbNote > 0) $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
+    $head[$h][2] = 'note';
+    $h++;
 	
 	
 	
@@ -91,39 +91,39 @@ 
  */
 function reception_admin_prepare_head()
 {
-	global $langs, $conf, $user;
-	$langs->load("receptions");
+    global $langs, $conf, $user;
+    $langs->load("receptions");
 
-	$h = 0;
-	$head = array();
+    $h = 0;
+    $head = array();
 	
-	$head[$h][0] = DOL_URL_ROOT."/admin/reception_setup.php";
-	$head[$h][1] = $langs->trans("Reception");
-	$head[$h][2] = 'reception';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT."/admin/reception_setup.php";
+    $head[$h][1] = $langs->trans("Reception");
+    $head[$h][2] = 'reception';
+    $h++;
 
 	
-	if (! empty($conf->global->MAIN_SUBMODULE_RECEPTION))
-	{
-	$head[$h][0] = DOL_URL_ROOT.'/admin/reception_extrafields.php';
-	$head[$h][1] = $langs->trans("ExtraFields");
-	$head[$h][2] = 'attributes_reception';
-	$h++;
-	}
+    if (! empty($conf->global->MAIN_SUBMODULE_RECEPTION))
+    {
+    $head[$h][0] = DOL_URL_ROOT.'/admin/reception_extrafields.php';
+    $head[$h][1] = $langs->trans("ExtraFields");
+    $head[$h][2] = 'attributes_reception';
+    $h++;
+    }
 	
-	if (! empty($conf->global->MAIN_SUBMODULE_RECEPTION))
-	{
-	$head[$h][0] = DOL_URL_ROOT.'/admin/commande_fournisseur_dispatch_extrafields.php';
-	$head[$h][1] = $langs->trans("ExtraFieldsLines");
-	$head[$h][2] = 'attributeslines_reception';
-	$h++;
-	}
+    if (! empty($conf->global->MAIN_SUBMODULE_RECEPTION))
+    {
+    $head[$h][0] = DOL_URL_ROOT.'/admin/commande_fournisseur_dispatch_extrafields.php';
+    $head[$h][1] = $langs->trans("ExtraFieldsLines");
+    $head[$h][2] = 'attributeslines_reception';
+    $h++;
+    }
 	
 	
 	
-	complete_head_from_modules($conf,$langs,null,$head,$h,'reception_admin','remove');
+    complete_head_from_modules($conf,$langs,null,$head,$h,'reception_admin','remove');
 
-	return $head;
+    return $head;
 }