alxarafe / alixar

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

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

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

dolibarr/htdocs/core/lib/cron.lib.php

Indentation +57 added lines, -57 removed lines

@@ -55,25 +55,25 @@ 
  */
 function cron_prepare_head(Cronjob $object)
 {
-	global $langs, $conf, $user;
-	$h = 0;
-	$head = array();
+    global $langs, $conf, $user;
+    $h = 0;
+    $head = array();
 
-	$head[$h][0] = dol_buildpath('/cron/card.php', 1).'?id='.$object->id;
-	$head[$h][1] = $langs->trans("CronTask");
-	$head[$h][2] = 'card';
-	$h++;
+    $head[$h][0] = dol_buildpath('/cron/card.php', 1).'?id='.$object->id;
+    $head[$h][1] = $langs->trans("CronTask");
+    $head[$h][2] = 'card';
+    $h++;
 
-	$head[$h][0] = dol_buildpath('/cron/info.php', 1).'?id='.$object->id;
-	$head[$h][1] = $langs->trans("Info");
-	$head[$h][2] = 'info';
-	$h++;
+    $head[$h][0] = dol_buildpath('/cron/info.php', 1).'?id='.$object->id;
+    $head[$h][1] = $langs->trans("Info");
+    $head[$h][2] = 'info';
+    $h++;
 
-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'cron');
+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'cron');
 
-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'cron', 'remove');
+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'cron', 'remove');
 
-	return $head;
+    return $head;
 }
 
 /**
@@ -83,54 +83,54 @@ 
  */
 function dol_print_cron_urls()
 {
-	global $conf, $langs, $user;
-	global $dolibarr_main_url_root;
-
-	// 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
-
-	// Cron launch
-	print '<div class="div-table-responsive-no-min">';
-	print '<u>'.$langs->trans("URLToLaunchCronJobs").':</u><br>';
-	$url=$urlwithroot.'/public/cron/cron_run_jobs.php?'.(empty($conf->global->CRON_KEY)?'':'securitykey='.$conf->global->CRON_KEY.'&').'userlogin='.$user->login;
-	print img_picto('','object_globe.png').' <a href="'.$url.'" target="_blank">'.$url."</a><br>\n";
-	print ' '.$langs->trans("OrToLaunchASpecificJob").'<br>';
-	$url=$urlwithroot.'/public/cron/cron_run_jobs.php?'.(empty($conf->global->CRON_KEY)?'':'securitykey='.$conf->global->CRON_KEY.'&').'userlogin='.$user->login.'&id=cronjobid';
-	print img_picto('','object_globe.png').' <a href="'.$url.'" target="_blank">'.$url."</a><br>\n";
+    global $conf, $langs, $user;
+    global $dolibarr_main_url_root;
+
+    // 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
+
+    // Cron launch
+    print '<div class="div-table-responsive-no-min">';
+    print '<u>'.$langs->trans("URLToLaunchCronJobs").':</u><br>';
+    $url=$urlwithroot.'/public/cron/cron_run_jobs.php?'.(empty($conf->global->CRON_KEY)?'':'securitykey='.$conf->global->CRON_KEY.'&').'userlogin='.$user->login;
+    print img_picto('','object_globe.png').' <a href="'.$url.'" target="_blank">'.$url."</a><br>\n";
+    print ' '.$langs->trans("OrToLaunchASpecificJob").'<br>';
+    $url=$urlwithroot.'/public/cron/cron_run_jobs.php?'.(empty($conf->global->CRON_KEY)?'':'securitykey='.$conf->global->CRON_KEY.'&').'userlogin='.$user->login.'&id=cronjobid';
+    print img_picto('','object_globe.png').' <a href="'.$url.'" target="_blank">'.$url."</a><br>\n";
     print '</div>';
     print '<br>';
     
-	$logintouse = 'firstadmin';
-	if ($user->admin) $logintouse = $user->login;
+    $logintouse = 'firstadmin';
+    if ($user->admin) $logintouse = $user->login;
 	
-	print '<u>'.$langs->trans("FileToLaunchCronJobs").':</u><br>';
-
-	$file='/scripts/cron/cron_run_jobs.php'.' '.(empty($conf->global->CRON_KEY)?'securitykey':''.$conf->global->CRON_KEY.'').' '.$logintouse.' [cronjobid]';
-	print '<textarea class="quatrevingtpercent">..'.$file."</textarea><br>\n";
-	print '<br>';
-
-	// Add note
-	if (empty($conf->global->CRON_DISABLE_TUTORIAL_CRON))
-	{
-    	$linuxlike=1;
-    	if (preg_match('/^win/i',PHP_OS)) $linuxlike=0;
-    	if (preg_match('/^mac/i',PHP_OS)) $linuxlike=0;
-    	print $langs->trans("Note").': ';
-    	if ($linuxlike)
-    	{
-    		print $langs->trans("CronExplainHowToRunUnix");
-    		print '<br>';
-    		print '<textarea class="quatrevingtpercent">*/5 * * * * pathtoscript/scripts/cron/cron_run_jobs.php '.(empty($conf->global->CRON_KEY)?'securitykey':''.$conf->global->CRON_KEY.'').' '.$logintouse.' &gt; '.DOL_DATA_ROOT.'/cron_run_jobs.php.log</textarea><br>';
-    	}
-    	else
-    	{
-    		print $langs->trans("CronExplainHowToRunWin");
-    	}
-	}
+    print '<u>'.$langs->trans("FileToLaunchCronJobs").':</u><br>';
+
+    $file='/scripts/cron/cron_run_jobs.php'.' '.(empty($conf->global->CRON_KEY)?'securitykey':''.$conf->global->CRON_KEY.'').' '.$logintouse.' [cronjobid]';
+    print '<textarea class="quatrevingtpercent">..'.$file."</textarea><br>\n";
+    print '<br>';
+
+    // Add note
+    if (empty($conf->global->CRON_DISABLE_TUTORIAL_CRON))
+    {
+        $linuxlike=1;
+        if (preg_match('/^win/i',PHP_OS)) $linuxlike=0;
+        if (preg_match('/^mac/i',PHP_OS)) $linuxlike=0;
+        print $langs->trans("Note").': ';
+        if ($linuxlike)
+        {
+            print $langs->trans("CronExplainHowToRunUnix");
+            print '<br>';
+            print '<textarea class="quatrevingtpercent">*/5 * * * * pathtoscript/scripts/cron/cron_run_jobs.php '.(empty($conf->global->CRON_KEY)?'securitykey':''.$conf->global->CRON_KEY.'').' '.$logintouse.' &gt; '.DOL_DATA_ROOT.'/cron_run_jobs.php.log</textarea><br>';
+        }
+        else
+        {
+            print $langs->trans("CronExplainHowToRunWin");
+        }
+    }
 	
-	return 0;
+    return 0;
 }
 
 

dolibarr/htdocs/core/lib/report.lib.php

Indentation +81 added lines, -81 removed lines

@@ -40,86 +40,86 @@
  */
 function report_header($reportname,$notused,$period,$periodlink,$description,$builddate,$exportlink='',$moreparam=array(),$calcmode='', $varlink='')
 {
-	global $langs;
-
-	if (empty($hselected)) $hselected='report';
-
-	print "\n\n<!-- start banner of report -->\n";
-
-	if(! empty($varlink)) $varlink = '?'.$varlink;
-
-	$h=0;
-	$head[$h][0] = $_SERVER["PHP_SELF"].$varlink;
-	$head[$h][1] = $langs->trans("Report");
-	$head[$h][2] = 'report';
-
-	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].$varlink.'">';
-
-	dol_fiche_head($head, 'report');
-
-	foreach($moreparam as $key => $value)
-	{
-		 print '<input type="hidden" name="'.$key.'" value="'.$value.'">';
-	}
-	print '<table width="100%" class="border">';
-
-	$variante = ($periodlink || $exportlink);
-
-	// Ligne de titre
-	print '<tr>';
-	print '<td width="110">'.$langs->trans("ReportName").'</td>';
-	print '<td>';
-	print $reportname;
-	print '</td>';
-	if ($variante) print '<td></td>';
-	print '</tr>';
-
-	// Calculation mode
-	if ($calcmode)
-	{
-		print '<tr>';
-		print '<td width="110">'.$langs->trans("CalculationMode").'</td>';
-		print '<td>';
-		print $calcmode;
-		if ($variante) print '<td></td>';
-		print '</td>';
-		print '</tr>';
-	}
-
-	// Ligne de la periode d'analyse du rapport
-	print '<tr>';
-	print '<td>'.$langs->trans("ReportPeriod").'</td>';
-	print '<td>';
-	if ($period) print $period;
-	if ($variante) print '<td class="nowraponall">'.$periodlink.'</td>';
-	print '</td>';
-	print '</tr>';
-
-	// Ligne de description
-	print '<tr>';
-	print '<td>'.$langs->trans("ReportDescription").'</td>';
-	print '<td>'.$description.'</td>';
-	if ($variante) print '<td></td>';
-	print '</tr>';
-
-	// Ligne d'export
-	print '<tr>';
-	print '<td>'.$langs->trans("GeneratedOn").'</td>';
-	print '<td>';
-	print dol_print_date($builddate, 'dayhour');
-	print '</td>';
-	if ($variante) print '<td>'.($exportlink ? $langs->trans("Export").': '.$exportlink : '').'</td>';
-	print '</tr>';
-
-	print '</table>';
-
-	dol_fiche_end();
-
-	print '<div class="center"><input type="submit" class="button" name="submit" value="'.$langs->trans("Refresh").'"></div>';
-
-	print '</form>';
-	print '<br>';
-
-	print "\n<!-- end banner of report -->\n\n";
+    global $langs;
+
+    if (empty($hselected)) $hselected='report';
+
+    print "\n\n<!-- start banner of report -->\n";
+
+    if(! empty($varlink)) $varlink = '?'.$varlink;
+
+    $h=0;
+    $head[$h][0] = $_SERVER["PHP_SELF"].$varlink;
+    $head[$h][1] = $langs->trans("Report");
+    $head[$h][2] = 'report';
+
+    print '<form method="POST" action="'.$_SERVER["PHP_SELF"].$varlink.'">';
+
+    dol_fiche_head($head, 'report');
+
+    foreach($moreparam as $key => $value)
+    {
+            print '<input type="hidden" name="'.$key.'" value="'.$value.'">';
+    }
+    print '<table width="100%" class="border">';
+
+    $variante = ($periodlink || $exportlink);
+
+    // Ligne de titre
+    print '<tr>';
+    print '<td width="110">'.$langs->trans("ReportName").'</td>';
+    print '<td>';
+    print $reportname;
+    print '</td>';
+    if ($variante) print '<td></td>';
+    print '</tr>';
+
+    // Calculation mode
+    if ($calcmode)
+    {
+        print '<tr>';
+        print '<td width="110">'.$langs->trans("CalculationMode").'</td>';
+        print '<td>';
+        print $calcmode;
+        if ($variante) print '<td></td>';
+        print '</td>';
+        print '</tr>';
+    }
+
+    // Ligne de la periode d'analyse du rapport
+    print '<tr>';
+    print '<td>'.$langs->trans("ReportPeriod").'</td>';
+    print '<td>';
+    if ($period) print $period;
+    if ($variante) print '<td class="nowraponall">'.$periodlink.'</td>';
+    print '</td>';
+    print '</tr>';
+
+    // Ligne de description
+    print '<tr>';
+    print '<td>'.$langs->trans("ReportDescription").'</td>';
+    print '<td>'.$description.'</td>';
+    if ($variante) print '<td></td>';
+    print '</tr>';
+
+    // Ligne d'export
+    print '<tr>';
+    print '<td>'.$langs->trans("GeneratedOn").'</td>';
+    print '<td>';
+    print dol_print_date($builddate, 'dayhour');
+    print '</td>';
+    if ($variante) print '<td>'.($exportlink ? $langs->trans("Export").': '.$exportlink : '').'</td>';
+    print '</tr>';
+
+    print '</table>';
+
+    dol_fiche_end();
+
+    print '<div class="center"><input type="submit" class="button" name="submit" value="'.$langs->trans("Refresh").'"></div>';
+
+    print '</form>';
+    print '<br>';
+
+    print "\n<!-- end banner of report -->\n\n";
 }
 

dolibarr/htdocs/core/actions_sendmails.inc.php

Indentation +394 added lines, -394 removed lines

@@ -34,16 +34,16 @@ 
  */
 if (GETPOST('addfile','alpha'))
 {
-	$trackid = GETPOST('trackid','aZ09');
+    $trackid = GETPOST('trackid','aZ09');
 
-	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+    require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-	// Set tmp user directory
-	$vardir=$conf->user->dir_output."/".$user->id;
-	$upload_dir_tmp = $vardir.'/temp';             // TODO Add $keytoavoidconflict in upload_dir path
+    // Set tmp user directory
+    $vardir=$conf->user->dir_output."/".$user->id;
+    $upload_dir_tmp = $vardir.'/temp';             // TODO Add $keytoavoidconflict in upload_dir path
 
-	dol_add_file_process($upload_dir_tmp, 0, 0, 'addedfile', '', null, $trackid, 0);
-	$action='presend';
+    dol_add_file_process($upload_dir_tmp, 0, 0, 'addedfile', '', null, $trackid, 0);
+    $action='presend';
 }
 
 /*
@@ -51,18 +51,18 @@ 
  */
 if (! empty($_POST['removedfile']) && empty($_POST['removAll']))
 {
-	$trackid = GETPOST('trackid','aZ09');
+    $trackid = GETPOST('trackid','aZ09');
 
-	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+    require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-	// Set tmp user directory
-	$vardir=$conf->user->dir_output."/".$user->id;
-	$upload_dir_tmp = $vardir.'/temp';             // TODO Add $keytoavoidconflict in upload_dir path
+    // Set tmp user directory
+    $vardir=$conf->user->dir_output."/".$user->id;
+    $upload_dir_tmp = $vardir.'/temp';             // TODO Add $keytoavoidconflict in upload_dir path
 
-	// TODO Delete only files that was uploaded from email form. This can be addressed by adding the trackid into the temp path then changing donotdeletefile to 2 instead of 1 to say "delete only if into temp dir"
-	// GETPOST('removedfile','alpha') is position of file into $_SESSION["listofpaths"...] array.
-	dol_remove_file_process(GETPOST('removedfile','alpha'), 0, 1, $trackid);   // We do not delete because if file is the official PDF of doc, we don't want to remove it physically
-	$action='presend';
+    // TODO Delete only files that was uploaded from email form. This can be addressed by adding the trackid into the temp path then changing donotdeletefile to 2 instead of 1 to say "delete only if into temp dir"
+    // GETPOST('removedfile','alpha') is position of file into $_SESSION["listofpaths"...] array.
+    dol_remove_file_process(GETPOST('removedfile','alpha'), 0, 1, $trackid);   // We do not delete because if file is the official PDF of doc, we don't want to remove it physically
+    $action='presend';
 }
 
 /*
@@ -70,31 +70,31 @@ 
  */
 if (GETPOST('removAll','alpha'))
 {
-	$trackid = GETPOST('trackid','aZ09');
-
-	$listofpaths=array();
-	$listofnames=array();
-	$listofmimes=array();
-	$keytoavoidconflict = empty($trackid)?'':'-'.$trackid;
-	if (! empty($_SESSION["listofpaths".$keytoavoidconflict])) $listofpaths=explode(';',$_SESSION["listofpaths".$keytoavoidconflict]);
-	if (! empty($_SESSION["listofnames".$keytoavoidconflict])) $listofnames=explode(';',$_SESSION["listofnames".$keytoavoidconflict]);
-	if (! empty($_SESSION["listofmimes".$keytoavoidconflict])) $listofmimes=explode(';',$_SESSION["listofmimes".$keytoavoidconflict]);
-
-	include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
-	$formmail = new FormMail($db);
-	$formmail->trackid = $trackid;
-
-	foreach($listofpaths as $key => $value)
-	{
-		$pathtodelete = $value;
-		$filetodelete = $listofnames[$key];
-		$result = dol_delete_file($pathtodelete,1); // Delete uploded Files
-
-		$langs->load("other");
-		setEventMessages($langs->trans("FileWasRemoved",$filetodelete), null, 'mesgs');
-
-		$formmail->remove_attached_files($key); // Update Session
-	}
+    $trackid = GETPOST('trackid','aZ09');
+
+    $listofpaths=array();
+    $listofnames=array();
+    $listofmimes=array();
+    $keytoavoidconflict = empty($trackid)?'':'-'.$trackid;
+    if (! empty($_SESSION["listofpaths".$keytoavoidconflict])) $listofpaths=explode(';',$_SESSION["listofpaths".$keytoavoidconflict]);
+    if (! empty($_SESSION["listofnames".$keytoavoidconflict])) $listofnames=explode(';',$_SESSION["listofnames".$keytoavoidconflict]);
+    if (! empty($_SESSION["listofmimes".$keytoavoidconflict])) $listofmimes=explode(';',$_SESSION["listofmimes".$keytoavoidconflict]);
+
+    include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
+    $formmail = new FormMail($db);
+    $formmail->trackid = $trackid;
+
+    foreach($listofpaths as $key => $value)
+    {
+        $pathtodelete = $value;
+        $filetodelete = $listofnames[$key];
+        $result = dol_delete_file($pathtodelete,1); // Delete uploded Files
+
+        $langs->load("other");
+        setEventMessages($langs->trans("FileWasRemoved",$filetodelete), null, 'mesgs');
+
+        $formmail->remove_attached_files($key); // Update Session
+    }
 }
 
 /*
@@ -102,244 +102,244 @@ 
  */
 if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_POST['removAll'] && ! $_POST['removedfile'] && ! $_POST['cancel'] && !$_POST['modelselected'])
 {
-	if (empty($trackid)) $trackid = GETPOST('trackid','aZ09');
-
-	$subject='';$actionmsg='';$actionmsg2='';
-
-	$langs->load('mails');
-
-	if (is_object($object))
-	{
-		$result=$object->fetch($id);
-
-		$sendtosocid=0;    // Thirdparty on object
-		if (method_exists($object,"fetch_thirdparty") && ! in_array($object->element, array('societe','member','user','expensereport', 'contact')))
-		{
-			$result=$object->fetch_thirdparty();
-			if ($object->element == 'user' && $result == 0) $result=1;    // Even if not found, we consider ok
-			$thirdparty=$object->thirdparty;
-			$sendtosocid=$thirdparty->id;
-		}
-		else if ($object->element == 'member' || $object->element == 'user')
-		{
-			$thirdparty=$object;
-			if ($thirdparty->id > 0) $sendtosocid=$thirdparty->id;
-		}
-		else if ($object->element == 'societe')
-		{
-			$thirdparty=$object;
-			if ($thirdparty->id > 0) $sendtosocid=$thirdparty->id;
-		}
-		else if ($object->element == 'contact')
-		{
-			$contact=$object;
-			if ($contact->id > 0) $sendtosocid=$contact->fetch_thirdparty()->id;
-		}
-		else dol_print_error('','Use actions_sendmails.in.php for an element/object that is not supported');
-
-		if (is_object($hookmanager))
-		{
-			$parameters=array();
-			$reshook=$hookmanager->executeHooks('initSendToSocid',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-		}
-	}
-	else $thirdparty = $mysoc;
-
-	if ($result > 0)
-	{
-		$sendto='';
-		$sendtocc='';
-		$sendtobcc='';
-		$sendtoid = array();
-		$sendtouserid=array();
-		$sendtoccuserid=array();
-
-		// Define $sendto
-		$receiver=$_POST['receiver'];
-		if (! is_array($receiver))
-		{
-			if ($receiver == '-1') $receiver=array();
-			else $receiver=array($receiver);
-		}
-		$tmparray=array();
-		if (trim($_POST['sendto']))
-		{
-			// Recipients are provided into free text
-			$tmparray[] = trim($_POST['sendto']);
-		}
-		if (count($receiver)>0)
-		{
-			foreach($receiver as $key=>$val)
-			{
-				// Recipient was provided from combo list
-				if ($val == 'thirdparty') // Id of third party
-				{
-					$tmparray[] = dol_string_nospecial($thirdparty->name, ' ', array(",")).' <'.$thirdparty->email.'>';
-				}
-				// Recipient was provided from combo list
-				elseif ($val == 'contact') // Id of contact
-				{
-					$tmparray[] = dol_string_nospecial($contact->name, ' ', array(",")).' <'.$contact->email.'>';
-				}
-				elseif ($val)	// Id du contact
-				{
-					$tmparray[] = $thirdparty->contact_get_property((int) $val,'email');
-					$sendtoid[] = $val;
-				}
-			}
-		}
-		if (!empty($conf->global->MAIN_MAIL_ENABLED_USER_DEST_SELECT))
-		{
-			$receiveruser=$_POST['receiveruser'];
-			if (is_array($receiveruser) && count($receiveruser)>0)
-			{
-				$fuserdest = new User($db);
-				foreach($receiveruser as $key=>$val)
-				{
-					$tmparray[] = $fuserdest->user_get_property($val,'email');
-					$sendtouserid[] = $val;
-				}
-			}
-		}
-
-		$sendto=implode(',',$tmparray);
-
-		// Define $sendtocc
-		$receivercc=$_POST['receivercc'];
-		if (! is_array($receivercc))
-		{
-			if ($receivercc == '-1') $receivercc=array();
-			else $receivercc=array($receivercc);
-		}
-		$tmparray=array();
-		if (trim($_POST['sendtocc']))
-		{
-			$tmparray[] = trim($_POST['sendtocc']);
-		}
-		if (count($receivercc) > 0)
-		{
-			foreach($receivercc as $key=>$val)
-			{
-				// Recipient was provided from combo list
-				if ($val == 'thirdparty') // Id of third party
-				{
-					$tmparray[] = dol_string_nospecial($thirdparty->name, ' ', array(",")).' <'.$thirdparty->email.'>';
-				}
-				// Recipient was provided from combo list
-				elseif ($val == 'contact') // Id of contact
-				{
-					$tmparray[] = dol_string_nospecial($contact->name, ' ', array(",")).' <'.$contact->email.'>';
-				}
-				elseif ($val)	// Id du contact
-				{
-					$tmparray[] = $thirdparty->contact_get_property((int) $val,'email');
-					//$sendtoid[] = $val;  TODO Add also id of contact in CC ?
-				}
-			}
-		}
-		if (!empty($conf->global->MAIN_MAIL_ENABLED_USER_DEST_SELECT)) {
-			$receiverccuser=$_POST['receiverccuser'];
-
-			if (is_array($receiverccuser) && count($receiverccuser)>0)
-			{
-				$fuserdest = new User($db);
-				foreach($receiverccuser as $key=>$val)
-				{
-					$tmparray[] = $fuserdest->user_get_property($val,'email');
-					$sendtoccuserid[] = $val;
-				}
-			}
-		}
-		$sendtocc=implode(',',$tmparray);
-
-		if (dol_strlen($sendto))
-		{
+    if (empty($trackid)) $trackid = GETPOST('trackid','aZ09');
+
+    $subject='';$actionmsg='';$actionmsg2='';
+
+    $langs->load('mails');
+
+    if (is_object($object))
+    {
+        $result=$object->fetch($id);
+
+        $sendtosocid=0;    // Thirdparty on object
+        if (method_exists($object,"fetch_thirdparty") && ! in_array($object->element, array('societe','member','user','expensereport', 'contact')))
+        {
+            $result=$object->fetch_thirdparty();
+            if ($object->element == 'user' && $result == 0) $result=1;    // Even if not found, we consider ok
+            $thirdparty=$object->thirdparty;
+            $sendtosocid=$thirdparty->id;
+        }
+        else if ($object->element == 'member' || $object->element == 'user')
+        {
+            $thirdparty=$object;
+            if ($thirdparty->id > 0) $sendtosocid=$thirdparty->id;
+        }
+        else if ($object->element == 'societe')
+        {
+            $thirdparty=$object;
+            if ($thirdparty->id > 0) $sendtosocid=$thirdparty->id;
+        }
+        else if ($object->element == 'contact')
+        {
+            $contact=$object;
+            if ($contact->id > 0) $sendtosocid=$contact->fetch_thirdparty()->id;
+        }
+        else dol_print_error('','Use actions_sendmails.in.php for an element/object that is not supported');
+
+        if (is_object($hookmanager))
+        {
+            $parameters=array();
+            $reshook=$hookmanager->executeHooks('initSendToSocid',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+        }
+    }
+    else $thirdparty = $mysoc;
+
+    if ($result > 0)
+    {
+        $sendto='';
+        $sendtocc='';
+        $sendtobcc='';
+        $sendtoid = array();
+        $sendtouserid=array();
+        $sendtoccuserid=array();
+
+        // Define $sendto
+        $receiver=$_POST['receiver'];
+        if (! is_array($receiver))
+        {
+            if ($receiver == '-1') $receiver=array();
+            else $receiver=array($receiver);
+        }
+        $tmparray=array();
+        if (trim($_POST['sendto']))
+        {
+            // Recipients are provided into free text
+            $tmparray[] = trim($_POST['sendto']);
+        }
+        if (count($receiver)>0)
+        {
+            foreach($receiver as $key=>$val)
+            {
+                // Recipient was provided from combo list
+                if ($val == 'thirdparty') // Id of third party
+                {
+                    $tmparray[] = dol_string_nospecial($thirdparty->name, ' ', array(",")).' <'.$thirdparty->email.'>';
+                }
+                // Recipient was provided from combo list
+                elseif ($val == 'contact') // Id of contact
+                {
+                    $tmparray[] = dol_string_nospecial($contact->name, ' ', array(",")).' <'.$contact->email.'>';
+                }
+                elseif ($val)	// Id du contact
+                {
+                    $tmparray[] = $thirdparty->contact_get_property((int) $val,'email');
+                    $sendtoid[] = $val;
+                }
+            }
+        }
+        if (!empty($conf->global->MAIN_MAIL_ENABLED_USER_DEST_SELECT))
+        {
+            $receiveruser=$_POST['receiveruser'];
+            if (is_array($receiveruser) && count($receiveruser)>0)
+            {
+                $fuserdest = new User($db);
+                foreach($receiveruser as $key=>$val)
+                {
+                    $tmparray[] = $fuserdest->user_get_property($val,'email');
+                    $sendtouserid[] = $val;
+                }
+            }
+        }
+
+        $sendto=implode(',',$tmparray);
+
+        // Define $sendtocc
+        $receivercc=$_POST['receivercc'];
+        if (! is_array($receivercc))
+        {
+            if ($receivercc == '-1') $receivercc=array();
+            else $receivercc=array($receivercc);
+        }
+        $tmparray=array();
+        if (trim($_POST['sendtocc']))
+        {
+            $tmparray[] = trim($_POST['sendtocc']);
+        }
+        if (count($receivercc) > 0)
+        {
+            foreach($receivercc as $key=>$val)
+            {
+                // Recipient was provided from combo list
+                if ($val == 'thirdparty') // Id of third party
+                {
+                    $tmparray[] = dol_string_nospecial($thirdparty->name, ' ', array(",")).' <'.$thirdparty->email.'>';
+                }
+                // Recipient was provided from combo list
+                elseif ($val == 'contact') // Id of contact
+                {
+                    $tmparray[] = dol_string_nospecial($contact->name, ' ', array(",")).' <'.$contact->email.'>';
+                }
+                elseif ($val)	// Id du contact
+                {
+                    $tmparray[] = $thirdparty->contact_get_property((int) $val,'email');
+                    //$sendtoid[] = $val;  TODO Add also id of contact in CC ?
+                }
+            }
+        }
+        if (!empty($conf->global->MAIN_MAIL_ENABLED_USER_DEST_SELECT)) {
+            $receiverccuser=$_POST['receiverccuser'];
+
+            if (is_array($receiverccuser) && count($receiverccuser)>0)
+            {
+                $fuserdest = new User($db);
+                foreach($receiverccuser as $key=>$val)
+                {
+                    $tmparray[] = $fuserdest->user_get_property($val,'email');
+                    $sendtoccuserid[] = $val;
+                }
+            }
+        }
+        $sendtocc=implode(',',$tmparray);
+
+        if (dol_strlen($sendto))
+        {
             // 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
 
-		    require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
-
-			$langs->load("commercial");
-
-			$fromtype = GETPOST('fromtype','alpha');
-			if ($fromtype === 'robot') {
-				$from = dol_string_nospecial($conf->global->MAIN_MAIL_EMAIL_FROM, ' ', array(",")) .' <'.$conf->global->MAIN_MAIL_EMAIL_FROM.'>';
-			}
-			elseif ($fromtype === 'user') {
-				$from = dol_string_nospecial($user->getFullName($langs), ' ', array(",")) .' <'.$user->email.'>';
-			}
-			elseif ($fromtype === 'company') {
-				$from = dol_string_nospecial($conf->global->MAIN_INFO_SOCIETE_NOM, ' ', array(",")) .' <'.$conf->global->MAIN_INFO_SOCIETE_MAIL.'>';
-			}
-			elseif (preg_match('/user_aliases_(\d+)/', $fromtype, $reg)) {
-				$tmp=explode(',', $user->email_aliases);
-				$from = trim($tmp[($reg[1] - 1)]);
-			}
-			elseif (preg_match('/global_aliases_(\d+)/', $fromtype, $reg)) {
-				$tmp=explode(',', $conf->global->MAIN_INFO_SOCIETE_MAIL_ALIASES);
-				$from = trim($tmp[($reg[1] - 1)]);
-			}
-			elseif (preg_match('/senderprofile_(\d+)_(\d+)/', $fromtype, $reg)) {
-				$sql='SELECT rowid, label, email FROM '.MAIN_DB_PREFIX.'c_email_senderprofile WHERE rowid = '.(int) $reg[1];
-				$resql = $db->query($sql);
-				$obj = $db->fetch_object($resql);
-				if ($obj)
-				{
-					$from = dol_string_nospecial($obj->label, ' ', array(",")).' <'.$obj->email.'>';
-				}
-			}
-			else {
-				$from = dol_string_nospecial($_POST['fromname'], ' ', array(",")) . ' <' . $_POST['frommail'] .'>';
-			}
-
-			$replyto = dol_string_nospecial($_POST['replytoname'], ' ', array(",")). ' <' . $_POST['replytomail'].'>';
-			$message = GETPOST('message','none');
-			$subject = GETPOST('subject','none');
-
-			// Make a change into HTML code to allow to include images from medias directory with an external reabable URL.
-			// <img alt="" src="/dolibarr_dev/htdocs/viewimage.php?modulepart=medias&amp;entity=1&amp;file=image/ldestailleur_166x166.jpg" style="height:166px; width:166px" />
-			// become
-			// <img alt="" src="'.$urlwithroot.'viewimage.php?modulepart=medias&amp;entity=1&amp;file=image/ldestailleur_166x166.jpg" style="height:166px; width:166px" />
-			$message=preg_replace('/(<img.*src=")[^\"]*viewimage\.php([^\"]*)modulepart=medias([^\"]*)file=([^\"]*)("[^\/]*\/>)/', '\1'.$urlwithroot.'/viewimage.php\2modulepart=medias\3file=\4\5', $message);
-
-			$sendtobcc= GETPOST('sendtoccc');
-			// Autocomplete the $sendtobcc
-			// $autocopy can be MAIN_MAIL_AUTOCOPY_PROPOSAL_TO, MAIN_MAIL_AUTOCOPY_ORDER_TO, MAIN_MAIL_AUTOCOPY_INVOICE_TO, MAIN_MAIL_AUTOCOPY_SUPPLIER_PROPOSAL_TO...
-			if (! empty($autocopy))
-			{
-				$sendtobcc .= (empty($conf->global->$autocopy) ? '' : (($sendtobcc?", ":"").$conf->global->$autocopy));
-			}
-
-			$deliveryreceipt = $_POST['deliveryreceipt'];
-
-			if ($action == 'send' || $action == 'relance')
-			{
-				$actionmsg2=$langs->transnoentities('MailSentBy').' '.CMailFile::getValidAddress($from,4,0,1).' '.$langs->transnoentities('To').' '.CMailFile::getValidAddress($sendto,4,0,1);
-				if ($message)
-				{
-					$actionmsg=$langs->transnoentities('MailFrom').': '.dol_escape_htmltag($from);
-					$actionmsg=dol_concatdesc($actionmsg, $langs->transnoentities('MailTo').': '.dol_escape_htmltag($sendto));
-					if ($sendtocc) $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('Bcc') . ": " . dol_escape_htmltag($sendtocc));
-					$actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('MailTopic') . ": " . $subject);
-					$actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('TextUsedInTheMessageBody') . ":");
-					$actionmsg = dol_concatdesc($actionmsg, $message);
-				}
-			}
-
-			// Create form object
-			include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
-			$formmail = new FormMail($db);
-			$formmail->trackid = $trackid;      // $trackid must be defined
-
-			$attachedfiles=$formmail->get_attached_files();
-			$filepath = $attachedfiles['paths'];
-			$filename = $attachedfiles['names'];
-			$mimetype = $attachedfiles['mimes'];
-
-			// Feature to push mail sent into Sent folder
-			/* This code must be now included into the hook mail, method sendMailAfter
+            require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
+
+            $langs->load("commercial");
+
+            $fromtype = GETPOST('fromtype','alpha');
+            if ($fromtype === 'robot') {
+                $from = dol_string_nospecial($conf->global->MAIN_MAIL_EMAIL_FROM, ' ', array(",")) .' <'.$conf->global->MAIN_MAIL_EMAIL_FROM.'>';
+            }
+            elseif ($fromtype === 'user') {
+                $from = dol_string_nospecial($user->getFullName($langs), ' ', array(",")) .' <'.$user->email.'>';
+            }
+            elseif ($fromtype === 'company') {
+                $from = dol_string_nospecial($conf->global->MAIN_INFO_SOCIETE_NOM, ' ', array(",")) .' <'.$conf->global->MAIN_INFO_SOCIETE_MAIL.'>';
+            }
+            elseif (preg_match('/user_aliases_(\d+)/', $fromtype, $reg)) {
+                $tmp=explode(',', $user->email_aliases);
+                $from = trim($tmp[($reg[1] - 1)]);
+            }
+            elseif (preg_match('/global_aliases_(\d+)/', $fromtype, $reg)) {
+                $tmp=explode(',', $conf->global->MAIN_INFO_SOCIETE_MAIL_ALIASES);
+                $from = trim($tmp[($reg[1] - 1)]);
+            }
+            elseif (preg_match('/senderprofile_(\d+)_(\d+)/', $fromtype, $reg)) {
+                $sql='SELECT rowid, label, email FROM '.MAIN_DB_PREFIX.'c_email_senderprofile WHERE rowid = '.(int) $reg[1];
+                $resql = $db->query($sql);
+                $obj = $db->fetch_object($resql);
+                if ($obj)
+                {
+                    $from = dol_string_nospecial($obj->label, ' ', array(",")).' <'.$obj->email.'>';
+                }
+            }
+            else {
+                $from = dol_string_nospecial($_POST['fromname'], ' ', array(",")) . ' <' . $_POST['frommail'] .'>';
+            }
+
+            $replyto = dol_string_nospecial($_POST['replytoname'], ' ', array(",")). ' <' . $_POST['replytomail'].'>';
+            $message = GETPOST('message','none');
+            $subject = GETPOST('subject','none');
+
+            // Make a change into HTML code to allow to include images from medias directory with an external reabable URL.
+            // <img alt="" src="/dolibarr_dev/htdocs/viewimage.php?modulepart=medias&amp;entity=1&amp;file=image/ldestailleur_166x166.jpg" style="height:166px; width:166px" />
+            // become
+            // <img alt="" src="'.$urlwithroot.'viewimage.php?modulepart=medias&amp;entity=1&amp;file=image/ldestailleur_166x166.jpg" style="height:166px; width:166px" />
+            $message=preg_replace('/(<img.*src=")[^\"]*viewimage\.php([^\"]*)modulepart=medias([^\"]*)file=([^\"]*)("[^\/]*\/>)/', '\1'.$urlwithroot.'/viewimage.php\2modulepart=medias\3file=\4\5', $message);
+
+            $sendtobcc= GETPOST('sendtoccc');
+            // Autocomplete the $sendtobcc
+            // $autocopy can be MAIN_MAIL_AUTOCOPY_PROPOSAL_TO, MAIN_MAIL_AUTOCOPY_ORDER_TO, MAIN_MAIL_AUTOCOPY_INVOICE_TO, MAIN_MAIL_AUTOCOPY_SUPPLIER_PROPOSAL_TO...
+            if (! empty($autocopy))
+            {
+                $sendtobcc .= (empty($conf->global->$autocopy) ? '' : (($sendtobcc?", ":"").$conf->global->$autocopy));
+            }
+
+            $deliveryreceipt = $_POST['deliveryreceipt'];
+
+            if ($action == 'send' || $action == 'relance')
+            {
+                $actionmsg2=$langs->transnoentities('MailSentBy').' '.CMailFile::getValidAddress($from,4,0,1).' '.$langs->transnoentities('To').' '.CMailFile::getValidAddress($sendto,4,0,1);
+                if ($message)
+                {
+                    $actionmsg=$langs->transnoentities('MailFrom').': '.dol_escape_htmltag($from);
+                    $actionmsg=dol_concatdesc($actionmsg, $langs->transnoentities('MailTo').': '.dol_escape_htmltag($sendto));
+                    if ($sendtocc) $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('Bcc') . ": " . dol_escape_htmltag($sendtocc));
+                    $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('MailTopic') . ": " . $subject);
+                    $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('TextUsedInTheMessageBody') . ":");
+                    $actionmsg = dol_concatdesc($actionmsg, $message);
+                }
+            }
+
+            // Create form object
+            include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
+            $formmail = new FormMail($db);
+            $formmail->trackid = $trackid;      // $trackid must be defined
+
+            $attachedfiles=$formmail->get_attached_files();
+            $filepath = $attachedfiles['paths'];
+            $filename = $attachedfiles['names'];
+            $mimetype = $attachedfiles['mimes'];
+
+            // Feature to push mail sent into Sent folder
+            /* This code must be now included into the hook mail, method sendMailAfter
 			if (! empty($conf->dolimail->enabled))
 			{
 				$mailfromid = explode("#", $_POST['frommail'],3);	// $_POST['frommail'] = 'aaa#Sent# <aaa@aaa.com>'	// TODO Use a better way to define Sent dir.
@@ -382,39 +382,39 @@ 
 			}
 			*/
 
-			// Make substitution in email content
-			$substitutionarray=getCommonSubstitutionArray($langs, 0, null, $object);
-			$substitutionarray['__EMAIL__'] = $sendto;
-			$substitutionarray['__CHECK_READ__'] = (is_object($object) && is_object($object->thirdparty))?'<img src="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-read.php?tag='.$object->thirdparty->tag.'&securitykey='.urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY).'" width="1" height="1" style="width:1px;height:1px" border="0"/>':'';
-
-			$parameters=array('mode'=>'formemail');
-			complete_substitutions_array($substitutionarray, $langs, $object, $parameters);
-
-			$subject=make_substitutions($subject, $substitutionarray);
-			$message=make_substitutions($message, $substitutionarray);
-
-			if (method_exists($object, 'makeSubstitution'))
-			{
-				$subject = $object->makeSubstitution($subject);
-				$message = $object->makeSubstitution($message);
-			}
-
-			// Send mail (substitutionarray must be done just before this)
-			if (empty($sendcontext)) $sendcontext = 'standard';
-			$mailfile = new CMailFile($subject,$sendto,$from,$message,$filepath,$mimetype,$filename,$sendtocc,$sendtobcc,$deliveryreceipt,-1,'','',$trackid,'', $sendcontext);
-
-			if ($mailfile->error)
-			{
-				setEventMessages($mailfile->error, $mailfile->errors, 'errors');
-				$action='presend';
-			}
-			else
-			{
-				$result=$mailfile->sendfile();
-				if ($result)
-				{
-					// Two hooks are available into method $mailfile->sendfile, so dedicated code is no more required
-					/*
+            // Make substitution in email content
+            $substitutionarray=getCommonSubstitutionArray($langs, 0, null, $object);
+            $substitutionarray['__EMAIL__'] = $sendto;
+            $substitutionarray['__CHECK_READ__'] = (is_object($object) && is_object($object->thirdparty))?'<img src="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-read.php?tag='.$object->thirdparty->tag.'&securitykey='.urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY).'" width="1" height="1" style="width:1px;height:1px" border="0"/>':'';
+
+            $parameters=array('mode'=>'formemail');
+            complete_substitutions_array($substitutionarray, $langs, $object, $parameters);
+
+            $subject=make_substitutions($subject, $substitutionarray);
+            $message=make_substitutions($message, $substitutionarray);
+
+            if (method_exists($object, 'makeSubstitution'))
+            {
+                $subject = $object->makeSubstitution($subject);
+                $message = $object->makeSubstitution($message);
+            }
+
+            // Send mail (substitutionarray must be done just before this)
+            if (empty($sendcontext)) $sendcontext = 'standard';
+            $mailfile = new CMailFile($subject,$sendto,$from,$message,$filepath,$mimetype,$filename,$sendtocc,$sendtobcc,$deliveryreceipt,-1,'','',$trackid,'', $sendcontext);
+
+            if ($mailfile->error)
+            {
+                setEventMessages($mailfile->error, $mailfile->errors, 'errors');
+                $action='presend';
+            }
+            else
+            {
+                $result=$mailfile->sendfile();
+                if ($result)
+                {
+                    // Two hooks are available into method $mailfile->sendfile, so dedicated code is no more required
+                    /*
 					if (! empty($conf->dolimail->enabled))
 					{
 						$mid = (GETPOST('mid','int') ? GETPOST('mid','int') : 0);	// Original mail id is set ?
@@ -434,91 +434,91 @@ 
 						}
 					}*/
 
-					// Initialisation of datas of object to call trigger
-					if (is_object($object))
-					{
-					    if (empty($actiontypecode)) $actiontypecode='AC_OTH_AUTO'; // Event insert into agenda automatically
-
-						$object->socid			= $sendtosocid;	   // To link to a company
-						$object->sendtoid		= $sendtoid;	   // To link to contact addresses. This is an array.
-						$object->actiontypecode	= $actiontypecode; // Type of event ('AC_OTH', 'AC_OTH_AUTO', 'AC_XXX'...)
-						$object->actionmsg		= $actionmsg;      // Long text (@TODO Replace this with $message, we already have details of email in dedicated properties)
-						$object->actionmsg2		= $actionmsg2;     // Short text ($langs->transnoentities('MailSentBy')...);
-
-						$object->trackid        = $trackid;
-						$object->fk_element		= $object->id;
-						$object->elementtype	= $object->element;
-						if (is_array($attachedfiles) && count($attachedfiles)>0) {
-							$object->attachedfiles	= $attachedfiles;
-						}
-						if (is_array($sendtouserid) && count($sendtouserid)>0 && !empty($conf->global->MAIN_MAIL_ENABLED_USER_DEST_SELECT)) {
-							$object->sendtouserid	= $sendtouserid;
-						}
-
-						$object->email_msgid = $mailfile->msgid;	// @TODO Set msgid into $mailfile after sending
-						$object->email_from = $from;
-						$object->email_subject = $subject;
-						$object->email_to = $sendto;
-						$object->email_tocc = $sendtocc;
-						$object->email_tobcc = $sendtobcc;
-						$object->email_subject = $subject;
-						$object->email_msgid = $mailfile->msgid;
-
-						// Call of triggers
-						if (! empty($trigger_name))
-						{
-    						include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-    						$interface=new Interfaces($db);
-    						$result=$interface->run_triggers($trigger_name,$object,$user,$langs,$conf);
-							if ($result < 0) {
-    							setEventMessages($interface->error, $interface->errors, 'errors');
-    						}
-						}
-					}
-
-					// Redirect here
-					// This avoid sending mail twice if going out and then back to page
-					$mesg=$langs->trans('MailSuccessfulySent',$mailfile->getValidAddress($from,2),$mailfile->getValidAddress($sendto,2));
-					setEventMessages($mesg, null, 'mesgs');
-
-  					$moreparam='';
-	  				if (isset($paramname2) || isset($paramval2)) $moreparam.= '&'.($paramname2?$paramname2:'mid').'='.$paramval2;
-		  			header('Location: '.$_SERVER["PHP_SELF"].'?'.($paramname?$paramname:'id').'='.(is_object($object)?$object->id:'').$moreparam);
-			  		exit;
-				}
-				else
-				{
-					$langs->load("other");
-					$mesg='<div class="error">';
-					if ($mailfile->error)
-					{
-						$mesg.=$langs->trans('ErrorFailedToSendMail',$from,$sendto);
-						$mesg.='<br>'.$mailfile->error;
-					}
-					else
-					{
-						$mesg.='No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS';
-					}
-					$mesg.='</div>';
-
-					setEventMessages($mesg, null, 'warnings');
-					$action = 'presend';
-				}
-			}
-		}
-		else
-		{
-			$langs->load("errors");
-			setEventMessages($langs->trans('ErrorFieldRequired',$langs->transnoentitiesnoconv("MailTo")), null, 'warnings');
-			dol_syslog('Try to send email with no recipient defined', LOG_WARNING);
-			$action = 'presend';
-		}
-	}
-	else
-	{
-		$langs->load("other");
-		setEventMessages($langs->trans('ErrorFailedToReadObject',$object->element), null, 'errors');
-		dol_syslog('Failed to read data of object id='.$object->id.' element='.$object->element);
-		$action = 'presend';
-	}
+                    // Initialisation of datas of object to call trigger
+                    if (is_object($object))
+                    {
+                        if (empty($actiontypecode)) $actiontypecode='AC_OTH_AUTO'; // Event insert into agenda automatically
+
+                        $object->socid			= $sendtosocid;	   // To link to a company
+                        $object->sendtoid		= $sendtoid;	   // To link to contact addresses. This is an array.
+                        $object->actiontypecode	= $actiontypecode; // Type of event ('AC_OTH', 'AC_OTH_AUTO', 'AC_XXX'...)
+                        $object->actionmsg		= $actionmsg;      // Long text (@TODO Replace this with $message, we already have details of email in dedicated properties)
+                        $object->actionmsg2		= $actionmsg2;     // Short text ($langs->transnoentities('MailSentBy')...);
+
+                        $object->trackid        = $trackid;
+                        $object->fk_element		= $object->id;
+                        $object->elementtype	= $object->element;
+                        if (is_array($attachedfiles) && count($attachedfiles)>0) {
+                            $object->attachedfiles	= $attachedfiles;
+                        }
+                        if (is_array($sendtouserid) && count($sendtouserid)>0 && !empty($conf->global->MAIN_MAIL_ENABLED_USER_DEST_SELECT)) {
+                            $object->sendtouserid	= $sendtouserid;
+                        }
+
+                        $object->email_msgid = $mailfile->msgid;	// @TODO Set msgid into $mailfile after sending
+                        $object->email_from = $from;
+                        $object->email_subject = $subject;
+                        $object->email_to = $sendto;
+                        $object->email_tocc = $sendtocc;
+                        $object->email_tobcc = $sendtobcc;
+                        $object->email_subject = $subject;
+                        $object->email_msgid = $mailfile->msgid;
+
+                        // Call of triggers
+                        if (! empty($trigger_name))
+                        {
+                            include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+                            $interface=new Interfaces($db);
+                            $result=$interface->run_triggers($trigger_name,$object,$user,$langs,$conf);
+                            if ($result < 0) {
+                                setEventMessages($interface->error, $interface->errors, 'errors');
+                            }
+                        }
+                    }
+
+                    // Redirect here
+                    // This avoid sending mail twice if going out and then back to page
+                    $mesg=$langs->trans('MailSuccessfulySent',$mailfile->getValidAddress($from,2),$mailfile->getValidAddress($sendto,2));
+                    setEventMessages($mesg, null, 'mesgs');
+
+                        $moreparam='';
+                        if (isset($paramname2) || isset($paramval2)) $moreparam.= '&'.($paramname2?$paramname2:'mid').'='.$paramval2;
+                        header('Location: '.$_SERVER["PHP_SELF"].'?'.($paramname?$paramname:'id').'='.(is_object($object)?$object->id:'').$moreparam);
+                        exit;
+                }
+                else
+                {
+                    $langs->load("other");
+                    $mesg='<div class="error">';
+                    if ($mailfile->error)
+                    {
+                        $mesg.=$langs->trans('ErrorFailedToSendMail',$from,$sendto);
+                        $mesg.='<br>'.$mailfile->error;
+                    }
+                    else
+                    {
+                        $mesg.='No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS';
+                    }
+                    $mesg.='</div>';
+
+                    setEventMessages($mesg, null, 'warnings');
+                    $action = 'presend';
+                }
+            }
+        }
+        else
+        {
+            $langs->load("errors");
+            setEventMessages($langs->trans('ErrorFieldRequired',$langs->transnoentitiesnoconv("MailTo")), null, 'warnings');
+            dol_syslog('Try to send email with no recipient defined', LOG_WARNING);
+            $action = 'presend';
+        }
+    }
+    else
+    {
+        $langs->load("other");
+        setEventMessages($langs->trans('ErrorFailedToReadObject',$object->element), null, 'errors');
+        dol_syslog('Failed to read data of object id='.$object->id.' element='.$object->element);
+        $action = 'presend';
+    }
 }

dolibarr/htdocs/core/tpl/resource_view.tpl.php

Indentation +70 added lines, -70 removed lines

@@ -3,8 +3,8 @@ 
 // Protection to avoid direct call of template
 if (empty($conf) || ! is_object($conf))
 {
-	print "Error, template page can't be called as URL";
-	exit;
+    print "Error, template page can't be called as URL";
+    exit;
 }
 
 
@@ -37,76 +37,76 @@ 
 if( (array) $linked_resources && count($linked_resources) > 0)
 {
 
-	foreach ($linked_resources as $linked_resource)
-	{
-
-		$object_resource = fetchObjectByElement($linked_resource['resource_id'],$linked_resource['resource_type']);
-
-		//$element_id = $linked_resource['rowid'];
-
-		if ($mode == 'edit' && $linked_resource['rowid'] == GETPOST('lineid'))
-		{
-
-			print '<form class="tagtr oddeven" action="'.$_SERVER["PHP_SELF"].'?element='.$element.'&element_id='.$element_id.'" method="POST">';
-			print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'" />';
-			print '<input type="hidden" name="id" value="'.$object->id.'" />';
-			print '<input type="hidden" name="action" value="update_linked_resource" />';
-			print '<input type="hidden" name="resource_type" value="'.$resource_type.'" />';
-			print '<input type="hidden" name="lineid" value="'.$linked_resource['rowid'].'" />';
-
-			print '<div class="tagtd">'.$object_resource->getNomUrl(1).'</div>';
-			print '<div class="tagtd">'.$object_resource->type_label.'</div>';
-			print '<div class="tagtd" align="center">'.$form->selectyesno('busy',$linked_resource['busy']?1:0,1).'</div>';
-			print '<div class="tagtd" align="center">'.$form->selectyesno('mandatory',$linked_resource['mandatory']?1:0,1).'</div>';
-			print '<div class="tagtd" align="right"><input type="submit" class="button" value="'.$langs->trans("Update").'"></div>';
-			print '</form>';
-		}
-		else
-		{
-			$style='';
-			if ($linked_resource['rowid'] == GETPOST('lineid'))
-				$style='style="background: orange;"';
-
-			print '<form class="tagtr oddeven" '.$style.'>';
-
-			print '<div class="tagtd">';
-			print $object_resource->getNomUrl(1);
-			print '</div>';
-
-			print '<div class="tagtd">';
-			print $object_resource->type_label;
-			print '</div>';
-
-			print '<div class="tagtd" align="center">';
-			print yn($linked_resource['busy']);
-			print '</div>';
-
-			print '<div class="tagtd" align="center">';
-			print yn($linked_resource['mandatory']);
-			print '</div>';
-
-			print '<div class="tagtd" align="right">';
-			print '<a href="'.$_SERVER['PHP_SELF'].'?mode=edit&resource_type='.$linked_resource['resource_type'].'&element='.$element.'&element_id='.$element_id.'&lineid='.$linked_resource['rowid'].'">';
-			print img_edit();
-			print '</a>';
-			print '&nbsp;';
-			print '<a href="'.$_SERVER['PHP_SELF'].'?action=delete_resource&id='.$linked_resource['resource_id'].'&element='.$element.'&element_id='.$element_id.'&lineid='.$linked_resource['rowid'].'">';
-			print img_delete();
-			print '</a>';
-			print '</div>';
-
-			print '</form>';
-		}
-	}
+    foreach ($linked_resources as $linked_resource)
+    {
+
+        $object_resource = fetchObjectByElement($linked_resource['resource_id'],$linked_resource['resource_type']);
+
+        //$element_id = $linked_resource['rowid'];
+
+        if ($mode == 'edit' && $linked_resource['rowid'] == GETPOST('lineid'))
+        {
+
+            print '<form class="tagtr oddeven" action="'.$_SERVER["PHP_SELF"].'?element='.$element.'&element_id='.$element_id.'" method="POST">';
+            print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'" />';
+            print '<input type="hidden" name="id" value="'.$object->id.'" />';
+            print '<input type="hidden" name="action" value="update_linked_resource" />';
+            print '<input type="hidden" name="resource_type" value="'.$resource_type.'" />';
+            print '<input type="hidden" name="lineid" value="'.$linked_resource['rowid'].'" />';
+
+            print '<div class="tagtd">'.$object_resource->getNomUrl(1).'</div>';
+            print '<div class="tagtd">'.$object_resource->type_label.'</div>';
+            print '<div class="tagtd" align="center">'.$form->selectyesno('busy',$linked_resource['busy']?1:0,1).'</div>';
+            print '<div class="tagtd" align="center">'.$form->selectyesno('mandatory',$linked_resource['mandatory']?1:0,1).'</div>';
+            print '<div class="tagtd" align="right"><input type="submit" class="button" value="'.$langs->trans("Update").'"></div>';
+            print '</form>';
+        }
+        else
+        {
+            $style='';
+            if ($linked_resource['rowid'] == GETPOST('lineid'))
+                $style='style="background: orange;"';
+
+            print '<form class="tagtr oddeven" '.$style.'>';
+
+            print '<div class="tagtd">';
+            print $object_resource->getNomUrl(1);
+            print '</div>';
+
+            print '<div class="tagtd">';
+            print $object_resource->type_label;
+            print '</div>';
+
+            print '<div class="tagtd" align="center">';
+            print yn($linked_resource['busy']);
+            print '</div>';
+
+            print '<div class="tagtd" align="center">';
+            print yn($linked_resource['mandatory']);
+            print '</div>';
+
+            print '<div class="tagtd" align="right">';
+            print '<a href="'.$_SERVER['PHP_SELF'].'?mode=edit&resource_type='.$linked_resource['resource_type'].'&element='.$element.'&element_id='.$element_id.'&lineid='.$linked_resource['rowid'].'">';
+            print img_edit();
+            print '</a>';
+            print '&nbsp;';
+            print '<a href="'.$_SERVER['PHP_SELF'].'?action=delete_resource&id='.$linked_resource['resource_id'].'&element='.$element.'&element_id='.$element_id.'&lineid='.$linked_resource['rowid'].'">';
+            print img_delete();
+            print '</a>';
+            print '</div>';
+
+            print '</form>';
+        }
+    }
 }
 else {
-	print '<form class="tagtr oddeven">';
-	print '<div class="tagtd opacitymedium">'.$langs->trans('NoResourceLinked').'</div>';
-	print '<div class="tagtd opacitymedium"></div>';
-	print '<div class="tagtd opacitymedium"></div>';
-	print '<div class="tagtd opacitymedium"></div>';
-	print '<div class="tagtd opacitymedium"></div>';
-	print '</form>';
+    print '<form class="tagtr oddeven">';
+    print '<div class="tagtd opacitymedium">'.$langs->trans('NoResourceLinked').'</div>';
+    print '<div class="tagtd opacitymedium"></div>';
+    print '<div class="tagtd opacitymedium"></div>';
+    print '<div class="tagtd opacitymedium"></div>';
+    print '<div class="tagtd opacitymedium"></div>';
+    print '</form>';
 }
 
 print '</div>';

dolibarr/htdocs/core/tpl/commonfields_edit.tpl.php

Indentation +21 added lines, -21 removed lines

@@ -24,8 +24,8 @@ 
 // Protection to avoid direct call of template
 if (empty($conf) || ! is_object($conf))
 {
-	print "Error, template page can't be called as URL";
-	exit;
+    print "Error, template page can't be called as URL";
+    exit;
 }
 if (! is_object($form)) $form=new Form($db);
 
@@ -37,27 +37,27 @@ 
 
 foreach($object->fields as $key => $val)
 {
-	// Discard if extrafield is a hidden field on form
-	if (abs($val['visible']) != 1) continue;
+    // Discard if extrafield is a hidden field on form
+    if (abs($val['visible']) != 1) continue;
 
-	if (array_key_exists('enabled', $val) && isset($val['enabled']) && ! verifCond($val['enabled'])) continue;	// We don't want this field
+    if (array_key_exists('enabled', $val) && isset($val['enabled']) && ! verifCond($val['enabled'])) continue;	// We don't want this field
 
-	print '<tr><td';
-	print ' class="titlefieldcreate';
-	if ($val['notnull'] > 0) print ' fieldrequired';
-	if ($val['type'] == 'text' || $val['type'] == 'html') print ' tdtop';
-	print '">';
-	if (! empty($val['help'])) print $form->textwithpicto($langs->trans($val['label']), $val['help']);
-	else print $langs->trans($val['label']);
-	print '</td>';
-	print '<td>';
-	if (in_array($val['type'], array('int', 'integer'))) $value = GETPOSTISSET($key)?GETPOST($key, 'int'):$object->$key;
-	elseif ($val['type'] == 'text' || $val['type'] == 'html') $value = GETPOSTISSET($key)?GETPOST($key,'none'):$object->$key;
-	else $value = GETPOSTISSET($key)?GETPOST($key, 'alpha'):$object->$key;
-	//var_dump($val.' '.$key.' '.$value);
-	print $object->showInputField($val, $key, $value, '', '', '', 0);
-	print '</td>';
-	print '</tr>';
+    print '<tr><td';
+    print ' class="titlefieldcreate';
+    if ($val['notnull'] > 0) print ' fieldrequired';
+    if ($val['type'] == 'text' || $val['type'] == 'html') print ' tdtop';
+    print '">';
+    if (! empty($val['help'])) print $form->textwithpicto($langs->trans($val['label']), $val['help']);
+    else print $langs->trans($val['label']);
+    print '</td>';
+    print '<td>';
+    if (in_array($val['type'], array('int', 'integer'))) $value = GETPOSTISSET($key)?GETPOST($key, 'int'):$object->$key;
+    elseif ($val['type'] == 'text' || $val['type'] == 'html') $value = GETPOSTISSET($key)?GETPOST($key,'none'):$object->$key;
+    else $value = GETPOSTISSET($key)?GETPOST($key, 'alpha'):$object->$key;
+    //var_dump($val.' '.$key.' '.$value);
+    print $object->showInputField($val, $key, $value, '', '', '', 0);
+    print '</td>';
+    print '</tr>';
 }
 
 ?>

dolibarr/htdocs/core/tpl/object_discounts.tpl.php

Indentation +44 added lines, -44 removed lines

@@ -35,74 +35,74 @@
 
 $fixedDiscount = $thirdparty->remise_percent;
 if(! empty($discount_type)) {
-	$fixedDiscount = $thirdparty->remise_supplier_percent;
+    $fixedDiscount = $thirdparty->remise_supplier_percent;
 }
 
 if ($fixedDiscount > 0)
 {
-	$translationKey = (! empty($discount_type)) ? 'HasRelativeDiscountFromSupplier' : 'CompanyHasRelativeDiscount';
-	print $langs->trans($translationKey, $fixedDiscount).'.';
+    $translationKey = (! empty($discount_type)) ? 'HasRelativeDiscountFromSupplier' : 'CompanyHasRelativeDiscount';
+    print $langs->trans($translationKey, $fixedDiscount).'.';
 }
 else
 {
-	$translationKey = (! empty($discount_type)) ? 'HasNoRelativeDiscountFromSupplier' : 'CompanyHasNoRelativeDiscount';
-	print $langs->trans($translationKey).'.';
+    $translationKey = (! empty($discount_type)) ? 'HasNoRelativeDiscountFromSupplier' : 'CompanyHasNoRelativeDiscount';
+    print $langs->trans($translationKey).'.';
 }
 if($isNewObject) print ' ('.$addrelativediscount.')';
 
 // Is there is commercial discount or down payment available ?
 if ($absolute_discount > 0) {
 
-	if ($cannotApplyDiscount || ! $isInvoice || $isNewObject || $object->statut > $classname::STATUS_DRAFT || $object->type == $classname::TYPE_CREDIT_NOTE || $object->type == $classname::TYPE_DEPOSIT) {
-		$translationKey = ! empty($discount_type) ? 'HasAbsoluteDiscountFromSupplier' : 'CompanyHasAbsoluteDiscount';
-		$text = $langs->trans($translationKey, price($absolute_discount), $langs->transnoentities("Currency" . $conf->currency)).'.';
+    if ($cannotApplyDiscount || ! $isInvoice || $isNewObject || $object->statut > $classname::STATUS_DRAFT || $object->type == $classname::TYPE_CREDIT_NOTE || $object->type == $classname::TYPE_DEPOSIT) {
+        $translationKey = ! empty($discount_type) ? 'HasAbsoluteDiscountFromSupplier' : 'CompanyHasAbsoluteDiscount';
+        $text = $langs->trans($translationKey, price($absolute_discount), $langs->transnoentities("Currency" . $conf->currency)).'.';
 
-		if ($isInvoice && ! $isNewObject && $object->statut > $classname::STATUS_DRAFT && $object->type != $classname::TYPE_CREDIT_NOTE && $object->type != $classname::TYPE_DEPOSIT) {
-			$text = $form->textwithpicto($text, $langs->trans('AbsoluteDiscountUse'));
-		}
+        if ($isInvoice && ! $isNewObject && $object->statut > $classname::STATUS_DRAFT && $object->type != $classname::TYPE_CREDIT_NOTE && $object->type != $classname::TYPE_DEPOSIT) {
+            $text = $form->textwithpicto($text, $langs->trans('AbsoluteDiscountUse'));
+        }
 
-		if ($isNewObject) {
-			$text.= ' ('.$addabsolutediscount.')';
-		}
+        if ($isNewObject) {
+            $text.= ' ('.$addabsolutediscount.')';
+        }
 
-		print '<br>'.$text;
-	} else {
-		// Discount available of type fixed amount (not credit note)
-		$more = '(' . $addabsolutediscount . ')';
-		$form->form_remise_dispo($_SERVER["PHP_SELF"] . '?facid=' . $object->id, GETPOST('discountid'), 'remise_id', $thirdparty->id, $absolute_discount, $filterabsolutediscount, $resteapayer, $more, 0, $discount_type);
-	}
+        print '<br>'.$text;
+    } else {
+        // Discount available of type fixed amount (not credit note)
+        $more = '(' . $addabsolutediscount . ')';
+        $form->form_remise_dispo($_SERVER["PHP_SELF"] . '?facid=' . $object->id, GETPOST('discountid'), 'remise_id', $thirdparty->id, $absolute_discount, $filterabsolutediscount, $resteapayer, $more, 0, $discount_type);
+    }
 }
 
 // Is there credit notes availables ?
 if ($absolute_creditnote > 0) {
 
-	// If validated, we show link "add credit note to payment"
-	if ($cannotApplyDiscount || ! $isInvoice || $isNewObject || $object->statut != $classname::STATUS_VALIDATED || $object->type == $classname::TYPE_CREDIT_NOTE) {
-		$translationKey = ! empty($discount_type) ? 'HasCreditNoteFromSupplier' : 'CompanyHasCreditNote';
-		$text = $langs->trans($translationKey, price($absolute_creditnote), $langs->transnoentities("Currency" . $conf->currency)) . '.';
-
-		if ($isInvoice && ! $isNewObject && $object->statut == $classname::STATUS_DRAFT && $object->type != $classname::TYPE_DEPOSIT) {
-			$text = $form->textwithpicto($text, $langs->trans('CreditNoteDepositUse'));
-		}
-
-		if ($absolute_discount <= 0 || $isNewObject) {
-			$text.= '('.$addabsolutediscount.')';
-		}
-
-		print '<br>'.$text;
-	} else {  // We can add a credit note on a down payment or standard invoice or situation invoice
-		// There is credit notes discounts available
-		$more = $isInvoice && ! $isNewObject ? ' (' . $viewabsolutediscount . ')' : '';
-		$form->form_remise_dispo($_SERVER["PHP_SELF"] . '?facid=' . $object->id, 0, 'remise_id_for_payment', $thirdparty->id, $absolute_creditnote, $filtercreditnote, 0, $more, 0, $discount_type); // We allow credit note even if amount is higher
-	}
+    // If validated, we show link "add credit note to payment"
+    if ($cannotApplyDiscount || ! $isInvoice || $isNewObject || $object->statut != $classname::STATUS_VALIDATED || $object->type == $classname::TYPE_CREDIT_NOTE) {
+        $translationKey = ! empty($discount_type) ? 'HasCreditNoteFromSupplier' : 'CompanyHasCreditNote';
+        $text = $langs->trans($translationKey, price($absolute_creditnote), $langs->transnoentities("Currency" . $conf->currency)) . '.';
+
+        if ($isInvoice && ! $isNewObject && $object->statut == $classname::STATUS_DRAFT && $object->type != $classname::TYPE_DEPOSIT) {
+            $text = $form->textwithpicto($text, $langs->trans('CreditNoteDepositUse'));
+        }
+
+        if ($absolute_discount <= 0 || $isNewObject) {
+            $text.= '('.$addabsolutediscount.')';
+        }
+
+        print '<br>'.$text;
+    } else {  // We can add a credit note on a down payment or standard invoice or situation invoice
+        // There is credit notes discounts available
+        $more = $isInvoice && ! $isNewObject ? ' (' . $viewabsolutediscount . ')' : '';
+        $form->form_remise_dispo($_SERVER["PHP_SELF"] . '?facid=' . $object->id, 0, 'remise_id_for_payment', $thirdparty->id, $absolute_creditnote, $filtercreditnote, 0, $more, 0, $discount_type); // We allow credit note even if amount is higher
+    }
 }
 
 if($absolute_discount <= 0 && $absolute_creditnote <= 0) {
-	$translationKey = ! empty($discount_type) ? 'HasNoAbsoluteDiscountFromSupplier' : 'CompanyHasNoAbsoluteDiscount';
-	print '<br>'.$langs->trans($translationKey).'.';
+    $translationKey = ! empty($discount_type) ? 'HasNoAbsoluteDiscountFromSupplier' : 'CompanyHasNoAbsoluteDiscount';
+    print '<br>'.$langs->trans($translationKey).'.';
 
-	if ($isInvoice && $object->statut == $classname::STATUS_DRAFT && $object->type != $classname::TYPE_CREDIT_NOTE && $object->type != $classname::TYPE_DEPOSIT) {
-		print ' (' . $addabsolutediscount . ')';
-	}
+    if ($isInvoice && $object->statut == $classname::STATUS_DRAFT && $object->type != $classname::TYPE_CREDIT_NOTE && $object->type != $classname::TYPE_DEPOSIT) {
+        print ' (' . $addabsolutediscount . ')';
+    }
 }