alxarafe / alixar

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;
 }

Spacing +87 added lines, -87 removed lines

@@ -23,8 +23,8 @@ 
  */
 
 // Define size of logo small and mini
-$maxwidthsmall=270;$maxheightsmall=150;
-$maxwidthmini=128;$maxheightmini=72;
+$maxwidthsmall = 270; $maxheightsmall = 150;
+$maxwidthmini = 128; $maxheightmini = 72;
 $quality = 80;
 
 
@@ -37,13 +37,13 @@ 
  */
 function image_format_supported($file)
 {
-    $regeximgext='\.gif|\.jpg|\.jpeg|\.png|\.bmp|\.xpm|\.xbm|\.svg';   // See also into product.class.php
+    $regeximgext = '\.gif|\.jpg|\.jpeg|\.png|\.bmp|\.xpm|\.xbm|\.svg'; // See also into product.class.php
 
     // Case filename is not a format image
-    if (! preg_match('/('.$regeximgext.')$/i',$file,$reg)) return -1;
+    if (!preg_match('/('.$regeximgext.')$/i', $file, $reg)) return -1;
 
     // Case filename is a format image but not supported by this PHP
-    $imgfonction='';
+    $imgfonction = '';
     if (strtolower($reg[1]) == '.gif')  $imgfonction = 'imagecreatefromgif';
     if (strtolower($reg[1]) == '.png')  $imgfonction = 'imagecreatefrompng';
     if (strtolower($reg[1]) == '.jpg')  $imgfonction = 'imagecreatefromjpeg';
@@ -53,7 +53,7 @@ 
     if (strtolower($reg[1]) == '.xbm')  $imgfonction = 'imagecreatefromxbm';
     if ($imgfonction)
     {
-        if (! function_exists($imgfonction))
+        if (!function_exists($imgfonction))
         {
             // Fonctions de conversion non presente dans ce PHP
             return 0;
@@ -74,21 +74,21 @@ 
  */
 function dol_getImageSize($file, $url = false)
 {
-	$ret=array();
+	$ret = array();
 
 	if (image_format_supported($file) < 0) return $ret;
 
 	$filetoread = $file;
 	if (!$url)
 	{
-		$filetoread = realpath(dol_osencode($file)); 	// Chemin canonique absolu de l'image
+		$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
+    	$ret['width'] = $infoImg[0]; // Largeur de l'image
+    	$ret['height'] = $infoImg[1]; // Hauteur de l'image
 	}
 
 	return $ret;
@@ -106,33 +106,33 @@ 
  * 		@param	int		$src_y			Position of croping image in source image (not use if mode=0)
  *		@return	int						File name if OK, error message if KO
  */
-function dol_imageResizeOrCrop($file, $mode, $newWidth, $newHeight, $src_x=0, $src_y=0)
+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;
+	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);
+	$file = trim($file);
 
 	// Check parameters
-	if (! $file)
+	if (!$file)
 	{
 		// Si le fichier n'a pas ete indique
 		return 'Bad parameter file';
 	}
-	elseif (! file_exists($file))
+	elseif (!file_exists($file))
 	{
 		// Si le fichier passe en parametre n'existe pas
-		return $langs->trans("ErrorFileNotFound",$file);
+		return $langs->trans("ErrorFileNotFound", $file);
 	}
-	elseif(image_format_supported($file) < 0)
+	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))
+	elseif (!is_numeric($newWidth) && !is_numeric($newHeight))
 	{
 		return 'Wrong value for parameter newWidth or newHeight';
 	}
@@ -145,7 +145,7 @@ 
 		return 'Both newHeight or newWidth must be defined for croping';
 	}
 
-	$filetoread = realpath(dol_osencode($file)); 	// Chemin canonique absolu de l'image
+	$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
@@ -153,18 +153,18 @@ 
 
 	if ($mode == 0)	// If resize, we check parameters
 	{
-		if ($newWidth  <= 0)
+		if ($newWidth <= 0)
 		{
-			$newWidth=intval(($newHeight / $imgHeight) * $imgWidth);	// Keep ratio
+			$newWidth = intval(($newHeight / $imgHeight) * $imgWidth); // Keep ratio
 		}
 		if ($newHeight <= 0)
 		{
-			$newHeight=intval(($newWidth / $imgWidth) * $imgHeight);	// Keep ratio
+			$newHeight = intval(($newWidth / $imgWidth) * $imgHeight); // Keep ratio
 		}
 	}
 
-	$imgfonction='';
-	switch($infoImg[2])
+	$imgfonction = '';
+	switch ($infoImg[2])
 	{
 		case 1:	// IMG_GIF
 			$imgfonction = 'imagecreatefromgif';
@@ -181,7 +181,7 @@ 
 	}
 	if ($imgfonction)
 	{
-		if (! function_exists($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;
@@ -189,27 +189,27 @@ 
 	}
 
 	// Initialisation des variables selon l'extension de l'image
-	switch($infoImg[2])
+	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
+			$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
+			$newquality = 100; // % quality maximum
 			break;
 		case 3:	// Png
 			$img = imagecreatefrompng($filetoread);
 			$extImg = '.png';
-			$newquality=0;		// No compression (0-9)
+			$newquality = 0; // No compression (0-9)
 			break;
 		case 4:	// Bmp
 			$img = imagecreatefromwbmp($filetoread);
 			$extImg = '.bmp';
-			$newquality='NU';	// Quality is not used for this format
+			$newquality = 'NU'; // Quality is not used for this format
 			break;
 	}
 
@@ -237,18 +237,18 @@ 
 	}
 
 	// Initialisation des variables selon l'extension de l'image
-	switch($infoImg[2])
+	switch ($infoImg[2])
 	{
 		case 1:	// Gif
 			$trans_colour = imagecolorallocate($imgThumb, 255, 255, 255); // On procede autrement pour le format GIF
-			imagecolortransparent($imgThumb,$trans_colour);
+			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
+			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);
@@ -258,7 +258,7 @@ 
 
 	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
+	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;
 
@@ -267,7 +267,7 @@ 
 	//fclose($fp);
 
 	// Create image on disk
-	switch($infoImg[2])
+	switch ($infoImg[2])
 	{
 		case 1:	// Gif
 			imagegif($imgThumb, $imgThumbName);
@@ -284,13 +284,13 @@ 
 	}
 
 	// Set permissions on file
-	if (! empty($conf->global->MAIN_UMASK)) @chmod($imgThumbName, octdec($conf->global->MAIN_UMASK));
+	if (!empty($conf->global->MAIN_UMASK)) @chmod($imgThumbName, octdec($conf->global->MAIN_UMASK));
 
 	// Free memory. This does not delete image.
     imagedestroy($img);
 	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;
 }
@@ -349,64 +349,64 @@ 
  *      @param     int		$targetformat     	New format of target (IMAGETYPE_GIF, IMAGETYPE_JPG, IMAGETYPE_PNG, IMAGETYPE_BMP, IMAGETYPE_WBMP ... or 0 to keep old format)
  *    	@return    string						Full path of thumb or '' if it fails or 'Error...' if it fails
  */
-function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName='_small', $quality=50, $outdir='thumbs', $targetformat=0)
+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';
 
-	global $conf,$langs;
+	global $conf, $langs;
 
 	dol_syslog("vignette file=".$file." extName=".$extName." maxWidth=".$maxWidth." maxHeight=".$maxHeight." quality=".$quality." outdir=".$outdir." targetformat=".$targetformat);
 
 	// Clean parameters
-	$file=trim($file);
+	$file = trim($file);
 
 	// Check parameters
-	if (! $file)
+	if (!$file)
 	{
 		// Si le fichier n'a pas ete indique
 		return 'ErrorBadParameters';
 	}
-	elseif (! file_exists($file))
+	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);
+        dol_syslog($langs->trans("ErrorFileNotFound", $file), LOG_ERR);
+	    return $langs->trans("ErrorFileNotFound", $file);
 	}
-	elseif(image_format_supported($file) < 0)
+	elseif (image_format_supported($file) < 0)
 	{
-        dol_syslog('This file '.$file.' does not seem to be an image format file name.',LOG_WARNING);
+        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){
+	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);
+        dol_syslog('Wrong value for parameter maxWidth', LOG_ERR);
 	    return 'Error: Wrong value for parameter maxWidth';
 	}
-	elseif(!is_numeric($maxHeight) || empty($maxHeight) || $maxHeight < -1){
+	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);
+        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
+	$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
+	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);
+		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])
+	$imgfonction = '';
+	switch ($infoImg[2])
 	{
 		case IMAGETYPE_GIF:	    // 1
 			$imgfonction = 'imagecreatefromgif';
@@ -426,7 +426,7 @@ 
 	}
 	if ($imgfonction)
 	{
-		if (! function_exists($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;
@@ -434,12 +434,12 @@ 
 	}
 
 	// On cree le repertoire contenant les vignettes
-	$dirthumb = dirname($file).($outdir?'/'.$outdir:''); 	// Chemin du dossier 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])
+	$img = null;
+	switch ($infoImg[2])
 	{
 		case IMAGETYPE_GIF:	    // 1
 			$img = imagecreatefromgif($filetoread);
@@ -447,7 +447,7 @@ 
 			break;
 		case IMAGETYPE_JPEG:    // 2
 			$img = imagecreatefromjpeg($filetoread);
-			$extImg = (preg_match('/\.jpeg$/',$file)?'.jpeg':'.jpg'); // Extension de l'image
+			$extImg = (preg_match('/\.jpeg$/', $file) ? '.jpeg' : '.jpg'); // Extension de l'image
 			break;
 		case IMAGETYPE_PNG:	    // 3
 			$img = imagecreatefrompng($filetoread);
@@ -462,21 +462,21 @@ 
 			$extImg = '.bmp';
 			break;
 	}
-    if (! is_resource($img))
+    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; }
+	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
+	$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)
+	if ($whFact < $imgWhFact)
 	{
 		// Si largeur determinante
 		$thumbWidth  = $maxWidth;
@@ -488,11 +488,11 @@ 
 		$thumbHeight = $maxHeight;
 		$thumbWidth  = $thumbHeight * $imgWhFact;
 	}
-	$thumbHeight=round($thumbHeight);
-	$thumbWidth=round($thumbWidth);
+	$thumbHeight = round($thumbHeight);
+	$thumbWidth = round($thumbWidth);
 
     // Define target format
-    if (empty($targetformat)) $targetformat=$infoImg[2];
+    if (empty($targetformat)) $targetformat = $infoImg[2];
 
 	// Create empty image
 	if ($targetformat == IMAGETYPE_GIF)
@@ -519,35 +519,35 @@ 
 
 	// Initialisation des variables selon l'extension de l'image
 	// $targetformat is 0 by default, in such case, we keep original extension
-	switch($targetformat)
+	switch ($targetformat)
 	{
 		case IMAGETYPE_GIF:	    // 1
 			$trans_colour = imagecolorallocate($imgThumb, 255, 255, 255); // On procede autrement pour le format GIF
-			imagecolortransparent($imgThumb,$trans_colour);
+			imagecolortransparent($imgThumb, $trans_colour);
             $extImgTarget = '.gif';
-            $newquality='NU';
+            $newquality = 'NU';
             break;
 		case IMAGETYPE_JPEG:    // 2
             $trans_colour = imagecolorallocatealpha($imgThumb, 255, 255, 255, 0);
-            $extImgTarget = (preg_match('/\.jpeg$/i',$file)?'.jpeg':'.jpg');
-            $newquality=$quality;
+            $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
+			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);
+            $newquality = $quality - 100;
+            $newquality = round(abs($quality - 100) * 9 / 100);
             break;
 		case IMAGETYPE_BMP:	    // 6
             // Not supported by PHP GD
             $extImgTarget = '.bmp';
-            $newquality='NU';
+            $newquality = 'NU';
             break;
 		case IMAGETYPE_WBMP:	// 15
 			$trans_colour = imagecolorallocatealpha($imgThumb, 255, 255, 255, 0);
             $extImgTarget = '.bmp';
-            $newquality='NU';
+            $newquality = 'NU';
             break;
 	}
 	if (function_exists("imagefill")) imagefill($imgThumb, 0, 0, $trans_colour);
@@ -556,10 +556,10 @@ 
 	//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 = 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
+	$imgThumbName = getImageFileNameForSize($file, $extName, $extImgTarget); // Full path of thumb file
 
 
 	// Check if permission are ok
@@ -567,7 +567,7 @@ 
 	//fclose($fp);
 
 	// Create image on disk
-	switch($targetformat)
+	switch ($targetformat)
 	{
 		case IMAGETYPE_GIF:	    // 1
 			imagegif($imgThumb, $imgThumbName);
@@ -587,7 +587,7 @@ 
 	}
 
 	// Set permissions on file
-	if (! empty($conf->global->MAIN_UMASK)) @chmod($imgThumbName, octdec($conf->global->MAIN_UMASK));
+	if (!empty($conf->global->MAIN_UMASK)) @chmod($imgThumbName, octdec($conf->global->MAIN_UMASK));
 
     // Free memory. This does not delete image.
     imagedestroy($img);

Braces +67 added lines, -42 removed lines

@@ -40,17 +40,33 @@ 
     $regeximgext='\.gif|\.jpg|\.jpeg|\.png|\.bmp|\.xpm|\.xbm|\.svg';   // See also into product.class.php
 
     // Case filename is not a format image
-    if (! preg_match('/('.$regeximgext.')$/i',$file,$reg)) return -1;
+    if (! preg_match('/('.$regeximgext.')$/i',$file,$reg)) {
+        return -1;
+    }
 
     // Case filename is a format image but not supported by this PHP
     $imgfonction='';
-    if (strtolower($reg[1]) == '.gif')  $imgfonction = 'imagecreatefromgif';
-    if (strtolower($reg[1]) == '.png')  $imgfonction = 'imagecreatefrompng';
-    if (strtolower($reg[1]) == '.jpg')  $imgfonction = 'imagecreatefromjpeg';
-    if (strtolower($reg[1]) == '.jpeg') $imgfonction = 'imagecreatefromjpeg';
-    if (strtolower($reg[1]) == '.bmp')  $imgfonction = 'imagecreatefromwbmp';
-    if (strtolower($reg[1]) == '.xpm')  $imgfonction = 'imagecreatefromxpm';
-    if (strtolower($reg[1]) == '.xbm')  $imgfonction = 'imagecreatefromxbm';
+    if (strtolower($reg[1]) == '.gif') {
+        $imgfonction = 'imagecreatefromgif';
+    }
+    if (strtolower($reg[1]) == '.png') {
+        $imgfonction = 'imagecreatefrompng';
+    }
+    if (strtolower($reg[1]) == '.jpg') {
+        $imgfonction = 'imagecreatefromjpeg';
+    }
+    if (strtolower($reg[1]) == '.jpeg') {
+        $imgfonction = 'imagecreatefromjpeg';
+    }
+    if (strtolower($reg[1]) == '.bmp') {
+        $imgfonction = 'imagecreatefromwbmp';
+    }
+    if (strtolower($reg[1]) == '.xpm') {
+        $imgfonction = 'imagecreatefromxpm';
+    }
+    if (strtolower($reg[1]) == '.xbm') {
+        $imgfonction = 'imagecreatefromxbm';
+    }
     if ($imgfonction)
     {
         if (! function_exists($imgfonction))
@@ -76,7 +92,9 @@ 
 {
 	$ret=array();
 
-	if (image_format_supported($file) < 0) return $ret;
+	if (image_format_supported($file) < 0) {
+	    return $ret;
+	}
 
 	$filetoread = $file;
 	if (!$url)
@@ -122,25 +140,20 @@ 
 	{
 		// Si le fichier n'a pas ete indique
 		return 'Bad parameter file';
-	}
-	elseif (! file_exists($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)
+	} 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))
+	} elseif(!is_numeric($newWidth) && !is_numeric($newHeight))
 	{
 		return 'Wrong value for parameter newWidth or newHeight';
-	}
-	elseif ($mode == 0 && $newWidth <= 0 && $newHeight <= 0)
+	} 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))
+	} elseif ($mode == 1 && ($newWidth <= 0 || $newHeight <= 0))
 	{
 		return 'Both newHeight or newWidth must be defined for croping';
 	}
@@ -151,11 +164,14 @@ 
 	$imgWidth = $infoImg[0]; // Largeur de l'image
 	$imgHeight = $infoImg[1]; // Hauteur de l'image
 
-	if ($mode == 0)	// If resize, we check parameters
+	if ($mode == 0) {
+	    // If resize, we check parameters
 	{
 		if ($newWidth  <= 0)
 		{
-			$newWidth=intval(($newHeight / $imgHeight) * $imgWidth);	// Keep ratio
+			$newWidth=intval(($newHeight / $imgHeight) * $imgWidth);
+	}
+	// Keep ratio
 		}
 		if ($newHeight <= 0)
 		{
@@ -218,8 +234,7 @@ 
 	{
 		// Compatibilite image GIF
 		$imgThumb = imagecreate($newWidth, $newHeight);
-	}
-	else
+	} else
 	{
 		$imgThumb = imagecreatetruecolor($newWidth, $newHeight);
 	}
@@ -254,7 +269,9 @@ 
 			$trans_colour = imagecolorallocatealpha($imgThumb, 255, 255, 255, 0);
 			break;
 	}
-	if (function_exists("imagefill")) imagefill($imgThumb, 0, 0, $trans_colour);
+	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
@@ -284,7 +301,9 @@ 
 	}
 
 	// Set permissions on file
-	if (! empty($conf->global->MAIN_UMASK)) @chmod($imgThumbName, octdec($conf->global->MAIN_UMASK));
+	if (! empty($conf->global->MAIN_UMASK)) {
+	    @chmod($imgThumbName, octdec($conf->global->MAIN_UMASK));
+	}
 
 	// Free memory. This does not delete image.
     imagedestroy($img);
@@ -365,24 +384,20 @@ 
 	{
 		// Si le fichier n'a pas ete indique
 		return 'ErrorBadParameters';
-	}
-	elseif (! file_exists($file))
+	} 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)
+	} 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){
+	} 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){
+	} 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';
@@ -394,8 +409,14 @@ 
 	$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
+	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)
@@ -481,8 +502,7 @@ 
 		// Si largeur determinante
 		$thumbWidth  = $maxWidth;
 		$thumbHeight = $thumbWidth / $imgWhFact;
-	}
-	else
+	} else
 	{
 		// Si hauteur determinante
 		$thumbHeight = $maxHeight;
@@ -492,15 +512,16 @@ 
 	$thumbWidth=round($thumbWidth);
 
     // Define target format
-    if (empty($targetformat)) $targetformat=$infoImg[2];
+    if (empty($targetformat)) {
+        $targetformat=$infoImg[2];
+    }
 
 	// Create empty image
 	if ($targetformat == IMAGETYPE_GIF)
 	{
 		// Compatibilite image GIF
 		$imgThumb = imagecreate($thumbWidth, $thumbHeight);
-	}
-	else
+	} else
 	{
 		$imgThumb = imagecreatetruecolor($thumbWidth, $thumbHeight);
 	}
@@ -550,7 +571,9 @@ 
             $newquality='NU';
             break;
 	}
-	if (function_exists("imagefill")) imagefill($imgThumb, 0, 0, $trans_colour);
+	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
@@ -587,7 +610,9 @@ 
 	}
 
 	// Set permissions on file
-	if (! empty($conf->global->MAIN_UMASK)) @chmod($imgThumbName, octdec($conf->global->MAIN_UMASK));
+	if (! empty($conf->global->MAIN_UMASK)) {
+	    @chmod($imgThumbName, octdec($conf->global->MAIN_UMASK));
+	}
 
     // Free memory. This does not delete image.
     imagedestroy($img);

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;
 }
 

Spacing +72 added lines, -72 removed lines

@@ -37,7 +37,7 @@ 
 	global $db, $langs, $conf, $user;
 
 	// Load translation files required by the page
-    $langs->loadLangs(array("sendings","deliveries"));
+    $langs->loadLangs(array("sendings", "deliveries"));
 
 	$h = 0;
 	$head = array();
@@ -50,8 +50,8 @@ 
 	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
+		$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']);
@@ -71,22 +71,22 @@ 
 	        $objectsrc = new Commande($db);
 	        $objectsrc->fetch($object->origin_id);
 	    }
-	    $nbContact = count($objectsrc->liste_contact(-1,'internal')) + count($objectsrc->liste_contact(-1,'external'));
+	    $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>';
+		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)$'));
-    $nbLinks=Link::count($db, $object->element, $object->id);
+	$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>';
+	if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= ' <span class="badge">'.($nbFiles + $nbLinks).'</span>';
 	$head[$h][2] = 'documents';
 	$h++;
 
@@ -95,7 +95,7 @@ 
     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>';
+	if ($nbNote > 0) $head[$h][1] .= ' <span class="badge">'.$nbNote.'</span>';
 	$head[$h][2] = 'note';
 	$h++;
 
@@ -103,9 +103,9 @@ 
 	// 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;
 }
@@ -122,7 +122,7 @@ 
 	global $langs, $conf, $user;
 
 	// Load translation files required by the page
-    $langs->loadLangs(array("sendings","deliveries"));
+    $langs->loadLangs(array("sendings", "deliveries"));
 
 	$h = 0;
 	$head = array();
@@ -158,9 +158,9 @@ 
     $tmpObjectId = $object->id;
     $object->id = $object->origin_id;
 
-    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');
 
 	$object->id = $tmpObjectId;
 	return $head;
@@ -174,34 +174,34 @@ 
  * @param	string		$filter			Filter
  * @return	int							<0 if KO, >0 if OK
  */
-function show_list_sending_receive($origin,$origin_id,$filter='')
+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);
+	$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,";
+	$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";
+	$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";
+	$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 .= " 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";
+	$sql .= " ORDER BY obj.fk_product";
 
 	dol_syslog("show_list_sending_receive", LOG_DEBUG);
 	$resql = $db->query($sql);
@@ -223,7 +223,7 @@ 
 			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))
+			if (!empty($conf->stock->enabled))
 			{
                 print '<td>'.$langs->trans("Warehouse").'</td>';
 			}
@@ -233,7 +233,7 @@ 
 			    print '<td>';
 			    print '</td>';
 			}*/
-			if (! empty($conf->livraison_bon->enabled))
+			if (!empty($conf->livraison_bon->enabled))
 			{
 				print '<td>'.$langs->trans("DeliveryOrder").'</td>';
 				//print '<td align="center">'.$langs->trans("QtyReceived").'</td>';
@@ -249,59 +249,59 @@ 
 
 				// 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 '<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))
+					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->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))
+						$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 = new Translate("", $conf);
 							$outputlangs->setDefaultLang($newlang);
 						}
 
-						$label = (! empty($prod->multilangs[$outputlangs->defaultlang]["label"])) ? $prod->multilangs[$outputlangs->defaultlang]["label"] : $objp->product_label;
+						$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);
+						$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);
+					$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);
+					print_date_range($objp->date_start, $objp->date_end);
 
 					// Add description in form
-					if (! empty($conf->global->PRODUIT_DESC_IN_FORM))
+					if (!empty($conf->global->PRODUIT_DESC_IN_FORM))
 					{
-						print (! empty($objp->description) && $objp->description!=$objp->product)?'<br>'.dol_htmlentitiesbr($objp->description):'';
+						print (!empty($objp->description) && $objp->description != $objp->product) ? '<br>'.dol_htmlentitiesbr($objp->description) : '';
 					}
 
 					print '</td>';
@@ -309,34 +309,34 @@ 
 				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 ($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);
+					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_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>';
+				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>';
+				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))
+				if (!empty($conf->stock->enabled))
 				{
 				    print '<td>';
     				if ($objp->warehouse_id > 0)
@@ -380,17 +380,17 @@ 
 				}*/
 
 				// Informations on receipt
-				if (! empty($conf->livraison_bon->enabled))
+				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);
+					$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
+					$receiving = '';
+					if (count($expedition->linkedObjects['delivery']) > 0) $receiving = reset($expedition->linkedObjects['delivery']); // Take first link
 
-					if (! empty($receiving))
+					if (!empty($receiving))
 					{
 						// $expedition->fk_origin_line = id of det line of order
 						// $receiving->fk_origin_line = id of det line of order
@@ -410,7 +410,7 @@ 
 						//print '</td>';
 						// Date shipping real
 						print '<td align="right">';
-						print dol_print_date($receiving->date_delivery,'day');
+						print dol_print_date($receiving->date_delivery, 'day');
 						print '</td>';
 					}
 					else

Braces +45 added lines, -22 removed lines

@@ -51,10 +51,12 @@ 
 	{
 		// delivery link
 		$object->fetchObjectLinked($object->id,$object->element);
-		if (count($object->linkedObjectsIds['delivery']) >  0)		// If there is a delivery
+		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");
@@ -74,7 +76,9 @@ 
 	    $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>';
+		if ($nbContact > 0) {
+		    $head[$h][1].= ' <span class="badge">'.$nbContact.'</span>';
+		}
     	$head[$h][2] = 'contact';
     	$h++;
 	}
@@ -86,16 +90,24 @@ 
     $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>';
+	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++;
+    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>';
+	if ($nbNote > 0) {
+	    $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
+	}
 	$head[$h][2] = 'note';
 	$h++;
 
@@ -199,7 +211,9 @@ 
 	$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;
+	if ($filter) {
+	    $sql.= $filter;
+	}
 
 	$sql.= " ORDER BY obj.fk_product";
 
@@ -212,8 +226,11 @@ 
 
 		if ($num)
 		{
-			if ($filter) print load_fiche_titre($langs->trans("OtherSendingsForSameOrder"));
-			else print load_fiche_titre($langs->trans("SendingsAndReceivingForSameOrder"));
+			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">';
@@ -268,8 +285,12 @@ 
 
 						$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) && ! empty($_REQUEST['lang_id'])) {
+						    $newlang=$_REQUEST['lang_id'];
+						}
+						if (empty($newlang)) {
+						    $newlang=$object->thirdparty->default_lang;
+						}
 						if (! empty($newlang))
 						{
 							$outputlangs = new Translate("",$conf);
@@ -277,8 +298,7 @@ 
 						}
 
 						$label = (! empty($prod->multilangs[$outputlangs->defaultlang]["label"])) ? $prod->multilangs[$outputlangs->defaultlang]["label"] : $objp->product_label;
-					}
-					else
+					} else
 					{
 						$label = (! empty($objp->label)?$objp->label:$objp->product_label);
 					}
@@ -305,12 +325,14 @@ 
 					}
 
 					print '</td>';
-				}
-				else
+				} 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 ($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>';
@@ -388,7 +410,10 @@ 
 					//var_dump($expedition->linkedObjects);
 
 					$receiving='';
-					if (count($expedition->linkedObjects['delivery']) > 0) $receiving=reset($expedition->linkedObjects['delivery']);   // Take first link
+					if (count($expedition->linkedObjects['delivery']) > 0) {
+					    $receiving=reset($expedition->linkedObjects['delivery']);
+					}
+					// Take first link
 
 					if (! empty($receiving))
 					{
@@ -412,8 +437,7 @@ 
 						print '<td align="right">';
 						print dol_print_date($receiving->date_delivery,'day');
 						print '</td>';
-					}
-					else
+					} else
 					{
 						//print '<td>&nbsp;</td>';
 						print '<td>&nbsp;</td>';
@@ -427,8 +451,7 @@ 
 			print '</table>';
 		}
 		$db->free($resql);
-	}
-	else
+	} else
 	{
 		dol_print_error($db);
 	}

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;
 }
 
 

Spacing +7 added lines, -7 removed lines

@@ -57,10 +57,10 @@ 
 	        $objectsrc = new Commande($db);
 	        $objectsrc->fetch($object->origin_id);
 	    }
-	    $nbContact = count($objectsrc->liste_contact(-1,'internal')) + count($objectsrc->liste_contact(-1,'external'));
+	    $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>';
+		if ($nbContact > 0) $head[$h][1] .= ' <span class="badge">'.$nbContact.'</span>';
     	$head[$h][2] = 'contact';
     	$h++;
 	}
@@ -70,7 +70,7 @@ 
     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>';
+	if ($nbNote > 0) $head[$h][1] .= ' <span class="badge">'.$nbNote.'</span>';
 	$head[$h][2] = 'note';
 	$h++;
 	
@@ -79,7 +79,7 @@ 
 
 	
 
-    complete_head_from_modules($conf,$langs,$object,$head,$h,'order','remove');
+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'order', 'remove');
 
     return $head;
 }
@@ -103,7 +103,7 @@ 
 	$h++;
 
 	
-	if (! empty($conf->global->MAIN_SUBMODULE_RECEPTION))
+	if (!empty($conf->global->MAIN_SUBMODULE_RECEPTION))
 	{
 	$head[$h][0] = DOL_URL_ROOT.'/admin/reception_extrafields.php';
 	$head[$h][1] = $langs->trans("ExtraFields");
@@ -111,7 +111,7 @@ 
 	$h++;
 	}
 	
-	if (! empty($conf->global->MAIN_SUBMODULE_RECEPTION))
+	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");
@@ -121,7 +121,7 @@ 
 	
 	
 	
-	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;
 }

Braces +12 added lines, -4 removed lines

@@ -60,17 +60,25 @@
 	    $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>';
+		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++;
+    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>';
+	if ($nbNote > 0) {
+	    $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
+	}
 	$head[$h][2] = 'note';
 	$h++;
 	

dolibarr/htdocs/core/lib/propal.lib.php

Indentation +69 added lines, -69 removed lines

@@ -31,39 +31,39 @@ 
  */
 function propal_prepare_head($object)
 {
-	global $db, $langs, $conf, $user;
-	$langs->loadLangs(array('propal', 'compta', 'companies'));
-
-	$h = 0;
-	$head = array();
-
-	$head[$h][0] = DOL_URL_ROOT.'/comm/propal/card.php?id='.$object->id;
-	$head[$h][1] = $langs->trans('ProposalCard');
-	$head[$h][2] = 'comm';
-	$h++;
-
-	if ((empty($conf->commande->enabled) &&	((! empty($conf->expedition_bon->enabled) && $user->rights->expedition->lire)
-	|| (! empty($conf->livraison_bon->enabled) && $user->rights->expedition->livraison->lire))))
-	{
-		$langs->load("sendings");
-		$text = '';
-		$head[$h][0] = DOL_URL_ROOT.'/expedition/propal.php?id='.$object->id;
-		if ($conf->expedition_bon->enabled) $text=$langs->trans("Shipment");
-		if ($conf->livraison_bon->enabled)  $text.='/'.$langs->trans("Receivings");
-		$head[$h][1] = $text;
-		$head[$h][2] = 'shipping';
-		$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.'/comm/propal/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++;
-	}
+    global $db, $langs, $conf, $user;
+    $langs->loadLangs(array('propal', 'compta', 'companies'));
+
+    $h = 0;
+    $head = array();
+
+    $head[$h][0] = DOL_URL_ROOT.'/comm/propal/card.php?id='.$object->id;
+    $head[$h][1] = $langs->trans('ProposalCard');
+    $head[$h][2] = 'comm';
+    $h++;
+
+    if ((empty($conf->commande->enabled) &&	((! empty($conf->expedition_bon->enabled) && $user->rights->expedition->lire)
+    || (! empty($conf->livraison_bon->enabled) && $user->rights->expedition->livraison->lire))))
+    {
+        $langs->load("sendings");
+        $text = '';
+        $head[$h][0] = DOL_URL_ROOT.'/expedition/propal.php?id='.$object->id;
+        if ($conf->expedition_bon->enabled) $text=$langs->trans("Shipment");
+        if ($conf->livraison_bon->enabled)  $text.='/'.$langs->trans("Receivings");
+        $head[$h][1] = $text;
+        $head[$h][2] = 'shipping';
+        $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.'/comm/propal/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
@@ -73,35 +73,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.'/comm/propal/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.'/comm/propal/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->propal->multidir_output[$object->entity] . "/" . dol_sanitizeFileName($object->ref);
-	$nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
+    $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.'/comm/propal/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] = 'document';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT.'/comm/propal/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] = 'document';
+    $h++;
 
-	$head[$h][0] = DOL_URL_ROOT.'/comm/propal/info.php?id='.$object->id;
-	$head[$h][1] = $langs->trans('Info');
-	$head[$h][2] = 'info';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT.'/comm/propal/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,'propal','remove');
+    complete_head_from_modules($conf,$langs,$object,$head,$h,'propal','remove');
 
-	return $head;
+    return $head;
 }
 
 /**
@@ -111,24 +111,24 @@ 
  */
 function propal_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/propal.php';
-	$head[$h][1] = $langs->trans("Miscellaneous");
-	$head[$h][2] = 'general';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT.'/admin/propal.php';
+    $head[$h][1] = $langs->trans("Miscellaneous");
+    $head[$h][2] = 'general';
+    $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,'propal_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,'propal_admin');
 
-	$head[$h][0] = DOL_URL_ROOT.'/comm/admin/propal_extrafields.php';
-	$head[$h][1] = $langs->trans("ExtraFields");
+    $head[$h][0] = DOL_URL_ROOT.'/comm/admin/propal_extrafields.php';
+    $head[$h][1] = $langs->trans("ExtraFields");
     $head[$h][2] = 'attributes';
     $h++;
 
@@ -137,9 +137,9 @@ 
     $head[$h][2] = 'attributeslines';
     $h++;
 
-	complete_head_from_modules($conf,$langs,null,$head,$h,'propal_admin','remove');
+    complete_head_from_modules($conf,$langs,null,$head,$h,'propal_admin','remove');
 
-	return $head;
+    return $head;
 }
 
 

Spacing +17 added lines, -17 removed lines

@@ -42,14 +42,14 @@ 
 	$head[$h][2] = 'comm';
 	$h++;
 
-	if ((empty($conf->commande->enabled) &&	((! empty($conf->expedition_bon->enabled) && $user->rights->expedition->lire)
-	|| (! empty($conf->livraison_bon->enabled) && $user->rights->expedition->livraison->lire))))
+	if ((empty($conf->commande->enabled) && ((!empty($conf->expedition_bon->enabled) && $user->rights->expedition->lire)
+	|| (!empty($conf->livraison_bon->enabled) && $user->rights->expedition->livraison->lire))))
 	{
 		$langs->load("sendings");
 		$text = '';
 		$head[$h][0] = DOL_URL_ROOT.'/expedition/propal.php?id='.$object->id;
-		if ($conf->expedition_bon->enabled) $text=$langs->trans("Shipment");
-		if ($conf->livraison_bon->enabled)  $text.='/'.$langs->trans("Receivings");
+		if ($conf->expedition_bon->enabled) $text = $langs->trans("Shipment");
+		if ($conf->livraison_bon->enabled)  $text .= '/'.$langs->trans("Receivings");
 		$head[$h][1] = $text;
 		$head[$h][2] = 'shipping';
 		$h++;
@@ -57,10 +57,10 @@ 
 
 	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
 	{
-	    $nbContact = count($object->liste_contact(-1,'internal')) + count($object->liste_contact(-1,'external'));
+	    $nbContact = count($object->liste_contact(-1, 'internal')) + count($object->liste_contact(-1, 'external'));
 		$head[$h][0] = DOL_URL_ROOT.'/comm/propal/contact.php?id='.$object->id;
 		$head[$h][1] = $langs->trans('ContactsAddresses');
-		if ($nbContact > 0) $head[$h][1].= ' <span class="badge">'.$nbContact.'</span>';
+		if ($nbContact > 0) $head[$h][1] .= ' <span class="badge">'.$nbContact.'</span>';
 		$head[$h][2] = 'contact';
 		$h++;
 	}
@@ -69,28 +69,28 @@ 
     // 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,'propal');
+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'propal');
 
     if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
     {
     	$nbNote = 0;
-        if(!empty($object->note_private)) $nbNote++;
-		if(!empty($object->note_public)) $nbNote++;
+        if (!empty($object->note_private)) $nbNote++;
+		if (!empty($object->note_public)) $nbNote++;
 	    $head[$h][0] = DOL_URL_ROOT.'/comm/propal/note.php?id='.$object->id;
 		$head[$h][1] = $langs->trans('Notes');
-		if ($nbNote > 0) $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
+		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/class/link.class.php';
-    $upload_dir = $conf->propal->multidir_output[$object->entity] . "/" . dol_sanitizeFileName($object->ref);
-	$nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
-    $nbLinks=Link::count($db, $object->element, $object->id);
+    $upload_dir = $conf->propal->multidir_output[$object->entity]."/".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.'/comm/propal/document.php?id='.$object->id;
 	$head[$h][1] = $langs->trans('Documents');
-	if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+	if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= ' <span class="badge">'.($nbFiles + $nbLinks).'</span>';
 	$head[$h][2] = 'document';
 	$h++;
 
@@ -99,7 +99,7 @@ 
 	$head[$h][2] = 'info';
 	$h++;
 
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'propal','remove');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'propal', 'remove');
 
 	return $head;
 }
@@ -125,7 +125,7 @@ 
 	// 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,'propal_admin');
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'propal_admin');
 
 	$head[$h][0] = DOL_URL_ROOT.'/comm/admin/propal_extrafields.php';
 	$head[$h][1] = $langs->trans("ExtraFields");
@@ -137,7 +137,7 @@ 
     $head[$h][2] = 'attributeslines';
     $h++;
 
-	complete_head_from_modules($conf,$langs,null,$head,$h,'propal_admin','remove');
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'propal_admin', 'remove');
 
 	return $head;
 }

Braces +21 added lines, -7 removed lines

@@ -48,8 +48,12 @@ 
 		$langs->load("sendings");
 		$text = '';
 		$head[$h][0] = DOL_URL_ROOT.'/expedition/propal.php?id='.$object->id;
-		if ($conf->expedition_bon->enabled) $text=$langs->trans("Shipment");
-		if ($conf->livraison_bon->enabled)  $text.='/'.$langs->trans("Receivings");
+		if ($conf->expedition_bon->enabled) {
+		    $text=$langs->trans("Shipment");
+		}
+		if ($conf->livraison_bon->enabled) {
+		    $text.='/'.$langs->trans("Receivings");
+		}
 		$head[$h][1] = $text;
 		$head[$h][2] = 'shipping';
 		$h++;
@@ -60,7 +64,9 @@ 
 	    $nbContact = count($object->liste_contact(-1,'internal')) + count($object->liste_contact(-1,'external'));
 		$head[$h][0] = DOL_URL_ROOT.'/comm/propal/contact.php?id='.$object->id;
 		$head[$h][1] = $langs->trans('ContactsAddresses');
-		if ($nbContact > 0) $head[$h][1].= ' <span class="badge">'.$nbContact.'</span>';
+		if ($nbContact > 0) {
+		    $head[$h][1].= ' <span class="badge">'.$nbContact.'</span>';
+		}
 		$head[$h][2] = 'contact';
 		$h++;
 	}
@@ -74,11 +80,17 @@ 
     if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
     {
     	$nbNote = 0;
-        if(!empty($object->note_private)) $nbNote++;
-		if(!empty($object->note_public)) $nbNote++;
+        if(!empty($object->note_private)) {
+            $nbNote++;
+        }
+		if(!empty($object->note_public)) {
+		    $nbNote++;
+		}
 	    $head[$h][0] = DOL_URL_ROOT.'/comm/propal/note.php?id='.$object->id;
 		$head[$h][1] = $langs->trans('Notes');
-		if ($nbNote > 0) $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
+		if ($nbNote > 0) {
+		    $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
+		}
 		$head[$h][2] = 'note';
 		$h++;
     }
@@ -90,7 +102,9 @@ 
     $nbLinks=Link::count($db, $object->element, $object->id);
 	$head[$h][0] = DOL_URL_ROOT.'/comm/propal/document.php?id='.$object->id;
 	$head[$h][1] = $langs->trans('Documents');
-	if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+	if (($nbFiles+$nbLinks) > 0) {
+	    $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+	}
 	$head[$h][2] = 'document';
 	$h++;
 

dolibarr/htdocs/core/lib/expensereport.lib.php

Indentation +89 added lines, -89 removed lines

@@ -29,53 +29,53 @@ 
  */
 function expensereport_prepare_head($object)
 {
-	global $db, $langs, $conf;
+    global $db, $langs, $conf;
 
-	$h = 0;
-	$head = array();
+    $h = 0;
+    $head = array();
 
-	$head[$h][0] = DOL_URL_ROOT . '/expensereport/card.php?id=' . $object->id;
-	$head[$h][1] = $langs->trans("Card");
-	$head[$h][2] = 'card';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT . '/expensereport/card.php?id=' . $object->id;
+    $head[$h][1] = $langs->trans("Card");
+    $head[$h][2] = 'card';
+    $h++;
 
-	// Show more tabs from modules
-	// Entries must be declared in modules descriptor with line
+    // 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,'expensereport');
+    complete_head_from_modules($conf,$langs,$object,$head,$h,'expensereport');
 
-	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->expensereport->dir_output . "/" . dol_sanitizeFileName($object->ref);
-	$nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
+    $upload_dir = $conf->expensereport->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.'/expensereport/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++;
-
-	if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
-	{
-	    $nbNote = 0;
-	    if(!empty($object->note_private)) $nbNote++;
-	    if(!empty($object->note_public)) $nbNote++;
-	    $head[$h][0] = DOL_URL_ROOT.'/expensereport/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 . '/expensereport/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,'expensereport','remove');
-
-	return $head;
+    $head[$h][0] = DOL_URL_ROOT.'/expensereport/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++;
+
+    if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
+    {
+        $nbNote = 0;
+        if(!empty($object->note_private)) $nbNote++;
+        if(!empty($object->note_public)) $nbNote++;
+        $head[$h][0] = DOL_URL_ROOT.'/expensereport/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 . '/expensereport/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,'expensereport','remove');
+
+    return $head;
 }
 
 /**
@@ -88,15 +88,15 @@ 
 function payment_expensereport_prepare_head(PaymentExpenseReport $object)
 {
 
-	global $langs, $conf;
+    global $langs, $conf;
 
-	$h = 0;
-	$head = array();
+    $h = 0;
+    $head = array();
 
-	$head[$h][0] = DOL_URL_ROOT.'/expensereport/payment/card.php?id='.$object->id;
-	$head[$h][1] = $langs->trans("Card");
-	$head[$h][2] = 'payment';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT.'/expensereport/payment/card.php?id='.$object->id;
+    $head[$h][1] = $langs->trans("Card");
+    $head[$h][2] = 'payment';
+    $h++;
 
     // Show more tabs from modules
     // Entries must be declared in modules descriptor with line
@@ -104,14 +104,14 @@ 
     // $this->tabs = array('entity:-tabname);   												to remove a tab
     complete_head_from_modules($conf,$langs,$object,$head,$h,'payment_expensereport');
 
-	$head[$h][0] = DOL_URL_ROOT.'/expensereport/payment/info.php?id='.$object->id;
-	$head[$h][1] = $langs->trans("Info");
-	$head[$h][2] = 'info';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT.'/expensereport/payment/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,'payment_expensereport', 'remove');
+    complete_head_from_modules($conf,$langs,$object,$head,$h,'payment_expensereport', 'remove');
 
-	return $head;
+    return $head;
 }
 
 /**
@@ -121,42 +121,42 @@ 
  */
 function expensereport_admin_prepare_head()
 {
-	global $langs, $conf, $user;
-
-	$h = 0;
-	$head = array();
-
-	$h = 0;
-
-	$head[$h][0] = DOL_URL_ROOT."/admin/expensereport.php";
-	$head[$h][1] = $langs->trans("ExpenseReports");
-	$head[$h][2] = 'expensereport';
-	$h++;
-
-	if (!empty($conf->global->MAIN_USE_EXPENSE_IK))
-	{
-		$head[$h][0] = DOL_URL_ROOT."/admin/expensereport_ik.php";
-		$head[$h][1] = $langs->trans("ExpenseReportsIk");
-		$head[$h][2] = 'expenseik';
-		$h++;
-	}
-
-	if (!empty($conf->global->MAIN_USE_EXPENSE_RULE))
-	{
-		$head[$h][0] = DOL_URL_ROOT."/admin/expensereport_rules.php";
-		$head[$h][1] = $langs->trans("ExpenseReportsRules");
-		$head[$h][2] = 'expenserules';
-		$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,'expensereport_admin');
-
-	$head[$h][0] = DOL_URL_ROOT.'/admin/expensereport_extrafields.php';
-	$head[$h][1] = $langs->trans("ExtraFields");
+    global $langs, $conf, $user;
+
+    $h = 0;
+    $head = array();
+
+    $h = 0;
+
+    $head[$h][0] = DOL_URL_ROOT."/admin/expensereport.php";
+    $head[$h][1] = $langs->trans("ExpenseReports");
+    $head[$h][2] = 'expensereport';
+    $h++;
+
+    if (!empty($conf->global->MAIN_USE_EXPENSE_IK))
+    {
+        $head[$h][0] = DOL_URL_ROOT."/admin/expensereport_ik.php";
+        $head[$h][1] = $langs->trans("ExpenseReportsIk");
+        $head[$h][2] = 'expenseik';
+        $h++;
+    }
+
+    if (!empty($conf->global->MAIN_USE_EXPENSE_RULE))
+    {
+        $head[$h][0] = DOL_URL_ROOT."/admin/expensereport_rules.php";
+        $head[$h][1] = $langs->trans("ExpenseReportsRules");
+        $head[$h][2] = 'expenserules';
+        $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,'expensereport_admin');
+
+    $head[$h][0] = DOL_URL_ROOT.'/admin/expensereport_extrafields.php';
+    $head[$h][1] = $langs->trans("ExtraFields");
     $head[$h][2] = 'attributes';
     $h++;
 
@@ -167,7 +167,7 @@ 
     $h++;
 	*/
 
-	complete_head_from_modules($conf,$langs,null,$head,$h,'expensereport_admin','remove');
+    complete_head_from_modules($conf,$langs,null,$head,$h,'expensereport_admin','remove');
 
     return $head;
 }

Spacing +15 added lines, -15 removed lines

@@ -34,7 +34,7 @@ 
 	$h = 0;
 	$head = array();
 
-	$head[$h][0] = DOL_URL_ROOT . '/expensereport/card.php?id=' . $object->id;
+	$head[$h][0] = DOL_URL_ROOT.'/expensereport/card.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("Card");
 	$head[$h][2] = 'card';
 	$h++;
@@ -43,37 +43,37 @@ 
 	// 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,'expensereport');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'expensereport');
 
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
     require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
-	$upload_dir = $conf->expensereport->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);
+	$upload_dir = $conf->expensereport->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.'/expensereport/document.php?id='.$object->id;
 	$head[$h][1] = $langs->trans('Documents');
-	if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+	if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= ' <span class="badge">'.($nbFiles + $nbLinks).'</span>';
 	$head[$h][2] = 'documents';
 	$h++;
 
 	if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
 	{
 	    $nbNote = 0;
-	    if(!empty($object->note_private)) $nbNote++;
-	    if(!empty($object->note_public)) $nbNote++;
+	    if (!empty($object->note_private)) $nbNote++;
+	    if (!empty($object->note_public)) $nbNote++;
 	    $head[$h][0] = DOL_URL_ROOT.'/expensereport/note.php?id='.$object->id;
 	    $head[$h][1] = $langs->trans('Notes');
-	    if ($nbNote > 0) $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
+	    if ($nbNote > 0) $head[$h][1] .= ' <span class="badge">'.$nbNote.'</span>';
 	    $head[$h][2] = 'note';
 	    $h++;
 	}
 
-	$head[$h][0] = DOL_URL_ROOT . '/expensereport/info.php?id=' . $object->id;
+	$head[$h][0] = DOL_URL_ROOT.'/expensereport/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,'expensereport','remove');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'expensereport', 'remove');
 
 	return $head;
 }
@@ -102,14 +102,14 @@ 
     // 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,'payment_expensereport');
+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'payment_expensereport');
 
 	$head[$h][0] = DOL_URL_ROOT.'/expensereport/payment/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,'payment_expensereport', 'remove');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'payment_expensereport', 'remove');
 
 	return $head;
 }
@@ -153,7 +153,7 @@ 
 	// 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,'expensereport_admin');
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'expensereport_admin');
 
 	$head[$h][0] = DOL_URL_ROOT.'/admin/expensereport_extrafields.php';
 	$head[$h][1] = $langs->trans("ExtraFields");
@@ -167,7 +167,7 @@ 
     $h++;
 	*/
 
-	complete_head_from_modules($conf,$langs,null,$head,$h,'expensereport_admin','remove');
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'expensereport_admin', 'remove');
 
     return $head;
 }

Braces +12 added lines, -4 removed lines

@@ -52,18 +52,26 @@
     $nbLinks=Link::count($db, $object->element, $object->id);
 	$head[$h][0] = DOL_URL_ROOT.'/expensereport/document.php?id='.$object->id;
 	$head[$h][1] = $langs->trans('Documents');
-	if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+	if (($nbFiles+$nbLinks) > 0) {
+	    $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+	}
 	$head[$h][2] = 'documents';
 	$h++;
 
 	if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
 	{
 	    $nbNote = 0;
-	    if(!empty($object->note_private)) $nbNote++;
-	    if(!empty($object->note_public)) $nbNote++;
+	    if(!empty($object->note_private)) {
+	        $nbNote++;
+	    }
+	    if(!empty($object->note_public)) {
+	        $nbNote++;
+	    }
 	    $head[$h][0] = DOL_URL_ROOT.'/expensereport/note.php?id='.$object->id;
 	    $head[$h][1] = $langs->trans('Notes');
-	    if ($nbNote > 0) $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
+	    if ($nbNote > 0) {
+	        $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
+	    }
 	    $head[$h][2] = 'note';
 	    $h++;
 	}

dolibarr/htdocs/core/lib/treeview.lib.php

Indentation +142 added lines, -142 removed lines

@@ -35,61 +35,61 @@ 
  */
 function tree_showpad(&$fulltree,$key,$silent=0)
 {
-	$pos=1;
-
-	// Loop on each pos, because we will output an img for each pos
-	while ($pos <= $fulltree[$key]['level'] && $fulltree[$key]['level'] > 0)
-	{
-		// Process for column $pos
-
-		$atleastoneofthislevelafter=0;
-		$nbofdirinsub=0;
-		$nbofdocinsub=0;
-		$found=0;
-		//print 'x'.$key;
-		foreach($fulltree as $key2 => $val2)
-		{
+    $pos=1;
+
+    // Loop on each pos, because we will output an img for each pos
+    while ($pos <= $fulltree[$key]['level'] && $fulltree[$key]['level'] > 0)
+    {
+        // Process for column $pos
+
+        $atleastoneofthislevelafter=0;
+        $nbofdirinsub=0;
+        $nbofdocinsub=0;
+        $found=0;
+        //print 'x'.$key;
+        foreach($fulltree as $key2 => $val2)
+        {
             //print "x".$pos." ".$key2." ".$found." ".$fulltree[$key2]['level'];
-			if ($found == 1) // We are after the entry to show
-			{
-				if ($fulltree[$key2]['level'] > $pos)
-				{
-					$nbofdirinsub++;
-					if (isset($fulltree[$key2]['cachenbofdoc']) && $fulltree[$key2]['cachenbofdoc'] > 0) $nbofdocinsub+=$fulltree[$key2]['cachenbofdoc'];
-				}
-				if ($fulltree[$key2]['level'] == $pos)
-				{
-					$atleastoneofthislevelafter=1;
-				}
-				if ($fulltree[$key2]['level'] <= $pos)
-				{
-					break;
-				}
-			}
-			if ($key2 == $key)    // We found ourself, so now every lower level will be counted
-			{
-				$found=1;
-			}
-		}
-		//print $atleastoneofthislevelafter;
-
-		if (! $silent)
-		{
-    		if ($atleastoneofthislevelafter)
-    		{
-    			if ($fulltree[$key]['level'] == $pos) print img_picto_common('','treemenu/branch.gif');
-    			else print img_picto_common('','treemenu/line.gif');
-    		}
-    		else
-    		{
-    			if ($fulltree[$key]['level'] == $pos) print img_picto_common('','treemenu/branchbottom.gif');
-    			else print img_picto_common('','treemenu/linebottom.gif');
-    		}
-		}
-		$pos++;
-	}
-
-	return array($atleastoneofthislevelafter,$nbofdirinsub,$nbofdocinsub);
+            if ($found == 1) // We are after the entry to show
+            {
+                if ($fulltree[$key2]['level'] > $pos)
+                {
+                    $nbofdirinsub++;
+                    if (isset($fulltree[$key2]['cachenbofdoc']) && $fulltree[$key2]['cachenbofdoc'] > 0) $nbofdocinsub+=$fulltree[$key2]['cachenbofdoc'];
+                }
+                if ($fulltree[$key2]['level'] == $pos)
+                {
+                    $atleastoneofthislevelafter=1;
+                }
+                if ($fulltree[$key2]['level'] <= $pos)
+                {
+                    break;
+                }
+            }
+            if ($key2 == $key)    // We found ourself, so now every lower level will be counted
+            {
+                $found=1;
+            }
+        }
+        //print $atleastoneofthislevelafter;
+
+        if (! $silent)
+        {
+            if ($atleastoneofthislevelafter)
+            {
+                if ($fulltree[$key]['level'] == $pos) print img_picto_common('','treemenu/branch.gif');
+                else print img_picto_common('','treemenu/line.gif');
+            }
+            else
+            {
+                if ($fulltree[$key]['level'] == $pos) print img_picto_common('','treemenu/branchbottom.gif');
+                else print img_picto_common('','treemenu/linebottom.gif');
+            }
+        }
+        $pos++;
+    }
+
+    return array($atleastoneofthislevelafter,$nbofdirinsub,$nbofdocinsub);
 }
 
 
@@ -120,9 +120,9 @@ 
     if ($rang == 0 && empty($donoresetalreadyloaded)) $tree_recur_alreadyadded=array();
 
     if ($rang == 0)
-	{
-		// Test also done with jstree and dynatree (not able to have <a> inside label)
-		print '<script type="text/javascript" language="javascript">
+    {
+        // Test also done with jstree and dynatree (not able to have <a> inside label)
+        print '<script type="text/javascript" language="javascript">
 		$(document).ready(function(){
 			$("#'.$iddivjstree.'").treeview({
 				collapsed: true,
@@ -136,94 +136,94 @@ 
 		})
 		</script>';
 
-		print '<ul id="'.$iddivjstree.'">';
-	}
-
-	if ($rang > 50)
-	{
-	    return;	// Protect against infinite loop. Max 50 depth
-	}
-
-	//ballayage du tableau
-	$sizeoftab=count($tab);
-	$ulprinted=0;
-	for ($x=0; $x < $sizeoftab; $x++)
-	{
-		//var_dump($tab[$x]);exit;
-		// If an element has $pere for parent
-		if ($tab[$x]['fk_menu'] != -1 && $tab[$x]['fk_menu'] == $pere['rowid'])
-		{
-		    //print 'rang='.$rang.'-x='.$x." rowid=".$tab[$x]['rowid']." tab[x]['fk_leftmenu'] = ".$tab[$x]['fk_leftmenu']." leftmenu pere = ".$pere['leftmenu']."<br>\n";
-			if (empty($ulprinted) && ! empty($pere['rowid']))
-			{
-    		    if (! empty($tree_recur_alreadyadded[$tab[$x]['rowid']]))
-    		    {
-    		          dol_syslog('Error, record with id '.$tab[$x]['rowid'].' seems to be a child of record with id '.$pere['rowid'].' but it was already output. Complete field "leftmenu" and "mainmenu" on ALL records to avoid ambiguity.', LOG_WARNING);
-    		          continue;
-    		    }
+        print '<ul id="'.$iddivjstree.'">';
+    }
+
+    if ($rang > 50)
+    {
+        return;	// Protect against infinite loop. Max 50 depth
+    }
+
+    //ballayage du tableau
+    $sizeoftab=count($tab);
+    $ulprinted=0;
+    for ($x=0; $x < $sizeoftab; $x++)
+    {
+        //var_dump($tab[$x]);exit;
+        // If an element has $pere for parent
+        if ($tab[$x]['fk_menu'] != -1 && $tab[$x]['fk_menu'] == $pere['rowid'])
+        {
+            //print 'rang='.$rang.'-x='.$x." rowid=".$tab[$x]['rowid']." tab[x]['fk_leftmenu'] = ".$tab[$x]['fk_leftmenu']." leftmenu pere = ".$pere['leftmenu']."<br>\n";
+            if (empty($ulprinted) && ! empty($pere['rowid']))
+            {
+                if (! empty($tree_recur_alreadyadded[$tab[$x]['rowid']]))
+                {
+                        dol_syslog('Error, record with id '.$tab[$x]['rowid'].' seems to be a child of record with id '.$pere['rowid'].' but it was already output. Complete field "leftmenu" and "mainmenu" on ALL records to avoid ambiguity.', LOG_WARNING);
+                        continue;
+                }
 
                 print '<ul'.(empty($pere['rowid'])?' id="treeData"':'').'>'; $ulprinted++;
-			}
-			print "\n".'<li '.($tab[$x]['statut']?' class="liuseractive"':'class="liuserdisabled"').'>';
-			if ($showfk)
-			{
-			    print '<table class="nobordernopadding centpercent"><tr><td>';
-			    print '<strong> &nbsp; ';
-			    print $tab[$x]['title'];
-			    print '&nbsp; (fk_mainmenu='.$tab[$x]['fk_mainmenu'].' fk_leftmenu='.$tab[$x]['fk_leftmenu'].')';
-			    print '</td><td align="right">';
-			    print $tab[$x]['buttons'];
-			    print '</td></tr></table>';
-			}
-			else
-			{
-			    print $tab[$x]['entry'];
-			}
-			//print ' -> A '.$tab[$x]['rowid'].' mainmenu='.$tab[$x]['mainmenu'].' leftmenu='.$tab[$x]['leftmenu'].' fk_mainmenu='.$tab[$x]['fk_mainmenu'].' fk_leftmenu='.$tab[$x]['fk_leftmenu'].'<br>'."\n";
-		    $tree_recur_alreadyadded[$tab[$x]['rowid']]=($rang + 1);
-			// And now we search all its sons of lower level
-			tree_recur($tab, $tab[$x], $rang+1, 'iddivjstree', 0, $showfk);
-			print '</li>';
-		}
-		elseif (! empty($tab[$x]['rowid']) && $tab[$x]['fk_menu'] == -1 && $tab[$x]['fk_mainmenu'] == $pere['mainmenu'] && $tab[$x]['fk_leftmenu'] == $pere['leftmenu'])
-		{
-		    //print 'rang='.$rang.'-x='.$x." rowid=".$tab[$x]['rowid']." tab[x]['fk_leftmenu'] = ".$tab[$x]['fk_leftmenu']." leftmenu pere = ".$pere['leftmenu']."<br>\n";
-		    if (empty($ulprinted) && ! empty($pere['rowid']))
-		    {
-		        if (! empty($tree_recur_alreadyadded[$tab[$x]['rowid']]))
-		        {
-		            dol_syslog('Error, record with id '.$tab[$x]['rowid'].' seems to be a child of record with id '.$pere['rowid'].' but it was already output. Complete field "leftmenu" and "mainmenu" on ALL records to avoid ambiguity.', LOG_WARNING);
-		            //print 'Error, record with id '.$tab[$x]['rowid'].' seems to be a child of record with id '.$pere['rowid'].' but it was already output. Complete field "leftmenu" and "mainmenu" on ALL records to avoid ambiguity.';
+            }
+            print "\n".'<li '.($tab[$x]['statut']?' class="liuseractive"':'class="liuserdisabled"').'>';
+            if ($showfk)
+            {
+                print '<table class="nobordernopadding centpercent"><tr><td>';
+                print '<strong> &nbsp; ';
+                print $tab[$x]['title'];
+                print '&nbsp; (fk_mainmenu='.$tab[$x]['fk_mainmenu'].' fk_leftmenu='.$tab[$x]['fk_leftmenu'].')';
+                print '</td><td align="right">';
+                print $tab[$x]['buttons'];
+                print '</td></tr></table>';
+            }
+            else
+            {
+                print $tab[$x]['entry'];
+            }
+            //print ' -> A '.$tab[$x]['rowid'].' mainmenu='.$tab[$x]['mainmenu'].' leftmenu='.$tab[$x]['leftmenu'].' fk_mainmenu='.$tab[$x]['fk_mainmenu'].' fk_leftmenu='.$tab[$x]['fk_leftmenu'].'<br>'."\n";
+            $tree_recur_alreadyadded[$tab[$x]['rowid']]=($rang + 1);
+            // And now we search all its sons of lower level
+            tree_recur($tab, $tab[$x], $rang+1, 'iddivjstree', 0, $showfk);
+            print '</li>';
+        }
+        elseif (! empty($tab[$x]['rowid']) && $tab[$x]['fk_menu'] == -1 && $tab[$x]['fk_mainmenu'] == $pere['mainmenu'] && $tab[$x]['fk_leftmenu'] == $pere['leftmenu'])
+        {
+            //print 'rang='.$rang.'-x='.$x." rowid=".$tab[$x]['rowid']." tab[x]['fk_leftmenu'] = ".$tab[$x]['fk_leftmenu']." leftmenu pere = ".$pere['leftmenu']."<br>\n";
+            if (empty($ulprinted) && ! empty($pere['rowid']))
+            {
+                if (! empty($tree_recur_alreadyadded[$tab[$x]['rowid']]))
+                {
+                    dol_syslog('Error, record with id '.$tab[$x]['rowid'].' seems to be a child of record with id '.$pere['rowid'].' but it was already output. Complete field "leftmenu" and "mainmenu" on ALL records to avoid ambiguity.', LOG_WARNING);
+                    //print 'Error, record with id '.$tab[$x]['rowid'].' seems to be a child of record with id '.$pere['rowid'].' but it was already output. Complete field "leftmenu" and "mainmenu" on ALL records to avoid ambiguity.';
                     continue;
-		        }
-
-		        print '<ul'.(empty($pere['rowid'])?' id="treeData"':'').'>'; $ulprinted++;
-		    }
-			print "\n".'<li '.($tab[$x]['statut']?' class="liuseractive"':'class="liuserdisabled"').'>';
-			if ($showfk)
-			{
-			    print '<table class="nobordernopadding centpercent"><tr><td>';
-			    print '<strong> &nbsp; <a href="edit.php?menu_handler='.$menu_handler_to_search.'&action=edit&menuId='.$menu['rowid'].'">';
-			    print $tab[$x]['title'];
-			    print '</a></strong>';
-			    print '&nbsp; (mainmenu='.$tab[$x]['mainmenu'].' leftmenu='.$tab[$x]['leftmenu'].' - fk_mainmenu='.$tab[$x]['fk_mainmenu'].' fk_leftmenu='.$tab[$x]['fk_leftmenu'].')';
-			    print '</td><td align="right">';
-			    print $tab[$x]['buttons'];
-			    print '</td></tr></table>';
-			}
-			else
-			{
-			    print $tab[$x]['entry'];
-			}
-			//print ' -> B '.$tab[$x]['rowid'].' mainmenu='.$tab[$x]['mainmenu'].' leftmenu='.$tab[$x]['leftmenu'].' fk_mainmenu='.$tab[$x]['fk_mainmenu'].' fk_leftmenu='.$tab[$x]['fk_leftmenu'].'<br>'."\n";
-			$tree_recur_alreadyadded[$tab[$x]['rowid']]=($rang + 1);
-			// And now we search all its sons of lower level
-			//print 'Call tree_recur for x='.$x.' rowid='.$tab[$x]['rowid']." fk_mainmenu pere = ".$tab[$x]['fk_mainmenu']." fk_leftmenu pere = ".$tab[$x]['fk_leftmenu']."<br>\n";
-		    tree_recur($tab, $tab[$x], $rang+1, 'iddivjstree', 0, $showfk);
-			print '</li>';
-		}
-	}
-	if (! empty($ulprinted) && ! empty($pere['rowid'])) { print '</ul>'."\n"; }
+                }
+
+                print '<ul'.(empty($pere['rowid'])?' id="treeData"':'').'>'; $ulprinted++;
+            }
+            print "\n".'<li '.($tab[$x]['statut']?' class="liuseractive"':'class="liuserdisabled"').'>';
+            if ($showfk)
+            {
+                print '<table class="nobordernopadding centpercent"><tr><td>';
+                print '<strong> &nbsp; <a href="edit.php?menu_handler='.$menu_handler_to_search.'&action=edit&menuId='.$menu['rowid'].'">';
+                print $tab[$x]['title'];
+                print '</a></strong>';
+                print '&nbsp; (mainmenu='.$tab[$x]['mainmenu'].' leftmenu='.$tab[$x]['leftmenu'].' - fk_mainmenu='.$tab[$x]['fk_mainmenu'].' fk_leftmenu='.$tab[$x]['fk_leftmenu'].')';
+                print '</td><td align="right">';
+                print $tab[$x]['buttons'];
+                print '</td></tr></table>';
+            }
+            else
+            {
+                print $tab[$x]['entry'];
+            }
+            //print ' -> B '.$tab[$x]['rowid'].' mainmenu='.$tab[$x]['mainmenu'].' leftmenu='.$tab[$x]['leftmenu'].' fk_mainmenu='.$tab[$x]['fk_mainmenu'].' fk_leftmenu='.$tab[$x]['fk_leftmenu'].'<br>'."\n";
+            $tree_recur_alreadyadded[$tab[$x]['rowid']]=($rang + 1);
+            // And now we search all its sons of lower level
+            //print 'Call tree_recur for x='.$x.' rowid='.$tab[$x]['rowid']." fk_mainmenu pere = ".$tab[$x]['fk_mainmenu']." fk_leftmenu pere = ".$tab[$x]['fk_leftmenu']."<br>\n";
+            tree_recur($tab, $tab[$x], $rang+1, 'iddivjstree', 0, $showfk);
+            print '</li>';
+        }
+    }
+    if (! empty($ulprinted) && ! empty($pere['rowid'])) { print '</ul>'."\n"; }
 
     if ($rang == 0) print '</ul>';
 }

Spacing +36 added lines, -36 removed lines

@@ -33,21 +33,21 @@ 
  * @param	int		$silent			Do not output indent and picto, returns only value
  * @return	integer[]					array(0 or 1 if at least one of this level after, 0 or 1 if at least one of higher level after, nbofdirinsub, nbofdocinsub)
  */
-function tree_showpad(&$fulltree,$key,$silent=0)
+function tree_showpad(&$fulltree, $key, $silent = 0)
 {
-	$pos=1;
+	$pos = 1;
 
 	// Loop on each pos, because we will output an img for each pos
 	while ($pos <= $fulltree[$key]['level'] && $fulltree[$key]['level'] > 0)
 	{
 		// Process for column $pos
 
-		$atleastoneofthislevelafter=0;
-		$nbofdirinsub=0;
-		$nbofdocinsub=0;
-		$found=0;
+		$atleastoneofthislevelafter = 0;
+		$nbofdirinsub = 0;
+		$nbofdocinsub = 0;
+		$found = 0;
 		//print 'x'.$key;
-		foreach($fulltree as $key2 => $val2)
+		foreach ($fulltree as $key2 => $val2)
 		{
             //print "x".$pos." ".$key2." ".$found." ".$fulltree[$key2]['level'];
 			if ($found == 1) // We are after the entry to show
@@ -55,11 +55,11 @@ 
 				if ($fulltree[$key2]['level'] > $pos)
 				{
 					$nbofdirinsub++;
-					if (isset($fulltree[$key2]['cachenbofdoc']) && $fulltree[$key2]['cachenbofdoc'] > 0) $nbofdocinsub+=$fulltree[$key2]['cachenbofdoc'];
+					if (isset($fulltree[$key2]['cachenbofdoc']) && $fulltree[$key2]['cachenbofdoc'] > 0) $nbofdocinsub += $fulltree[$key2]['cachenbofdoc'];
 				}
 				if ($fulltree[$key2]['level'] == $pos)
 				{
-					$atleastoneofthislevelafter=1;
+					$atleastoneofthislevelafter = 1;
 				}
 				if ($fulltree[$key2]['level'] <= $pos)
 				{
@@ -68,28 +68,28 @@ 
 			}
 			if ($key2 == $key)    // We found ourself, so now every lower level will be counted
 			{
-				$found=1;
+				$found = 1;
 			}
 		}
 		//print $atleastoneofthislevelafter;
 
-		if (! $silent)
+		if (!$silent)
 		{
     		if ($atleastoneofthislevelafter)
     		{
-    			if ($fulltree[$key]['level'] == $pos) print img_picto_common('','treemenu/branch.gif');
-    			else print img_picto_common('','treemenu/line.gif');
+    			if ($fulltree[$key]['level'] == $pos) print img_picto_common('', 'treemenu/branch.gif');
+    			else print img_picto_common('', 'treemenu/line.gif');
     		}
     		else
     		{
-    			if ($fulltree[$key]['level'] == $pos) print img_picto_common('','treemenu/branchbottom.gif');
-    			else print img_picto_common('','treemenu/linebottom.gif');
+    			if ($fulltree[$key]['level'] == $pos) print img_picto_common('', 'treemenu/branchbottom.gif');
+    			else print img_picto_common('', 'treemenu/linebottom.gif');
     		}
 		}
 		$pos++;
 	}
 
-	return array($atleastoneofthislevelafter,$nbofdirinsub,$nbofdocinsub);
+	return array($atleastoneofthislevelafter, $nbofdirinsub, $nbofdocinsub);
 }
 
 
@@ -113,11 +113,11 @@ 
  *  @param  int     $showfk         1=show fk_links to parent into label  (used by menu editor only)
  *  @return	void
  */
-function tree_recur($tab, $pere, $rang, $iddivjstree='iddivjstree', $donoresetalreadyloaded=0, $showfk=0)
+function tree_recur($tab, $pere, $rang, $iddivjstree = 'iddivjstree', $donoresetalreadyloaded = 0, $showfk = 0)
 {
     global $tree_recur_alreadyadded;
 
-    if ($rang == 0 && empty($donoresetalreadyloaded)) $tree_recur_alreadyadded=array();
+    if ($rang == 0 && empty($donoresetalreadyloaded)) $tree_recur_alreadyadded = array();
 
     if ($rang == 0)
 	{
@@ -141,30 +141,30 @@ 
 
 	if ($rang > 50)
 	{
-	    return;	// Protect against infinite loop. Max 50 depth
+	    return; // Protect against infinite loop. Max 50 depth
 	}
 
 	//ballayage du tableau
-	$sizeoftab=count($tab);
-	$ulprinted=0;
-	for ($x=0; $x < $sizeoftab; $x++)
+	$sizeoftab = count($tab);
+	$ulprinted = 0;
+	for ($x = 0; $x < $sizeoftab; $x++)
 	{
 		//var_dump($tab[$x]);exit;
 		// If an element has $pere for parent
 		if ($tab[$x]['fk_menu'] != -1 && $tab[$x]['fk_menu'] == $pere['rowid'])
 		{
 		    //print 'rang='.$rang.'-x='.$x." rowid=".$tab[$x]['rowid']." tab[x]['fk_leftmenu'] = ".$tab[$x]['fk_leftmenu']." leftmenu pere = ".$pere['leftmenu']."<br>\n";
-			if (empty($ulprinted) && ! empty($pere['rowid']))
+			if (empty($ulprinted) && !empty($pere['rowid']))
 			{
-    		    if (! empty($tree_recur_alreadyadded[$tab[$x]['rowid']]))
+    		    if (!empty($tree_recur_alreadyadded[$tab[$x]['rowid']]))
     		    {
     		          dol_syslog('Error, record with id '.$tab[$x]['rowid'].' seems to be a child of record with id '.$pere['rowid'].' but it was already output. Complete field "leftmenu" and "mainmenu" on ALL records to avoid ambiguity.', LOG_WARNING);
     		          continue;
     		    }
 
-                print '<ul'.(empty($pere['rowid'])?' id="treeData"':'').'>'; $ulprinted++;
+                print '<ul'.(empty($pere['rowid']) ? ' id="treeData"' : '').'>'; $ulprinted++;
 			}
-			print "\n".'<li '.($tab[$x]['statut']?' class="liuseractive"':'class="liuserdisabled"').'>';
+			print "\n".'<li '.($tab[$x]['statut'] ? ' class="liuseractive"' : 'class="liuserdisabled"').'>';
 			if ($showfk)
 			{
 			    print '<table class="nobordernopadding centpercent"><tr><td>';
@@ -180,26 +180,26 @@ 
 			    print $tab[$x]['entry'];
 			}
 			//print ' -> A '.$tab[$x]['rowid'].' mainmenu='.$tab[$x]['mainmenu'].' leftmenu='.$tab[$x]['leftmenu'].' fk_mainmenu='.$tab[$x]['fk_mainmenu'].' fk_leftmenu='.$tab[$x]['fk_leftmenu'].'<br>'."\n";
-		    $tree_recur_alreadyadded[$tab[$x]['rowid']]=($rang + 1);
+		    $tree_recur_alreadyadded[$tab[$x]['rowid']] = ($rang + 1);
 			// And now we search all its sons of lower level
-			tree_recur($tab, $tab[$x], $rang+1, 'iddivjstree', 0, $showfk);
+			tree_recur($tab, $tab[$x], $rang + 1, 'iddivjstree', 0, $showfk);
 			print '</li>';
 		}
-		elseif (! empty($tab[$x]['rowid']) && $tab[$x]['fk_menu'] == -1 && $tab[$x]['fk_mainmenu'] == $pere['mainmenu'] && $tab[$x]['fk_leftmenu'] == $pere['leftmenu'])
+		elseif (!empty($tab[$x]['rowid']) && $tab[$x]['fk_menu'] == -1 && $tab[$x]['fk_mainmenu'] == $pere['mainmenu'] && $tab[$x]['fk_leftmenu'] == $pere['leftmenu'])
 		{
 		    //print 'rang='.$rang.'-x='.$x." rowid=".$tab[$x]['rowid']." tab[x]['fk_leftmenu'] = ".$tab[$x]['fk_leftmenu']." leftmenu pere = ".$pere['leftmenu']."<br>\n";
-		    if (empty($ulprinted) && ! empty($pere['rowid']))
+		    if (empty($ulprinted) && !empty($pere['rowid']))
 		    {
-		        if (! empty($tree_recur_alreadyadded[$tab[$x]['rowid']]))
+		        if (!empty($tree_recur_alreadyadded[$tab[$x]['rowid']]))
 		        {
 		            dol_syslog('Error, record with id '.$tab[$x]['rowid'].' seems to be a child of record with id '.$pere['rowid'].' but it was already output. Complete field "leftmenu" and "mainmenu" on ALL records to avoid ambiguity.', LOG_WARNING);
 		            //print 'Error, record with id '.$tab[$x]['rowid'].' seems to be a child of record with id '.$pere['rowid'].' but it was already output. Complete field "leftmenu" and "mainmenu" on ALL records to avoid ambiguity.';
                     continue;
 		        }
 
-		        print '<ul'.(empty($pere['rowid'])?' id="treeData"':'').'>'; $ulprinted++;
+		        print '<ul'.(empty($pere['rowid']) ? ' id="treeData"' : '').'>'; $ulprinted++;
 		    }
-			print "\n".'<li '.($tab[$x]['statut']?' class="liuseractive"':'class="liuserdisabled"').'>';
+			print "\n".'<li '.($tab[$x]['statut'] ? ' class="liuseractive"' : 'class="liuserdisabled"').'>';
 			if ($showfk)
 			{
 			    print '<table class="nobordernopadding centpercent"><tr><td>';
@@ -216,14 +216,14 @@ 
 			    print $tab[$x]['entry'];
 			}
 			//print ' -> B '.$tab[$x]['rowid'].' mainmenu='.$tab[$x]['mainmenu'].' leftmenu='.$tab[$x]['leftmenu'].' fk_mainmenu='.$tab[$x]['fk_mainmenu'].' fk_leftmenu='.$tab[$x]['fk_leftmenu'].'<br>'."\n";
-			$tree_recur_alreadyadded[$tab[$x]['rowid']]=($rang + 1);
+			$tree_recur_alreadyadded[$tab[$x]['rowid']] = ($rang + 1);
 			// And now we search all its sons of lower level
 			//print 'Call tree_recur for x='.$x.' rowid='.$tab[$x]['rowid']." fk_mainmenu pere = ".$tab[$x]['fk_mainmenu']." fk_leftmenu pere = ".$tab[$x]['fk_leftmenu']."<br>\n";
-		    tree_recur($tab, $tab[$x], $rang+1, 'iddivjstree', 0, $showfk);
+		    tree_recur($tab, $tab[$x], $rang + 1, 'iddivjstree', 0, $showfk);
 			print '</li>';
 		}
 	}
-	if (! empty($ulprinted) && ! empty($pere['rowid'])) { print '</ul>'."\n"; }
+	if (!empty($ulprinted) && !empty($pere['rowid'])) { print '</ul>'."\n"; }
 
     if ($rang == 0) print '</ul>';
 }

Braces +30 added lines, -18 removed lines

@@ -50,12 +50,16 @@ 
 		foreach($fulltree as $key2 => $val2)
 		{
             //print "x".$pos." ".$key2." ".$found." ".$fulltree[$key2]['level'];
-			if ($found == 1) // We are after the entry to show
+			if ($found == 1) {
+			    // We are after the entry to show
 			{
 				if ($fulltree[$key2]['level'] > $pos)
 				{
 					$nbofdirinsub++;
-					if (isset($fulltree[$key2]['cachenbofdoc']) && $fulltree[$key2]['cachenbofdoc'] > 0) $nbofdocinsub+=$fulltree[$key2]['cachenbofdoc'];
+			}
+					if (isset($fulltree[$key2]['cachenbofdoc']) && $fulltree[$key2]['cachenbofdoc'] > 0) {
+					    $nbofdocinsub+=$fulltree[$key2]['cachenbofdoc'];
+					}
 				}
 				if ($fulltree[$key2]['level'] == $pos)
 				{
@@ -66,10 +70,12 @@ 
 					break;
 				}
 			}
-			if ($key2 == $key)    // We found ourself, so now every lower level will be counted
+			if ($key2 == $key) {
+			    // We found ourself, so now every lower level will be counted
 			{
 				$found=1;
 			}
+			}
 		}
 		//print $atleastoneofthislevelafter;
 
@@ -77,13 +83,18 @@ 
 		{
     		if ($atleastoneofthislevelafter)
     		{
-    			if ($fulltree[$key]['level'] == $pos) print img_picto_common('','treemenu/branch.gif');
-    			else print img_picto_common('','treemenu/line.gif');
-    		}
-    		else
+    			if ($fulltree[$key]['level'] == $pos) {
+    			    print img_picto_common('','treemenu/branch.gif');
+    			} else {
+    			    print img_picto_common('','treemenu/line.gif');
+    			}
+    		} else
     		{
-    			if ($fulltree[$key]['level'] == $pos) print img_picto_common('','treemenu/branchbottom.gif');
-    			else print img_picto_common('','treemenu/linebottom.gif');
+    			if ($fulltree[$key]['level'] == $pos) {
+    			    print img_picto_common('','treemenu/branchbottom.gif');
+    			} else {
+    			    print img_picto_common('','treemenu/linebottom.gif');
+    			}
     		}
 		}
 		$pos++;
@@ -117,7 +128,9 @@ 
 {
     global $tree_recur_alreadyadded;
 
-    if ($rang == 0 && empty($donoresetalreadyloaded)) $tree_recur_alreadyadded=array();
+    if ($rang == 0 && empty($donoresetalreadyloaded)) {
+        $tree_recur_alreadyadded=array();
+    }
 
     if ($rang == 0)
 	{
@@ -174,8 +187,7 @@ 
 			    print '</td><td align="right">';
 			    print $tab[$x]['buttons'];
 			    print '</td></tr></table>';
-			}
-			else
+			} else
 			{
 			    print $tab[$x]['entry'];
 			}
@@ -184,8 +196,7 @@ 
 			// And now we search all its sons of lower level
 			tree_recur($tab, $tab[$x], $rang+1, 'iddivjstree', 0, $showfk);
 			print '</li>';
-		}
-		elseif (! empty($tab[$x]['rowid']) && $tab[$x]['fk_menu'] == -1 && $tab[$x]['fk_mainmenu'] == $pere['mainmenu'] && $tab[$x]['fk_leftmenu'] == $pere['leftmenu'])
+		} elseif (! empty($tab[$x]['rowid']) && $tab[$x]['fk_menu'] == -1 && $tab[$x]['fk_mainmenu'] == $pere['mainmenu'] && $tab[$x]['fk_leftmenu'] == $pere['leftmenu'])
 		{
 		    //print 'rang='.$rang.'-x='.$x." rowid=".$tab[$x]['rowid']." tab[x]['fk_leftmenu'] = ".$tab[$x]['fk_leftmenu']." leftmenu pere = ".$pere['leftmenu']."<br>\n";
 		    if (empty($ulprinted) && ! empty($pere['rowid']))
@@ -210,8 +221,7 @@ 
 			    print '</td><td align="right">';
 			    print $tab[$x]['buttons'];
 			    print '</td></tr></table>';
-			}
-			else
+			} else
 			{
 			    print $tab[$x]['entry'];
 			}
@@ -225,6 +235,8 @@ 
 	}
 	if (! empty($ulprinted) && ! empty($pere['rowid'])) { print '</ul>'."\n"; }
 
-    if ($rang == 0) print '</ul>';
-}
+    if ($rang == 0) {
+        print '</ul>';
+    }
+    }
 

dolibarr/htdocs/core/lib/memory.lib.php

Indentation +168 added lines, -168 removed lines

@@ -24,10 +24,10 @@ 
 global $shmkeys,$shmoffset;
 
 $shmkeys=array('main'=>1,'admin'=>2,'dict'=>3,'companies'=>4,'suppliers'=>5,'products'=>6,
-				'commercial'=>7,'compta'=>8,'projects'=>9,'cashdesk'=>10,'agenda'=>11,'bills'=>12,
-				'propal'=>13,'boxes'=>14,'banks'=>15,'other'=>16,'errors'=>17,'members'=>18,'ecm'=>19,
-				'orders'=>20,'users'=>21,'help'=>22,'stocks'=>23,'interventions'=>24,
-				'donations'=>25,'contracts'=>26);
+                'commercial'=>7,'compta'=>8,'projects'=>9,'cashdesk'=>10,'agenda'=>11,'bills'=>12,
+                'propal'=>13,'boxes'=>14,'banks'=>15,'other'=>16,'errors'=>17,'members'=>18,'ecm'=>19,
+                'orders'=>20,'users'=>21,'help'=>22,'stocks'=>23,'interventions'=>24,
+                'donations'=>25,'contracts'=>26);
 $shmoffset=1000;	// Max number of entries found into a language file. If too low, some entries will be overwritten.
 
 
@@ -41,64 +41,64 @@ 
  */
 function dol_setcache($memoryid,$data)
 {
-	global $conf;
-	$result=0;
+    global $conf;
+    $result=0;
 
-	// Using a memcached server
-	if (! empty($conf->memcached->enabled) && class_exists('Memcached'))
-	{
-	    global $dolmemcache;
-		if (empty($dolmemcache) || ! is_object($dolmemcache))
-    	{
-       	    $dolmemcache=new Memcached();
-       		$tmparray=explode(':',$conf->global->MEMCACHED_SERVER);
-       		$result=$dolmemcache->addServer($tmparray[0], $tmparray[1]?$tmparray[1]:11211);
-       		if (! $result) return -1;
-       	}
+    // Using a memcached server
+    if (! empty($conf->memcached->enabled) && class_exists('Memcached'))
+    {
+        global $dolmemcache;
+        if (empty($dolmemcache) || ! is_object($dolmemcache))
+        {
+                $dolmemcache=new Memcached();
+                $tmparray=explode(':',$conf->global->MEMCACHED_SERVER);
+                $result=$dolmemcache->addServer($tmparray[0], $tmparray[1]?$tmparray[1]:11211);
+                if (! $result) return -1;
+            }
        	
-	    $memoryid=session_name().'_'.$memoryid;
-		//$dolmemcache->setOption(Memcached::OPT_COMPRESSION, false);
-		$dolmemcache->add($memoryid,$data);    // This fails if key already exists
-		$rescode=$dolmemcache->getResultCode();
-		if ($rescode == 0)
-		{
-			return count($data);
-		}
-		else
-		{
-			return -$rescode;
-		}
-	}
-	else if (! empty($conf->memcached->enabled) && class_exists('Memcache'))
-	{
-		global $dolmemcache;
-		if (empty($dolmemcache) || ! is_object($dolmemcache))
-    	{
-       	    $dolmemcache=new Memcache();
-       		$tmparray=explode(':',$conf->global->MEMCACHED_SERVER);
-       		$result=$dolmemcache->addServer($tmparray[0], $tmparray[1]?$tmparray[1]:11211);
-       		if (! $result) return -1;
-       	}
+        $memoryid=session_name().'_'.$memoryid;
+        //$dolmemcache->setOption(Memcached::OPT_COMPRESSION, false);
+        $dolmemcache->add($memoryid,$data);    // This fails if key already exists
+        $rescode=$dolmemcache->getResultCode();
+        if ($rescode == 0)
+        {
+            return count($data);
+        }
+        else
+        {
+            return -$rescode;
+        }
+    }
+    else if (! empty($conf->memcached->enabled) && class_exists('Memcache'))
+    {
+        global $dolmemcache;
+        if (empty($dolmemcache) || ! is_object($dolmemcache))
+        {
+                $dolmemcache=new Memcache();
+                $tmparray=explode(':',$conf->global->MEMCACHED_SERVER);
+                $result=$dolmemcache->addServer($tmparray[0], $tmparray[1]?$tmparray[1]:11211);
+                if (! $result) return -1;
+            }
 	    
-       	$memoryid=session_name().'_'.$memoryid;
-		//$dolmemcache->setOption(Memcached::OPT_COMPRESSION, false);
-		$result=$dolmemcache->add($memoryid,$data);    // This fails if key already exists
-		if ($result)
-		{
-			return count($data);
-		}
-		else
-		{
-			return -1;
-		}
-	}
-	// Using shmop
-	else if (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_SPEED & 0x02))
-	{
-		$result=dol_setshmop($memoryid,$data);
-	}
+            $memoryid=session_name().'_'.$memoryid;
+        //$dolmemcache->setOption(Memcached::OPT_COMPRESSION, false);
+        $result=$dolmemcache->add($memoryid,$data);    // This fails if key already exists
+        if ($result)
+        {
+            return count($data);
+        }
+        else
+        {
+            return -1;
+        }
+    }
+    // Using shmop
+    else if (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_SPEED & 0x02))
+    {
+        $result=dol_setshmop($memoryid,$data);
+    }
 
-	return $result;
+    return $result;
 }
 
 /**
@@ -109,69 +109,69 @@ 
  */
 function dol_getcache($memoryid)
 {
-	global $conf;
+    global $conf;
 
-	// Using a memcached server
-	if (! empty($conf->memcached->enabled) && class_exists('Memcached'))
-	{
-		global $m;
-		if (empty($m) || ! is_object($m))
-    	{
+    // Using a memcached server
+    if (! empty($conf->memcached->enabled) && class_exists('Memcached'))
+    {
+        global $m;
+        if (empty($m) || ! is_object($m))
+        {
             $m=new Memcached();
-       		$tmparray=explode(':',$conf->global->MEMCACHED_SERVER);
-       		$result=$m->addServer($tmparray[0], $tmparray[1]?$tmparray[1]:11211);
-       		if (! $result) return -1;
-       	}
+                $tmparray=explode(':',$conf->global->MEMCACHED_SERVER);
+                $result=$m->addServer($tmparray[0], $tmparray[1]?$tmparray[1]:11211);
+                if (! $result) return -1;
+            }
 	    
-		$memoryid=session_name().'_'.$memoryid;
-		//$m->setOption(Memcached::OPT_COMPRESSION, false);
-		//print "Get memoryid=".$memoryid;
-		$data=$m->get($memoryid);
-		$rescode=$m->getResultCode();
-		//print "memoryid=".$memoryid." - rescode=".$rescode." - data=".count($data)."\n<br>";
-		//var_dump($data);
-		if ($rescode == 0)
-		{
-			return $data;
-		}
-		else
-		{
-			return -$rescode;
-		}
-	}
-	else if (! empty($conf->memcached->enabled) && class_exists('Memcache'))
-	{
-		global $m;
-		if (empty($m) || ! is_object($m))
-    	{
-       	    $m=new Memcache();
-       		$tmparray=explode(':',$conf->global->MEMCACHED_SERVER);
-       		$result=$m->addServer($tmparray[0], $tmparray[1]?$tmparray[1]:11211);
-       		if (! $result) return -1;
-       	}
+        $memoryid=session_name().'_'.$memoryid;
+        //$m->setOption(Memcached::OPT_COMPRESSION, false);
+        //print "Get memoryid=".$memoryid;
+        $data=$m->get($memoryid);
+        $rescode=$m->getResultCode();
+        //print "memoryid=".$memoryid." - rescode=".$rescode." - data=".count($data)."\n<br>";
+        //var_dump($data);
+        if ($rescode == 0)
+        {
+            return $data;
+        }
+        else
+        {
+            return -$rescode;
+        }
+    }
+    else if (! empty($conf->memcached->enabled) && class_exists('Memcache'))
+    {
+        global $m;
+        if (empty($m) || ! is_object($m))
+        {
+                $m=new Memcache();
+                $tmparray=explode(':',$conf->global->MEMCACHED_SERVER);
+                $result=$m->addServer($tmparray[0], $tmparray[1]?$tmparray[1]:11211);
+                if (! $result) return -1;
+            }
 	    
-       	$memoryid=session_name().'_'.$memoryid;
-		//$m->setOption(Memcached::OPT_COMPRESSION, false);
-		$data=$m->get($memoryid);
-		//print "memoryid=".$memoryid." - rescode=".$rescode." - data=".count($data)."\n<br>";
-		//var_dump($data);
-		if ($data)
-		{
-			return $data;
-		}
-		else
-		{
-			return -1;
-		}
-	}
-	// Using shmop
-	else if (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_SPEED & 0x02))
-	{
-		$data=dol_getshmop($memoryid);
-		return $data;
-	}
+            $memoryid=session_name().'_'.$memoryid;
+        //$m->setOption(Memcached::OPT_COMPRESSION, false);
+        $data=$m->get($memoryid);
+        //print "memoryid=".$memoryid." - rescode=".$rescode." - data=".count($data)."\n<br>";
+        //var_dump($data);
+        if ($data)
+        {
+            return $data;
+        }
+        else
+        {
+            return -1;
+        }
+    }
+    // Using shmop
+    else if (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_SPEED & 0x02))
+    {
+        $data=dol_getshmop($memoryid);
+        return $data;
+    }
 
-	return 0;
+    return 0;
 }
 
 
@@ -184,9 +184,9 @@ 
  */
 function dol_getshmopaddress($memoryid)
 {
-	global $shmkeys,$shmoffset;
-	if (empty($shmkeys[$memoryid])) return 0;
-	return $shmkeys[$memoryid]+$shmoffset;
+    global $shmkeys,$shmoffset;
+    if (empty($shmkeys[$memoryid])) return 0;
+    return $shmkeys[$memoryid]+$shmoffset;
 }
 
 /**
@@ -196,15 +196,15 @@ 
  */
 function dol_listshmop()
 {
-	global $shmkeys,$shmoffset;
+    global $shmkeys,$shmoffset;
 
-	$resarray=array();
-	foreach($shmkeys as $key => $val)
-	{
-		$result=dol_getshmop($key);
-		if (! is_numeric($result) || $result > 0) $resarray[$key]=$result;
-	}
-	return $resarray;
+    $resarray=array();
+    foreach($shmkeys as $key => $val)
+    {
+        $result=dol_getshmop($key);
+        if (! is_numeric($result) || $result > 0) $resarray[$key]=$result;
+    }
+    return $resarray;
 }
 
 /**
@@ -216,31 +216,31 @@ 
  */
 function dol_setshmop($memoryid,$data)
 {
-	global $shmkeys,$shmoffset;
+    global $shmkeys,$shmoffset;
 
-	//print 'dol_setshmop memoryid='.$memoryid."<br>\n";
-	if (empty($shmkeys[$memoryid]) || ! function_exists("shmop_write")) return 0;
-	$shmkey=dol_getshmopaddress($memoryid);
-	$newdata=serialize($data);
-	$size=strlen($newdata);
-	//print 'dol_setshmop memoryid='.$memoryid." shmkey=".$shmkey." newdata=".$size."bytes<br>\n";
-	$handle=shmop_open($shmkey,'c',0644,6+$size);
-	if ($handle)
-	{
-		$shm_bytes_written1=shmop_write($handle,str_pad($size,6),0);
-		$shm_bytes_written2=shmop_write($handle,$newdata,6);
-		if (($shm_bytes_written1 + $shm_bytes_written2) != (6+dol_strlen($newdata)))
-		{
-   			print "Couldn't write the entire length of data\n";
-		}
-		shmop_close($handle);
-		return ($shm_bytes_written1+$shm_bytes_written2);
-	}
-	else
-	{
-		print 'Error in shmop_open for memoryid='.$memoryid.' shmkey='.$shmkey.' 6+size=6+'.$size;
-		return -1;
-	}
+    //print 'dol_setshmop memoryid='.$memoryid."<br>\n";
+    if (empty($shmkeys[$memoryid]) || ! function_exists("shmop_write")) return 0;
+    $shmkey=dol_getshmopaddress($memoryid);
+    $newdata=serialize($data);
+    $size=strlen($newdata);
+    //print 'dol_setshmop memoryid='.$memoryid." shmkey=".$shmkey." newdata=".$size."bytes<br>\n";
+    $handle=shmop_open($shmkey,'c',0644,6+$size);
+    if ($handle)
+    {
+        $shm_bytes_written1=shmop_write($handle,str_pad($size,6),0);
+        $shm_bytes_written2=shmop_write($handle,$newdata,6);
+        if (($shm_bytes_written1 + $shm_bytes_written2) != (6+dol_strlen($newdata)))
+        {
+                print "Couldn't write the entire length of data\n";
+        }
+        shmop_close($handle);
+        return ($shm_bytes_written1+$shm_bytes_written2);
+    }
+    else
+    {
+        print 'Error in shmop_open for memoryid='.$memoryid.' shmkey='.$shmkey.' 6+size=6+'.$size;
+        return -1;
+    }
 }
 
 /**
@@ -251,23 +251,23 @@ 
  */
 function dol_getshmop($memoryid)
 {
-	global $shmkeys,$shmoffset;
+    global $shmkeys,$shmoffset;
 
-	if (empty($shmkeys[$memoryid]) || ! function_exists("shmop_open")) return 0;
-	$shmkey=dol_getshmopaddress($memoryid);
-	//print 'dol_getshmop memoryid='.$memoryid." shmkey=".$shmkey."<br>\n";
-	$handle=@shmop_open($shmkey,'a',0,0);
-	if ($handle)
-	{
-		$size=trim(shmop_read($handle,0,6));
-		if ($size) $data=unserialize(shmop_read($handle,6,$size));
-		else return -1;
-		shmop_close($handle);
-	}
-	else
-	{
-		return -2;
-	}
-	return $data;
+    if (empty($shmkeys[$memoryid]) || ! function_exists("shmop_open")) return 0;
+    $shmkey=dol_getshmopaddress($memoryid);
+    //print 'dol_getshmop memoryid='.$memoryid." shmkey=".$shmkey."<br>\n";
+    $handle=@shmop_open($shmkey,'a',0,0);
+    if ($handle)
+    {
+        $size=trim(shmop_read($handle,0,6));
+        if ($size) $data=unserialize(shmop_read($handle,6,$size));
+        else return -1;
+        shmop_close($handle);
+    }
+    else
+    {
+        return -2;
+    }
+    return $data;
 }
 

Spacing +69 added lines, -69 removed lines

@@ -21,14 +21,14 @@ 
  *  \brief		Set of function for memory/cache management
  */
 
-global $shmkeys,$shmoffset;
+global $shmkeys, $shmoffset;
 
-$shmkeys=array('main'=>1,'admin'=>2,'dict'=>3,'companies'=>4,'suppliers'=>5,'products'=>6,
-				'commercial'=>7,'compta'=>8,'projects'=>9,'cashdesk'=>10,'agenda'=>11,'bills'=>12,
-				'propal'=>13,'boxes'=>14,'banks'=>15,'other'=>16,'errors'=>17,'members'=>18,'ecm'=>19,
-				'orders'=>20,'users'=>21,'help'=>22,'stocks'=>23,'interventions'=>24,
-				'donations'=>25,'contracts'=>26);
-$shmoffset=1000;	// Max number of entries found into a language file. If too low, some entries will be overwritten.
+$shmkeys = array('main'=>1, 'admin'=>2, 'dict'=>3, 'companies'=>4, 'suppliers'=>5, 'products'=>6,
+				'commercial'=>7, 'compta'=>8, 'projects'=>9, 'cashdesk'=>10, 'agenda'=>11, 'bills'=>12,
+				'propal'=>13, 'boxes'=>14, 'banks'=>15, 'other'=>16, 'errors'=>17, 'members'=>18, 'ecm'=>19,
+				'orders'=>20, 'users'=>21, 'help'=>22, 'stocks'=>23, 'interventions'=>24,
+				'donations'=>25, 'contracts'=>26);
+$shmoffset = 1000; // Max number of entries found into a language file. If too low, some entries will be overwritten.
 
 
 
@@ -39,27 +39,27 @@ 
  * 	@param	string		$data			Data to save
  * 	@return	int							<0 if KO, Nb of bytes written if OK
  */
-function dol_setcache($memoryid,$data)
+function dol_setcache($memoryid, $data)
 {
 	global $conf;
-	$result=0;
+	$result = 0;
 
 	// Using a memcached server
-	if (! empty($conf->memcached->enabled) && class_exists('Memcached'))
+	if (!empty($conf->memcached->enabled) && class_exists('Memcached'))
 	{
 	    global $dolmemcache;
-		if (empty($dolmemcache) || ! is_object($dolmemcache))
+		if (empty($dolmemcache) || !is_object($dolmemcache))
     	{
-       	    $dolmemcache=new Memcached();
-       		$tmparray=explode(':',$conf->global->MEMCACHED_SERVER);
-       		$result=$dolmemcache->addServer($tmparray[0], $tmparray[1]?$tmparray[1]:11211);
-       		if (! $result) return -1;
+       	    $dolmemcache = new Memcached();
+       		$tmparray = explode(':', $conf->global->MEMCACHED_SERVER);
+       		$result = $dolmemcache->addServer($tmparray[0], $tmparray[1] ? $tmparray[1] : 11211);
+       		if (!$result) return -1;
        	}
        	
-	    $memoryid=session_name().'_'.$memoryid;
+	    $memoryid = session_name().'_'.$memoryid;
 		//$dolmemcache->setOption(Memcached::OPT_COMPRESSION, false);
-		$dolmemcache->add($memoryid,$data);    // This fails if key already exists
-		$rescode=$dolmemcache->getResultCode();
+		$dolmemcache->add($memoryid, $data); // This fails if key already exists
+		$rescode = $dolmemcache->getResultCode();
 		if ($rescode == 0)
 		{
 			return count($data);
@@ -69,20 +69,20 @@ 
 			return -$rescode;
 		}
 	}
-	else if (! empty($conf->memcached->enabled) && class_exists('Memcache'))
+	else if (!empty($conf->memcached->enabled) && class_exists('Memcache'))
 	{
 		global $dolmemcache;
-		if (empty($dolmemcache) || ! is_object($dolmemcache))
+		if (empty($dolmemcache) || !is_object($dolmemcache))
     	{
-       	    $dolmemcache=new Memcache();
-       		$tmparray=explode(':',$conf->global->MEMCACHED_SERVER);
-       		$result=$dolmemcache->addServer($tmparray[0], $tmparray[1]?$tmparray[1]:11211);
-       		if (! $result) return -1;
+       	    $dolmemcache = new Memcache();
+       		$tmparray = explode(':', $conf->global->MEMCACHED_SERVER);
+       		$result = $dolmemcache->addServer($tmparray[0], $tmparray[1] ? $tmparray[1] : 11211);
+       		if (!$result) return -1;
        	}
 	    
-       	$memoryid=session_name().'_'.$memoryid;
+       	$memoryid = session_name().'_'.$memoryid;
 		//$dolmemcache->setOption(Memcached::OPT_COMPRESSION, false);
-		$result=$dolmemcache->add($memoryid,$data);    // This fails if key already exists
+		$result = $dolmemcache->add($memoryid, $data); // This fails if key already exists
 		if ($result)
 		{
 			return count($data);
@@ -95,7 +95,7 @@ 
 	// Using shmop
 	else if (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_SPEED & 0x02))
 	{
-		$result=dol_setshmop($memoryid,$data);
+		$result = dol_setshmop($memoryid, $data);
 	}
 
 	return $result;
@@ -112,22 +112,22 @@ 
 	global $conf;
 
 	// Using a memcached server
-	if (! empty($conf->memcached->enabled) && class_exists('Memcached'))
+	if (!empty($conf->memcached->enabled) && class_exists('Memcached'))
 	{
 		global $m;
-		if (empty($m) || ! is_object($m))
+		if (empty($m) || !is_object($m))
     	{
-            $m=new Memcached();
-       		$tmparray=explode(':',$conf->global->MEMCACHED_SERVER);
-       		$result=$m->addServer($tmparray[0], $tmparray[1]?$tmparray[1]:11211);
-       		if (! $result) return -1;
+            $m = new Memcached();
+       		$tmparray = explode(':', $conf->global->MEMCACHED_SERVER);
+       		$result = $m->addServer($tmparray[0], $tmparray[1] ? $tmparray[1] : 11211);
+       		if (!$result) return -1;
        	}
 	    
-		$memoryid=session_name().'_'.$memoryid;
+		$memoryid = session_name().'_'.$memoryid;
 		//$m->setOption(Memcached::OPT_COMPRESSION, false);
 		//print "Get memoryid=".$memoryid;
-		$data=$m->get($memoryid);
-		$rescode=$m->getResultCode();
+		$data = $m->get($memoryid);
+		$rescode = $m->getResultCode();
 		//print "memoryid=".$memoryid." - rescode=".$rescode." - data=".count($data)."\n<br>";
 		//var_dump($data);
 		if ($rescode == 0)
@@ -139,20 +139,20 @@ 
 			return -$rescode;
 		}
 	}
-	else if (! empty($conf->memcached->enabled) && class_exists('Memcache'))
+	else if (!empty($conf->memcached->enabled) && class_exists('Memcache'))
 	{
 		global $m;
-		if (empty($m) || ! is_object($m))
+		if (empty($m) || !is_object($m))
     	{
-       	    $m=new Memcache();
-       		$tmparray=explode(':',$conf->global->MEMCACHED_SERVER);
-       		$result=$m->addServer($tmparray[0], $tmparray[1]?$tmparray[1]:11211);
-       		if (! $result) return -1;
+       	    $m = new Memcache();
+       		$tmparray = explode(':', $conf->global->MEMCACHED_SERVER);
+       		$result = $m->addServer($tmparray[0], $tmparray[1] ? $tmparray[1] : 11211);
+       		if (!$result) return -1;
        	}
 	    
-       	$memoryid=session_name().'_'.$memoryid;
+       	$memoryid = session_name().'_'.$memoryid;
 		//$m->setOption(Memcached::OPT_COMPRESSION, false);
-		$data=$m->get($memoryid);
+		$data = $m->get($memoryid);
 		//print "memoryid=".$memoryid." - rescode=".$rescode." - data=".count($data)."\n<br>";
 		//var_dump($data);
 		if ($data)
@@ -167,7 +167,7 @@ 
 	// Using shmop
 	else if (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_SPEED & 0x02))
 	{
-		$data=dol_getshmop($memoryid);
+		$data = dol_getshmop($memoryid);
 		return $data;
 	}
 
@@ -184,9 +184,9 @@ 
  */
 function dol_getshmopaddress($memoryid)
 {
-	global $shmkeys,$shmoffset;
+	global $shmkeys, $shmoffset;
 	if (empty($shmkeys[$memoryid])) return 0;
-	return $shmkeys[$memoryid]+$shmoffset;
+	return $shmkeys[$memoryid] + $shmoffset;
 }
 
 /**
@@ -196,13 +196,13 @@ 
  */
 function dol_listshmop()
 {
-	global $shmkeys,$shmoffset;
+	global $shmkeys, $shmoffset;
 
-	$resarray=array();
-	foreach($shmkeys as $key => $val)
+	$resarray = array();
+	foreach ($shmkeys as $key => $val)
 	{
-		$result=dol_getshmop($key);
-		if (! is_numeric($result) || $result > 0) $resarray[$key]=$result;
+		$result = dol_getshmop($key);
+		if (!is_numeric($result) || $result > 0) $resarray[$key] = $result;
 	}
 	return $resarray;
 }
@@ -214,27 +214,27 @@ 
  * 	@param	string	$data			Data to save
  * 	@return	int						<0 if KO, Nb of bytes written if OK
  */
-function dol_setshmop($memoryid,$data)
+function dol_setshmop($memoryid, $data)
 {
-	global $shmkeys,$shmoffset;
+	global $shmkeys, $shmoffset;
 
 	//print 'dol_setshmop memoryid='.$memoryid."<br>\n";
-	if (empty($shmkeys[$memoryid]) || ! function_exists("shmop_write")) return 0;
-	$shmkey=dol_getshmopaddress($memoryid);
-	$newdata=serialize($data);
-	$size=strlen($newdata);
+	if (empty($shmkeys[$memoryid]) || !function_exists("shmop_write")) return 0;
+	$shmkey = dol_getshmopaddress($memoryid);
+	$newdata = serialize($data);
+	$size = strlen($newdata);
 	//print 'dol_setshmop memoryid='.$memoryid." shmkey=".$shmkey." newdata=".$size."bytes<br>\n";
-	$handle=shmop_open($shmkey,'c',0644,6+$size);
+	$handle = shmop_open($shmkey, 'c', 0644, 6 + $size);
 	if ($handle)
 	{
-		$shm_bytes_written1=shmop_write($handle,str_pad($size,6),0);
-		$shm_bytes_written2=shmop_write($handle,$newdata,6);
-		if (($shm_bytes_written1 + $shm_bytes_written2) != (6+dol_strlen($newdata)))
+		$shm_bytes_written1 = shmop_write($handle, str_pad($size, 6), 0);
+		$shm_bytes_written2 = shmop_write($handle, $newdata, 6);
+		if (($shm_bytes_written1 + $shm_bytes_written2) != (6 + dol_strlen($newdata)))
 		{
    			print "Couldn't write the entire length of data\n";
 		}
 		shmop_close($handle);
-		return ($shm_bytes_written1+$shm_bytes_written2);
+		return ($shm_bytes_written1 + $shm_bytes_written2);
 	}
 	else
 	{
@@ -251,16 +251,16 @@ 
  */
 function dol_getshmop($memoryid)
 {
-	global $shmkeys,$shmoffset;
+	global $shmkeys, $shmoffset;
 
-	if (empty($shmkeys[$memoryid]) || ! function_exists("shmop_open")) return 0;
-	$shmkey=dol_getshmopaddress($memoryid);
+	if (empty($shmkeys[$memoryid]) || !function_exists("shmop_open")) return 0;
+	$shmkey = dol_getshmopaddress($memoryid);
 	//print 'dol_getshmop memoryid='.$memoryid." shmkey=".$shmkey."<br>\n";
-	$handle=@shmop_open($shmkey,'a',0,0);
+	$handle = @shmop_open($shmkey, 'a', 0, 0);
 	if ($handle)
 	{
-		$size=trim(shmop_read($handle,0,6));
-		if ($size) $data=unserialize(shmop_read($handle,6,$size));
+		$size = trim(shmop_read($handle, 0, 6));
+		if ($size) $data = unserialize(shmop_read($handle, 6, $size));
 		else return -1;
 		shmop_close($handle);
 	}

Braces +37 added lines, -26 removed lines

@@ -53,7 +53,9 @@ 
        	    $dolmemcache=new Memcached();
        		$tmparray=explode(':',$conf->global->MEMCACHED_SERVER);
        		$result=$dolmemcache->addServer($tmparray[0], $tmparray[1]?$tmparray[1]:11211);
-       		if (! $result) return -1;
+       		if (! $result) {
+       		    return -1;
+       		}
        	}
        	
 	    $memoryid=session_name().'_'.$memoryid;
@@ -63,13 +65,11 @@ 
 		if ($rescode == 0)
 		{
 			return count($data);
-		}
-		else
+		} else
 		{
 			return -$rescode;
 		}
-	}
-	else if (! empty($conf->memcached->enabled) && class_exists('Memcache'))
+	} else if (! empty($conf->memcached->enabled) && class_exists('Memcache'))
 	{
 		global $dolmemcache;
 		if (empty($dolmemcache) || ! is_object($dolmemcache))
@@ -77,7 +77,9 @@ 
        	    $dolmemcache=new Memcache();
        		$tmparray=explode(':',$conf->global->MEMCACHED_SERVER);
        		$result=$dolmemcache->addServer($tmparray[0], $tmparray[1]?$tmparray[1]:11211);
-       		if (! $result) return -1;
+       		if (! $result) {
+       		    return -1;
+       		}
        	}
 	    
        	$memoryid=session_name().'_'.$memoryid;
@@ -86,8 +88,7 @@ 
 		if ($result)
 		{
 			return count($data);
-		}
-		else
+		} else
 		{
 			return -1;
 		}
@@ -120,7 +121,9 @@ 
             $m=new Memcached();
        		$tmparray=explode(':',$conf->global->MEMCACHED_SERVER);
        		$result=$m->addServer($tmparray[0], $tmparray[1]?$tmparray[1]:11211);
-       		if (! $result) return -1;
+       		if (! $result) {
+       		    return -1;
+       		}
        	}
 	    
 		$memoryid=session_name().'_'.$memoryid;
@@ -133,13 +136,11 @@ 
 		if ($rescode == 0)
 		{
 			return $data;
-		}
-		else
+		} else
 		{
 			return -$rescode;
 		}
-	}
-	else if (! empty($conf->memcached->enabled) && class_exists('Memcache'))
+	} else if (! empty($conf->memcached->enabled) && class_exists('Memcache'))
 	{
 		global $m;
 		if (empty($m) || ! is_object($m))
@@ -147,7 +148,9 @@ 
        	    $m=new Memcache();
        		$tmparray=explode(':',$conf->global->MEMCACHED_SERVER);
        		$result=$m->addServer($tmparray[0], $tmparray[1]?$tmparray[1]:11211);
-       		if (! $result) return -1;
+       		if (! $result) {
+       		    return -1;
+       		}
        	}
 	    
        	$memoryid=session_name().'_'.$memoryid;
@@ -158,8 +161,7 @@ 
 		if ($data)
 		{
 			return $data;
-		}
-		else
+		} else
 		{
 			return -1;
 		}
@@ -185,7 +187,9 @@ 
 function dol_getshmopaddress($memoryid)
 {
 	global $shmkeys,$shmoffset;
-	if (empty($shmkeys[$memoryid])) return 0;
+	if (empty($shmkeys[$memoryid])) {
+	    return 0;
+	}
 	return $shmkeys[$memoryid]+$shmoffset;
 }
 
@@ -202,7 +206,9 @@ 
 	foreach($shmkeys as $key => $val)
 	{
 		$result=dol_getshmop($key);
-		if (! is_numeric($result) || $result > 0) $resarray[$key]=$result;
+		if (! is_numeric($result) || $result > 0) {
+		    $resarray[$key]=$result;
+		}
 	}
 	return $resarray;
 }
@@ -219,7 +225,9 @@ 
 	global $shmkeys,$shmoffset;
 
 	//print 'dol_setshmop memoryid='.$memoryid."<br>\n";
-	if (empty($shmkeys[$memoryid]) || ! function_exists("shmop_write")) return 0;
+	if (empty($shmkeys[$memoryid]) || ! function_exists("shmop_write")) {
+	    return 0;
+	}
 	$shmkey=dol_getshmopaddress($memoryid);
 	$newdata=serialize($data);
 	$size=strlen($newdata);
@@ -235,8 +243,7 @@ 
 		}
 		shmop_close($handle);
 		return ($shm_bytes_written1+$shm_bytes_written2);
-	}
-	else
+	} else
 	{
 		print 'Error in shmop_open for memoryid='.$memoryid.' shmkey='.$shmkey.' 6+size=6+'.$size;
 		return -1;
@@ -253,18 +260,22 @@ 
 {
 	global $shmkeys,$shmoffset;
 
-	if (empty($shmkeys[$memoryid]) || ! function_exists("shmop_open")) return 0;
+	if (empty($shmkeys[$memoryid]) || ! function_exists("shmop_open")) {
+	    return 0;
+	}
 	$shmkey=dol_getshmopaddress($memoryid);
 	//print 'dol_getshmop memoryid='.$memoryid." shmkey=".$shmkey."<br>\n";
 	$handle=@shmop_open($shmkey,'a',0,0);
 	if ($handle)
 	{
 		$size=trim(shmop_read($handle,0,6));
-		if ($size) $data=unserialize(shmop_read($handle,6,$size));
-		else return -1;
+		if ($size) {
+		    $data=unserialize(shmop_read($handle,6,$size));
+		} else {
+		    return -1;
+		}
 		shmop_close($handle);
-	}
-	else
+	} else
 	{
 		return -2;
 	}

dolibarr/htdocs/core/lib/xcal.lib.php

Indentation +311 added lines, -311 removed lines

@@ -34,78 +34,78 @@ 
  */
 function build_calfile($format,$title,$desc,$events_array,$outputfile)
 {
-	global $conf,$langs;
+    global $conf,$langs;
 
-	dol_syslog("xcal.lib.php::build_calfile Build cal file ".$outputfile." to format ".$format);
+    dol_syslog("xcal.lib.php::build_calfile Build cal file ".$outputfile." to format ".$format);
 
-	if (empty($outputfile)) return -1;
+    if (empty($outputfile)) return -1;
 
     // Note: A cal file is an UTF8 encoded file
-	$calfileh=fopen($outputfile,'w');
-	if ($calfileh)
-	{
-	    include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-		$now=dol_now();
-
-		$encoding='';
-		if ($format == 'vcal') $encoding='ENCODING=QUOTED-PRINTABLE:';
-
-		// Print header
-		fwrite($calfileh,"BEGIN:VCALENDAR\n");
-		fwrite($calfileh,"VERSION:2.0\n");
-		fwrite($calfileh,"METHOD:PUBLISH\n");
-		//fwrite($calfileh,"PRODID:-//DOLIBARR ".DOL_VERSION."//EN\n");
-		fwrite($calfileh,"PRODID:-//DOLIBARR ".DOL_VERSION."\n");
-		fwrite($calfileh,"CALSCALE:GREGORIAN\n");
-		fwrite($calfileh,"X-WR-CALNAME:".$encoding.format_cal($format,$title)."\n");
+    $calfileh=fopen($outputfile,'w');
+    if ($calfileh)
+    {
+        include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+        $now=dol_now();
+
+        $encoding='';
+        if ($format == 'vcal') $encoding='ENCODING=QUOTED-PRINTABLE:';
+
+        // Print header
+        fwrite($calfileh,"BEGIN:VCALENDAR\n");
+        fwrite($calfileh,"VERSION:2.0\n");
+        fwrite($calfileh,"METHOD:PUBLISH\n");
+        //fwrite($calfileh,"PRODID:-//DOLIBARR ".DOL_VERSION."//EN\n");
+        fwrite($calfileh,"PRODID:-//DOLIBARR ".DOL_VERSION."\n");
+        fwrite($calfileh,"CALSCALE:GREGORIAN\n");
+        fwrite($calfileh,"X-WR-CALNAME:".$encoding.format_cal($format,$title)."\n");
         fwrite($calfileh,"X-WR-CALDESC:".$encoding.format_cal($format,$desc)."\n");
         //fwrite($calfileh,"X-WR-TIMEZONE:Europe/Paris\n");
         if (! empty($conf->global->MAIN_AGENDA_EXPORT_CACHE)
         && $conf->global->MAIN_AGENDA_EXPORT_CACHE > 60){
-	        $hh=convertSecondToTime($conf->global->MAIN_AGENDA_EXPORT_CACHE,'hour');
-	        $mm=convertSecondToTime($conf->global->MAIN_AGENDA_EXPORT_CACHE,'min');
-	        $ss=convertSecondToTime($conf->global->MAIN_AGENDA_EXPORT_CACHE,'sec');
-	        fwrite($calfileh,"X-PUBLISHED-TTL: P".$hh."H".$mm."M".$ss."S\n");
+            $hh=convertSecondToTime($conf->global->MAIN_AGENDA_EXPORT_CACHE,'hour');
+            $mm=convertSecondToTime($conf->global->MAIN_AGENDA_EXPORT_CACHE,'min');
+            $ss=convertSecondToTime($conf->global->MAIN_AGENDA_EXPORT_CACHE,'sec');
+            fwrite($calfileh,"X-PUBLISHED-TTL: P".$hh."H".$mm."M".$ss."S\n");
         }
 
-		foreach ($events_array as $key => $event)
-		{
-			$eventqualified=true;
-			if ($eventqualified)
-			{
-				// See http://fr.wikipedia.org/wiki/ICalendar for format
-				// See http://www.ietf.org/rfc/rfc2445.txt for RFC
-				$uid 		  = $event['uid'];
-				$type         = $event['type'];
+        foreach ($events_array as $key => $event)
+        {
+            $eventqualified=true;
+            if ($eventqualified)
+            {
+                // See http://fr.wikipedia.org/wiki/ICalendar for format
+                // See http://www.ietf.org/rfc/rfc2445.txt for RFC
+                $uid 		  = $event['uid'];
+                $type         = $event['type'];
                 $startdate    = $event['startdate'];
-				$duration	  = $event['duration'];
-				$enddate	  = $event['enddate'];
-				$summary  	  = $event['summary'];
-				$category	  = $event['category'];
+                $duration	  = $event['duration'];
+                $enddate	  = $event['enddate'];
+                $summary  	  = $event['summary'];
+                $category	  = $event['category'];
                 $priority     = $event['priority'];
                 $fulldayevent = $event['fulldayevent'];
-				$location     = $event['location'];
-				$email 		  = $event['email'];
-				$url		  = $event['url'];
-				$transparency = $event['transparency'];		// OPAQUE (busy) or TRANSPARENT (not busy)
-				$description=preg_replace('/<br[\s\/]?>/i',"\n",$event['desc']);
- 				$description=dol_string_nohtmltag($description,0);	// Remove html tags
+                $location     = $event['location'];
+                $email 		  = $event['email'];
+                $url		  = $event['url'];
+                $transparency = $event['transparency'];		// OPAQUE (busy) or TRANSPARENT (not busy)
+                $description=preg_replace('/<br[\s\/]?>/i',"\n",$event['desc']);
+                    $description=dol_string_nohtmltag($description,0);	// Remove html tags
                 $created      = $event['created'];
- 				$modified     = $event['modified'];
+                    $modified     = $event['modified'];
 
-				// Uncomment for tests
-				//$summary="Resume";
-				//$description="Description";
-				//$description="MemberValidatedInDolibarr gd gdf gd gdff\nNom: tgdf g dfgdf gfd r ter\nType: gdfgfdf dfg fd gfd gd gdf gdf gfd gdfg dfg ddf\nAuteur: AD01fg dgdgdfg df gdf gd";
+                // Uncomment for tests
+                //$summary="Resume";
+                //$description="Description";
+                //$description="MemberValidatedInDolibarr gd gdf gd gdff\nNom: tgdf g dfgdf gfd r ter\nType: gdfgfdf dfg fd gfd gd gdf gdf gfd gdfg dfg ddf\nAuteur: AD01fg dgdgdfg df gdf gd";
 
-				// Format
-				$summary=format_cal($format,$summary);
-				$description=format_cal($format,$description);
-				$category=format_cal($format,$category);
-				$location=format_cal($format,$location);
+                // Format
+                $summary=format_cal($format,$summary);
+                $description=format_cal($format,$description);
+                $category=format_cal($format,$category);
+                $location=format_cal($format,$location);
 
-				// Output the vCard/iCal VEVENT object
-				/*
+                // Output the vCard/iCal VEVENT object
+                /*
 				Example from Google ical export for a 1 hour event:
                 BEGIN:VEVENT
                 DTSTART:20101103T120000Z
@@ -138,26 +138,26 @@ 
                 TRANSP:TRANSPARENT
                 END:VEVENT
                 */
-				if ($type == 'event')
-				{
-					fwrite($calfileh,"BEGIN:VEVENT\n");
-					fwrite($calfileh,"UID:".$uid."\n");
-					if (! empty($email))
-					{
-						fwrite($calfileh,"ORGANIZER:MAILTO:".$email."\n");
-						fwrite($calfileh,"CONTACT:MAILTO:".$email."\n");
-					}
-					if (! empty($url))
-					{
-						fwrite($calfileh,"URL:".$url."\n");
-					};
+                if ($type == 'event')
+                {
+                    fwrite($calfileh,"BEGIN:VEVENT\n");
+                    fwrite($calfileh,"UID:".$uid."\n");
+                    if (! empty($email))
+                    {
+                        fwrite($calfileh,"ORGANIZER:MAILTO:".$email."\n");
+                        fwrite($calfileh,"CONTACT:MAILTO:".$email."\n");
+                    }
+                    if (! empty($url))
+                    {
+                        fwrite($calfileh,"URL:".$url."\n");
+                    };
 
                     if ($created)  fwrite($calfileh,"CREATED:".dol_print_date($created,'dayhourxcard',true)."\n");
                     if ($modified) fwrite($calfileh,"LAST-MODIFIED:".dol_print_date($modified,'dayhourxcard',true)."\n");
                     fwrite($calfileh,"SUMMARY:".$encoding.$summary."\n");
-					fwrite($calfileh,"DESCRIPTION:".$encoding.$description."\n");
+                    fwrite($calfileh,"DESCRIPTION:".$encoding.$description."\n");
 
-					/* Other keys:
+                    /* Other keys:
 					// Status values for a "VEVENT"
 					statvalue  = "TENTATIVE"           ;Indicates event is
 				                                        ;tentative.
@@ -174,86 +174,86 @@ 
 				                / "FINAL"               ;Indicates journal is final.
 				                / "CANCELLED"           ;Indicates journal is removed.
 					*/
-					//fwrite($calfileh,"CLASS:PUBLIC\n");				// PUBLIC, PRIVATE, CONFIDENTIAL
+                    //fwrite($calfileh,"CLASS:PUBLIC\n");				// PUBLIC, PRIVATE, CONFIDENTIAL
                     //fwrite($calfileh,"X-MICROSOFT-CDO-BUSYSTATUS:1\n");
                     //ATTENDEE;CUTYPE=INDIVIDUAL;ROLE=REQ-PARTICIPANT;PARTSTAT=ACCEPTED;CN=Laurent Destailleur;X-NUM-GUESTS=0:mailto:eldy10@gmail.com
 
                     if (! empty($location)) fwrite($calfileh,"LOCATION:".$encoding.$location."\n");
-					if ($fulldayevent) fwrite($calfileh,"X-FUNAMBOL-ALLDAY:1\n");
+                    if ($fulldayevent) fwrite($calfileh,"X-FUNAMBOL-ALLDAY:1\n");
                     if ($fulldayevent) fwrite($calfileh,"X-MICROSOFT-CDO-ALLDAYEVENT:1\n");
 
-					// Date must be GMT dates
-					// Current date
-					fwrite($calfileh,"DTSTAMP:".dol_print_date($now,'dayhourxcard',true)."\n");
-					// Start date
+                    // Date must be GMT dates
+                    // Current date
+                    fwrite($calfileh,"DTSTAMP:".dol_print_date($now,'dayhourxcard',true)."\n");
+                    // Start date
                     $prefix='';
                     $startdatef = dol_print_date($startdate,'dayhourxcard',true);
                     if ($fulldayevent)
-					{
+                    {
                         $prefix=';VALUE=DATE';
-					    $startdatef = dol_print_date($startdate,'dayxcard',false);     // Local time
-					}
-					fwrite($calfileh,"DTSTART".$prefix.":".$startdatef."\n");
+                        $startdatef = dol_print_date($startdate,'dayxcard',false);     // Local time
+                    }
+                    fwrite($calfileh,"DTSTART".$prefix.":".$startdatef."\n");
                     // End date
-					if ($fulldayevent)
-					{
-    					if (empty($enddate)) $enddate=dol_time_plus_duree($startdate,1,'d');
-					}
-					else
-					{
+                    if ($fulldayevent)
+                    {
+                        if (empty($enddate)) $enddate=dol_time_plus_duree($startdate,1,'d');
+                    }
+                    else
+                    {
                         if (empty($enddate)) $enddate=$startdate+$duration;
-					}
+                    }
                     $prefix='';
-					$enddatef = dol_print_date($enddate,'dayhourxcard',true);
-					if ($fulldayevent)
-					{
+                    $enddatef = dol_print_date($enddate,'dayhourxcard',true);
+                    if ($fulldayevent)
+                    {
                         $prefix=';VALUE=DATE';
-					    $enddatef = dol_print_date($enddate+1,'dayxcard',false);
-					    //$enddatef .= dol_print_date($enddate+1,'dayhourxcard',false);   // Local time
-					}
+                        $enddatef = dol_print_date($enddate+1,'dayxcard',false);
+                        //$enddatef .= dol_print_date($enddate+1,'dayhourxcard',false);   // Local time
+                    }
                     fwrite($calfileh,"DTEND".$prefix.":".$enddatef."\n");
-					fwrite($calfileh,'STATUS:CONFIRMED'."\n");
-					if (! empty($transparency)) fwrite($calfileh,"TRANSP:".$transparency."\n");
-					if (! empty($category)) fwrite($calfileh,"CATEGORIES:".$encoding.$category."\n");
-					fwrite($calfileh,"END:VEVENT\n");
-				}
-
-				// Output the vCard/iCal VTODO object
-				// ...
-				//PERCENT-COMPLETE:39
-
-				// Output the vCard/iCal VJOURNAL object
-				if ($type == 'journal')
-				{
-					fwrite($calfileh,"BEGIN:VJOURNAL\n");
-					fwrite($calfileh,"UID:".$uid."\n");
-					if (! empty($email))
-					{
-						fwrite($calfileh,"ORGANIZER:MAILTO:".$email."\n");
-						fwrite($calfileh,"CONTACT:MAILTO:".$email."\n");
-					}
-					if (! empty($url))
-					{
-						fwrite($calfileh,"URL:".$url."\n");
-					};
+                    fwrite($calfileh,'STATUS:CONFIRMED'."\n");
+                    if (! empty($transparency)) fwrite($calfileh,"TRANSP:".$transparency."\n");
+                    if (! empty($category)) fwrite($calfileh,"CATEGORIES:".$encoding.$category."\n");
+                    fwrite($calfileh,"END:VEVENT\n");
+                }
+
+                // Output the vCard/iCal VTODO object
+                // ...
+                //PERCENT-COMPLETE:39
+
+                // Output the vCard/iCal VJOURNAL object
+                if ($type == 'journal')
+                {
+                    fwrite($calfileh,"BEGIN:VJOURNAL\n");
+                    fwrite($calfileh,"UID:".$uid."\n");
+                    if (! empty($email))
+                    {
+                        fwrite($calfileh,"ORGANIZER:MAILTO:".$email."\n");
+                        fwrite($calfileh,"CONTACT:MAILTO:".$email."\n");
+                    }
+                    if (! empty($url))
+                    {
+                        fwrite($calfileh,"URL:".$url."\n");
+                    };
 
                     if ($created)  fwrite($calfileh,"CREATED:".dol_print_date($created,'dayhourxcard',true)."\n");
                     if ($modified) fwrite($calfileh,"LAST-MODIFIED:".dol_print_date($modified,'dayhourxcard',true)."\n");
-					fwrite($calfileh,"SUMMARY:".$encoding.$summary."\n");
-					fwrite($calfileh,"DESCRIPTION:".$encoding.$description."\n");
-					fwrite($calfileh,'STATUS:CONFIRMED'."\n");
-					fwrite($calfileh,"CATEGORIES:".$category."\n");
-					fwrite($calfileh,"LOCATION:".$location."\n");
-					fwrite($calfileh,"TRANSP:OPAQUE\n");
-					fwrite($calfileh,"CLASS:CONFIDENTIAL\n");
-					fwrite($calfileh,"DTSTAMP:".dol_print_date($startdatef,'dayhourxcard',true)."\n");
+                    fwrite($calfileh,"SUMMARY:".$encoding.$summary."\n");
+                    fwrite($calfileh,"DESCRIPTION:".$encoding.$description."\n");
+                    fwrite($calfileh,'STATUS:CONFIRMED'."\n");
+                    fwrite($calfileh,"CATEGORIES:".$category."\n");
+                    fwrite($calfileh,"LOCATION:".$location."\n");
+                    fwrite($calfileh,"TRANSP:OPAQUE\n");
+                    fwrite($calfileh,"CLASS:CONFIDENTIAL\n");
+                    fwrite($calfileh,"DTSTAMP:".dol_print_date($startdatef,'dayhourxcard',true)."\n");
 
-					fwrite($calfileh,"END:VJOURNAL\n");
-				}
+                    fwrite($calfileh,"END:VJOURNAL\n");
+                }
 
 
-				// Put other info in comment
-				/*
+                // Put other info in comment
+                /*
 				$comment=array();
 				$comment ['eid']			= $eid;
 				$comment ['url']			= $linktoevent;
@@ -263,21 +263,21 @@ 
 				$comment ['enddate']		= $enddate;
 				fwrite($calfileh,"COMMENT:" . serialize ($comment) . "\n");
 				*/
-			}
-		}
-
-		// Footer
-		fwrite($calfileh,"END:VCALENDAR");
-
-		fclose($calfileh);
-		if (! empty($conf->global->MAIN_UMASK))
-			@chmod($outputfile, octdec($conf->global->MAIN_UMASK));
-	}
-	else
-	{
-		dol_syslog("xcal.lib.php::build_calfile Failed to open file ".$outputfile." for writing");
-		return -2;
-	}
+            }
+        }
+
+        // Footer
+        fwrite($calfileh,"END:VCALENDAR");
+
+        fclose($calfileh);
+        if (! empty($conf->global->MAIN_UMASK))
+            @chmod($outputfile, octdec($conf->global->MAIN_UMASK));
+    }
+    else
+    {
+        dol_syslog("xcal.lib.php::build_calfile Failed to open file ".$outputfile." for writing");
+        return -2;
+    }
 }
 
 /**
@@ -294,97 +294,97 @@ 
  */
 function build_rssfile($format,$title,$desc,$events_array,$outputfile,$filter='')
 {
-	global $user,$conf,$langs;
-	global $dolibarr_main_url_root;
+    global $user,$conf,$langs;
+    global $dolibarr_main_url_root;
 
-	dol_syslog("xcal.lib.php::build_rssfile Build rss file ".$outputfile." to format ".$format);
+    dol_syslog("xcal.lib.php::build_rssfile Build rss file ".$outputfile." to format ".$format);
 
-	if (empty($outputfile)) return -1;
+    if (empty($outputfile)) return -1;
 
-	$fichier=fopen($outputfile,'w');
-	if ($fichier)
-	{
-		$date=date("r");
+    $fichier=fopen($outputfile,'w');
+    if ($fichier)
+    {
+        $date=date("r");
 
-		// Print header
-		$form='<?xml version="1.0" encoding="'.$langs->charset_output.'"?>';
-		fwrite($fichier, $form);
-		fwrite($fichier, "\n");
-		$form='<rss version="2.0">';
-		fwrite($fichier, $form);
-		fwrite($fichier, "\n");
+        // Print header
+        $form='<?xml version="1.0" encoding="'.$langs->charset_output.'"?>';
+        fwrite($fichier, $form);
+        fwrite($fichier, "\n");
+        $form='<rss version="2.0">';
+        fwrite($fichier, $form);
+        fwrite($fichier, "\n");
 
-		$form="<channel>\n<title>".$title."</title>\n";
-		fwrite($fichier, $form);
+        $form="<channel>\n<title>".$title."</title>\n";
+        fwrite($fichier, $form);
 
-		$form='<description><![CDATA['.$desc.'.]]></description>'."\n".
+        $form='<description><![CDATA['.$desc.'.]]></description>'."\n".
 //		'<language>fr</language>'."\n".
-		'<copyright>Dolibarr</copyright>'."\n".
-		'<lastBuildDate>'.$date.'</lastBuildDate>'."\n".
-		'<generator>Dolibarr</generator>'."\n";
-
-		// Define $urlwithroot
-		$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
-		$urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;			// This is to use external domain name found into config file
-		//$urlwithroot=DOL_MAIN_URL_ROOT;						// This is to use same domain name than current
-  		$url=$urlwithroot.'/public/agenda/agendaexport.php?format=rss&exportkey='.urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY);
-		$form.='<link><![CDATA['.$url.']]></link>'."\n";
-
-		//print $form;
-		fwrite($fichier, $form);
-
-
-		foreach ($events_array as $key => $event)
-		{
-			$eventqualified=true;
-			if ($filter)
-			{
-				// TODO Add a filter
-
-				$eventqualified=false;
-			}
-
-			if ($eventqualified)
-			{
-				$uid		  = $event['uid'];
-				$startdate	  = $event['startdate'];
-				$summary  	  = $event['summary'];
-				$url		  = $event['url'];
-				$author		  = $event['author'];
-				$category	  = $event['category'];
-				/* No place inside a RSS
+        '<copyright>Dolibarr</copyright>'."\n".
+        '<lastBuildDate>'.$date.'</lastBuildDate>'."\n".
+        '<generator>Dolibarr</generator>'."\n";
+
+        // Define $urlwithroot
+        $urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
+        $urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;			// This is to use external domain name found into config file
+        //$urlwithroot=DOL_MAIN_URL_ROOT;						// This is to use same domain name than current
+            $url=$urlwithroot.'/public/agenda/agendaexport.php?format=rss&exportkey='.urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY);
+        $form.='<link><![CDATA['.$url.']]></link>'."\n";
+
+        //print $form;
+        fwrite($fichier, $form);
+
+
+        foreach ($events_array as $key => $event)
+        {
+            $eventqualified=true;
+            if ($filter)
+            {
+                // TODO Add a filter
+
+                $eventqualified=false;
+            }
+
+            if ($eventqualified)
+            {
+                $uid		  = $event['uid'];
+                $startdate	  = $event['startdate'];
+                $summary  	  = $event['summary'];
+                $url		  = $event['url'];
+                $author		  = $event['author'];
+                $category	  = $event['category'];
+                /* No place inside a RSS
                 $priority     = $event['priority'];
                 $fulldayevent = $event['fulldayevent'];
                 $location     = $event['location'];
                 $email        = $event['email'];
                 */
-				$description=preg_replace('/<br[\s\/]?>/i',"\n",$event['desc']);
- 				$description=dol_string_nohtmltag($description,0);	// Remove html tags
-
-				fwrite($fichier, "<item>\n");
-				fwrite($fichier, "<title><![CDATA[".$summary."]]></title>\n");
-				fwrite($fichier, "<link><![CDATA[".$url."]]></link>\n");
-				fwrite($fichier, "<author><![CDATA[".$author."]]></author>\n");
-				fwrite($fichier, "<category><![CDATA[".$category."]]></category>\n");
-				fwrite($fichier, "<description><![CDATA[");
-				if ($description) fwrite($fichier, $description);
-				//else fwrite($fichier, 'NoDesc');
-				fwrite($fichier, "]]></description>\n");
-				fwrite($fichier, "<pubDate>".date("r", $startdate)."</pubDate>\n");
-				fwrite($fichier, "<guid isPermaLink=\"true\"><![CDATA[".$uid."]]></guid>\n");
-				fwrite($fichier, "<source><![CDATA[Dolibarr]]></source>\n");
-				fwrite($fichier, "</item>\n");
-			}
-		}
-
-		fwrite($fichier, '</channel>');
-		fwrite($fichier, "\n");
-		fwrite($fichier, '</rss>');
-
-		fclose($fichier);
-		if (! empty($conf->global->MAIN_UMASK))
-			@chmod($outputfile, octdec($conf->global->MAIN_UMASK));
-	}
+                $description=preg_replace('/<br[\s\/]?>/i',"\n",$event['desc']);
+                    $description=dol_string_nohtmltag($description,0);	// Remove html tags
+
+                fwrite($fichier, "<item>\n");
+                fwrite($fichier, "<title><![CDATA[".$summary."]]></title>\n");
+                fwrite($fichier, "<link><![CDATA[".$url."]]></link>\n");
+                fwrite($fichier, "<author><![CDATA[".$author."]]></author>\n");
+                fwrite($fichier, "<category><![CDATA[".$category."]]></category>\n");
+                fwrite($fichier, "<description><![CDATA[");
+                if ($description) fwrite($fichier, $description);
+                //else fwrite($fichier, 'NoDesc');
+                fwrite($fichier, "]]></description>\n");
+                fwrite($fichier, "<pubDate>".date("r", $startdate)."</pubDate>\n");
+                fwrite($fichier, "<guid isPermaLink=\"true\"><![CDATA[".$uid."]]></guid>\n");
+                fwrite($fichier, "<source><![CDATA[Dolibarr]]></source>\n");
+                fwrite($fichier, "</item>\n");
+            }
+        }
+
+        fwrite($fichier, '</channel>');
+        fwrite($fichier, "\n");
+        fwrite($fichier, '</rss>');
+
+        fclose($fichier);
+        if (! empty($conf->global->MAIN_UMASK))
+            @chmod($outputfile, octdec($conf->global->MAIN_UMASK));
+    }
 }
 
 
@@ -397,25 +397,25 @@ 
  */
 function format_cal($format,$string)
 {
-	global $conf;
-
-	$newstring=$string;
-
-	if ($format == 'vcal')
-	{
-		$newstring=quotedPrintEncode($newstring);
-	}
-	if ($format == 'ical')
-	{
-		// Replace new lines chars by '\n'
-		$newstring=preg_replace('/'."\r\n".'/i',"\n",$newstring);
-		$newstring=preg_replace('/'."\n\r".'/i',"\n",$newstring);
-		$newstring=preg_replace('/'."\n".'/i','\n',$newstring);
-		// Must not exceed 75 char. Cut with "\r\n"+Space
-		$newstring=calEncode($newstring);
-	}
-
-	return $newstring;
+    global $conf;
+
+    $newstring=$string;
+
+    if ($format == 'vcal')
+    {
+        $newstring=quotedPrintEncode($newstring);
+    }
+    if ($format == 'ical')
+    {
+        // Replace new lines chars by '\n'
+        $newstring=preg_replace('/'."\r\n".'/i',"\n",$newstring);
+        $newstring=preg_replace('/'."\n\r".'/i',"\n",$newstring);
+        $newstring=preg_replace('/'."\n".'/i','\n',$newstring);
+        // Must not exceed 75 char. Cut with "\r\n"+Space
+        $newstring=calEncode($newstring);
+    }
+
+    return $newstring;
 }
 
 /**
@@ -427,45 +427,45 @@ 
  */
 function calEncode($line)
 {
-	$out = '';
-
-	$newpara = '';
-
-	// If mb_ functions exists, it's better to use them
-	if (function_exists('mb_strlen'))
-	{
-	    $strlength=mb_strlen($line, 'UTF-8');
-		for ($j = 0; $j <= ($strlength - 1); $j++)
-		{
-			$char = mb_substr($line, $j, 1, 'UTF-8');	// Take char at position $j
-
-			if ((mb_strlen($newpara, 'UTF-8') + mb_strlen($char, 'UTF-8')) >= 75)
-			{
-				$out .= $newpara . "\r\n ";	// CRLF + Space for cal
-				$newpara = '';
-			}
-			$newpara .= $char;
-		}
-		$out .= $newpara;
-	}
-	else
-	{
-	    $strlength=dol_strlen($line);
-		for ($j = 0; $j <= ($strlength - 1); $j++)
-		{
-			$char = substr($line, $j, 1);	// Take char at position $j
-
-			if ((dol_strlen($newpara) + dol_strlen($char)) >= 75 )
-			{
-				$out .= $newpara . "\r\n ";	// CRLF + Space for cal
-				$newpara = '';
-			}
-			$newpara .= $char;
-		}
-		$out .= $newpara;
-	}
-
-	return trim($out);
+    $out = '';
+
+    $newpara = '';
+
+    // If mb_ functions exists, it's better to use them
+    if (function_exists('mb_strlen'))
+    {
+        $strlength=mb_strlen($line, 'UTF-8');
+        for ($j = 0; $j <= ($strlength - 1); $j++)
+        {
+            $char = mb_substr($line, $j, 1, 'UTF-8');	// Take char at position $j
+
+            if ((mb_strlen($newpara, 'UTF-8') + mb_strlen($char, 'UTF-8')) >= 75)
+            {
+                $out .= $newpara . "\r\n ";	// CRLF + Space for cal
+                $newpara = '';
+            }
+            $newpara .= $char;
+        }
+        $out .= $newpara;
+    }
+    else
+    {
+        $strlength=dol_strlen($line);
+        for ($j = 0; $j <= ($strlength - 1); $j++)
+        {
+            $char = substr($line, $j, 1);	// Take char at position $j
+
+            if ((dol_strlen($newpara) + dol_strlen($char)) >= 75 )
+            {
+                $out .= $newpara . "\r\n ";	// CRLF + Space for cal
+                $newpara = '';
+            }
+            $newpara .= $char;
+        }
+        $out .= $newpara;
+    }
+
+    return trim($out);
 }
 
 
@@ -478,33 +478,33 @@ 
  */
 function quotedPrintEncode($str,$forcal=0)
 {
-	$lines = preg_split("/\r\n/", $str);
-	$out = '';
-
-	foreach ($lines as $line)
-	{
-		$newpara = '';
-
-		$strlength=strlen($line);	// Do not use dol_strlen here, we need number of bytes
-		for ($j = 0; $j <= ($strlength - 1); $j++)
-		{
-			$char = substr($line, $j, 1);
-			$ascii = ord($char);
-
-			if ( $ascii < 32 || $ascii == 61 || $ascii > 126 )
-			$char = '=' . strtoupper(sprintf("%02X", $ascii));
-
-			if ((strlen($newpara) + strlen($char)) >= 76 )	// Do not use dol_strlen here, we need number of bytes
-			{
-				$out .= $newpara . '=' . "\r\n";	// CRLF
-				if ($forcal) $out .= " ";		// + Space for cal
-				$newpara = '';
-			}
-			$newpara .= $char;
-		}
-		$out .= $newpara;
-	}
-	return trim($out);
+    $lines = preg_split("/\r\n/", $str);
+    $out = '';
+
+    foreach ($lines as $line)
+    {
+        $newpara = '';
+
+        $strlength=strlen($line);	// Do not use dol_strlen here, we need number of bytes
+        for ($j = 0; $j <= ($strlength - 1); $j++)
+        {
+            $char = substr($line, $j, 1);
+            $ascii = ord($char);
+
+            if ( $ascii < 32 || $ascii == 61 || $ascii > 126 )
+            $char = '=' . strtoupper(sprintf("%02X", $ascii));
+
+            if ((strlen($newpara) + strlen($char)) >= 76 )	// Do not use dol_strlen here, we need number of bytes
+            {
+                $out .= $newpara . '=' . "\r\n";	// CRLF
+                if ($forcal) $out .= " ";		// + Space for cal
+                $newpara = '';
+            }
+            $newpara .= $char;
+        }
+        $out .= $newpara;
+    }
+    return trim($out);
 }
 
 /**
@@ -515,7 +515,7 @@ 
  */
 function quotedPrintDecode($str)
 {
-	$out = preg_replace('/=\r?\n/', '', $str);
-	$out = quoted_printable_decode($out);	// Available with PHP 4+
-	return trim($out);
+    $out = preg_replace('/=\r?\n/', '', $str);
+    $out = quoted_printable_decode($out);	// Available with PHP 4+
+    return trim($out);
 }

Spacing +129 added lines, -129 removed lines

@@ -32,66 +32,66 @@ 
  *	@param		string	$outputfile			Output file
  *	@return		int							<0 if ko, Nb of events in file if ok
  */
-function build_calfile($format,$title,$desc,$events_array,$outputfile)
+function build_calfile($format, $title, $desc, $events_array, $outputfile)
 {
-	global $conf,$langs;
+	global $conf, $langs;
 
 	dol_syslog("xcal.lib.php::build_calfile Build cal file ".$outputfile." to format ".$format);
 
 	if (empty($outputfile)) return -1;
 
     // Note: A cal file is an UTF8 encoded file
-	$calfileh=fopen($outputfile,'w');
+	$calfileh = fopen($outputfile, 'w');
 	if ($calfileh)
 	{
 	    include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-		$now=dol_now();
+		$now = dol_now();
 
-		$encoding='';
-		if ($format == 'vcal') $encoding='ENCODING=QUOTED-PRINTABLE:';
+		$encoding = '';
+		if ($format == 'vcal') $encoding = 'ENCODING=QUOTED-PRINTABLE:';
 
 		// Print header
-		fwrite($calfileh,"BEGIN:VCALENDAR\n");
-		fwrite($calfileh,"VERSION:2.0\n");
-		fwrite($calfileh,"METHOD:PUBLISH\n");
+		fwrite($calfileh, "BEGIN:VCALENDAR\n");
+		fwrite($calfileh, "VERSION:2.0\n");
+		fwrite($calfileh, "METHOD:PUBLISH\n");
 		//fwrite($calfileh,"PRODID:-//DOLIBARR ".DOL_VERSION."//EN\n");
-		fwrite($calfileh,"PRODID:-//DOLIBARR ".DOL_VERSION."\n");
-		fwrite($calfileh,"CALSCALE:GREGORIAN\n");
-		fwrite($calfileh,"X-WR-CALNAME:".$encoding.format_cal($format,$title)."\n");
-        fwrite($calfileh,"X-WR-CALDESC:".$encoding.format_cal($format,$desc)."\n");
+		fwrite($calfileh, "PRODID:-//DOLIBARR ".DOL_VERSION."\n");
+		fwrite($calfileh, "CALSCALE:GREGORIAN\n");
+		fwrite($calfileh, "X-WR-CALNAME:".$encoding.format_cal($format, $title)."\n");
+        fwrite($calfileh, "X-WR-CALDESC:".$encoding.format_cal($format, $desc)."\n");
         //fwrite($calfileh,"X-WR-TIMEZONE:Europe/Paris\n");
-        if (! empty($conf->global->MAIN_AGENDA_EXPORT_CACHE)
-        && $conf->global->MAIN_AGENDA_EXPORT_CACHE > 60){
-	        $hh=convertSecondToTime($conf->global->MAIN_AGENDA_EXPORT_CACHE,'hour');
-	        $mm=convertSecondToTime($conf->global->MAIN_AGENDA_EXPORT_CACHE,'min');
-	        $ss=convertSecondToTime($conf->global->MAIN_AGENDA_EXPORT_CACHE,'sec');
-	        fwrite($calfileh,"X-PUBLISHED-TTL: P".$hh."H".$mm."M".$ss."S\n");
+        if (!empty($conf->global->MAIN_AGENDA_EXPORT_CACHE)
+        && $conf->global->MAIN_AGENDA_EXPORT_CACHE > 60) {
+	        $hh = convertSecondToTime($conf->global->MAIN_AGENDA_EXPORT_CACHE, 'hour');
+	        $mm = convertSecondToTime($conf->global->MAIN_AGENDA_EXPORT_CACHE, 'min');
+	        $ss = convertSecondToTime($conf->global->MAIN_AGENDA_EXPORT_CACHE, 'sec');
+	        fwrite($calfileh, "X-PUBLISHED-TTL: P".$hh."H".$mm."M".$ss."S\n");
         }
 
 		foreach ($events_array as $key => $event)
 		{
-			$eventqualified=true;
+			$eventqualified = true;
 			if ($eventqualified)
 			{
 				// See http://fr.wikipedia.org/wiki/ICalendar for format
 				// See http://www.ietf.org/rfc/rfc2445.txt for RFC
-				$uid 		  = $event['uid'];
-				$type         = $event['type'];
-                $startdate    = $event['startdate'];
+				$uid = $event['uid'];
+				$type = $event['type'];
+                $startdate = $event['startdate'];
 				$duration	  = $event['duration'];
-				$enddate	  = $event['enddate'];
-				$summary  	  = $event['summary'];
+				$enddate = $event['enddate'];
+				$summary = $event['summary'];
 				$category	  = $event['category'];
                 $priority     = $event['priority'];
                 $fulldayevent = $event['fulldayevent'];
 				$location     = $event['location'];
-				$email 		  = $event['email'];
-				$url		  = $event['url'];
-				$transparency = $event['transparency'];		// OPAQUE (busy) or TRANSPARENT (not busy)
-				$description=preg_replace('/<br[\s\/]?>/i',"\n",$event['desc']);
- 				$description=dol_string_nohtmltag($description,0);	// Remove html tags
-                $created      = $event['created'];
- 				$modified     = $event['modified'];
+				$email = $event['email'];
+				$url = $event['url'];
+				$transparency = $event['transparency']; // OPAQUE (busy) or TRANSPARENT (not busy)
+				$description = preg_replace('/<br[\s\/]?>/i', "\n", $event['desc']);
+ 				$description = dol_string_nohtmltag($description, 0); // Remove html tags
+                $created = $event['created'];
+ 				$modified = $event['modified'];
 
 				// Uncomment for tests
 				//$summary="Resume";
@@ -99,10 +99,10 @@ 
 				//$description="MemberValidatedInDolibarr gd gdf gd gdff\nNom: tgdf g dfgdf gfd r ter\nType: gdfgfdf dfg fd gfd gd gdf gdf gfd gdfg dfg ddf\nAuteur: AD01fg dgdgdfg df gdf gd";
 
 				// Format
-				$summary=format_cal($format,$summary);
-				$description=format_cal($format,$description);
-				$category=format_cal($format,$category);
-				$location=format_cal($format,$location);
+				$summary = format_cal($format, $summary);
+				$description = format_cal($format, $description);
+				$category = format_cal($format, $category);
+				$location = format_cal($format, $location);
 
 				// Output the vCard/iCal VEVENT object
 				/*
@@ -140,22 +140,22 @@ 
                 */
 				if ($type == 'event')
 				{
-					fwrite($calfileh,"BEGIN:VEVENT\n");
-					fwrite($calfileh,"UID:".$uid."\n");
-					if (! empty($email))
+					fwrite($calfileh, "BEGIN:VEVENT\n");
+					fwrite($calfileh, "UID:".$uid."\n");
+					if (!empty($email))
 					{
-						fwrite($calfileh,"ORGANIZER:MAILTO:".$email."\n");
-						fwrite($calfileh,"CONTACT:MAILTO:".$email."\n");
+						fwrite($calfileh, "ORGANIZER:MAILTO:".$email."\n");
+						fwrite($calfileh, "CONTACT:MAILTO:".$email."\n");
 					}
-					if (! empty($url))
+					if (!empty($url))
 					{
-						fwrite($calfileh,"URL:".$url."\n");
+						fwrite($calfileh, "URL:".$url."\n");
 					};
 
-                    if ($created)  fwrite($calfileh,"CREATED:".dol_print_date($created,'dayhourxcard',true)."\n");
-                    if ($modified) fwrite($calfileh,"LAST-MODIFIED:".dol_print_date($modified,'dayhourxcard',true)."\n");
-                    fwrite($calfileh,"SUMMARY:".$encoding.$summary."\n");
-					fwrite($calfileh,"DESCRIPTION:".$encoding.$description."\n");
+                    if ($created)  fwrite($calfileh, "CREATED:".dol_print_date($created, 'dayhourxcard', true)."\n");
+                    if ($modified) fwrite($calfileh, "LAST-MODIFIED:".dol_print_date($modified, 'dayhourxcard', true)."\n");
+                    fwrite($calfileh, "SUMMARY:".$encoding.$summary."\n");
+					fwrite($calfileh, "DESCRIPTION:".$encoding.$description."\n");
 
 					/* Other keys:
 					// Status values for a "VEVENT"
@@ -178,44 +178,44 @@ 
                     //fwrite($calfileh,"X-MICROSOFT-CDO-BUSYSTATUS:1\n");
                     //ATTENDEE;CUTYPE=INDIVIDUAL;ROLE=REQ-PARTICIPANT;PARTSTAT=ACCEPTED;CN=Laurent Destailleur;X-NUM-GUESTS=0:mailto:eldy10@gmail.com
 
-                    if (! empty($location)) fwrite($calfileh,"LOCATION:".$encoding.$location."\n");
-					if ($fulldayevent) fwrite($calfileh,"X-FUNAMBOL-ALLDAY:1\n");
-                    if ($fulldayevent) fwrite($calfileh,"X-MICROSOFT-CDO-ALLDAYEVENT:1\n");
+                    if (!empty($location)) fwrite($calfileh, "LOCATION:".$encoding.$location."\n");
+					if ($fulldayevent) fwrite($calfileh, "X-FUNAMBOL-ALLDAY:1\n");
+                    if ($fulldayevent) fwrite($calfileh, "X-MICROSOFT-CDO-ALLDAYEVENT:1\n");
 
 					// Date must be GMT dates
 					// Current date
-					fwrite($calfileh,"DTSTAMP:".dol_print_date($now,'dayhourxcard',true)."\n");
+					fwrite($calfileh, "DTSTAMP:".dol_print_date($now, 'dayhourxcard', true)."\n");
 					// Start date
-                    $prefix='';
-                    $startdatef = dol_print_date($startdate,'dayhourxcard',true);
+                    $prefix = '';
+                    $startdatef = dol_print_date($startdate, 'dayhourxcard', true);
                     if ($fulldayevent)
 					{
-                        $prefix=';VALUE=DATE';
-					    $startdatef = dol_print_date($startdate,'dayxcard',false);     // Local time
+                        $prefix = ';VALUE=DATE';
+					    $startdatef = dol_print_date($startdate, 'dayxcard', false); // Local time
 					}
-					fwrite($calfileh,"DTSTART".$prefix.":".$startdatef."\n");
+					fwrite($calfileh, "DTSTART".$prefix.":".$startdatef."\n");
                     // End date
 					if ($fulldayevent)
 					{
-    					if (empty($enddate)) $enddate=dol_time_plus_duree($startdate,1,'d');
+    					if (empty($enddate)) $enddate = dol_time_plus_duree($startdate, 1, 'd');
 					}
 					else
 					{
-                        if (empty($enddate)) $enddate=$startdate+$duration;
+                        if (empty($enddate)) $enddate = $startdate + $duration;
 					}
-                    $prefix='';
-					$enddatef = dol_print_date($enddate,'dayhourxcard',true);
+                    $prefix = '';
+					$enddatef = dol_print_date($enddate, 'dayhourxcard', true);
 					if ($fulldayevent)
 					{
-                        $prefix=';VALUE=DATE';
-					    $enddatef = dol_print_date($enddate+1,'dayxcard',false);
+                        $prefix = ';VALUE=DATE';
+					    $enddatef = dol_print_date($enddate + 1, 'dayxcard', false);
 					    //$enddatef .= dol_print_date($enddate+1,'dayhourxcard',false);   // Local time
 					}
-                    fwrite($calfileh,"DTEND".$prefix.":".$enddatef."\n");
-					fwrite($calfileh,'STATUS:CONFIRMED'."\n");
-					if (! empty($transparency)) fwrite($calfileh,"TRANSP:".$transparency."\n");
-					if (! empty($category)) fwrite($calfileh,"CATEGORIES:".$encoding.$category."\n");
-					fwrite($calfileh,"END:VEVENT\n");
+                    fwrite($calfileh, "DTEND".$prefix.":".$enddatef."\n");
+					fwrite($calfileh, 'STATUS:CONFIRMED'."\n");
+					if (!empty($transparency)) fwrite($calfileh, "TRANSP:".$transparency."\n");
+					if (!empty($category)) fwrite($calfileh, "CATEGORIES:".$encoding.$category."\n");
+					fwrite($calfileh, "END:VEVENT\n");
 				}
 
 				// Output the vCard/iCal VTODO object
@@ -225,30 +225,30 @@ 
 				// Output the vCard/iCal VJOURNAL object
 				if ($type == 'journal')
 				{
-					fwrite($calfileh,"BEGIN:VJOURNAL\n");
-					fwrite($calfileh,"UID:".$uid."\n");
-					if (! empty($email))
+					fwrite($calfileh, "BEGIN:VJOURNAL\n");
+					fwrite($calfileh, "UID:".$uid."\n");
+					if (!empty($email))
 					{
-						fwrite($calfileh,"ORGANIZER:MAILTO:".$email."\n");
-						fwrite($calfileh,"CONTACT:MAILTO:".$email."\n");
+						fwrite($calfileh, "ORGANIZER:MAILTO:".$email."\n");
+						fwrite($calfileh, "CONTACT:MAILTO:".$email."\n");
 					}
-					if (! empty($url))
+					if (!empty($url))
 					{
-						fwrite($calfileh,"URL:".$url."\n");
+						fwrite($calfileh, "URL:".$url."\n");
 					};
 
-                    if ($created)  fwrite($calfileh,"CREATED:".dol_print_date($created,'dayhourxcard',true)."\n");
-                    if ($modified) fwrite($calfileh,"LAST-MODIFIED:".dol_print_date($modified,'dayhourxcard',true)."\n");
-					fwrite($calfileh,"SUMMARY:".$encoding.$summary."\n");
-					fwrite($calfileh,"DESCRIPTION:".$encoding.$description."\n");
-					fwrite($calfileh,'STATUS:CONFIRMED'."\n");
-					fwrite($calfileh,"CATEGORIES:".$category."\n");
-					fwrite($calfileh,"LOCATION:".$location."\n");
-					fwrite($calfileh,"TRANSP:OPAQUE\n");
-					fwrite($calfileh,"CLASS:CONFIDENTIAL\n");
-					fwrite($calfileh,"DTSTAMP:".dol_print_date($startdatef,'dayhourxcard',true)."\n");
-
-					fwrite($calfileh,"END:VJOURNAL\n");
+                    if ($created)  fwrite($calfileh, "CREATED:".dol_print_date($created, 'dayhourxcard', true)."\n");
+                    if ($modified) fwrite($calfileh, "LAST-MODIFIED:".dol_print_date($modified, 'dayhourxcard', true)."\n");
+					fwrite($calfileh, "SUMMARY:".$encoding.$summary."\n");
+					fwrite($calfileh, "DESCRIPTION:".$encoding.$description."\n");
+					fwrite($calfileh, 'STATUS:CONFIRMED'."\n");
+					fwrite($calfileh, "CATEGORIES:".$category."\n");
+					fwrite($calfileh, "LOCATION:".$location."\n");
+					fwrite($calfileh, "TRANSP:OPAQUE\n");
+					fwrite($calfileh, "CLASS:CONFIDENTIAL\n");
+					fwrite($calfileh, "DTSTAMP:".dol_print_date($startdatef, 'dayhourxcard', true)."\n");
+
+					fwrite($calfileh, "END:VJOURNAL\n");
 				}
 
 
@@ -267,10 +267,10 @@ 
 		}
 
 		// Footer
-		fwrite($calfileh,"END:VCALENDAR");
+		fwrite($calfileh, "END:VCALENDAR");
 
 		fclose($calfileh);
-		if (! empty($conf->global->MAIN_UMASK))
+		if (!empty($conf->global->MAIN_UMASK))
 			@chmod($outputfile, octdec($conf->global->MAIN_UMASK));
 	}
 	else
@@ -292,43 +292,43 @@ 
  *	@param		string	$filter				Filter
  *	@return		int							<0 if ko, Nb of events in file if ok
  */
-function build_rssfile($format,$title,$desc,$events_array,$outputfile,$filter='')
+function build_rssfile($format, $title, $desc, $events_array, $outputfile, $filter = '')
 {
-	global $user,$conf,$langs;
+	global $user, $conf, $langs;
 	global $dolibarr_main_url_root;
 
 	dol_syslog("xcal.lib.php::build_rssfile Build rss file ".$outputfile." to format ".$format);
 
 	if (empty($outputfile)) return -1;
 
-	$fichier=fopen($outputfile,'w');
+	$fichier = fopen($outputfile, 'w');
 	if ($fichier)
 	{
-		$date=date("r");
+		$date = date("r");
 
 		// Print header
-		$form='<?xml version="1.0" encoding="'.$langs->charset_output.'"?>';
+		$form = '<?xml version="1.0" encoding="'.$langs->charset_output.'"?>';
 		fwrite($fichier, $form);
 		fwrite($fichier, "\n");
-		$form='<rss version="2.0">';
+		$form = '<rss version="2.0">';
 		fwrite($fichier, $form);
 		fwrite($fichier, "\n");
 
-		$form="<channel>\n<title>".$title."</title>\n";
+		$form = "<channel>\n<title>".$title."</title>\n";
 		fwrite($fichier, $form);
 
-		$form='<description><![CDATA['.$desc.'.]]></description>'."\n".
+		$form = '<description><![CDATA['.$desc.'.]]></description>'."\n".
 //		'<language>fr</language>'."\n".
 		'<copyright>Dolibarr</copyright>'."\n".
 		'<lastBuildDate>'.$date.'</lastBuildDate>'."\n".
 		'<generator>Dolibarr</generator>'."\n";
 
 		// Define $urlwithroot
-		$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
-		$urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;			// This is to use external domain name found into config file
+		$urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
+		$urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file
 		//$urlwithroot=DOL_MAIN_URL_ROOT;						// This is to use same domain name than current
-  		$url=$urlwithroot.'/public/agenda/agendaexport.php?format=rss&exportkey='.urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY);
-		$form.='<link><![CDATA['.$url.']]></link>'."\n";
+  		$url = $urlwithroot.'/public/agenda/agendaexport.php?format=rss&exportkey='.urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY);
+		$form .= '<link><![CDATA['.$url.']]></link>'."\n";
 
 		//print $form;
 		fwrite($fichier, $form);
@@ -336,12 +336,12 @@ 
 
 		foreach ($events_array as $key => $event)
 		{
-			$eventqualified=true;
+			$eventqualified = true;
 			if ($filter)
 			{
 				// TODO Add a filter
 
-				$eventqualified=false;
+				$eventqualified = false;
 			}
 
 			if ($eventqualified)
@@ -350,16 +350,16 @@ 
 				$startdate	  = $event['startdate'];
 				$summary  	  = $event['summary'];
 				$url		  = $event['url'];
-				$author		  = $event['author'];
-				$category	  = $event['category'];
+				$author = $event['author'];
+				$category = $event['category'];
 				/* No place inside a RSS
                 $priority     = $event['priority'];
                 $fulldayevent = $event['fulldayevent'];
                 $location     = $event['location'];
                 $email        = $event['email'];
                 */
-				$description=preg_replace('/<br[\s\/]?>/i',"\n",$event['desc']);
- 				$description=dol_string_nohtmltag($description,0);	// Remove html tags
+				$description = preg_replace('/<br[\s\/]?>/i', "\n", $event['desc']);
+ 				$description = dol_string_nohtmltag($description, 0); // Remove html tags
 
 				fwrite($fichier, "<item>\n");
 				fwrite($fichier, "<title><![CDATA[".$summary."]]></title>\n");
@@ -382,7 +382,7 @@ 
 		fwrite($fichier, '</rss>');
 
 		fclose($fichier);
-		if (! empty($conf->global->MAIN_UMASK))
+		if (!empty($conf->global->MAIN_UMASK))
 			@chmod($outputfile, octdec($conf->global->MAIN_UMASK));
 	}
 }
@@ -395,24 +395,24 @@ 
  * 	@param 		string	$string		string to encode
  * 	@return		string				string encoded
  */
-function format_cal($format,$string)
+function format_cal($format, $string)
 {
 	global $conf;
 
-	$newstring=$string;
+	$newstring = $string;
 
 	if ($format == 'vcal')
 	{
-		$newstring=quotedPrintEncode($newstring);
+		$newstring = quotedPrintEncode($newstring);
 	}
 	if ($format == 'ical')
 	{
 		// Replace new lines chars by '\n'
-		$newstring=preg_replace('/'."\r\n".'/i',"\n",$newstring);
-		$newstring=preg_replace('/'."\n\r".'/i',"\n",$newstring);
-		$newstring=preg_replace('/'."\n".'/i','\n',$newstring);
+		$newstring = preg_replace('/'."\r\n".'/i', "\n", $newstring);
+		$newstring = preg_replace('/'."\n\r".'/i', "\n", $newstring);
+		$newstring = preg_replace('/'."\n".'/i', '\n', $newstring);
 		// Must not exceed 75 char. Cut with "\r\n"+Space
-		$newstring=calEncode($newstring);
+		$newstring = calEncode($newstring);
 	}
 
 	return $newstring;
@@ -434,14 +434,14 @@ 
 	// If mb_ functions exists, it's better to use them
 	if (function_exists('mb_strlen'))
 	{
-	    $strlength=mb_strlen($line, 'UTF-8');
+	    $strlength = mb_strlen($line, 'UTF-8');
 		for ($j = 0; $j <= ($strlength - 1); $j++)
 		{
-			$char = mb_substr($line, $j, 1, 'UTF-8');	// Take char at position $j
+			$char = mb_substr($line, $j, 1, 'UTF-8'); // Take char at position $j
 
 			if ((mb_strlen($newpara, 'UTF-8') + mb_strlen($char, 'UTF-8')) >= 75)
 			{
-				$out .= $newpara . "\r\n ";	// CRLF + Space for cal
+				$out .= $newpara."\r\n "; // CRLF + Space for cal
 				$newpara = '';
 			}
 			$newpara .= $char;
@@ -450,14 +450,14 @@ 
 	}
 	else
 	{
-	    $strlength=dol_strlen($line);
+	    $strlength = dol_strlen($line);
 		for ($j = 0; $j <= ($strlength - 1); $j++)
 		{
-			$char = substr($line, $j, 1);	// Take char at position $j
+			$char = substr($line, $j, 1); // Take char at position $j
 
-			if ((dol_strlen($newpara) + dol_strlen($char)) >= 75 )
+			if ((dol_strlen($newpara) + dol_strlen($char)) >= 75)
 			{
-				$out .= $newpara . "\r\n ";	// CRLF + Space for cal
+				$out .= $newpara."\r\n "; // CRLF + Space for cal
 				$newpara = '';
 			}
 			$newpara .= $char;
@@ -476,7 +476,7 @@ 
  *	@param		int		$forcal		1=For cal
  *	@return		string 				String converted
  */
-function quotedPrintEncode($str,$forcal=0)
+function quotedPrintEncode($str, $forcal = 0)
 {
 	$lines = preg_split("/\r\n/", $str);
 	$out = '';
@@ -485,19 +485,19 @@ 
 	{
 		$newpara = '';
 
-		$strlength=strlen($line);	// Do not use dol_strlen here, we need number of bytes
+		$strlength = strlen($line); // Do not use dol_strlen here, we need number of bytes
 		for ($j = 0; $j <= ($strlength - 1); $j++)
 		{
 			$char = substr($line, $j, 1);
 			$ascii = ord($char);
 
-			if ( $ascii < 32 || $ascii == 61 || $ascii > 126 )
-			$char = '=' . strtoupper(sprintf("%02X", $ascii));
+			if ($ascii < 32 || $ascii == 61 || $ascii > 126)
+			$char = '='.strtoupper(sprintf("%02X", $ascii));
 
-			if ((strlen($newpara) + strlen($char)) >= 76 )	// Do not use dol_strlen here, we need number of bytes
+			if ((strlen($newpara) + strlen($char)) >= 76)	// Do not use dol_strlen here, we need number of bytes
 			{
-				$out .= $newpara . '=' . "\r\n";	// CRLF
-				if ($forcal) $out .= " ";		// + Space for cal
+				$out .= $newpara.'='."\r\n"; // CRLF
+				if ($forcal) $out .= " "; // + Space for cal
 				$newpara = '';
 			}
 			$newpara .= $char;
@@ -516,6 +516,6 @@ 
 function quotedPrintDecode($str)
 {
 	$out = preg_replace('/=\r?\n/', '', $str);
-	$out = quoted_printable_decode($out);	// Available with PHP 4+
+	$out = quoted_printable_decode($out); // Available with PHP 4+
 	return trim($out);
 }

Braces +66 added lines, -30 removed lines

@@ -38,7 +38,9 @@ 
 
 	dol_syslog("xcal.lib.php::build_calfile Build cal file ".$outputfile." to format ".$format);
 
-	if (empty($outputfile)) return -1;
+	if (empty($outputfile)) {
+	    return -1;
+	}
 
     // Note: A cal file is an UTF8 encoded file
 	$calfileh=fopen($outputfile,'w');
@@ -48,7 +50,9 @@ 
 		$now=dol_now();
 
 		$encoding='';
-		if ($format == 'vcal') $encoding='ENCODING=QUOTED-PRINTABLE:';
+		if ($format == 'vcal') {
+		    $encoding='ENCODING=QUOTED-PRINTABLE:';
+		}
 
 		// Print header
 		fwrite($calfileh,"BEGIN:VCALENDAR\n");
@@ -152,8 +156,12 @@ 
 						fwrite($calfileh,"URL:".$url."\n");
 					};
 
-                    if ($created)  fwrite($calfileh,"CREATED:".dol_print_date($created,'dayhourxcard',true)."\n");
-                    if ($modified) fwrite($calfileh,"LAST-MODIFIED:".dol_print_date($modified,'dayhourxcard',true)."\n");
+                    if ($created) {
+                        fwrite($calfileh,"CREATED:".dol_print_date($created,'dayhourxcard',true)."\n");
+                    }
+                    if ($modified) {
+                        fwrite($calfileh,"LAST-MODIFIED:".dol_print_date($modified,'dayhourxcard',true)."\n");
+                    }
                     fwrite($calfileh,"SUMMARY:".$encoding.$summary."\n");
 					fwrite($calfileh,"DESCRIPTION:".$encoding.$description."\n");
 
@@ -178,9 +186,15 @@ 
                     //fwrite($calfileh,"X-MICROSOFT-CDO-BUSYSTATUS:1\n");
                     //ATTENDEE;CUTYPE=INDIVIDUAL;ROLE=REQ-PARTICIPANT;PARTSTAT=ACCEPTED;CN=Laurent Destailleur;X-NUM-GUESTS=0:mailto:eldy10@gmail.com
 
-                    if (! empty($location)) fwrite($calfileh,"LOCATION:".$encoding.$location."\n");
-					if ($fulldayevent) fwrite($calfileh,"X-FUNAMBOL-ALLDAY:1\n");
-                    if ($fulldayevent) fwrite($calfileh,"X-MICROSOFT-CDO-ALLDAYEVENT:1\n");
+                    if (! empty($location)) {
+                        fwrite($calfileh,"LOCATION:".$encoding.$location."\n");
+                    }
+					if ($fulldayevent) {
+					    fwrite($calfileh,"X-FUNAMBOL-ALLDAY:1\n");
+					}
+                    if ($fulldayevent) {
+                        fwrite($calfileh,"X-MICROSOFT-CDO-ALLDAYEVENT:1\n");
+                    }
 
 					// Date must be GMT dates
 					// Current date
@@ -197,11 +211,14 @@ 
                     // End date
 					if ($fulldayevent)
 					{
-    					if (empty($enddate)) $enddate=dol_time_plus_duree($startdate,1,'d');
-					}
-					else
+    					if (empty($enddate)) {
+    					    $enddate=dol_time_plus_duree($startdate,1,'d');
+    					}
+					} else
 					{
-                        if (empty($enddate)) $enddate=$startdate+$duration;
+                        if (empty($enddate)) {
+                            $enddate=$startdate+$duration;
+                        }
 					}
                     $prefix='';
 					$enddatef = dol_print_date($enddate,'dayhourxcard',true);
@@ -213,8 +230,12 @@ 
 					}
                     fwrite($calfileh,"DTEND".$prefix.":".$enddatef."\n");
 					fwrite($calfileh,'STATUS:CONFIRMED'."\n");
-					if (! empty($transparency)) fwrite($calfileh,"TRANSP:".$transparency."\n");
-					if (! empty($category)) fwrite($calfileh,"CATEGORIES:".$encoding.$category."\n");
+					if (! empty($transparency)) {
+					    fwrite($calfileh,"TRANSP:".$transparency."\n");
+					}
+					if (! empty($category)) {
+					    fwrite($calfileh,"CATEGORIES:".$encoding.$category."\n");
+					}
 					fwrite($calfileh,"END:VEVENT\n");
 				}
 
@@ -237,8 +258,12 @@ 
 						fwrite($calfileh,"URL:".$url."\n");
 					};
 
-                    if ($created)  fwrite($calfileh,"CREATED:".dol_print_date($created,'dayhourxcard',true)."\n");
-                    if ($modified) fwrite($calfileh,"LAST-MODIFIED:".dol_print_date($modified,'dayhourxcard',true)."\n");
+                    if ($created) {
+                        fwrite($calfileh,"CREATED:".dol_print_date($created,'dayhourxcard',true)."\n");
+                    }
+                    if ($modified) {
+                        fwrite($calfileh,"LAST-MODIFIED:".dol_print_date($modified,'dayhourxcard',true)."\n");
+                    }
 					fwrite($calfileh,"SUMMARY:".$encoding.$summary."\n");
 					fwrite($calfileh,"DESCRIPTION:".$encoding.$description."\n");
 					fwrite($calfileh,'STATUS:CONFIRMED'."\n");
@@ -270,10 +295,10 @@ 
 		fwrite($calfileh,"END:VCALENDAR");
 
 		fclose($calfileh);
-		if (! empty($conf->global->MAIN_UMASK))
-			@chmod($outputfile, octdec($conf->global->MAIN_UMASK));
-	}
-	else
+		if (! empty($conf->global->MAIN_UMASK)) {
+					@chmod($outputfile, octdec($conf->global->MAIN_UMASK));
+		}
+	} else
 	{
 		dol_syslog("xcal.lib.php::build_calfile Failed to open file ".$outputfile." for writing");
 		return -2;
@@ -299,7 +324,9 @@ 
 
 	dol_syslog("xcal.lib.php::build_rssfile Build rss file ".$outputfile." to format ".$format);
 
-	if (empty($outputfile)) return -1;
+	if (empty($outputfile)) {
+	    return -1;
+	}
 
 	$fichier=fopen($outputfile,'w');
 	if ($fichier)
@@ -367,7 +394,9 @@ 
 				fwrite($fichier, "<author><![CDATA[".$author."]]></author>\n");
 				fwrite($fichier, "<category><![CDATA[".$category."]]></category>\n");
 				fwrite($fichier, "<description><![CDATA[");
-				if ($description) fwrite($fichier, $description);
+				if ($description) {
+				    fwrite($fichier, $description);
+				}
 				//else fwrite($fichier, 'NoDesc');
 				fwrite($fichier, "]]></description>\n");
 				fwrite($fichier, "<pubDate>".date("r", $startdate)."</pubDate>\n");
@@ -382,8 +411,9 @@ 
 		fwrite($fichier, '</rss>');
 
 		fclose($fichier);
-		if (! empty($conf->global->MAIN_UMASK))
-			@chmod($outputfile, octdec($conf->global->MAIN_UMASK));
+		if (! empty($conf->global->MAIN_UMASK)) {
+					@chmod($outputfile, octdec($conf->global->MAIN_UMASK));
+		}
 	}
 }
 
@@ -447,8 +477,7 @@ 
 			$newpara .= $char;
 		}
 		$out .= $newpara;
-	}
-	else
+	} else
 	{
 	    $strlength=dol_strlen($line);
 		for ($j = 0; $j <= ($strlength - 1); $j++)
@@ -491,13 +520,20 @@ 
 			$char = substr($line, $j, 1);
 			$ascii = ord($char);
 
-			if ( $ascii < 32 || $ascii == 61 || $ascii > 126 )
-			$char = '=' . strtoupper(sprintf("%02X", $ascii));
+			if ( $ascii < 32 || $ascii == 61 || $ascii > 126 ) {
+						$char = '=' . strtoupper(sprintf("%02X", $ascii));
+			}
 
-			if ((strlen($newpara) + strlen($char)) >= 76 )	// Do not use dol_strlen here, we need number of bytes
+			if ((strlen($newpara) + strlen($char)) >= 76 ) {
+			    // Do not use dol_strlen here, we need number of bytes
 			{
-				$out .= $newpara . '=' . "\r\n";	// CRLF
-				if ($forcal) $out .= " ";		// + Space for cal
+				$out .= $newpara . '=' . "\r\n";
+			}
+			// CRLF
+				if ($forcal) {
+				    $out .= " ";
+				}
+				// + Space for cal
 				$newpara = '';
 			}
 			$newpara .= $char;

dolibarr/htdocs/core/lib/ticket.lib.php

Braces +3 added lines, -1 removed lines

@@ -81,7 +81,9 @@
     	$nbContact = count($object->liste_contact(-1,'internal')) + count($object->liste_contact(-1,'external'));
     	$head[$h][0] = DOL_URL_ROOT.'/ticket/contact.php?track_id='.$object->track_id;
     	$head[$h][1] = $langs->trans('ContactsAddresses');
-    	if ($nbContact > 0) $head[$h][1].= ' <span class="badge">'.$nbContact.'</span>';
+    	if ($nbContact > 0) {
+    	    $head[$h][1].= ' <span class="badge">'.$nbContact.'</span>';
+    	}
     	$head[$h][2] = 'contact';
     	$h++;
     }

Indentation +19 added lines, -19 removed lines

@@ -78,12 +78,12 @@ 
 
     if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && empty($user->socid))
     {
-    	$nbContact = count($object->liste_contact(-1,'internal')) + count($object->liste_contact(-1,'external'));
-    	$head[$h][0] = DOL_URL_ROOT.'/ticket/contact.php?track_id='.$object->track_id;
-    	$head[$h][1] = $langs->trans('ContactsAddresses');
-    	if ($nbContact > 0) $head[$h][1].= ' <span class="badge">'.$nbContact.'</span>';
-    	$head[$h][2] = 'contact';
-    	$h++;
+        $nbContact = count($object->liste_contact(-1,'internal')) + count($object->liste_contact(-1,'external'));
+        $head[$h][0] = DOL_URL_ROOT.'/ticket/contact.php?track_id='.$object->track_id;
+        $head[$h][1] = $langs->trans('ContactsAddresses');
+        if ($nbContact > 0) $head[$h][1].= ' <span class="badge">'.$nbContact.'</span>';
+        $head[$h][2] = 'contact';
+        $h++;
     }
 
     complete_head_from_modules($conf, $langs, $object, $head, $h, 'ticket');
@@ -107,8 +107,8 @@ 
     $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][1].= '/';
+        $head[$h][1].= $langs->trans("Agenda");
     }
     $head[$h][2] = 'tabTicketLogs';
     $h++;
@@ -156,21 +156,21 @@ 
     print '<body id="mainbody" class="publicnewticketform" style="margin-top: 10px;">';
 
     if (! empty($conf->global->TICKET_SHOW_COMPANY_LOGO)) {
-    	// Print logo
-    	$urllogo = DOL_BASE_URI . '/theme/login_logo.png';
+        // Print logo
+        $urllogo = DOL_BASE_URI . '/theme/login_logo.png';
 
         if (!empty($mysoc->logo_small) && is_readable($conf->mycompany->dir_output . '/logos/thumbs/' . $mysoc->logo_small)) {
-    		$urllogo = DOL_URL_ROOT . '/viewimage.php?modulepart=mycompany&amp;entity='.$conf->entity.'&amp;file=' . urlencode('logos/thumbs/'.$mysoc->logo_small);
-    	} elseif (!empty($mysoc->logo) && is_readable($conf->mycompany->dir_output . '/logos/' . $mysoc->logo)) {
-    		$urllogo = DOL_URL_ROOT . '/viewimage.php?modulepart=mycompany&amp;entity='.$conf->entity.'&amp;file=' . urlencode('logos/'.$mysoc->logo);
-    		$width = 128;
-    	} elseif (is_readable(DOL_BASE_URI . '/theme/dolibarr_logo.png')) {
+            $urllogo = DOL_URL_ROOT . '/viewimage.php?modulepart=mycompany&amp;entity='.$conf->entity.'&amp;file=' . urlencode('logos/thumbs/'.$mysoc->logo_small);
+        } elseif (!empty($mysoc->logo) && is_readable($conf->mycompany->dir_output . '/logos/' . $mysoc->logo)) {
+            $urllogo = DOL_URL_ROOT . '/viewimage.php?modulepart=mycompany&amp;entity='.$conf->entity.'&amp;file=' . urlencode('logos/'.$mysoc->logo);
+            $width = 128;
+        } elseif (is_readable(DOL_BASE_URI . '/theme/dolibarr_logo.png')) {
             $urllogo = DOL_BASE_URI . '/theme/dolibarr_logo.png';
         }
-    	print '<center>';
-    	print '<a href="' . ($conf->global->TICKET_URL_PUBLIC_INTERFACE ? $conf->global->TICKET_URL_PUBLIC_INTERFACE : dol_buildpath('/public/ticket/index.php', 1)) . '"><img alt="Logo" id="logosubscribe" title="" src="' . $urllogo . '" style="max-width: 440px" /></a><br>';
-    	print '<strong>' . ($conf->global->TICKET_PUBLIC_INTERFACE_TOPIC ? $conf->global->TICKET_PUBLIC_INTERFACE_TOPIC : $langs->trans("TicketSystem")) . '</strong>';
-    	print '</center><br>';
+        print '<center>';
+        print '<a href="' . ($conf->global->TICKET_URL_PUBLIC_INTERFACE ? $conf->global->TICKET_URL_PUBLIC_INTERFACE : dol_buildpath('/public/ticket/index.php', 1)) . '"><img alt="Logo" id="logosubscribe" title="" src="' . $urllogo . '" style="max-width: 440px" /></a><br>';
+        print '<strong>' . ($conf->global->TICKET_PUBLIC_INTERFACE_TOPIC ? $conf->global->TICKET_PUBLIC_INTERFACE_TOPIC : $langs->trans("TicketSystem")) . '</strong>';
+        print '</center><br>';
     }
 
     print '<div style="margin-left: 50px; margin-right: 50px;">';

Spacing +23 added lines, -23 removed lines

@@ -70,7 +70,7 @@ 
 
     $h = 0;
     $head = array();
-    $head[$h][0] = DOL_URL_ROOT.'/ticket/card.php?action=view&track_id=' . $object->track_id;
+    $head[$h][0] = DOL_URL_ROOT.'/ticket/card.php?action=view&track_id='.$object->track_id;
     $head[$h][1] = $langs->trans("Card");
     $head[$h][2] = 'tabTicket';
     $h++;
@@ -78,10 +78,10 @@ 
 
     if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && empty($user->socid))
     {
-    	$nbContact = count($object->liste_contact(-1,'internal')) + count($object->liste_contact(-1,'external'));
+    	$nbContact = count($object->liste_contact(-1, 'internal')) + count($object->liste_contact(-1, 'external'));
     	$head[$h][0] = DOL_URL_ROOT.'/ticket/contact.php?track_id='.$object->track_id;
     	$head[$h][1] = $langs->trans('ContactsAddresses');
-    	if ($nbContact > 0) $head[$h][1].= ' <span class="badge">'.$nbContact.'</span>';
+    	if ($nbContact > 0) $head[$h][1] .= ' <span class="badge">'.$nbContact.'</span>';
     	$head[$h][2] = 'contact';
     	$h++;
     }
@@ -89,13 +89,13 @@ 
     complete_head_from_modules($conf, $langs, $object, $head, $h, 'ticket');
 
     // Attached files
-    include_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
-    $upload_dir = $conf->ticket->dir_output . "/" . $object->track_id;
+    include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+    $upload_dir = $conf->ticket->dir_output."/".$object->track_id;
     $nbFiles = count(dol_dir_list($upload_dir, 'files'));
-    $head[$h][0] = dol_buildpath('/ticket/document.php', 1) . '?track_id=' . $object->track_id;
+    $head[$h][0] = dol_buildpath('/ticket/document.php', 1).'?track_id='.$object->track_id;
     $head[$h][1] = $langs->trans("Documents");
     if ($nbFiles > 0) {
-        $head[$h][1] .= ' <span class="badge">' . $nbFiles . '</span>';
+        $head[$h][1] .= ' <span class="badge">'.$nbFiles.'</span>';
     }
 
     $head[$h][2] = 'tabTicketDocument';
@@ -103,18 +103,18 @@ 
 
 
     // History
-    $head[$h][0] = DOL_URL_ROOT.'/ticket/agenda.php?track_id=' . $object->track_id;
+    $head[$h][0] = DOL_URL_ROOT.'/ticket/agenda.php?track_id='.$object->track_id;
     $head[$h][1] = $langs->trans('Events');
-    if (! empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read) ))
+    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][1] .= '/';
+    	$head[$h][1] .= $langs->trans("Agenda");
     }
     $head[$h][2] = 'tabTicketLogs';
     $h++;
 
 
-    complete_head_from_modules($conf, $langs, $object, $head, $h, 'ticket','remove');
+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'ticket', 'remove');
 
 
     return $head;
@@ -126,7 +126,7 @@ 
  *    @param  string $car Char to generate key
  *     @return void
  */
-function generate_random_id($car=16)
+function generate_random_id($car = 16)
 {
     $string = "";
     $chaine = "abcdefghijklmnopqrstuvwxyz123456789";
@@ -155,21 +155,21 @@ 
     top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss); // Show html headers
     print '<body id="mainbody" class="publicnewticketform" style="margin-top: 10px;">';
 
-    if (! empty($conf->global->TICKET_SHOW_COMPANY_LOGO)) {
+    if (!empty($conf->global->TICKET_SHOW_COMPANY_LOGO)) {
     	// Print logo
-    	$urllogo = DOL_BASE_URI . '/theme/login_logo.png';
+    	$urllogo = DOL_BASE_URI.'/theme/login_logo.png';
 
-        if (!empty($mysoc->logo_small) && is_readable($conf->mycompany->dir_output . '/logos/thumbs/' . $mysoc->logo_small)) {
-    		$urllogo = DOL_URL_ROOT . '/viewimage.php?modulepart=mycompany&amp;entity='.$conf->entity.'&amp;file=' . urlencode('logos/thumbs/'.$mysoc->logo_small);
-    	} elseif (!empty($mysoc->logo) && is_readable($conf->mycompany->dir_output . '/logos/' . $mysoc->logo)) {
-    		$urllogo = DOL_URL_ROOT . '/viewimage.php?modulepart=mycompany&amp;entity='.$conf->entity.'&amp;file=' . urlencode('logos/'.$mysoc->logo);
+        if (!empty($mysoc->logo_small) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small)) {
+    		$urllogo = DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;entity='.$conf->entity.'&amp;file='.urlencode('logos/thumbs/'.$mysoc->logo_small);
+    	} elseif (!empty($mysoc->logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$mysoc->logo)) {
+    		$urllogo = DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;entity='.$conf->entity.'&amp;file='.urlencode('logos/'.$mysoc->logo);
     		$width = 128;
-    	} elseif (is_readable(DOL_BASE_URI . '/theme/dolibarr_logo.png')) {
-            $urllogo = DOL_BASE_URI . '/theme/dolibarr_logo.png';
+    	} elseif (is_readable(DOL_BASE_URI.'/theme/dolibarr_logo.png')) {
+            $urllogo = DOL_BASE_URI.'/theme/dolibarr_logo.png';
         }
     	print '<center>';
-    	print '<a href="' . ($conf->global->TICKET_URL_PUBLIC_INTERFACE ? $conf->global->TICKET_URL_PUBLIC_INTERFACE : dol_buildpath('/public/ticket/index.php', 1)) . '"><img alt="Logo" id="logosubscribe" title="" src="' . $urllogo . '" style="max-width: 440px" /></a><br>';
-    	print '<strong>' . ($conf->global->TICKET_PUBLIC_INTERFACE_TOPIC ? $conf->global->TICKET_PUBLIC_INTERFACE_TOPIC : $langs->trans("TicketSystem")) . '</strong>';
+    	print '<a href="'.($conf->global->TICKET_URL_PUBLIC_INTERFACE ? $conf->global->TICKET_URL_PUBLIC_INTERFACE : dol_buildpath('/public/ticket/index.php', 1)).'"><img alt="Logo" id="logosubscribe" title="" src="'.$urllogo.'" style="max-width: 440px" /></a><br>';
+    	print '<strong>'.($conf->global->TICKET_PUBLIC_INTERFACE_TOPIC ? $conf->global->TICKET_PUBLIC_INTERFACE_TOPIC : $langs->trans("TicketSystem")).'</strong>';
     	print '</center><br>';
     }