From 189c3c94da73b00a15ce95e7ae5e22031ab5f076 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a?= <marcosgdf@gmail.com>
Date: Sat, 4 Aug 2012 02:15:39 +0200
Subject: [PATCH] Removed duplicated code

---
 htdocs/core/lib/functions.lib.php | 75 ++++++++++++-------------------
 1 file changed, 29 insertions(+), 46 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 4d916737fbf..859b9579a2e 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -1617,45 +1617,6 @@ function dol_trunc($string,$size=40,$trunc='right',$stringencoding='UTF-8',$nodo
 	else return 'BadParam3CallingDolTrunc';
 }
 
-
-/**
- *	Show a picto called object_picto (generic function)
- *
- *	@param      string		$alt           		Text of alt on image
- *	@param      string		$picto         		Name of image to show object_picto (example: user, group, action, bill, contract, propal, product, ...)
- *							 		       		For external modules use imagename@mymodule to search into directory "img" of module.
- *  @param      string		$options       		Add more attribute on img tag (ie: class="datecallink")
- *  @param      int			$pictoisfullpath    If 1, image path is a full path
- *	@return     string      					Return img tag
- *  @see        #img_picto, #img_picto_common
- */
-function img_object($alt, $picto, $options='', $pictoisfullpath=0)
-{
-	global $conf;
-
-	// Clean parameters
-	if (! preg_match('/(\.png|\.gif)$/i',$picto) && ! preg_match('/^([^@]+)@([^@]+)$/i',$picto)) $picto.='.png';
-
-	// Define fullpathpicto to use into src
-	if (! empty($pictoisfullpath)) $fullpathpicto=$picto;
-	else
-	{
-		// By default, we search into theme directory
-		$url = DOL_URL_ROOT;
-		$path = 'theme/'.$conf->theme;
-		if (! empty($conf->global->MAIN_FORCETHEMEDIR)) $path=preg_replace('/^\//','',$conf->global->MAIN_FORCETHEMEDIR).'/'.$path;
-		// If we ask an image into module/img (not into a theme path)
-		if (preg_match('/^([^@]+)@([^@]+)$/i',$picto,$regs)) { $picto = $regs[1]; $path=$regs[2]; }      // If image into a module/img path
-		if (! preg_match('/(\.png|\.gif)$/i',$picto)) $picto.='.png';
-		// If img file not into standard path, we use alternate path
-		if (defined('DOL_URL_ROOT_ALT') && DOL_URL_ROOT_ALT && ! file_exists(DOL_DOCUMENT_ROOT.'/'.$path.'/img/object_'.$picto)) $url = DOL_URL_ROOT_ALT;
-
-		$fullpathpicto=$url.'/'.$path.'/img/object_'.$picto;
-	}
-
-	return '<img src="'.$fullpathpicto.'" border="0" alt="'.dol_escape_htmltag($alt).'" title="'.dol_escape_htmltag($alt).'"'.($options?' '.$options:'').'>';
-}
-
 /**
  *	Show picto whatever it's its name (generic function)
  *
@@ -1670,33 +1631,55 @@ function img_object($alt, $picto, $options='', $pictoisfullpath=0)
  *  @return     string       				    Return img tag
  *  @see        #img_object, #img_picto_common
  */
-function img_picto($alt, $picto, $options='', $pictoisfullpath=0)
+function img_picto($alt, $picto, $options = '', $pictoisfullpath = false)
 {
 	global $conf;
 
 	// Clean parameters
-	if (! preg_match('/(\.png|\.gif)$/i',$picto) && ! preg_match('/^([^@]+)@([^@]+)$/i',$picto)) $picto.='.png';
+	if (! preg_match('/(\.png|\.gif)$/i', $picto) && ! preg_match('/^([^@]+)@([^@]+)$/i', $picto)) $picto .= '.png';
 
 	// Define fullpathpicto to use into src
-	if (! empty($pictoisfullpath)) $fullpathpicto=$picto;
+	if ($pictoisfullpath) $fullpathpicto = $picto;
 	else
 	{
 		// By default, we search into theme directory
 		$url = DOL_URL_ROOT;
 		$path = 'theme/'.$conf->theme;
-		if (! empty($conf->global->MAIN_FORCETHEMEDIR)) $path=preg_replace('/^\//','',$conf->global->MAIN_FORCETHEMEDIR).'/'.$path;
+		if (! empty($conf->global->MAIN_FORCETHEMEDIR)) $path = preg_replace('/^\//', '', $conf->global->MAIN_FORCETHEMEDIR).'/'.$path;
 		// If we ask an image into module/img (not into a theme path)
-		if (preg_match('/^([^@]+)@([^@]+)$/i',$picto,$regs)) { $picto = $regs[1]; $path=$regs[2]; }      // If image into a module/img path
-		if (! preg_match('/(\.png|\.gif)$/i',$picto)) $picto.='.png';
+		if (preg_match('/^([^@]+)@([^@]+)$/i',$picto,$regs))
+		{
+			$picto = $regs[1];
+			$path = $regs[2];
+		}
+		if (! preg_match('/(\.png|\.gif)$/i',$picto)) $picto .= '.png';
 		// If img file not into standard path, we use alternate path
 		if (defined('DOL_URL_ROOT_ALT') && DOL_URL_ROOT_ALT && ! file_exists(DOL_DOCUMENT_ROOT.'/'.$path.'/img/'.$picto)) $url = DOL_URL_ROOT_ALT;
 
-		$fullpathpicto=$url.'/'.$path.'/img/'.$picto;
+		$fullpathpicto = $url.'/'.$path.'/img/'.$picto;
 	}
 
 	return '<img src="'.$fullpathpicto.'" border="0" alt="'.dol_escape_htmltag($alt).'" title="'.dol_escape_htmltag($alt).'"'.($options?' '.$options:'').'>';
 }
 
+/**
+ *	Show a picto called object_picto (generic function)
+ *
+ *	@param	string	$alt				Text of alt on image
+ *	@param	string	$picto				Name of image to show object_picto (example: user, group, action, bill, contract, propal, product, ...)
+ *										For external modules use imagename@mymodule to search into directory "img" of module.
+ *	@param	string	$options			Add more attribute on img tag (ie: class="datecallink")
+ *	@param	int		$pictoisfullpath	If 1, image path is a full path
+ *	@return	string						Return img tag
+ *	@see	#img_picto, #img_picto_common
+ */
+function img_object($alt, $picto, $options = '', $pictoisfullpath = false)
+{
+	global $conf;
+
+	return img_picto($alt, 'object_'.$picto, $options, $pictoisfullpath);
+}
+
 /**
  *	Show picto (generic function)
  *