alxarafe / alixar

dolibarr/htdocs/core/boxes/box_graph_orders_permonth.php

Indentation +209 added lines, -209 removed lines

@@ -28,254 +28,254 @@
  */
 class box_graph_orders_permonth extends ModeleBoxes
 {
-	var $boxcode="orderspermonth";
-	var $boximg="object_order";
-	var $boxlabel="BoxCustomersOrdersPerMonth";
-	var $depends = array("commande");
+    var $boxcode="orderspermonth";
+    var $boximg="object_order";
+    var $boxlabel="BoxCustomersOrdersPerMonth";
+    var $depends = array("commande");
 
-	/**
+    /**
      * @var DoliDB Database handler.
      */
     public $db;
 
-	var $info_box_head = array();
-	var $info_box_contents = array();
+    var $info_box_head = array();
+    var $info_box_contents = array();
 
 
-	/**
-	 *  Constructor
-	 *
-	 * 	@param	DoliDB	$db			Database handler
-	 *  @param	string	$param		More parameters
-	 */
-	function __construct($db,$param)
-	{
-		global $user;
+    /**
+     *  Constructor
+     *
+     * 	@param	DoliDB	$db			Database handler
+     *  @param	string	$param		More parameters
+     */
+    function __construct($db,$param)
+    {
+        global $user;
 
-		$this->db=$db;
+        $this->db=$db;
 
-		$this->hidden = ! ($user->rights->commande->lire);
-	}
+        $this->hidden = ! ($user->rights->commande->lire);
+    }
 
-	/**
-	 *  Load data into info_box_contents array to show array later.
-	 *
-	 *  @param	int		$max        Maximum number of records to load
+    /**
+     *  Load data into info_box_contents array to show array later.
+     *
+     *  @param	int		$max        Maximum number of records to load
      *  @return	void
-	 */
-	function loadBox($max=5)
-	{
-		global $conf, $user, $langs, $db;
+     */
+    function loadBox($max=5)
+    {
+        global $conf, $user, $langs, $db;
 
-		$this->max=$max;
+        $this->max=$max;
 
-		$refreshaction='refresh_'.$this->boxcode;
+        $refreshaction='refresh_'.$this->boxcode;
 
-		//include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
-		//$commandestatic=new Commande($db);
+        //include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
+        //$commandestatic=new Commande($db);
 
-		$text = $langs->trans("BoxCustomersOrdersPerMonth",$max);
-		$this->info_box_head = array(
-				'text' => $text,
-				'limit'=> dol_strlen($text),
-				'graph'=> 1,
-				'sublink'=>'',
-				'subtext'=>$langs->trans("Filter"),
-				'subpicto'=>'filter.png',
-				'subclass'=>'linkobject boxfilter',
-				'target'=>'none'	// Set '' to get target="_blank"
-		);
+        $text = $langs->trans("BoxCustomersOrdersPerMonth",$max);
+        $this->info_box_head = array(
+                'text' => $text,
+                'limit'=> dol_strlen($text),
+                'graph'=> 1,
+                'sublink'=>'',
+                'subtext'=>$langs->trans("Filter"),
+                'subpicto'=>'filter.png',
+                'subclass'=>'linkobject boxfilter',
+                'target'=>'none'	// Set '' to get target="_blank"
+        );
 
-		$dir=''; 	// We don't need a path because image file will not be saved into disk
-		$prefix='';
-		$socid=0;
-		if ($user->societe_id) $socid=$user->societe_id;
-		if (! $user->rights->societe->client->voir || $socid) $prefix.='private-'.$user->id.'-';	// If user has no permission to see all, output dir is specific to user
+        $dir=''; 	// We don't need a path because image file will not be saved into disk
+        $prefix='';
+        $socid=0;
+        if ($user->societe_id) $socid=$user->societe_id;
+        if (! $user->rights->societe->client->voir || $socid) $prefix.='private-'.$user->id.'-';	// If user has no permission to see all, output dir is specific to user
 
-		if ($user->rights->commande->lire)
-		{
-		    $langs->load("orders");
+        if ($user->rights->commande->lire)
+        {
+            $langs->load("orders");
 
-		    $param_year='DOLUSERCOOKIE_box_'.$this->boxcode.'_year';
-			$param_shownb='DOLUSERCOOKIE_box_'.$this->boxcode.'_shownb';
-			$param_showtot='DOLUSERCOOKIE_box_'.$this->boxcode.'_showtot';
+            $param_year='DOLUSERCOOKIE_box_'.$this->boxcode.'_year';
+            $param_shownb='DOLUSERCOOKIE_box_'.$this->boxcode.'_shownb';
+            $param_showtot='DOLUSERCOOKIE_box_'.$this->boxcode.'_showtot';
 
-			include_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
-			include_once DOL_DOCUMENT_ROOT.'/commande/class/commandestats.class.php';
-			$autosetarray=preg_split("/[,;:]+/",GETPOST('DOL_AUTOSET_COOKIE'));
-			if (in_array('DOLUSERCOOKIE_box_'.$this->boxcode,$autosetarray))
-			{
-				$endyear=GETPOST($param_year,'int');
-				$shownb=GETPOST($param_shownb,'alpha');
-				$showtot=GETPOST($param_showtot,'alpha');
-			}
-			else
-			{
-				$tmparray=json_decode($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode],true);
-				$endyear=$tmparray['year'];
-				$shownb=$tmparray['shownb'];
-				$showtot=$tmparray['showtot'];
-			}
-			if (empty($shownb) && empty($showtot)) { $shownb=1; $showtot=1; }
-			$nowarray=dol_getdate(dol_now(),true);
-			if (empty($endyear)) $endyear=$nowarray['year'];
-			$startyear=$endyear-1;
-			$mode='customer';
-			$WIDTH=(($shownb && $showtot) || ! empty($conf->dol_optimize_smallscreen))?'256':'320';
-			$HEIGHT='192';
+            include_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
+            include_once DOL_DOCUMENT_ROOT.'/commande/class/commandestats.class.php';
+            $autosetarray=preg_split("/[,;:]+/",GETPOST('DOL_AUTOSET_COOKIE'));
+            if (in_array('DOLUSERCOOKIE_box_'.$this->boxcode,$autosetarray))
+            {
+                $endyear=GETPOST($param_year,'int');
+                $shownb=GETPOST($param_shownb,'alpha');
+                $showtot=GETPOST($param_showtot,'alpha');
+            }
+            else
+            {
+                $tmparray=json_decode($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode],true);
+                $endyear=$tmparray['year'];
+                $shownb=$tmparray['shownb'];
+                $showtot=$tmparray['showtot'];
+            }
+            if (empty($shownb) && empty($showtot)) { $shownb=1; $showtot=1; }
+            $nowarray=dol_getdate(dol_now(),true);
+            if (empty($endyear)) $endyear=$nowarray['year'];
+            $startyear=$endyear-1;
+            $mode='customer';
+            $WIDTH=(($shownb && $showtot) || ! empty($conf->dol_optimize_smallscreen))?'256':'320';
+            $HEIGHT='192';
 
-			$stats = new CommandeStats($this->db, $socid, $mode, 0);
+            $stats = new CommandeStats($this->db, $socid, $mode, 0);
 
-			// Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...)
-			if ($shownb)
-			{
-				$data1 = $stats->getNbByMonthWithPrevYear($endyear,$startyear,(GETPOST('action','aZ09')==$refreshaction?-1:(3600*24)), ($WIDTH<300?2:0));
+            // Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...)
+            if ($shownb)
+            {
+                $data1 = $stats->getNbByMonthWithPrevYear($endyear,$startyear,(GETPOST('action','aZ09')==$refreshaction?-1:(3600*24)), ($WIDTH<300?2:0));
 
-				$filenamenb = $dir."/".$prefix."ordersnbinyear-".$endyear.".png";
-				if ($mode == 'customer') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&amp;file=ordersnbinyear-'.$endyear.'.png';
-				if ($mode == 'supplier') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&amp;file=ordersnbinyear-'.$endyear.'.png';
+                $filenamenb = $dir."/".$prefix."ordersnbinyear-".$endyear.".png";
+                if ($mode == 'customer') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&amp;file=ordersnbinyear-'.$endyear.'.png';
+                if ($mode == 'supplier') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&amp;file=ordersnbinyear-'.$endyear.'.png';
 
-				$px1 = new DolGraph();
-				$mesg = $px1->isGraphKo();
-				if (! $mesg)
-				{
-					$px1->SetData($data1);
-					unset($data1);
-					$px1->SetPrecisionY(0);
-					$i=$startyear;$legend=array();
-					while ($i <= $endyear)
-					{
-						$legend[]=$i;
-						$i++;
-					}
-					$px1->SetLegend($legend);
-					$px1->SetMaxValue($px1->GetCeilMaxValue());
-					$px1->SetWidth($WIDTH);
-					$px1->SetHeight($HEIGHT);
-					$px1->SetYLabel($langs->trans("NumberOfOrders"));
-					$px1->SetShading(3);
-					$px1->SetHorizTickIncrement(1);
-					$px1->SetPrecisionY(0);
-					$px1->SetCssPrefix("cssboxes");
-					$px1->mode='depth';
-					$px1->SetTitle($langs->trans("NumberOfOrdersByMonth"));
+                $px1 = new DolGraph();
+                $mesg = $px1->isGraphKo();
+                if (! $mesg)
+                {
+                    $px1->SetData($data1);
+                    unset($data1);
+                    $px1->SetPrecisionY(0);
+                    $i=$startyear;$legend=array();
+                    while ($i <= $endyear)
+                    {
+                        $legend[]=$i;
+                        $i++;
+                    }
+                    $px1->SetLegend($legend);
+                    $px1->SetMaxValue($px1->GetCeilMaxValue());
+                    $px1->SetWidth($WIDTH);
+                    $px1->SetHeight($HEIGHT);
+                    $px1->SetYLabel($langs->trans("NumberOfOrders"));
+                    $px1->SetShading(3);
+                    $px1->SetHorizTickIncrement(1);
+                    $px1->SetPrecisionY(0);
+                    $px1->SetCssPrefix("cssboxes");
+                    $px1->mode='depth';
+                    $px1->SetTitle($langs->trans("NumberOfOrdersByMonth"));
 
-					$px1->draw($filenamenb,$fileurlnb);
-				}
-			}
+                    $px1->draw($filenamenb,$fileurlnb);
+                }
+            }
 
-			// Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...)
-			if ($showtot)
-			{
-				$data2 = $stats->getAmountByMonthWithPrevYear($endyear,$startyear,(GETPOST('action','aZ09')==$refreshaction?-1:(3600*24)), ($WIDTH<300?2:0));
+            // Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...)
+            if ($showtot)
+            {
+                $data2 = $stats->getAmountByMonthWithPrevYear($endyear,$startyear,(GETPOST('action','aZ09')==$refreshaction?-1:(3600*24)), ($WIDTH<300?2:0));
 
-				$filenamenb = $dir."/".$prefix."ordersamountinyear-".$endyear.".png";
-				if ($mode == 'customer') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&amp;file=ordersamountinyear-'.$endyear.'.png';
-				if ($mode == 'supplier') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&amp;file=ordersamountinyear-'.$endyear.'.png';
+                $filenamenb = $dir."/".$prefix."ordersamountinyear-".$endyear.".png";
+                if ($mode == 'customer') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&amp;file=ordersamountinyear-'.$endyear.'.png';
+                if ($mode == 'supplier') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&amp;file=ordersamountinyear-'.$endyear.'.png';
 
-				$px2 = new DolGraph();
-				$mesg = $px2->isGraphKo();
-				if (! $mesg)
-				{
-					$px2->SetData($data2);
-					unset($data2);
-					$px2->SetPrecisionY(0);
-					$i=$startyear;$legend=array();
-					while ($i <= $endyear)
-					{
-						$legend[]=$i;
-						$i++;
-					}
-					$px2->SetLegend($legend);
-					$px2->SetMaxValue($px2->GetCeilMaxValue());
-					$px2->SetWidth($WIDTH);
-					$px2->SetHeight($HEIGHT);
-					$px2->SetYLabel($langs->trans("AmountOfOrdersHT"));
-					$px2->SetShading(3);
-					$px2->SetHorizTickIncrement(1);
-					$px2->SetPrecisionY(0);
-					$px2->SetCssPrefix("cssboxes");
-					$px2->mode='depth';
-					$px2->SetTitle($langs->trans("AmountOfOrdersByMonthHT"));
+                $px2 = new DolGraph();
+                $mesg = $px2->isGraphKo();
+                if (! $mesg)
+                {
+                    $px2->SetData($data2);
+                    unset($data2);
+                    $px2->SetPrecisionY(0);
+                    $i=$startyear;$legend=array();
+                    while ($i <= $endyear)
+                    {
+                        $legend[]=$i;
+                        $i++;
+                    }
+                    $px2->SetLegend($legend);
+                    $px2->SetMaxValue($px2->GetCeilMaxValue());
+                    $px2->SetWidth($WIDTH);
+                    $px2->SetHeight($HEIGHT);
+                    $px2->SetYLabel($langs->trans("AmountOfOrdersHT"));
+                    $px2->SetShading(3);
+                    $px2->SetHorizTickIncrement(1);
+                    $px2->SetPrecisionY(0);
+                    $px2->SetCssPrefix("cssboxes");
+                    $px2->mode='depth';
+                    $px2->SetTitle($langs->trans("AmountOfOrdersByMonthHT"));
 
-					$px2->draw($filenamenb,$fileurlnb);
-				}
-			}
+                    $px2->draw($filenamenb,$fileurlnb);
+                }
+            }
 
-			if (empty($conf->use_javascript_ajax))
-			{
-				$langs->load("errors");
-				$mesg=$langs->trans("WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs");
-			}
+            if (empty($conf->use_javascript_ajax))
+            {
+                $langs->load("errors");
+                $mesg=$langs->trans("WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs");
+            }
 
-			if (! $mesg)
-			{
-				$stringtoshow='';
-				$stringtoshow.='<script type="text/javascript" language="javascript">
+            if (! $mesg)
+            {
+                $stringtoshow='';
+                $stringtoshow.='<script type="text/javascript" language="javascript">
 					jQuery(document).ready(function() {
 						jQuery("#idsubimg'.$this->boxcode.'").click(function() {
 							jQuery("#idfilter'.$this->boxcode.'").toggle();
 						});
 					});
 					</script>';
-				$stringtoshow.='<div class="center hideobject" id="idfilter'.$this->boxcode.'">';	// hideobject is to start hidden
-				$stringtoshow.='<form class="flat formboxfilter" method="POST" action="'.$_SERVER["PHP_SELF"].'">';
-				$stringtoshow.='<input type="hidden" name="action" value="'.$refreshaction.'">';
-				$stringtoshow.='<input type="hidden" name="page_y" value="">';
-				$stringtoshow.='<input type="hidden" name="DOL_AUTOSET_COOKIE" value="DOLUSERCOOKIE_box_'.$this->boxcode.':year,shownb,showtot">';
-				$stringtoshow.='<input type="checkbox" name="'.$param_shownb.'"'.($shownb?' checked':'').'> '.$langs->trans("NumberOfOrdersByMonth");
-				$stringtoshow.=' &nbsp; ';
-				$stringtoshow.='<input type="checkbox" name="'.$param_showtot.'"'.($showtot?' checked':'').'> '.$langs->trans("AmountOfOrdersByMonthHT");
-				$stringtoshow.='<br>';
-				$stringtoshow.=$langs->trans("Year").' <input class="flat" size="4" type="text" name="'.$param_year.'" value="'.$endyear.'">';
-				$stringtoshow.='<input type="image" class="reposition inline-block valigntextbottom" alt="'.$langs->trans("Refresh").'" src="'.img_picto($langs->trans("Refresh"),'refresh.png','','',1).'">';
-				$stringtoshow.='</form>';
-				$stringtoshow.='</div>';
-				if ($shownb && $showtot)
-				{
-					$stringtoshow.='<div class="fichecenter">';
-					$stringtoshow.='<div class="fichehalfleft">';
-				}
-				if ($shownb) $stringtoshow.=$px1->show();
-				if ($shownb && $showtot)
-				{
-					$stringtoshow.='</div>';
-					$stringtoshow.='<div class="fichehalfright">';
-				}
-				if ($showtot) $stringtoshow.=$px2->show();
-				if ($shownb && $showtot)
-				{
-					$stringtoshow.='</div>';
-					$stringtoshow.='</div>';
-				}
-				$this->info_box_contents[0][0] = array('tr'=>'class="oddeven nohover"', 'td' => 'align="center" class="nohover"','textnoformat'=>$stringtoshow);
-			}
-			else
-			{
-				$this->info_box_contents[0][0] = array('tr'=>'class="oddeven nohover"',	'td' => 'align="left" class="nohover"',
-    	        										'maxlength'=>500,
-	            										'text' => $mesg);
-			}
-		}
-		else {
-			$this->info_box_contents[0][0] = array(
-			    'td' => 'align="left" class="nohover opacitymedium"',
+                $stringtoshow.='<div class="center hideobject" id="idfilter'.$this->boxcode.'">';	// hideobject is to start hidden
+                $stringtoshow.='<form class="flat formboxfilter" method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+                $stringtoshow.='<input type="hidden" name="action" value="'.$refreshaction.'">';
+                $stringtoshow.='<input type="hidden" name="page_y" value="">';
+                $stringtoshow.='<input type="hidden" name="DOL_AUTOSET_COOKIE" value="DOLUSERCOOKIE_box_'.$this->boxcode.':year,shownb,showtot">';
+                $stringtoshow.='<input type="checkbox" name="'.$param_shownb.'"'.($shownb?' checked':'').'> '.$langs->trans("NumberOfOrdersByMonth");
+                $stringtoshow.=' &nbsp; ';
+                $stringtoshow.='<input type="checkbox" name="'.$param_showtot.'"'.($showtot?' checked':'').'> '.$langs->trans("AmountOfOrdersByMonthHT");
+                $stringtoshow.='<br>';
+                $stringtoshow.=$langs->trans("Year").' <input class="flat" size="4" type="text" name="'.$param_year.'" value="'.$endyear.'">';
+                $stringtoshow.='<input type="image" class="reposition inline-block valigntextbottom" alt="'.$langs->trans("Refresh").'" src="'.img_picto($langs->trans("Refresh"),'refresh.png','','',1).'">';
+                $stringtoshow.='</form>';
+                $stringtoshow.='</div>';
+                if ($shownb && $showtot)
+                {
+                    $stringtoshow.='<div class="fichecenter">';
+                    $stringtoshow.='<div class="fichehalfleft">';
+                }
+                if ($shownb) $stringtoshow.=$px1->show();
+                if ($shownb && $showtot)
+                {
+                    $stringtoshow.='</div>';
+                    $stringtoshow.='<div class="fichehalfright">';
+                }
+                if ($showtot) $stringtoshow.=$px2->show();
+                if ($shownb && $showtot)
+                {
+                    $stringtoshow.='</div>';
+                    $stringtoshow.='</div>';
+                }
+                $this->info_box_contents[0][0] = array('tr'=>'class="oddeven nohover"', 'td' => 'align="center" class="nohover"','textnoformat'=>$stringtoshow);
+            }
+            else
+            {
+                $this->info_box_contents[0][0] = array('tr'=>'class="oddeven nohover"',	'td' => 'align="left" class="nohover"',
+                                                        'maxlength'=>500,
+                                                        'text' => $mesg);
+            }
+        }
+        else {
+            $this->info_box_contents[0][0] = array(
+                'td' => 'align="left" class="nohover opacitymedium"',
                 'text' => $langs->trans("ReadPermissionNotAllowed")
-			);
-		}
-	}
+            );
+        }
+    }
 
-	/**
-	 *	Method to show box
-	 *
-	 *	@param	array	$head       Array with properties of box title
-	 *	@param  array	$contents   Array with properties of box lines
-	 *  @param	int		$nooutput	No print, only return string
-	 *	@return	string
-	 */
+    /**
+     *	Method to show box
+     *
+     *	@param	array	$head       Array with properties of box title
+     *	@param  array	$contents   Array with properties of box lines
+     *  @param	int		$nooutput	No print, only return string
+     *	@return	string
+     */
     function showBox($head = null, $contents = null, $nooutput=0)
     {
-		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
-	}
+        return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+    }
 }
 

Spacing +74 added lines, -74 removed lines

@@ -28,9 +28,9 @@ 
  */
 class box_graph_orders_permonth extends ModeleBoxes
 {
-	var $boxcode="orderspermonth";
-	var $boximg="object_order";
-	var $boxlabel="BoxCustomersOrdersPerMonth";
+	var $boxcode = "orderspermonth";
+	var $boximg = "object_order";
+	var $boxlabel = "BoxCustomersOrdersPerMonth";
 	var $depends = array("commande");
 
 	/**
@@ -48,13 +48,13 @@ 
 	 * 	@param	DoliDB	$db			Database handler
 	 *  @param	string	$param		More parameters
 	 */
-	function __construct($db,$param)
+	function __construct($db, $param)
 	{
 		global $user;
 
-		$this->db=$db;
+		$this->db = $db;
 
-		$this->hidden = ! ($user->rights->commande->lire);
+		$this->hidden = !($user->rights->commande->lire);
 	}
 
 	/**
@@ -63,18 +63,18 @@ 
 	 *  @param	int		$max        Maximum number of records to load
      *  @return	void
 	 */
-	function loadBox($max=5)
+	function loadBox($max = 5)
 	{
 		global $conf, $user, $langs, $db;
 
-		$this->max=$max;
+		$this->max = $max;
 
-		$refreshaction='refresh_'.$this->boxcode;
+		$refreshaction = 'refresh_'.$this->boxcode;
 
 		//include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 		//$commandestatic=new Commande($db);
 
-		$text = $langs->trans("BoxCustomersOrdersPerMonth",$max);
+		$text = $langs->trans("BoxCustomersOrdersPerMonth", $max);
 		$this->info_box_head = array(
 				'text' => $text,
 				'limit'=> dol_strlen($text),
@@ -86,50 +86,50 @@ 
 				'target'=>'none'	// Set '' to get target="_blank"
 		);
 
-		$dir=''; 	// We don't need a path because image file will not be saved into disk
-		$prefix='';
-		$socid=0;
-		if ($user->societe_id) $socid=$user->societe_id;
-		if (! $user->rights->societe->client->voir || $socid) $prefix.='private-'.$user->id.'-';	// If user has no permission to see all, output dir is specific to user
+		$dir = ''; // We don't need a path because image file will not be saved into disk
+		$prefix = '';
+		$socid = 0;
+		if ($user->societe_id) $socid = $user->societe_id;
+		if (!$user->rights->societe->client->voir || $socid) $prefix .= 'private-'.$user->id.'-'; // If user has no permission to see all, output dir is specific to user
 
 		if ($user->rights->commande->lire)
 		{
 		    $langs->load("orders");
 
-		    $param_year='DOLUSERCOOKIE_box_'.$this->boxcode.'_year';
-			$param_shownb='DOLUSERCOOKIE_box_'.$this->boxcode.'_shownb';
-			$param_showtot='DOLUSERCOOKIE_box_'.$this->boxcode.'_showtot';
+		    $param_year = 'DOLUSERCOOKIE_box_'.$this->boxcode.'_year';
+			$param_shownb = 'DOLUSERCOOKIE_box_'.$this->boxcode.'_shownb';
+			$param_showtot = 'DOLUSERCOOKIE_box_'.$this->boxcode.'_showtot';
 
 			include_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
 			include_once DOL_DOCUMENT_ROOT.'/commande/class/commandestats.class.php';
-			$autosetarray=preg_split("/[,;:]+/",GETPOST('DOL_AUTOSET_COOKIE'));
-			if (in_array('DOLUSERCOOKIE_box_'.$this->boxcode,$autosetarray))
+			$autosetarray = preg_split("/[,;:]+/", GETPOST('DOL_AUTOSET_COOKIE'));
+			if (in_array('DOLUSERCOOKIE_box_'.$this->boxcode, $autosetarray))
 			{
-				$endyear=GETPOST($param_year,'int');
-				$shownb=GETPOST($param_shownb,'alpha');
-				$showtot=GETPOST($param_showtot,'alpha');
+				$endyear = GETPOST($param_year, 'int');
+				$shownb = GETPOST($param_shownb, 'alpha');
+				$showtot = GETPOST($param_showtot, 'alpha');
 			}
 			else
 			{
-				$tmparray=json_decode($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode],true);
-				$endyear=$tmparray['year'];
-				$shownb=$tmparray['shownb'];
-				$showtot=$tmparray['showtot'];
+				$tmparray = json_decode($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode], true);
+				$endyear = $tmparray['year'];
+				$shownb = $tmparray['shownb'];
+				$showtot = $tmparray['showtot'];
 			}
-			if (empty($shownb) && empty($showtot)) { $shownb=1; $showtot=1; }
-			$nowarray=dol_getdate(dol_now(),true);
-			if (empty($endyear)) $endyear=$nowarray['year'];
-			$startyear=$endyear-1;
-			$mode='customer';
-			$WIDTH=(($shownb && $showtot) || ! empty($conf->dol_optimize_smallscreen))?'256':'320';
-			$HEIGHT='192';
+			if (empty($shownb) && empty($showtot)) { $shownb = 1; $showtot = 1; }
+			$nowarray = dol_getdate(dol_now(), true);
+			if (empty($endyear)) $endyear = $nowarray['year'];
+			$startyear = $endyear - 1;
+			$mode = 'customer';
+			$WIDTH = (($shownb && $showtot) || !empty($conf->dol_optimize_smallscreen)) ? '256' : '320';
+			$HEIGHT = '192';
 
 			$stats = new CommandeStats($this->db, $socid, $mode, 0);
 
 			// Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...)
 			if ($shownb)
 			{
-				$data1 = $stats->getNbByMonthWithPrevYear($endyear,$startyear,(GETPOST('action','aZ09')==$refreshaction?-1:(3600*24)), ($WIDTH<300?2:0));
+				$data1 = $stats->getNbByMonthWithPrevYear($endyear, $startyear, (GETPOST('action', 'aZ09') == $refreshaction ?-1 : (3600 * 24)), ($WIDTH < 300 ? 2 : 0));
 
 				$filenamenb = $dir."/".$prefix."ordersnbinyear-".$endyear.".png";
 				if ($mode == 'customer') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&amp;file=ordersnbinyear-'.$endyear.'.png';
@@ -137,15 +137,15 @@ 
 
 				$px1 = new DolGraph();
 				$mesg = $px1->isGraphKo();
-				if (! $mesg)
+				if (!$mesg)
 				{
 					$px1->SetData($data1);
 					unset($data1);
 					$px1->SetPrecisionY(0);
-					$i=$startyear;$legend=array();
+					$i = $startyear; $legend = array();
 					while ($i <= $endyear)
 					{
-						$legend[]=$i;
+						$legend[] = $i;
 						$i++;
 					}
 					$px1->SetLegend($legend);
@@ -157,17 +157,17 @@ 
 					$px1->SetHorizTickIncrement(1);
 					$px1->SetPrecisionY(0);
 					$px1->SetCssPrefix("cssboxes");
-					$px1->mode='depth';
+					$px1->mode = 'depth';
 					$px1->SetTitle($langs->trans("NumberOfOrdersByMonth"));
 
-					$px1->draw($filenamenb,$fileurlnb);
+					$px1->draw($filenamenb, $fileurlnb);
 				}
 			}
 
 			// Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...)
 			if ($showtot)
 			{
-				$data2 = $stats->getAmountByMonthWithPrevYear($endyear,$startyear,(GETPOST('action','aZ09')==$refreshaction?-1:(3600*24)), ($WIDTH<300?2:0));
+				$data2 = $stats->getAmountByMonthWithPrevYear($endyear, $startyear, (GETPOST('action', 'aZ09') == $refreshaction ?-1 : (3600 * 24)), ($WIDTH < 300 ? 2 : 0));
 
 				$filenamenb = $dir."/".$prefix."ordersamountinyear-".$endyear.".png";
 				if ($mode == 'customer') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&amp;file=ordersamountinyear-'.$endyear.'.png';
@@ -175,15 +175,15 @@ 
 
 				$px2 = new DolGraph();
 				$mesg = $px2->isGraphKo();
-				if (! $mesg)
+				if (!$mesg)
 				{
 					$px2->SetData($data2);
 					unset($data2);
 					$px2->SetPrecisionY(0);
-					$i=$startyear;$legend=array();
+					$i = $startyear; $legend = array();
 					while ($i <= $endyear)
 					{
-						$legend[]=$i;
+						$legend[] = $i;
 						$i++;
 					}
 					$px2->SetLegend($legend);
@@ -195,64 +195,64 @@ 
 					$px2->SetHorizTickIncrement(1);
 					$px2->SetPrecisionY(0);
 					$px2->SetCssPrefix("cssboxes");
-					$px2->mode='depth';
+					$px2->mode = 'depth';
 					$px2->SetTitle($langs->trans("AmountOfOrdersByMonthHT"));
 
-					$px2->draw($filenamenb,$fileurlnb);
+					$px2->draw($filenamenb, $fileurlnb);
 				}
 			}
 
 			if (empty($conf->use_javascript_ajax))
 			{
 				$langs->load("errors");
-				$mesg=$langs->trans("WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs");
+				$mesg = $langs->trans("WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs");
 			}
 
-			if (! $mesg)
+			if (!$mesg)
 			{
-				$stringtoshow='';
-				$stringtoshow.='<script type="text/javascript" language="javascript">
+				$stringtoshow = '';
+				$stringtoshow .= '<script type="text/javascript" language="javascript">
 					jQuery(document).ready(function() {
 						jQuery("#idsubimg'.$this->boxcode.'").click(function() {
 							jQuery("#idfilter'.$this->boxcode.'").toggle();
 						});
 					});
 					</script>';
-				$stringtoshow.='<div class="center hideobject" id="idfilter'.$this->boxcode.'">';	// hideobject is to start hidden
-				$stringtoshow.='<form class="flat formboxfilter" method="POST" action="'.$_SERVER["PHP_SELF"].'">';
-				$stringtoshow.='<input type="hidden" name="action" value="'.$refreshaction.'">';
-				$stringtoshow.='<input type="hidden" name="page_y" value="">';
-				$stringtoshow.='<input type="hidden" name="DOL_AUTOSET_COOKIE" value="DOLUSERCOOKIE_box_'.$this->boxcode.':year,shownb,showtot">';
-				$stringtoshow.='<input type="checkbox" name="'.$param_shownb.'"'.($shownb?' checked':'').'> '.$langs->trans("NumberOfOrdersByMonth");
-				$stringtoshow.=' &nbsp; ';
-				$stringtoshow.='<input type="checkbox" name="'.$param_showtot.'"'.($showtot?' checked':'').'> '.$langs->trans("AmountOfOrdersByMonthHT");
-				$stringtoshow.='<br>';
-				$stringtoshow.=$langs->trans("Year").' <input class="flat" size="4" type="text" name="'.$param_year.'" value="'.$endyear.'">';
-				$stringtoshow.='<input type="image" class="reposition inline-block valigntextbottom" alt="'.$langs->trans("Refresh").'" src="'.img_picto($langs->trans("Refresh"),'refresh.png','','',1).'">';
-				$stringtoshow.='</form>';
-				$stringtoshow.='</div>';
+				$stringtoshow .= '<div class="center hideobject" id="idfilter'.$this->boxcode.'">'; // hideobject is to start hidden
+				$stringtoshow .= '<form class="flat formboxfilter" method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+				$stringtoshow .= '<input type="hidden" name="action" value="'.$refreshaction.'">';
+				$stringtoshow .= '<input type="hidden" name="page_y" value="">';
+				$stringtoshow .= '<input type="hidden" name="DOL_AUTOSET_COOKIE" value="DOLUSERCOOKIE_box_'.$this->boxcode.':year,shownb,showtot">';
+				$stringtoshow .= '<input type="checkbox" name="'.$param_shownb.'"'.($shownb ? ' checked' : '').'> '.$langs->trans("NumberOfOrdersByMonth");
+				$stringtoshow .= ' &nbsp; ';
+				$stringtoshow .= '<input type="checkbox" name="'.$param_showtot.'"'.($showtot ? ' checked' : '').'> '.$langs->trans("AmountOfOrdersByMonthHT");
+				$stringtoshow .= '<br>';
+				$stringtoshow .= $langs->trans("Year").' <input class="flat" size="4" type="text" name="'.$param_year.'" value="'.$endyear.'">';
+				$stringtoshow .= '<input type="image" class="reposition inline-block valigntextbottom" alt="'.$langs->trans("Refresh").'" src="'.img_picto($langs->trans("Refresh"), 'refresh.png', '', '', 1).'">';
+				$stringtoshow .= '</form>';
+				$stringtoshow .= '</div>';
 				if ($shownb && $showtot)
 				{
-					$stringtoshow.='<div class="fichecenter">';
-					$stringtoshow.='<div class="fichehalfleft">';
+					$stringtoshow .= '<div class="fichecenter">';
+					$stringtoshow .= '<div class="fichehalfleft">';
 				}
-				if ($shownb) $stringtoshow.=$px1->show();
+				if ($shownb) $stringtoshow .= $px1->show();
 				if ($shownb && $showtot)
 				{
-					$stringtoshow.='</div>';
-					$stringtoshow.='<div class="fichehalfright">';
+					$stringtoshow .= '</div>';
+					$stringtoshow .= '<div class="fichehalfright">';
 				}
-				if ($showtot) $stringtoshow.=$px2->show();
+				if ($showtot) $stringtoshow .= $px2->show();
 				if ($shownb && $showtot)
 				{
-					$stringtoshow.='</div>';
-					$stringtoshow.='</div>';
+					$stringtoshow .= '</div>';
+					$stringtoshow .= '</div>';
 				}
-				$this->info_box_contents[0][0] = array('tr'=>'class="oddeven nohover"', 'td' => 'align="center" class="nohover"','textnoformat'=>$stringtoshow);
+				$this->info_box_contents[0][0] = array('tr'=>'class="oddeven nohover"', 'td' => 'align="center" class="nohover"', 'textnoformat'=>$stringtoshow);
 			}
 			else
 			{
-				$this->info_box_contents[0][0] = array('tr'=>'class="oddeven nohover"',	'td' => 'align="left" class="nohover"',
+				$this->info_box_contents[0][0] = array('tr'=>'class="oddeven nohover"', 'td' => 'align="left" class="nohover"',
     	        										'maxlength'=>500,
 	            										'text' => $mesg);
 			}
@@ -273,7 +273,7 @@ 
 	 *  @param	int		$nooutput	No print, only return string
 	 *	@return	string
 	 */
-    function showBox($head = null, $contents = null, $nooutput=0)
+    function showBox($head = null, $contents = null, $nooutput = 0)
     {
 		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}

Braces +31 added lines, -15 removed lines

@@ -89,8 +89,13 @@ 
 		$dir=''; 	// We don't need a path because image file will not be saved into disk
 		$prefix='';
 		$socid=0;
-		if ($user->societe_id) $socid=$user->societe_id;
-		if (! $user->rights->societe->client->voir || $socid) $prefix.='private-'.$user->id.'-';	// If user has no permission to see all, output dir is specific to user
+		if ($user->societe_id) {
+		    $socid=$user->societe_id;
+		}
+		if (! $user->rights->societe->client->voir || $socid) {
+		    $prefix.='private-'.$user->id.'-';
+		}
+		// If user has no permission to see all, output dir is specific to user
 
 		if ($user->rights->commande->lire)
 		{
@@ -108,8 +113,7 @@ 
 				$endyear=GETPOST($param_year,'int');
 				$shownb=GETPOST($param_shownb,'alpha');
 				$showtot=GETPOST($param_showtot,'alpha');
-			}
-			else
+			} else
 			{
 				$tmparray=json_decode($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode],true);
 				$endyear=$tmparray['year'];
@@ -118,7 +122,9 @@ 
 			}
 			if (empty($shownb) && empty($showtot)) { $shownb=1; $showtot=1; }
 			$nowarray=dol_getdate(dol_now(),true);
-			if (empty($endyear)) $endyear=$nowarray['year'];
+			if (empty($endyear)) {
+			    $endyear=$nowarray['year'];
+			}
 			$startyear=$endyear-1;
 			$mode='customer';
 			$WIDTH=(($shownb && $showtot) || ! empty($conf->dol_optimize_smallscreen))?'256':'320';
@@ -132,8 +138,12 @@ 
 				$data1 = $stats->getNbByMonthWithPrevYear($endyear,$startyear,(GETPOST('action','aZ09')==$refreshaction?-1:(3600*24)), ($WIDTH<300?2:0));
 
 				$filenamenb = $dir."/".$prefix."ordersnbinyear-".$endyear.".png";
-				if ($mode == 'customer') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&amp;file=ordersnbinyear-'.$endyear.'.png';
-				if ($mode == 'supplier') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&amp;file=ordersnbinyear-'.$endyear.'.png';
+				if ($mode == 'customer') {
+				    $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&amp;file=ordersnbinyear-'.$endyear.'.png';
+				}
+				if ($mode == 'supplier') {
+				    $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&amp;file=ordersnbinyear-'.$endyear.'.png';
+				}
 
 				$px1 = new DolGraph();
 				$mesg = $px1->isGraphKo();
@@ -170,8 +180,12 @@ 
 				$data2 = $stats->getAmountByMonthWithPrevYear($endyear,$startyear,(GETPOST('action','aZ09')==$refreshaction?-1:(3600*24)), ($WIDTH<300?2:0));
 
 				$filenamenb = $dir."/".$prefix."ordersamountinyear-".$endyear.".png";
-				if ($mode == 'customer') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&amp;file=ordersamountinyear-'.$endyear.'.png';
-				if ($mode == 'supplier') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&amp;file=ordersamountinyear-'.$endyear.'.png';
+				if ($mode == 'customer') {
+				    $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&amp;file=ordersamountinyear-'.$endyear.'.png';
+				}
+				if ($mode == 'supplier') {
+				    $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&amp;file=ordersamountinyear-'.$endyear.'.png';
+				}
 
 				$px2 = new DolGraph();
 				$mesg = $px2->isGraphKo();
@@ -236,28 +250,30 @@ 
 					$stringtoshow.='<div class="fichecenter">';
 					$stringtoshow.='<div class="fichehalfleft">';
 				}
-				if ($shownb) $stringtoshow.=$px1->show();
+				if ($shownb) {
+				    $stringtoshow.=$px1->show();
+				}
 				if ($shownb && $showtot)
 				{
 					$stringtoshow.='</div>';
 					$stringtoshow.='<div class="fichehalfright">';
 				}
-				if ($showtot) $stringtoshow.=$px2->show();
+				if ($showtot) {
+				    $stringtoshow.=$px2->show();
+				}
 				if ($shownb && $showtot)
 				{
 					$stringtoshow.='</div>';
 					$stringtoshow.='</div>';
 				}
 				$this->info_box_contents[0][0] = array('tr'=>'class="oddeven nohover"', 'td' => 'align="center" class="nohover"','textnoformat'=>$stringtoshow);
-			}
-			else
+			} else
 			{
 				$this->info_box_contents[0][0] = array('tr'=>'class="oddeven nohover"',	'td' => 'align="left" class="nohover"',
     	        										'maxlength'=>500,
 	            										'text' => $mesg);
 			}
-		}
-		else {
+		} else {
 			$this->info_box_contents[0][0] = array(
 			    'td' => 'align="left" class="nohover opacitymedium"',
                 'text' => $langs->trans("ReadPermissionNotAllowed")

dolibarr/htdocs/core/boxes/box_bookmarks.php

Indentation +59 added lines, -59 removed lines

@@ -28,79 +28,79 @@ 
  */
 class box_bookmarks extends ModeleBoxes
 {
-	var $boxcode="bookmarks";
-	var $boximg="object_bookmark";
-	var $boxlabel="BoxMyLastBookmarks";
-	var $depends = array("bookmark");
+    var $boxcode="bookmarks";
+    var $boximg="object_bookmark";
+    var $boxlabel="BoxMyLastBookmarks";
+    var $depends = array("bookmark");
 
-	/**
+    /**
      * @var DoliDB Database handler.
      */
     public $db;
     
-	var $param;
+    var $param;
 
-	var $info_box_head = array();
-	var $info_box_contents = array();
+    var $info_box_head = array();
+    var $info_box_contents = array();
 
 
-	/**
-	 *  Constructor
-	 *
-	 *  @param  DoliDB  $db         Database handler
-	 *  @param  string  $param      More parameters
-	 */
-	function __construct($db,$param)
-	{
-	    global $user;
+    /**
+     *  Constructor
+     *
+     *  @param  DoliDB  $db         Database handler
+     *  @param  string  $param      More parameters
+     */
+    function __construct($db,$param)
+    {
+        global $user;
 
-	    $this->db=$db;
+        $this->db=$db;
 
-	    $this->hidden=! ($user->rights->bookmark->lire);
-	}
+        $this->hidden=! ($user->rights->bookmark->lire);
+    }
 
-	/**
+    /**
      *  Load data for box to show them later
      *
      *  @param	int		$max        Maximum number of records to load
      *  @return	void
-	 */
-	function loadBox($max=5)
-	{
-		global $user, $langs, $db, $conf;
-		$langs->load("boxes");
+     */
+    function loadBox($max=5)
+    {
+        global $user, $langs, $db, $conf;
+        $langs->load("boxes");
 
-		$this->max=$max;
+        $this->max=$max;
 
-		$this->info_box_head = array(
+        $this->info_box_head = array(
             'text' => $langs->trans("BoxMyLastBookmarks",$max),
             'sublink' => DOL_URL_ROOT.'/bookmarks/list.php',
         );
         if ($user->rights->bookmark->creer) {
-			$this->info_box_head['subpicto']='object_bookmark';
-			$this->info_box_head['subtext']=$langs->trans("BookmarksManagement");
-		}
-		else
-		{
-			$this->info_box_head['subpicto']='object_bookmark';
-			$this->info_box_head['subtext']=$langs->trans("ListOfBookmark");
-		}
-
-		if ($user->rights->bookmark->lire)
-		{
-			$sql = "SELECT b.title, b.url, b.target, b.favicon";
-			$sql.= " FROM ".MAIN_DB_PREFIX."bookmark as b";
-			$sql.= " WHERE fk_user = ".$user->id;
+            $this->info_box_head['subpicto']='object_bookmark';
+            $this->info_box_head['subtext']=$langs->trans("BookmarksManagement");
+        }
+        else
+        {
+            $this->info_box_head['subpicto']='object_bookmark';
+            $this->info_box_head['subtext']=$langs->trans("ListOfBookmark");
+        }
+
+        if ($user->rights->bookmark->lire)
+        {
+            $sql = "SELECT b.title, b.url, b.target, b.favicon";
+            $sql.= " FROM ".MAIN_DB_PREFIX."bookmark as b";
+            $sql.= " WHERE fk_user = ".$user->id;
             $sql.= " AND b.entity = ".$conf->entity;
-			$sql.= $db->order("position","ASC");
-			$sql.= $db->plimit($max, 0);
+            $sql.= $db->order("position","ASC");
+            $sql.= $db->plimit($max, 0);
 
-			$result = $db->query($sql);
-			if ($result)
-			{
-				$num = $db->num_rows($result);
+            $result = $db->query($sql);
+            if ($result)
+            {
+                $num = $db->num_rows($result);
 
-				$line = 0;
+                $line = 0;
 
                 while ($line < $num) {
                     $objp = $db->fetch_object($result);
@@ -149,17 +149,17 @@ 
         }
     }
 
-	/**
-	 *	Method to show box
-	 *
-	 *	@param	array	$head       Array with properties of box title
-	 *	@param  array	$contents   Array with properties of box lines
-	 *  @param	int		$nooutput	No print, only return string
-	 *	@return	string
-	 */
+    /**
+     *	Method to show box
+     *
+     *	@param	array	$head       Array with properties of box title
+     *	@param  array	$contents   Array with properties of box lines
+     *  @param	int		$nooutput	No print, only return string
+     *	@return	string
+     */
     function showBox($head = null, $contents = null, $nooutput=0)
     {
-		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
-	}
+        return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+    }
 }
 

Spacing +24 added lines, -24 removed lines

@@ -28,9 +28,9 @@ 
  */
 class box_bookmarks extends ModeleBoxes
 {
-	var $boxcode="bookmarks";
-	var $boximg="object_bookmark";
-	var $boxlabel="BoxMyLastBookmarks";
+	var $boxcode = "bookmarks";
+	var $boximg = "object_bookmark";
+	var $boxlabel = "BoxMyLastBookmarks";
 	var $depends = array("bookmark");
 
 	/**
@@ -50,13 +50,13 @@ 
 	 *  @param  DoliDB  $db         Database handler
 	 *  @param  string  $param      More parameters
 	 */
-	function __construct($db,$param)
+	function __construct($db, $param)
 	{
 	    global $user;
 
-	    $this->db=$db;
+	    $this->db = $db;
 
-	    $this->hidden=! ($user->rights->bookmark->lire);
+	    $this->hidden = !($user->rights->bookmark->lire);
 	}
 
 	/**
@@ -65,35 +65,35 @@ 
      *  @param	int		$max        Maximum number of records to load
      *  @return	void
 	 */
-	function loadBox($max=5)
+	function loadBox($max = 5)
 	{
 		global $user, $langs, $db, $conf;
 		$langs->load("boxes");
 
-		$this->max=$max;
+		$this->max = $max;
 
 		$this->info_box_head = array(
-            'text' => $langs->trans("BoxMyLastBookmarks",$max),
+            'text' => $langs->trans("BoxMyLastBookmarks", $max),
             'sublink' => DOL_URL_ROOT.'/bookmarks/list.php',
         );
         if ($user->rights->bookmark->creer) {
-			$this->info_box_head['subpicto']='object_bookmark';
-			$this->info_box_head['subtext']=$langs->trans("BookmarksManagement");
+			$this->info_box_head['subpicto'] = 'object_bookmark';
+			$this->info_box_head['subtext'] = $langs->trans("BookmarksManagement");
 		}
 		else
 		{
-			$this->info_box_head['subpicto']='object_bookmark';
-			$this->info_box_head['subtext']=$langs->trans("ListOfBookmark");
+			$this->info_box_head['subpicto'] = 'object_bookmark';
+			$this->info_box_head['subtext'] = $langs->trans("ListOfBookmark");
 		}
 
 		if ($user->rights->bookmark->lire)
 		{
 			$sql = "SELECT b.title, b.url, b.target, b.favicon";
-			$sql.= " FROM ".MAIN_DB_PREFIX."bookmark as b";
-			$sql.= " WHERE fk_user = ".$user->id;
-            $sql.= " AND b.entity = ".$conf->entity;
-			$sql.= $db->order("position","ASC");
-			$sql.= $db->plimit($max, 0);
+			$sql .= " FROM ".MAIN_DB_PREFIX."bookmark as b";
+			$sql .= " WHERE fk_user = ".$user->id;
+            $sql .= " AND b.entity = ".$conf->entity;
+			$sql .= $db->order("position", "ASC");
+			$sql .= $db->plimit($max, 0);
 
 			$result = $db->query($sql);
 			if ($result)
@@ -110,22 +110,22 @@ 
                         'logo' => $this->boximg,
                         'url' => $objp->url,
                         'tooltip' => $objp->title,
-                        'target' => $objp->target?'newtab':'',
+                        'target' => $objp->target ? 'newtab' : '',
                     );
                     $this->info_box_contents[$line][1] = array(
                         'td' => '',
                         'text' => $objp->title,
                         'url' => $objp->url,
                         'tooltip' => $objp->title,
-                        'target' => $objp->target?'newtab':'',
+                        'target' => $objp->target ? 'newtab' : '',
                     );
 
                     $line++;
                 }
 
-                if ($num==0) {
-                    $mytxt=$langs->trans("NoRecordedBookmarks");
-                    if ($user->rights->bookmark->creer) $mytxt.=' '.$langs->trans("ClickToAdd");
+                if ($num == 0) {
+                    $mytxt = $langs->trans("NoRecordedBookmarks");
+                    if ($user->rights->bookmark->creer) $mytxt .= ' '.$langs->trans("ClickToAdd");
                     $this->info_box_contents[$line][0] = array(
                         'td' => 'align="center" colspan="2"',
                         'tooltip' => $mytxt,
@@ -157,7 +157,7 @@ 
 	 *  @param	int		$nooutput	No print, only return string
 	 *	@return	string
 	 */
-    function showBox($head = null, $contents = null, $nooutput=0)
+    function showBox($head = null, $contents = null, $nooutput = 0)
     {
 		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}

Braces +4 added lines, -3 removed lines

@@ -79,8 +79,7 @@ 
         if ($user->rights->bookmark->creer) {
 			$this->info_box_head['subpicto']='object_bookmark';
 			$this->info_box_head['subtext']=$langs->trans("BookmarksManagement");
-		}
-		else
+		} else
 		{
 			$this->info_box_head['subpicto']='object_bookmark';
 			$this->info_box_head['subtext']=$langs->trans("ListOfBookmark");
@@ -125,7 +124,9 @@ 
 
                 if ($num==0) {
                     $mytxt=$langs->trans("NoRecordedBookmarks");
-                    if ($user->rights->bookmark->creer) $mytxt.=' '.$langs->trans("ClickToAdd");
+                    if ($user->rights->bookmark->creer) {
+                        $mytxt.=' '.$langs->trans("ClickToAdd");
+                    }
                     $this->info_box_contents[$line][0] = array(
                         'td' => 'align="center" colspan="2"',
                         'tooltip' => $mytxt,

dolibarr/htdocs/core/boxes/box_propales.php

Indentation +43 added lines, -43 removed lines

@@ -64,54 +64,54 @@ 
     }
 
     /**
-	 *  Load data into info_box_contents array to show array later.
-	 *
-	 *  @param	int		$max        Maximum number of records to load
+     *  Load data into info_box_contents array to show array later.
+     *
+     *  @param	int		$max        Maximum number of records to load
      *  @return	void
      */
     function loadBox($max=5)
     {
-    	global $user, $langs, $db, $conf;
+        global $user, $langs, $db, $conf;
 
-    	$this->max=$max;
+        $this->max=$max;
 
-    	include_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
+        include_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
         include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
-    	$propalstatic=new Propal($db);
+        $propalstatic=new Propal($db);
         $societestatic = new Societe($db);
 
         $this->info_box_head = array('text' => $langs->trans("BoxTitleLast".($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE?"":"Modified")."Propals",$max));
 
-    	if ($user->rights->propale->lire)
-    	{
-    		$sql = "SELECT s.nom as name, s.rowid as socid, s.code_client, s.logo,";
-    		$sql.= " p.rowid, p.ref, p.fk_statut, p.datep as dp, p.datec, p.fin_validite, p.date_cloture, p.total_ht, p.tva as total_tva, p.total as total_ttc, p.tms";
-    		$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
-    		$sql.= ", ".MAIN_DB_PREFIX."propal as p";
-    		if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-    		$sql.= " WHERE p.fk_soc = s.rowid";
-    		$sql.= " AND p.entity = ".$conf->entity;
-    		if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-    		if($user->societe_id) $sql.= " AND s.rowid = ".$user->societe_id;
+        if ($user->rights->propale->lire)
+        {
+            $sql = "SELECT s.nom as name, s.rowid as socid, s.code_client, s.logo,";
+            $sql.= " p.rowid, p.ref, p.fk_statut, p.datep as dp, p.datec, p.fin_validite, p.date_cloture, p.total_ht, p.tva as total_tva, p.total as total_ttc, p.tms";
+            $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
+            $sql.= ", ".MAIN_DB_PREFIX."propal as p";
+            if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+            $sql.= " WHERE p.fk_soc = s.rowid";
+            $sql.= " AND p.entity = ".$conf->entity;
+            if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+            if($user->societe_id) $sql.= " AND s.rowid = ".$user->societe_id;
             if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) $sql.= " ORDER BY p.datep DESC, p.ref DESC ";
             else $sql.= " ORDER BY p.tms DESC, p.ref DESC ";
-    		$sql.= $db->plimit($max, 0);
+            $sql.= $db->plimit($max, 0);
 
-    		$result = $db->query($sql);
-    		if ($result)
-    		{
-    			$num = $db->num_rows($result);
-    			$now=dol_now();
+            $result = $db->query($sql);
+            if ($result)
+            {
+                $num = $db->num_rows($result);
+                $now=dol_now();
 
-    			$line = 0;
+                $line = 0;
 
                 while ($line < $num) {
-    				$objp = $db->fetch_object($result);
-    				$date=$db->jdate($objp->dp);
-    				$datec=$db->jdate($objp->datec);
-    				$datem=$db->jdate($objp->tms);
-    				$dateterm=$db->jdate($objp->fin_validite);
-    				$dateclose=$db->jdate($objp->date_cloture);
+                    $objp = $db->fetch_object($result);
+                    $date=$db->jdate($objp->dp);
+                    $datec=$db->jdate($objp->datec);
+                    $datem=$db->jdate($objp->tms);
+                    $dateterm=$db->jdate($objp->fin_validite);
+                    $dateclose=$db->jdate($objp->date_cloture);
                     $propalstatic->id = $objp->rowid;
                     $propalstatic->ref = $objp->ref;
                     $propalstatic->total_ht = $objp->total_ht;
@@ -122,10 +122,10 @@ 
                     $societestatic->code_client = $objp->code_client;
                     $societestatic->logo = $objp->logo;
 
-    				$late = '';
-    				if ($objp->fk_statut == 1 && $dateterm < ($now - $conf->propal->cloture->warning_delay)) {
-    					$late = img_warning($langs->trans("Late"));
-    				}
+                    $late = '';
+                    if ($objp->fk_statut == 1 && $dateterm < ($now - $conf->propal->cloture->warning_delay)) {
+                        $late = img_warning($langs->trans("Late"));
+                    }
 
                     $this->info_box_contents[$line][] = array(
                         'td' => '',
@@ -180,14 +180,14 @@ 
         }
     }
 
-	/**
-	 *	Method to show box
-	 *
-	 *	@param	array	$head       Array with properties of box title
-	 *	@param  array	$contents   Array with properties of box lines
-	 *  @param	int		$nooutput	No print, only return string
-	 *	@return	string
-	 */
+    /**
+     *	Method to show box
+     *
+     *	@param	array	$head       Array with properties of box title
+     *	@param  array	$contents   Array with properties of box lines
+     *  @param	int		$nooutput	No print, only return string
+     *	@return	string
+     */
     function showBox($head = null, $contents = null, $nooutput=0)
     {
         return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);

Spacing +32 added lines, -32 removed lines

@@ -32,10 +32,10 @@ 
  */
 class box_propales extends ModeleBoxes
 {
-    var $boxcode="lastpropals";
-    var $boximg="object_propal";
-    var $boxlabel="BoxLastProposals";
-    var $depends = array("propal");	// conf->propal->enabled
+    var $boxcode = "lastpropals";
+    var $boximg = "object_propal";
+    var $boxlabel = "BoxLastProposals";
+    var $depends = array("propal"); // conf->propal->enabled
 
     /**
      * @var DoliDB Database handler.
@@ -54,13 +54,13 @@ 
      *  @param  DoliDB  $db         Database handler
      *  @param  string  $param      More parameters
      */
-    function __construct($db,$param)
+    function __construct($db, $param)
     {
         global $user;
 
-        $this->db=$db;
+        $this->db = $db;
 
-        $this->hidden=! ($user->rights->propale->lire);
+        $this->hidden = !($user->rights->propale->lire);
     }
 
     /**
@@ -69,49 +69,49 @@ 
 	 *  @param	int		$max        Maximum number of records to load
      *  @return	void
      */
-    function loadBox($max=5)
+    function loadBox($max = 5)
     {
     	global $user, $langs, $db, $conf;
 
-    	$this->max=$max;
+    	$this->max = $max;
 
     	include_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
         include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
-    	$propalstatic=new Propal($db);
+    	$propalstatic = new Propal($db);
         $societestatic = new Societe($db);
 
-        $this->info_box_head = array('text' => $langs->trans("BoxTitleLast".($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE?"":"Modified")."Propals",$max));
+        $this->info_box_head = array('text' => $langs->trans("BoxTitleLast".($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE ? "" : "Modified")."Propals", $max));
 
     	if ($user->rights->propale->lire)
     	{
     		$sql = "SELECT s.nom as name, s.rowid as socid, s.code_client, s.logo,";
-    		$sql.= " p.rowid, p.ref, p.fk_statut, p.datep as dp, p.datec, p.fin_validite, p.date_cloture, p.total_ht, p.tva as total_tva, p.total as total_ttc, p.tms";
-    		$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
-    		$sql.= ", ".MAIN_DB_PREFIX."propal as p";
-    		if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-    		$sql.= " WHERE p.fk_soc = s.rowid";
-    		$sql.= " AND p.entity = ".$conf->entity;
-    		if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-    		if($user->societe_id) $sql.= " AND s.rowid = ".$user->societe_id;
-            if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) $sql.= " ORDER BY p.datep DESC, p.ref DESC ";
-            else $sql.= " ORDER BY p.tms DESC, p.ref DESC ";
-    		$sql.= $db->plimit($max, 0);
+    		$sql .= " p.rowid, p.ref, p.fk_statut, p.datep as dp, p.datec, p.fin_validite, p.date_cloture, p.total_ht, p.tva as total_tva, p.total as total_ttc, p.tms";
+    		$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+    		$sql .= ", ".MAIN_DB_PREFIX."propal as p";
+    		if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+    		$sql .= " WHERE p.fk_soc = s.rowid";
+    		$sql .= " AND p.entity = ".$conf->entity;
+    		if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+    		if ($user->societe_id) $sql .= " AND s.rowid = ".$user->societe_id;
+            if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) $sql .= " ORDER BY p.datep DESC, p.ref DESC ";
+            else $sql .= " ORDER BY p.tms DESC, p.ref DESC ";
+    		$sql .= $db->plimit($max, 0);
 
     		$result = $db->query($sql);
     		if ($result)
     		{
     			$num = $db->num_rows($result);
-    			$now=dol_now();
+    			$now = dol_now();
 
     			$line = 0;
 
                 while ($line < $num) {
     				$objp = $db->fetch_object($result);
-    				$date=$db->jdate($objp->dp);
-    				$datec=$db->jdate($objp->datec);
-    				$datem=$db->jdate($objp->tms);
-    				$dateterm=$db->jdate($objp->fin_validite);
-    				$dateclose=$db->jdate($objp->date_cloture);
+    				$date = $db->jdate($objp->dp);
+    				$datec = $db->jdate($objp->datec);
+    				$datem = $db->jdate($objp->tms);
+    				$dateterm = $db->jdate($objp->fin_validite);
+    				$dateclose = $db->jdate($objp->date_cloture);
                     $propalstatic->id = $objp->rowid;
                     $propalstatic->ref = $objp->ref;
                     $propalstatic->total_ht = $objp->total_ht;
@@ -147,18 +147,18 @@ 
 
                     $this->info_box_contents[$line][] = array(
                         'td' => 'class="right"',
-                        'text' => dol_print_date($date,'day'),
+                        'text' => dol_print_date($date, 'day'),
                     );
 
                     $this->info_box_contents[$line][] = array(
                         'td' => 'align="right" width="18"',
-                        'text' => $propalstatic->LibStatut($objp->fk_statut,3),
+                        'text' => $propalstatic->LibStatut($objp->fk_statut, 3),
                     );
 
                     $line++;
                 }
 
-                if ($num==0)
+                if ($num == 0)
                     $this->info_box_contents[$line][0] = array(
                         'td' => 'align="center"',
                         'text'=>$langs->trans("NoRecordedProposals"),
@@ -188,7 +188,7 @@ 
 	 *  @param	int		$nooutput	No print, only return string
 	 *	@return	string
 	 */
-    function showBox($head = null, $contents = null, $nooutput=0)
+    function showBox($head = null, $contents = null, $nooutput = 0)
     {
         return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
     }

Braces +17 added lines, -7 removed lines

@@ -88,13 +88,22 @@ 
     		$sql.= " p.rowid, p.ref, p.fk_statut, p.datep as dp, p.datec, p.fin_validite, p.date_cloture, p.total_ht, p.tva as total_tva, p.total as total_ttc, p.tms";
     		$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
     		$sql.= ", ".MAIN_DB_PREFIX."propal as p";
-    		if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+    		if (!$user->rights->societe->client->voir && !$user->societe_id) {
+    		    $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+    		}
     		$sql.= " WHERE p.fk_soc = s.rowid";
     		$sql.= " AND p.entity = ".$conf->entity;
-    		if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-    		if($user->societe_id) $sql.= " AND s.rowid = ".$user->societe_id;
-            if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) $sql.= " ORDER BY p.datep DESC, p.ref DESC ";
-            else $sql.= " ORDER BY p.tms DESC, p.ref DESC ";
+    		if (!$user->rights->societe->client->voir && !$user->societe_id) {
+    		    $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+    		}
+    		if($user->societe_id) {
+    		    $sql.= " AND s.rowid = ".$user->societe_id;
+    		}
+            if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) {
+                $sql.= " ORDER BY p.datep DESC, p.ref DESC ";
+            } else {
+                $sql.= " ORDER BY p.tms DESC, p.ref DESC ";
+            }
     		$sql.= $db->plimit($max, 0);
 
     		$result = $db->query($sql);
@@ -158,11 +167,12 @@ 
                     $line++;
                 }
 
-                if ($num==0)
-                    $this->info_box_contents[$line][0] = array(
+                if ($num==0) {
+                                    $this->info_box_contents[$line][0] = array(
                         'td' => 'align="center"',
                         'text'=>$langs->trans("NoRecordedProposals"),
                     );
+                }
 
                 $db->free($result);
             } else {

dolibarr/htdocs/core/boxes/box_project.php

Indentation +78 added lines, -78 removed lines

@@ -30,20 +30,20 @@ 
  */
 class box_project extends ModeleBoxes
 {
-	var $boxcode="project";
-	var $boximg="object_projectpub";
-	var $boxlabel;
-	//var $depends = array("projet");
+    var $boxcode="project";
+    var $boximg="object_projectpub";
+    var $boxlabel;
+    //var $depends = array("projet");
 
-	/**
+    /**
      * @var DoliDB Database handler.
      */
     public $db;
 
-	var $param;
+    var $param;
 
-	var $info_box_head = array();
-	var $info_box_contents = array();
+    var $info_box_head = array();
+    var $info_box_contents = array();
 
     /**
      *  Constructor
@@ -64,49 +64,49 @@ 
         $this->hidden=! ($user->rights->projet->lire);
     }
 
-	/**
-	*  Load data for box to show them later
-	*
-	*  @param   int		$max        Maximum number of records to load
-	*  @return  void
-	*/
-	function loadBox($max=5)
-	{
-		global $conf, $user, $langs, $db;
+    /**
+     *  Load data for box to show them later
+     *
+     *  @param   int		$max        Maximum number of records to load
+     *  @return  void
+     */
+    function loadBox($max=5)
+    {
+        global $conf, $user, $langs, $db;
 
-		$this->max=$max;
+        $this->max=$max;
 
-		$totalMnt = 0;
-		$totalnb = 0;
-		$totalnbTask=0;
+        $totalMnt = 0;
+        $totalnb = 0;
+        $totalnbTask=0;
 
-		$textHead = $langs->trans("OpenedProjects");
-		$this->info_box_head = array('text' => $textHead, 'limit'=> dol_strlen($textHead));
+        $textHead = $langs->trans("OpenedProjects");
+        $this->info_box_head = array('text' => $textHead, 'limit'=> dol_strlen($textHead));
 
-		// list the summary of the orders
-		if ($user->rights->projet->lire) {
+        // list the summary of the orders
+        if ($user->rights->projet->lire) {
 
-		    include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
-		    $projectstatic = new Project($this->db);
+            include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+            $projectstatic = new Project($this->db);
 
-		    $socid=$user->societe_id;
+            $socid=$user->societe_id;
 
-    		// Get list of project id allowed to user (in a string list separated by coma)
-		    $projectsListId='';
-    		if (! $user->rights->projet->all->lire) $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user,0,1,$socid);
+            // Get list of project id allowed to user (in a string list separated by coma)
+            $projectsListId='';
+            if (! $user->rights->projet->all->lire) $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user,0,1,$socid);
 
-		    $sql = "SELECT p.rowid, p.ref, p.title, p.fk_statut, p.public";
-			$sql.= " FROM ".MAIN_DB_PREFIX."projet as p";
+            $sql = "SELECT p.rowid, p.ref, p.title, p.fk_statut, p.public";
+            $sql.= " FROM ".MAIN_DB_PREFIX."projet as p";
             if($user->socid) $sql.= " INNER JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid=p.fk_soc";
-			$sql.= " WHERE p.entity IN (".getEntity('project').')';
+            $sql.= " WHERE p.entity IN (".getEntity('project').')';
             if (! $user->rights->projet->all->lire) $sql.= " AND p.rowid IN (".$projectsListId.")";     // public and assigned to, or restricted to company for external users
-			if ($user->socid) $sql.= " AND s.rowid = ".$user->socid;
+            if ($user->socid) $sql.= " AND s.rowid = ".$user->socid;
             $sql.= " AND p.fk_statut = 1"; // Seulement les projets ouverts
             if ($socid) $sql.= " AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
             if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND ((s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id.") OR (s.rowid IS NULL))";
 
             $sql.= " ORDER BY p.datec DESC";
-			//$sql.= $db->plimit($max, 0);
+            //$sql.= $db->plimit($max, 0);
 
             $result = $db->query($sql);
 
@@ -124,7 +124,7 @@ 
                     $this->info_box_contents[$i][] = array(
                         'td' => '',
                         'text' => $projectstatic->getNomUrl(1),
-                    	'asis' => 1
+                        'asis' => 1
                     );
 
                     $this->info_box_contents[$i][] = array(
@@ -132,46 +132,46 @@ 
                         'text' => $objp->title,
                     );
 
-					$sql ="SELECT count(*) as nb, sum(progress) as totprogress";
-					$sql.=" FROM ".MAIN_DB_PREFIX."projet as p LEFT JOIN ".MAIN_DB_PREFIX."projet_task as pt on pt.fk_projet = p.rowid";
-	           		$sql.= " WHERE p.entity IN (".getEntity('project').')';
-    				$sql.=" AND p.rowid = ".$objp->rowid;
-					$resultTask = $db->query($sql);
-					if ($resultTask) {
-						$objTask = $db->fetch_object($resultTask);
+                    $sql ="SELECT count(*) as nb, sum(progress) as totprogress";
+                    $sql.=" FROM ".MAIN_DB_PREFIX."projet as p LEFT JOIN ".MAIN_DB_PREFIX."projet_task as pt on pt.fk_projet = p.rowid";
+                        $sql.= " WHERE p.entity IN (".getEntity('project').')';
+                    $sql.=" AND p.rowid = ".$objp->rowid;
+                    $resultTask = $db->query($sql);
+                    if ($resultTask) {
+                        $objTask = $db->fetch_object($resultTask);
                         $this->info_box_contents[$i][] = array(
                             'td' => 'class="right"',
                             'text' => $objTask->nb." ".$langs->trans("Tasks"),
                         );
-						if ($objTask->nb  > 0)
+                        if ($objTask->nb  > 0)
                             $this->info_box_contents[$i][] = array(
                                 'td' => 'class="right"',
                                 'text' => round($objTask->totprogress/$objTask->nb, 0)."%",
                             );
-						else
-							$this->info_box_contents[$i][] = array('td' => 'class="right"', 'text' => "N/A ");
-						$totalnbTask += $objTask->nb;
-					} else {
-						$this->info_box_contents[$i][] = array('td' => 'class="right"', 'text' => round(0));
-						$this->info_box_contents[$i][] = array('td' => 'class="right"', 'text' => "N/A ");
-					}
-
-					$i++;
-				}
-				if ($max < $num)
-				{
-				    $this->info_box_contents[$i][] = array('td' => 'colspan="5"', 'text' => '...');
-				    $i++;
-				}
-			}
-		}
-
-
-		// Add the sum à the bottom of the boxes
+                        else
+                            $this->info_box_contents[$i][] = array('td' => 'class="right"', 'text' => "N/A&nbsp;");
+                        $totalnbTask += $objTask->nb;
+                    } else {
+                        $this->info_box_contents[$i][] = array('td' => 'class="right"', 'text' => round(0));
+                        $this->info_box_contents[$i][] = array('td' => 'class="right"', 'text' => "N/A&nbsp;");
+                    }
+
+                    $i++;
+                }
+                if ($max < $num)
+                {
+                    $this->info_box_contents[$i][] = array('td' => 'colspan="5"', 'text' => '...');
+                    $i++;
+                }
+            }
+        }
+
+
+        // Add the sum à the bottom of the boxes
         $this->info_box_contents[$i][] = array(
             'td' => '',
             'text' => $langs->trans("Total")."&nbsp;".$textHead,
-             'text' => "&nbsp;",
+                'text' => "&nbsp;",
         );
         $this->info_box_contents[$i][] = array(
             'td' => 'align="right" ',
@@ -185,19 +185,19 @@ 
             'td' => '',
             'text' => "&nbsp;",
         );
-	}
-
-	/**
-	 *	Method to show box
-	 *
-	 *	@param	array	$head       Array with properties of box title
-	 *	@param  array	$contents   Array with properties of box lines
-	 *  @param	int		$nooutput	No print, only return string
-	 *	@return	string
-	 */
+    }
+
+    /**
+     *	Method to show box
+     *
+     *	@param	array	$head       Array with properties of box title
+     *	@param  array	$contents   Array with properties of box lines
+     *  @param	int		$nooutput	No print, only return string
+     *	@return	string
+     */
     function showBox($head = null, $contents = null, $nooutput=0)
     {
-		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
-	}
+        return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+    }
 }
 

Spacing +28 added lines, -28 removed lines

@@ -30,8 +30,8 @@ 
  */
 class box_project extends ModeleBoxes
 {
-	var $boxcode="project";
-	var $boximg="object_projectpub";
+	var $boxcode = "project";
+	var $boximg = "object_projectpub";
 	var $boxlabel;
 	//var $depends = array("projet");
 
@@ -51,7 +51,7 @@ 
      *  @param  DoliDB  $db         Database handler
      *  @param  string  $param      More parameters
      */
-    function __construct($db,$param='')
+    function __construct($db, $param = '')
     {
         global $user, $langs;
 
@@ -59,9 +59,9 @@ 
         $langs->loadLangs(array('boxes', 'projects'));
 
         $this->db = $db;
-        $this->boxlabel="Projects";
+        $this->boxlabel = "Projects";
 
-        $this->hidden=! ($user->rights->projet->lire);
+        $this->hidden = !($user->rights->projet->lire);
     }
 
 	/**
@@ -70,15 +70,15 @@ 
 	*  @param   int		$max        Maximum number of records to load
 	*  @return  void
 	*/
-	function loadBox($max=5)
+	function loadBox($max = 5)
 	{
 		global $conf, $user, $langs, $db;
 
-		$this->max=$max;
+		$this->max = $max;
 
 		$totalMnt = 0;
 		$totalnb = 0;
-		$totalnbTask=0;
+		$totalnbTask = 0;
 
 		$textHead = $langs->trans("OpenedProjects");
 		$this->info_box_head = array('text' => $textHead, 'limit'=> dol_strlen($textHead));
@@ -89,23 +89,23 @@ 
 		    include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 		    $projectstatic = new Project($this->db);
 
-		    $socid=$user->societe_id;
+		    $socid = $user->societe_id;
 
     		// Get list of project id allowed to user (in a string list separated by coma)
-		    $projectsListId='';
-    		if (! $user->rights->projet->all->lire) $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user,0,1,$socid);
+		    $projectsListId = '';
+    		if (!$user->rights->projet->all->lire) $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1, $socid);
 
 		    $sql = "SELECT p.rowid, p.ref, p.title, p.fk_statut, p.public";
-			$sql.= " FROM ".MAIN_DB_PREFIX."projet as p";
-            if($user->socid) $sql.= " INNER JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid=p.fk_soc";
-			$sql.= " WHERE p.entity IN (".getEntity('project').')';
-            if (! $user->rights->projet->all->lire) $sql.= " AND p.rowid IN (".$projectsListId.")";     // public and assigned to, or restricted to company for external users
-			if ($user->socid) $sql.= " AND s.rowid = ".$user->socid;
-            $sql.= " AND p.fk_statut = 1"; // Seulement les projets ouverts
-            if ($socid) $sql.= " AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
-            if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND ((s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id.") OR (s.rowid IS NULL))";
-
-            $sql.= " ORDER BY p.datec DESC";
+			$sql .= " FROM ".MAIN_DB_PREFIX."projet as p";
+            if ($user->socid) $sql .= " INNER JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid=p.fk_soc";
+			$sql .= " WHERE p.entity IN (".getEntity('project').')';
+            if (!$user->rights->projet->all->lire) $sql .= " AND p.rowid IN (".$projectsListId.")"; // public and assigned to, or restricted to company for external users
+			if ($user->socid) $sql .= " AND s.rowid = ".$user->socid;
+            $sql .= " AND p.fk_statut = 1"; // Seulement les projets ouverts
+            if ($socid) $sql .= " AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
+            if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND ((s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id.") OR (s.rowid IS NULL))";
+
+            $sql .= " ORDER BY p.datec DESC";
 			//$sql.= $db->plimit($max, 0);
 
             $result = $db->query($sql);
@@ -132,10 +132,10 @@ 
                         'text' => $objp->title,
                     );
 
-					$sql ="SELECT count(*) as nb, sum(progress) as totprogress";
-					$sql.=" FROM ".MAIN_DB_PREFIX."projet as p LEFT JOIN ".MAIN_DB_PREFIX."projet_task as pt on pt.fk_projet = p.rowid";
-	           		$sql.= " WHERE p.entity IN (".getEntity('project').')';
-    				$sql.=" AND p.rowid = ".$objp->rowid;
+					$sql = "SELECT count(*) as nb, sum(progress) as totprogress";
+					$sql .= " FROM ".MAIN_DB_PREFIX."projet as p LEFT JOIN ".MAIN_DB_PREFIX."projet_task as pt on pt.fk_projet = p.rowid";
+	           		$sql .= " WHERE p.entity IN (".getEntity('project').')';
+    				$sql .= " AND p.rowid = ".$objp->rowid;
 					$resultTask = $db->query($sql);
 					if ($resultTask) {
 						$objTask = $db->fetch_object($resultTask);
@@ -143,10 +143,10 @@ 
                             'td' => 'class="right"',
                             'text' => $objTask->nb." ".$langs->trans("Tasks"),
                         );
-						if ($objTask->nb  > 0)
+						if ($objTask->nb > 0)
                             $this->info_box_contents[$i][] = array(
                                 'td' => 'class="right"',
-                                'text' => round($objTask->totprogress/$objTask->nb, 0)."%",
+                                'text' => round($objTask->totprogress / $objTask->nb, 0)."%",
                             );
 						else
 							$this->info_box_contents[$i][] = array('td' => 'class="right"', 'text' => "N/A ");
@@ -195,7 +195,7 @@ 
 	 *  @param	int		$nooutput	No print, only return string
 	 *	@return	string
 	 */
-    function showBox($head = null, $contents = null, $nooutput=0)
+    function showBox($head = null, $contents = null, $nooutput = 0)
     {
 		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}

Braces +24 added lines, -10 removed lines

@@ -93,17 +93,30 @@ 
 
     		// Get list of project id allowed to user (in a string list separated by coma)
 		    $projectsListId='';
-    		if (! $user->rights->projet->all->lire) $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user,0,1,$socid);
+    		if (! $user->rights->projet->all->lire) {
+    		    $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user,0,1,$socid);
+    		}
 
 		    $sql = "SELECT p.rowid, p.ref, p.title, p.fk_statut, p.public";
 			$sql.= " FROM ".MAIN_DB_PREFIX."projet as p";
-            if($user->socid) $sql.= " INNER JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid=p.fk_soc";
+            if($user->socid) {
+                $sql.= " INNER JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid=p.fk_soc";
+            }
 			$sql.= " WHERE p.entity IN (".getEntity('project').')';
-            if (! $user->rights->projet->all->lire) $sql.= " AND p.rowid IN (".$projectsListId.")";     // public and assigned to, or restricted to company for external users
-			if ($user->socid) $sql.= " AND s.rowid = ".$user->socid;
+            if (! $user->rights->projet->all->lire) {
+                $sql.= " AND p.rowid IN (".$projectsListId.")";
+            }
+            // public and assigned to, or restricted to company for external users
+			if ($user->socid) {
+			    $sql.= " AND s.rowid = ".$user->socid;
+			}
             $sql.= " AND p.fk_statut = 1"; // Seulement les projets ouverts
-            if ($socid) $sql.= " AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
-            if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND ((s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id.") OR (s.rowid IS NULL))";
+            if ($socid) {
+                $sql.= " AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
+            }
+            if (! $user->rights->societe->client->voir && ! $socid) {
+                $sql.= " AND ((s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id.") OR (s.rowid IS NULL))";
+            }
 
             $sql.= " ORDER BY p.datec DESC";
 			//$sql.= $db->plimit($max, 0);
@@ -143,13 +156,14 @@ 
                             'td' => 'class="right"',
                             'text' => $objTask->nb." ".$langs->trans("Tasks"),
                         );
-						if ($objTask->nb  > 0)
-                            $this->info_box_contents[$i][] = array(
+						if ($objTask->nb  > 0) {
+						                            $this->info_box_contents[$i][] = array(
                                 'td' => 'class="right"',
                                 'text' => round($objTask->totprogress/$objTask->nb, 0)."%",
                             );
-						else
-							$this->info_box_contents[$i][] = array('td' => 'class="right"', 'text' => "N/A ");
+						} else {
+													$this->info_box_contents[$i][] = array('td' => 'class="right"', 'text' => "N/A ");
+						}
 						$totalnbTask += $objTask->nb;
 					} else {
 						$this->info_box_contents[$i][] = array('td' => 'class="right"', 'text' => round(0));

dolibarr/htdocs/core/boxes/box_graph_propales_permonth.php

Indentation +212 added lines, -212 removed lines

@@ -28,257 +28,257 @@
  */
 class box_graph_propales_permonth extends ModeleBoxes
 {
-	var $boxcode="propalpermonth";
-	var $boximg="object_propal";
-	var $boxlabel="BoxProposalsPerMonth";
-	var $depends = array("propal");
+    var $boxcode="propalpermonth";
+    var $boximg="object_propal";
+    var $boxlabel="BoxProposalsPerMonth";
+    var $depends = array("propal");
 
-	/**
+    /**
      * @var DoliDB Database handler.
      */
     public $db;
 
-	var $info_box_head = array();
-	var $info_box_contents = array();
+    var $info_box_head = array();
+    var $info_box_contents = array();
 
 
-	/**
-	 *  Constructor
-	 *
-	 * 	@param	DoliDB	$db			Database handler
-	 *  @param	string	$param		More parameters
-	 */
-	function __construct($db,$param)
-	{
-		global $user;
+    /**
+     *  Constructor
+     *
+     * 	@param	DoliDB	$db			Database handler
+     *  @param	string	$param		More parameters
+     */
+    function __construct($db,$param)
+    {
+        global $user;
 
-		$this->db=$db;
+        $this->db=$db;
 
-		$this->hidden=! ($user->rights->propale->lire);
-	}
+        $this->hidden=! ($user->rights->propale->lire);
+    }
 
-	/**
-	 *  Load data into info_box_contents array to show array later.
-	 *
-	 *  @param	int		$max        Maximum number of records to load
+    /**
+     *  Load data into info_box_contents array to show array later.
+     *
+     *  @param	int		$max        Maximum number of records to load
      *  @return	void
-	 */
-	function loadBox($max=5)
-	{
-		global $conf, $user, $langs, $db;
+     */
+    function loadBox($max=5)
+    {
+        global $conf, $user, $langs, $db;
 
-		$this->max=$max;
+        $this->max=$max;
 
-		$refreshaction='refresh_'.$this->boxcode;
+        $refreshaction='refresh_'.$this->boxcode;
 
-		//include_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
-		//$propalstatic=new Propal($db);
+        //include_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
+        //$propalstatic=new Propal($db);
 
-		$langs->load("propal");
+        $langs->load("propal");
 
-		$text = $langs->trans("BoxProposalsPerMonth",$max);
-		$this->info_box_head = array(
-				'text' => $text,
-				'limit'=> dol_strlen($text),
-				'graph'=> 1,		// Set to 1 if it's a box graph
-				'sublink'=>'',
-				'subtext'=>$langs->trans("Filter"),
-				'subpicto'=>'filter.png',
-				'subclass'=>'linkobject boxfilter',
-				'target'=>'none'	// Set '' to get target="_blank"
-		);
+        $text = $langs->trans("BoxProposalsPerMonth",$max);
+        $this->info_box_head = array(
+                'text' => $text,
+                'limit'=> dol_strlen($text),
+                'graph'=> 1,		// Set to 1 if it's a box graph
+                'sublink'=>'',
+                'subtext'=>$langs->trans("Filter"),
+                'subpicto'=>'filter.png',
+                'subclass'=>'linkobject boxfilter',
+                'target'=>'none'	// Set '' to get target="_blank"
+        );
 
-		$dir=''; 	// We don't need a path because image file will not be saved into disk
-		$prefix='';
-		$socid=0;
-		if ($user->societe_id) $socid=$user->societe_id;
-		if (! $user->rights->societe->client->voir || $socid) $prefix.='private-'.$user->id.'-';	// If user has no permission to see all, output dir is specific to user
+        $dir=''; 	// We don't need a path because image file will not be saved into disk
+        $prefix='';
+        $socid=0;
+        if ($user->societe_id) $socid=$user->societe_id;
+        if (! $user->rights->societe->client->voir || $socid) $prefix.='private-'.$user->id.'-';	// If user has no permission to see all, output dir is specific to user
 
-		if ($user->rights->propale->lire)
-		{
-			$param_year='DOLUSERCOOKIE_box_'.$this->boxcode.'_year';
-			$param_shownb='DOLUSERCOOKIE_box_'.$this->boxcode.'_shownb';
-			$param_showtot='DOLUSERCOOKIE_box_'.$this->boxcode.'_showtot';
+        if ($user->rights->propale->lire)
+        {
+            $param_year='DOLUSERCOOKIE_box_'.$this->boxcode.'_year';
+            $param_shownb='DOLUSERCOOKIE_box_'.$this->boxcode.'_shownb';
+            $param_showtot='DOLUSERCOOKIE_box_'.$this->boxcode.'_showtot';
 
-			include_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
-			include_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propalestats.class.php';
-			$autosetarray=preg_split("/[,;:]+/",GETPOST('DOL_AUTOSET_COOKIE'));
-			if (in_array('DOLUSERCOOKIE_box_'.$this->boxcode,$autosetarray))
-			{
-				$endyear=GETPOST($param_year,'int');
-				$shownb=GETPOST($param_shownb,'alpha');
-				$showtot=GETPOST($param_showtot,'alpha');
-			}
-			else
-			{
-				$tmparray=json_decode($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode],true);
-				$endyear=$tmparray['year'];
-				$shownb=$tmparray['shownb'];
-				$showtot=$tmparray['showtot'];
-			}
-			if (empty($shownb) && empty($showtot))  { $shownb=1; $showtot=1; }
-			$nowarray=dol_getdate(dol_now(),true);
-			if (empty($endyear)) $endyear=$nowarray['year'];
-			$startyear=$endyear-1;
-			$WIDTH=(($shownb && $showtot) || ! empty($conf->dol_optimize_smallscreen))?'256':'320';
-			$HEIGHT='192';
+            include_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
+            include_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propalestats.class.php';
+            $autosetarray=preg_split("/[,;:]+/",GETPOST('DOL_AUTOSET_COOKIE'));
+            if (in_array('DOLUSERCOOKIE_box_'.$this->boxcode,$autosetarray))
+            {
+                $endyear=GETPOST($param_year,'int');
+                $shownb=GETPOST($param_shownb,'alpha');
+                $showtot=GETPOST($param_showtot,'alpha');
+            }
+            else
+            {
+                $tmparray=json_decode($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode],true);
+                $endyear=$tmparray['year'];
+                $shownb=$tmparray['shownb'];
+                $showtot=$tmparray['showtot'];
+            }
+            if (empty($shownb) && empty($showtot))  { $shownb=1; $showtot=1; }
+            $nowarray=dol_getdate(dol_now(),true);
+            if (empty($endyear)) $endyear=$nowarray['year'];
+            $startyear=$endyear-1;
+            $WIDTH=(($shownb && $showtot) || ! empty($conf->dol_optimize_smallscreen))?'256':'320';
+            $HEIGHT='192';
 
-			$stats = new PropaleStats($this->db, $socid, 0);
+            $stats = new PropaleStats($this->db, $socid, 0);
 
-			// Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...)
-			if ($shownb)
-			{
-				$data1 = $stats->getNbByMonthWithPrevYear($endyear,$startyear,(GETPOST('action','aZ09')==$refreshaction?-1:(3600*24)), ($WIDTH<300?2:0));
-				$datatype1 = array_pad(array(), ($endyear-$startyear+1), 'bars');
+            // Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...)
+            if ($shownb)
+            {
+                $data1 = $stats->getNbByMonthWithPrevYear($endyear,$startyear,(GETPOST('action','aZ09')==$refreshaction?-1:(3600*24)), ($WIDTH<300?2:0));
+                $datatype1 = array_pad(array(), ($endyear-$startyear+1), 'bars');
 
-				$filenamenb = $dir."/".$prefix."propalsnbinyear-".$endyear.".png";
-				$fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=propalstats&amp;file=propalsnbinyear-'.$endyear.'.png';
+                $filenamenb = $dir."/".$prefix."propalsnbinyear-".$endyear.".png";
+                $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=propalstats&amp;file=propalsnbinyear-'.$endyear.'.png';
 
-				$px1 = new DolGraph();
-				$mesg = $px1->isGraphKo();
-				if (! $mesg)
-				{
-					$px1->SetType($datatype1);
-					$px1->SetData($data1);
-					unset($data1);
-					$px1->SetPrecisionY(0);
-					$i=$startyear;$legend=array();
-					while ($i <= $endyear)
-					{
-						$legend[]=$i;
-						$i++;
-					}
-					$px1->SetLegend($legend);
-					$px1->SetMaxValue($px1->GetCeilMaxValue());
-					$px1->SetWidth($WIDTH);
-					$px1->SetHeight($HEIGHT);
-					$px1->SetYLabel($langs->trans("NumberOfProposals"));
-					$px1->SetShading(3);
-					$px1->SetHorizTickIncrement(1);
-					$px1->SetPrecisionY(0);
-					$px1->SetCssPrefix("cssboxes");
-					$px1->mode='depth';
-					$px1->SetTitle($langs->trans("NumberOfProposalsByMonth"));
+                $px1 = new DolGraph();
+                $mesg = $px1->isGraphKo();
+                if (! $mesg)
+                {
+                    $px1->SetType($datatype1);
+                    $px1->SetData($data1);
+                    unset($data1);
+                    $px1->SetPrecisionY(0);
+                    $i=$startyear;$legend=array();
+                    while ($i <= $endyear)
+                    {
+                        $legend[]=$i;
+                        $i++;
+                    }
+                    $px1->SetLegend($legend);
+                    $px1->SetMaxValue($px1->GetCeilMaxValue());
+                    $px1->SetWidth($WIDTH);
+                    $px1->SetHeight($HEIGHT);
+                    $px1->SetYLabel($langs->trans("NumberOfProposals"));
+                    $px1->SetShading(3);
+                    $px1->SetHorizTickIncrement(1);
+                    $px1->SetPrecisionY(0);
+                    $px1->SetCssPrefix("cssboxes");
+                    $px1->mode='depth';
+                    $px1->SetTitle($langs->trans("NumberOfProposalsByMonth"));
 
-					$px1->draw($filenamenb,$fileurlnb);
-				}
-			}
+                    $px1->draw($filenamenb,$fileurlnb);
+                }
+            }
 
-			// Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...)
-			if ($showtot)
-			{
-				$data2 = $stats->getAmountByMonthWithPrevYear($endyear,$startyear,(GETPOST('action','aZ09')==$refreshaction?-1:(3600*24)), ($WIDTH<300?2:0));
-				$datatype2 = array_pad(array(), ($endyear-$startyear+1), 'bars');
-				//$datatype2 = array('lines','bars');
+            // Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...)
+            if ($showtot)
+            {
+                $data2 = $stats->getAmountByMonthWithPrevYear($endyear,$startyear,(GETPOST('action','aZ09')==$refreshaction?-1:(3600*24)), ($WIDTH<300?2:0));
+                $datatype2 = array_pad(array(), ($endyear-$startyear+1), 'bars');
+                //$datatype2 = array('lines','bars');
 
-				$filenamenb = $dir."/".$prefix."propalsamountinyear-".$endyear.".png";
-				if ($mode == 'customer') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=propalstats&amp;file=propalsamountinyear-'.$endyear.'.png';
-				if ($mode == 'supplier') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=propalstatssupplier&amp;file=propalsamountinyear-'.$endyear.'.png';
+                $filenamenb = $dir."/".$prefix."propalsamountinyear-".$endyear.".png";
+                if ($mode == 'customer') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=propalstats&amp;file=propalsamountinyear-'.$endyear.'.png';
+                if ($mode == 'supplier') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=propalstatssupplier&amp;file=propalsamountinyear-'.$endyear.'.png';
 
-				$px2 = new DolGraph();
-				$mesg = $px2->isGraphKo();
-				if (! $mesg)
-				{
-					$px2->SetType($datatype2);
-					$px2->SetData($data2);
-					unset($data2);
-					$px2->SetPrecisionY(0);
-					$i=$startyear;$legend=array();
-					while ($i <= $endyear)
-					{
-						$legend[]=$i;
-						$i++;
-					}
-					$px2->SetLegend($legend);
-					$px2->SetMaxValue($px2->GetCeilMaxValue());
-					$px2->SetWidth($WIDTH);
-					$px2->SetHeight($HEIGHT);
-					$px2->SetYLabel($langs->trans("AmountOfProposalsHT"));
-					$px2->SetShading(3);
-					$px2->SetHorizTickIncrement(1);
-					$px2->SetPrecisionY(0);
-					$px2->SetCssPrefix("cssboxes");
-					$px2->mode='depth';
-					$px2->SetTitle($langs->trans("AmountOfProposalsByMonthHT"));
+                $px2 = new DolGraph();
+                $mesg = $px2->isGraphKo();
+                if (! $mesg)
+                {
+                    $px2->SetType($datatype2);
+                    $px2->SetData($data2);
+                    unset($data2);
+                    $px2->SetPrecisionY(0);
+                    $i=$startyear;$legend=array();
+                    while ($i <= $endyear)
+                    {
+                        $legend[]=$i;
+                        $i++;
+                    }
+                    $px2->SetLegend($legend);
+                    $px2->SetMaxValue($px2->GetCeilMaxValue());
+                    $px2->SetWidth($WIDTH);
+                    $px2->SetHeight($HEIGHT);
+                    $px2->SetYLabel($langs->trans("AmountOfProposalsHT"));
+                    $px2->SetShading(3);
+                    $px2->SetHorizTickIncrement(1);
+                    $px2->SetPrecisionY(0);
+                    $px2->SetCssPrefix("cssboxes");
+                    $px2->mode='depth';
+                    $px2->SetTitle($langs->trans("AmountOfProposalsByMonthHT"));
 
-					$px2->draw($filenamenb,$fileurlnb);
-				}
-			}
+                    $px2->draw($filenamenb,$fileurlnb);
+                }
+            }
 
-			if (empty($conf->use_javascript_ajax))
-			{
-				$langs->load("errors");
-				$mesg=$langs->trans("WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs");
-			}
+            if (empty($conf->use_javascript_ajax))
+            {
+                $langs->load("errors");
+                $mesg=$langs->trans("WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs");
+            }
 
-			if (! $mesg)
-			{
-				$stringtoshow='';
-				$stringtoshow.='<script type="text/javascript" language="javascript">
+            if (! $mesg)
+            {
+                $stringtoshow='';
+                $stringtoshow.='<script type="text/javascript" language="javascript">
 					jQuery(document).ready(function() {
 						jQuery("#idsubimg'.$this->boxcode.'").click(function() {
 							jQuery("#idfilter'.$this->boxcode.'").toggle();
 						});
 					});
 					</script>';
-				$stringtoshow.='<div class="center hideobject divboxfilter" id="idfilter'.$this->boxcode.'">';	// hideobject is to start hidden
-				$stringtoshow.='<form class="flat formboxfilter" method="POST" action="'.$_SERVER["PHP_SELF"].'">';
-				$stringtoshow.='<input type="hidden" name="action" value="'.$refreshaction.'">';
-				$stringtoshow.='<input type="hidden" name="page_y" value="">';
-				$stringtoshow.='<input type="hidden" name="DOL_AUTOSET_COOKIE" value="DOLUSERCOOKIE_box_'.$this->boxcode.':year,shownb,showtot">';
-				$stringtoshow.='<input type="checkbox" name="'.$param_shownb.'"'.($shownb?' checked':'').'> '.$langs->trans("NumberOfProposalsByMonth");
-				$stringtoshow.=' &nbsp; ';
-				$stringtoshow.='<input type="checkbox" name="'.$param_showtot.'"'.($showtot?' checked':'').'> '.$langs->trans("AmountOfProposalsByMonthHT");
-				$stringtoshow.='<br>';
-				$stringtoshow.=$langs->trans("Year").' <input class="flat" size="4" type="text" name="'.$param_year.'" value="'.$endyear.'">';
-				$stringtoshow.='<input type="image" class="reposition inline-block valigntextbottom" alt="'.$langs->trans("Refresh").'" src="'.img_picto($langs->trans("Refresh"),'refresh.png','','',1).'">';
-				$stringtoshow.='</form>';
-				$stringtoshow.='</div>';
-				if ($shownb && $showtot)
-				{
-					$stringtoshow.='<div class="fichecenter">';
-					$stringtoshow.='<div class="fichehalfleft">';
-				}
-				if ($shownb) $stringtoshow.=$px1->show();
-				if ($shownb && $showtot)
-				{
-					$stringtoshow.='</div>';
-					$stringtoshow.='<div class="fichehalfright">';
-				}
-				if ($showtot) $stringtoshow.=$px2->show();
-				if ($shownb && $showtot)
-				{
-					$stringtoshow.='</div>';
-					$stringtoshow.='</div>';
-				}
-				$this->info_box_contents[0][0] = array('tr'=>'class="oddeven nohover"', 'td' => 'align="center" class="nohover"','textnoformat'=>$stringtoshow);
-			}
-			else
-			{
-				$this->info_box_contents[0][0] = array('tr'=>'class="oddeven nohover"',	'td' => 'align="left" class="nohover"',
-    	        										'maxlength'=>500,
-	            										'text' => $mesg);
-			}
-		}
-		else {
-			$this->info_box_contents[0][0] = array(
-			    'td' => 'align="left" class="nohover opacitymedium"',
+                $stringtoshow.='<div class="center hideobject divboxfilter" id="idfilter'.$this->boxcode.'">';	// hideobject is to start hidden
+                $stringtoshow.='<form class="flat formboxfilter" method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+                $stringtoshow.='<input type="hidden" name="action" value="'.$refreshaction.'">';
+                $stringtoshow.='<input type="hidden" name="page_y" value="">';
+                $stringtoshow.='<input type="hidden" name="DOL_AUTOSET_COOKIE" value="DOLUSERCOOKIE_box_'.$this->boxcode.':year,shownb,showtot">';
+                $stringtoshow.='<input type="checkbox" name="'.$param_shownb.'"'.($shownb?' checked':'').'> '.$langs->trans("NumberOfProposalsByMonth");
+                $stringtoshow.=' &nbsp; ';
+                $stringtoshow.='<input type="checkbox" name="'.$param_showtot.'"'.($showtot?' checked':'').'> '.$langs->trans("AmountOfProposalsByMonthHT");
+                $stringtoshow.='<br>';
+                $stringtoshow.=$langs->trans("Year").' <input class="flat" size="4" type="text" name="'.$param_year.'" value="'.$endyear.'">';
+                $stringtoshow.='<input type="image" class="reposition inline-block valigntextbottom" alt="'.$langs->trans("Refresh").'" src="'.img_picto($langs->trans("Refresh"),'refresh.png','','',1).'">';
+                $stringtoshow.='</form>';
+                $stringtoshow.='</div>';
+                if ($shownb && $showtot)
+                {
+                    $stringtoshow.='<div class="fichecenter">';
+                    $stringtoshow.='<div class="fichehalfleft">';
+                }
+                if ($shownb) $stringtoshow.=$px1->show();
+                if ($shownb && $showtot)
+                {
+                    $stringtoshow.='</div>';
+                    $stringtoshow.='<div class="fichehalfright">';
+                }
+                if ($showtot) $stringtoshow.=$px2->show();
+                if ($shownb && $showtot)
+                {
+                    $stringtoshow.='</div>';
+                    $stringtoshow.='</div>';
+                }
+                $this->info_box_contents[0][0] = array('tr'=>'class="oddeven nohover"', 'td' => 'align="center" class="nohover"','textnoformat'=>$stringtoshow);
+            }
+            else
+            {
+                $this->info_box_contents[0][0] = array('tr'=>'class="oddeven nohover"',	'td' => 'align="left" class="nohover"',
+                                                        'maxlength'=>500,
+                                                        'text' => $mesg);
+            }
+        }
+        else {
+            $this->info_box_contents[0][0] = array(
+                'td' => 'align="left" class="nohover opacitymedium"',
                 'text' => $langs->trans("ReadPermissionNotAllowed")
-			);
-		}
-	}
+            );
+        }
+    }
 
-	/**
-	 *	Method to show box
-	 *
-	 *	@param	array	$head       Array with properties of box title
-	 *	@param  array	$contents   Array with properties of box lines
-	 *  @param	int		$nooutput	No print, only return string
-	 *	@return	string
-	 */
+    /**
+     *	Method to show box
+     *
+     *	@param	array	$head       Array with properties of box title
+     *	@param  array	$contents   Array with properties of box lines
+     *  @param	int		$nooutput	No print, only return string
+     *	@return	string
+     */
     function showBox($head = null, $contents = null, $nooutput=0)
     {
-		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
-	}
+        return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+    }
 }
 

Spacing +76 added lines, -76 removed lines

@@ -28,9 +28,9 @@ 
  */
 class box_graph_propales_permonth extends ModeleBoxes
 {
-	var $boxcode="propalpermonth";
-	var $boximg="object_propal";
-	var $boxlabel="BoxProposalsPerMonth";
+	var $boxcode = "propalpermonth";
+	var $boximg = "object_propal";
+	var $boxlabel = "BoxProposalsPerMonth";
 	var $depends = array("propal");
 
 	/**
@@ -48,13 +48,13 @@ 
 	 * 	@param	DoliDB	$db			Database handler
 	 *  @param	string	$param		More parameters
 	 */
-	function __construct($db,$param)
+	function __construct($db, $param)
 	{
 		global $user;
 
-		$this->db=$db;
+		$this->db = $db;
 
-		$this->hidden=! ($user->rights->propale->lire);
+		$this->hidden = !($user->rights->propale->lire);
 	}
 
 	/**
@@ -63,24 +63,24 @@ 
 	 *  @param	int		$max        Maximum number of records to load
      *  @return	void
 	 */
-	function loadBox($max=5)
+	function loadBox($max = 5)
 	{
 		global $conf, $user, $langs, $db;
 
-		$this->max=$max;
+		$this->max = $max;
 
-		$refreshaction='refresh_'.$this->boxcode;
+		$refreshaction = 'refresh_'.$this->boxcode;
 
 		//include_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
 		//$propalstatic=new Propal($db);
 
 		$langs->load("propal");
 
-		$text = $langs->trans("BoxProposalsPerMonth",$max);
+		$text = $langs->trans("BoxProposalsPerMonth", $max);
 		$this->info_box_head = array(
 				'text' => $text,
 				'limit'=> dol_strlen($text),
-				'graph'=> 1,		// Set to 1 if it's a box graph
+				'graph'=> 1, // Set to 1 if it's a box graph
 				'sublink'=>'',
 				'subtext'=>$langs->trans("Filter"),
 				'subpicto'=>'filter.png',
@@ -88,64 +88,64 @@ 
 				'target'=>'none'	// Set '' to get target="_blank"
 		);
 
-		$dir=''; 	// We don't need a path because image file will not be saved into disk
-		$prefix='';
-		$socid=0;
-		if ($user->societe_id) $socid=$user->societe_id;
-		if (! $user->rights->societe->client->voir || $socid) $prefix.='private-'.$user->id.'-';	// If user has no permission to see all, output dir is specific to user
+		$dir = ''; // We don't need a path because image file will not be saved into disk
+		$prefix = '';
+		$socid = 0;
+		if ($user->societe_id) $socid = $user->societe_id;
+		if (!$user->rights->societe->client->voir || $socid) $prefix .= 'private-'.$user->id.'-'; // If user has no permission to see all, output dir is specific to user
 
 		if ($user->rights->propale->lire)
 		{
-			$param_year='DOLUSERCOOKIE_box_'.$this->boxcode.'_year';
-			$param_shownb='DOLUSERCOOKIE_box_'.$this->boxcode.'_shownb';
-			$param_showtot='DOLUSERCOOKIE_box_'.$this->boxcode.'_showtot';
+			$param_year = 'DOLUSERCOOKIE_box_'.$this->boxcode.'_year';
+			$param_shownb = 'DOLUSERCOOKIE_box_'.$this->boxcode.'_shownb';
+			$param_showtot = 'DOLUSERCOOKIE_box_'.$this->boxcode.'_showtot';
 
 			include_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
 			include_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propalestats.class.php';
-			$autosetarray=preg_split("/[,;:]+/",GETPOST('DOL_AUTOSET_COOKIE'));
-			if (in_array('DOLUSERCOOKIE_box_'.$this->boxcode,$autosetarray))
+			$autosetarray = preg_split("/[,;:]+/", GETPOST('DOL_AUTOSET_COOKIE'));
+			if (in_array('DOLUSERCOOKIE_box_'.$this->boxcode, $autosetarray))
 			{
-				$endyear=GETPOST($param_year,'int');
-				$shownb=GETPOST($param_shownb,'alpha');
-				$showtot=GETPOST($param_showtot,'alpha');
+				$endyear = GETPOST($param_year, 'int');
+				$shownb = GETPOST($param_shownb, 'alpha');
+				$showtot = GETPOST($param_showtot, 'alpha');
 			}
 			else
 			{
-				$tmparray=json_decode($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode],true);
-				$endyear=$tmparray['year'];
-				$shownb=$tmparray['shownb'];
-				$showtot=$tmparray['showtot'];
+				$tmparray = json_decode($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode], true);
+				$endyear = $tmparray['year'];
+				$shownb = $tmparray['shownb'];
+				$showtot = $tmparray['showtot'];
 			}
-			if (empty($shownb) && empty($showtot))  { $shownb=1; $showtot=1; }
-			$nowarray=dol_getdate(dol_now(),true);
-			if (empty($endyear)) $endyear=$nowarray['year'];
-			$startyear=$endyear-1;
-			$WIDTH=(($shownb && $showtot) || ! empty($conf->dol_optimize_smallscreen))?'256':'320';
-			$HEIGHT='192';
+			if (empty($shownb) && empty($showtot)) { $shownb = 1; $showtot = 1; }
+			$nowarray = dol_getdate(dol_now(), true);
+			if (empty($endyear)) $endyear = $nowarray['year'];
+			$startyear = $endyear - 1;
+			$WIDTH = (($shownb && $showtot) || !empty($conf->dol_optimize_smallscreen)) ? '256' : '320';
+			$HEIGHT = '192';
 
 			$stats = new PropaleStats($this->db, $socid, 0);
 
 			// Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...)
 			if ($shownb)
 			{
-				$data1 = $stats->getNbByMonthWithPrevYear($endyear,$startyear,(GETPOST('action','aZ09')==$refreshaction?-1:(3600*24)), ($WIDTH<300?2:0));
-				$datatype1 = array_pad(array(), ($endyear-$startyear+1), 'bars');
+				$data1 = $stats->getNbByMonthWithPrevYear($endyear, $startyear, (GETPOST('action', 'aZ09') == $refreshaction ?-1 : (3600 * 24)), ($WIDTH < 300 ? 2 : 0));
+				$datatype1 = array_pad(array(), ($endyear - $startyear + 1), 'bars');
 
 				$filenamenb = $dir."/".$prefix."propalsnbinyear-".$endyear.".png";
 				$fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=propalstats&amp;file=propalsnbinyear-'.$endyear.'.png';
 
 				$px1 = new DolGraph();
 				$mesg = $px1->isGraphKo();
-				if (! $mesg)
+				if (!$mesg)
 				{
 					$px1->SetType($datatype1);
 					$px1->SetData($data1);
 					unset($data1);
 					$px1->SetPrecisionY(0);
-					$i=$startyear;$legend=array();
+					$i = $startyear; $legend = array();
 					while ($i <= $endyear)
 					{
-						$legend[]=$i;
+						$legend[] = $i;
 						$i++;
 					}
 					$px1->SetLegend($legend);
@@ -157,18 +157,18 @@ 
 					$px1->SetHorizTickIncrement(1);
 					$px1->SetPrecisionY(0);
 					$px1->SetCssPrefix("cssboxes");
-					$px1->mode='depth';
+					$px1->mode = 'depth';
 					$px1->SetTitle($langs->trans("NumberOfProposalsByMonth"));
 
-					$px1->draw($filenamenb,$fileurlnb);
+					$px1->draw($filenamenb, $fileurlnb);
 				}
 			}
 
 			// Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...)
 			if ($showtot)
 			{
-				$data2 = $stats->getAmountByMonthWithPrevYear($endyear,$startyear,(GETPOST('action','aZ09')==$refreshaction?-1:(3600*24)), ($WIDTH<300?2:0));
-				$datatype2 = array_pad(array(), ($endyear-$startyear+1), 'bars');
+				$data2 = $stats->getAmountByMonthWithPrevYear($endyear, $startyear, (GETPOST('action', 'aZ09') == $refreshaction ?-1 : (3600 * 24)), ($WIDTH < 300 ? 2 : 0));
+				$datatype2 = array_pad(array(), ($endyear - $startyear + 1), 'bars');
 				//$datatype2 = array('lines','bars');
 
 				$filenamenb = $dir."/".$prefix."propalsamountinyear-".$endyear.".png";
@@ -177,16 +177,16 @@ 
 
 				$px2 = new DolGraph();
 				$mesg = $px2->isGraphKo();
-				if (! $mesg)
+				if (!$mesg)
 				{
 					$px2->SetType($datatype2);
 					$px2->SetData($data2);
 					unset($data2);
 					$px2->SetPrecisionY(0);
-					$i=$startyear;$legend=array();
+					$i = $startyear; $legend = array();
 					while ($i <= $endyear)
 					{
-						$legend[]=$i;
+						$legend[] = $i;
 						$i++;
 					}
 					$px2->SetLegend($legend);
@@ -198,64 +198,64 @@ 
 					$px2->SetHorizTickIncrement(1);
 					$px2->SetPrecisionY(0);
 					$px2->SetCssPrefix("cssboxes");
-					$px2->mode='depth';
+					$px2->mode = 'depth';
 					$px2->SetTitle($langs->trans("AmountOfProposalsByMonthHT"));
 
-					$px2->draw($filenamenb,$fileurlnb);
+					$px2->draw($filenamenb, $fileurlnb);
 				}
 			}
 
 			if (empty($conf->use_javascript_ajax))
 			{
 				$langs->load("errors");
-				$mesg=$langs->trans("WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs");
+				$mesg = $langs->trans("WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs");
 			}
 
-			if (! $mesg)
+			if (!$mesg)
 			{
-				$stringtoshow='';
-				$stringtoshow.='<script type="text/javascript" language="javascript">
+				$stringtoshow = '';
+				$stringtoshow .= '<script type="text/javascript" language="javascript">
 					jQuery(document).ready(function() {
 						jQuery("#idsubimg'.$this->boxcode.'").click(function() {
 							jQuery("#idfilter'.$this->boxcode.'").toggle();
 						});
 					});
 					</script>';
-				$stringtoshow.='<div class="center hideobject divboxfilter" id="idfilter'.$this->boxcode.'">';	// hideobject is to start hidden
-				$stringtoshow.='<form class="flat formboxfilter" method="POST" action="'.$_SERVER["PHP_SELF"].'">';
-				$stringtoshow.='<input type="hidden" name="action" value="'.$refreshaction.'">';
-				$stringtoshow.='<input type="hidden" name="page_y" value="">';
-				$stringtoshow.='<input type="hidden" name="DOL_AUTOSET_COOKIE" value="DOLUSERCOOKIE_box_'.$this->boxcode.':year,shownb,showtot">';
-				$stringtoshow.='<input type="checkbox" name="'.$param_shownb.'"'.($shownb?' checked':'').'> '.$langs->trans("NumberOfProposalsByMonth");
-				$stringtoshow.=' &nbsp; ';
-				$stringtoshow.='<input type="checkbox" name="'.$param_showtot.'"'.($showtot?' checked':'').'> '.$langs->trans("AmountOfProposalsByMonthHT");
-				$stringtoshow.='<br>';
-				$stringtoshow.=$langs->trans("Year").' <input class="flat" size="4" type="text" name="'.$param_year.'" value="'.$endyear.'">';
-				$stringtoshow.='<input type="image" class="reposition inline-block valigntextbottom" alt="'.$langs->trans("Refresh").'" src="'.img_picto($langs->trans("Refresh"),'refresh.png','','',1).'">';
-				$stringtoshow.='</form>';
-				$stringtoshow.='</div>';
+				$stringtoshow .= '<div class="center hideobject divboxfilter" id="idfilter'.$this->boxcode.'">'; // hideobject is to start hidden
+				$stringtoshow .= '<form class="flat formboxfilter" method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+				$stringtoshow .= '<input type="hidden" name="action" value="'.$refreshaction.'">';
+				$stringtoshow .= '<input type="hidden" name="page_y" value="">';
+				$stringtoshow .= '<input type="hidden" name="DOL_AUTOSET_COOKIE" value="DOLUSERCOOKIE_box_'.$this->boxcode.':year,shownb,showtot">';
+				$stringtoshow .= '<input type="checkbox" name="'.$param_shownb.'"'.($shownb ? ' checked' : '').'> '.$langs->trans("NumberOfProposalsByMonth");
+				$stringtoshow .= ' &nbsp; ';
+				$stringtoshow .= '<input type="checkbox" name="'.$param_showtot.'"'.($showtot ? ' checked' : '').'> '.$langs->trans("AmountOfProposalsByMonthHT");
+				$stringtoshow .= '<br>';
+				$stringtoshow .= $langs->trans("Year").' <input class="flat" size="4" type="text" name="'.$param_year.'" value="'.$endyear.'">';
+				$stringtoshow .= '<input type="image" class="reposition inline-block valigntextbottom" alt="'.$langs->trans("Refresh").'" src="'.img_picto($langs->trans("Refresh"), 'refresh.png', '', '', 1).'">';
+				$stringtoshow .= '</form>';
+				$stringtoshow .= '</div>';
 				if ($shownb && $showtot)
 				{
-					$stringtoshow.='<div class="fichecenter">';
-					$stringtoshow.='<div class="fichehalfleft">';
+					$stringtoshow .= '<div class="fichecenter">';
+					$stringtoshow .= '<div class="fichehalfleft">';
 				}
-				if ($shownb) $stringtoshow.=$px1->show();
+				if ($shownb) $stringtoshow .= $px1->show();
 				if ($shownb && $showtot)
 				{
-					$stringtoshow.='</div>';
-					$stringtoshow.='<div class="fichehalfright">';
+					$stringtoshow .= '</div>';
+					$stringtoshow .= '<div class="fichehalfright">';
 				}
-				if ($showtot) $stringtoshow.=$px2->show();
+				if ($showtot) $stringtoshow .= $px2->show();
 				if ($shownb && $showtot)
 				{
-					$stringtoshow.='</div>';
-					$stringtoshow.='</div>';
+					$stringtoshow .= '</div>';
+					$stringtoshow .= '</div>';
 				}
-				$this->info_box_contents[0][0] = array('tr'=>'class="oddeven nohover"', 'td' => 'align="center" class="nohover"','textnoformat'=>$stringtoshow);
+				$this->info_box_contents[0][0] = array('tr'=>'class="oddeven nohover"', 'td' => 'align="center" class="nohover"', 'textnoformat'=>$stringtoshow);
 			}
 			else
 			{
-				$this->info_box_contents[0][0] = array('tr'=>'class="oddeven nohover"',	'td' => 'align="left" class="nohover"',
+				$this->info_box_contents[0][0] = array('tr'=>'class="oddeven nohover"', 'td' => 'align="left" class="nohover"',
     	        										'maxlength'=>500,
 	            										'text' => $mesg);
 			}
@@ -276,7 +276,7 @@ 
 	 *  @param	int		$nooutput	No print, only return string
 	 *	@return	string
 	 */
-    function showBox($head = null, $contents = null, $nooutput=0)
+    function showBox($head = null, $contents = null, $nooutput = 0)
     {
 		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}

Braces +25 added lines, -13 removed lines

@@ -91,8 +91,13 @@ 
 		$dir=''; 	// We don't need a path because image file will not be saved into disk
 		$prefix='';
 		$socid=0;
-		if ($user->societe_id) $socid=$user->societe_id;
-		if (! $user->rights->societe->client->voir || $socid) $prefix.='private-'.$user->id.'-';	// If user has no permission to see all, output dir is specific to user
+		if ($user->societe_id) {
+		    $socid=$user->societe_id;
+		}
+		if (! $user->rights->societe->client->voir || $socid) {
+		    $prefix.='private-'.$user->id.'-';
+		}
+		// If user has no permission to see all, output dir is specific to user
 
 		if ($user->rights->propale->lire)
 		{
@@ -108,8 +113,7 @@ 
 				$endyear=GETPOST($param_year,'int');
 				$shownb=GETPOST($param_shownb,'alpha');
 				$showtot=GETPOST($param_showtot,'alpha');
-			}
-			else
+			} else
 			{
 				$tmparray=json_decode($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode],true);
 				$endyear=$tmparray['year'];
@@ -118,7 +122,9 @@ 
 			}
 			if (empty($shownb) && empty($showtot))  { $shownb=1; $showtot=1; }
 			$nowarray=dol_getdate(dol_now(),true);
-			if (empty($endyear)) $endyear=$nowarray['year'];
+			if (empty($endyear)) {
+			    $endyear=$nowarray['year'];
+			}
 			$startyear=$endyear-1;
 			$WIDTH=(($shownb && $showtot) || ! empty($conf->dol_optimize_smallscreen))?'256':'320';
 			$HEIGHT='192';
@@ -172,8 +178,12 @@ 
 				//$datatype2 = array('lines','bars');
 
 				$filenamenb = $dir."/".$prefix."propalsamountinyear-".$endyear.".png";
-				if ($mode == 'customer') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=propalstats&file=propalsamountinyear-'.$endyear.'.png';
-				if ($mode == 'supplier') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=propalstatssupplier&file=propalsamountinyear-'.$endyear.'.png';
+				if ($mode == 'customer') {
+				    $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=propalstats&file=propalsamountinyear-'.$endyear.'.png';
+				}
+				if ($mode == 'supplier') {
+				    $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=propalstatssupplier&file=propalsamountinyear-'.$endyear.'.png';
+				}
 
 				$px2 = new DolGraph();
 				$mesg = $px2->isGraphKo();
@@ -239,28 +249,30 @@ 
 					$stringtoshow.='<div class="fichecenter">';
 					$stringtoshow.='<div class="fichehalfleft">';
 				}
-				if ($shownb) $stringtoshow.=$px1->show();
+				if ($shownb) {
+				    $stringtoshow.=$px1->show();
+				}
 				if ($shownb && $showtot)
 				{
 					$stringtoshow.='</div>';
 					$stringtoshow.='<div class="fichehalfright">';
 				}
-				if ($showtot) $stringtoshow.=$px2->show();
+				if ($showtot) {
+				    $stringtoshow.=$px2->show();
+				}
 				if ($shownb && $showtot)
 				{
 					$stringtoshow.='</div>';
 					$stringtoshow.='</div>';
 				}
 				$this->info_box_contents[0][0] = array('tr'=>'class="oddeven nohover"', 'td' => 'align="center" class="nohover"','textnoformat'=>$stringtoshow);
-			}
-			else
+			} else
 			{
 				$this->info_box_contents[0][0] = array('tr'=>'class="oddeven nohover"',	'td' => 'align="left" class="nohover"',
     	        										'maxlength'=>500,
 	            										'text' => $mesg);
 			}
-		}
-		else {
+		} else {
 			$this->info_box_contents[0][0] = array(
 			    'td' => 'align="left" class="nohover opacitymedium"',
                 'text' => $langs->trans("ReadPermissionNotAllowed")

dolibarr/htdocs/core/boxes/box_lastlogin.php

Indentation +10 added lines, -10 removed lines

@@ -101,16 +101,16 @@
     }
 
 
-	/**
-	 *	Method to show box
-	 *
-	 *	@param	array	$head       Array with properties of box title
-	 *	@param  array	$contents   Array with properties of box lines
-	 *  @param	int		$nooutput	No print, only return string
-	 *	@return	void
-	 */
+    /**
+     *	Method to show box
+     *
+     *	@param	array	$head       Array with properties of box title
+     *	@param  array	$contents   Array with properties of box lines
+     *  @param	int		$nooutput	No print, only return string
+     *	@return	void
+     */
     function showBox($head = null, $contents = null, $nooutput=0)
     {
-		parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
-	}
+        parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+    }
 }

Spacing +11 added lines, -11 removed lines

@@ -30,9 +30,9 @@ 
  */
 class box_lastlogin extends ModeleBoxes
 {
-    var $boxcode="lastlogin";
-    var $boximg="object_user";
-    var $boxlabel='BoxLoginInformation';
+    var $boxcode = "lastlogin";
+    var $boximg = "object_user";
+    var $boxlabel = 'BoxLoginInformation';
     var $depends = array("user");
 
     /**
@@ -53,11 +53,11 @@ 
      *  @param  DoliDB  $db         Database handler
      *  @param  string  $param      More parameters
      */
-    function __construct($db,$param)
+    function __construct($db, $param)
     {
         global $conf;
 
-        $this->db=$db;
+        $this->db = $db;
     }
 
     /**
@@ -66,7 +66,7 @@ 
      *  @param  int     $max        Maximum number of records to load
      *  @return void
      */
-    function loadBox($max=5)
+    function loadBox($max = 5)
     {
         global $conf, $user, $langs, $db;
 
@@ -76,7 +76,7 @@ 
             'limit'=> dol_strlen($textHead),
         );
         
-        $line=0;
+        $line = 0;
         $this->info_box_contents[$line][0] = array(
             'td' => '',
             'text' => $langs->trans("User"),
@@ -87,13 +87,13 @@ 
             'asis' => 1
         );
         
-        $line=1;
+        $line = 1;
         $this->info_box_contents[$line][0] = array(
             'td' => '',
             'text' => $langs->trans("PreviousConnexion"),
         );
-        if ($user->datepreviouslogin) $tmp= dol_print_date($user->datepreviouslogin,"dayhour",'tzuser');
-        else $tmp= $langs->trans("Unknown");
+        if ($user->datepreviouslogin) $tmp = dol_print_date($user->datepreviouslogin, "dayhour", 'tzuser');
+        else $tmp = $langs->trans("Unknown");
         $this->info_box_contents[$line][1] = array(
             'td' => '',
             'text' => $tmp,
@@ -109,7 +109,7 @@ 
 	 *  @param	int		$nooutput	No print, only return string
 	 *	@return	void
 	 */
-    function showBox($head = null, $contents = null, $nooutput=0)
+    function showBox($head = null, $contents = null, $nooutput = 0)
     {
 		parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}

Braces +5 added lines, -2 removed lines

@@ -92,8 +92,11 @@
             'td' => '',
             'text' => $langs->trans("PreviousConnexion"),
         );
-        if ($user->datepreviouslogin) $tmp= dol_print_date($user->datepreviouslogin,"dayhour",'tzuser');
-        else $tmp= $langs->trans("Unknown");
+        if ($user->datepreviouslogin) {
+            $tmp= dol_print_date($user->datepreviouslogin,"dayhour",'tzuser');
+        } else {
+            $tmp= $langs->trans("Unknown");
+        }
         $this->info_box_contents[$line][1] = array(
             'td' => '',
             'text' => $tmp,

dolibarr/htdocs/core/boxes/box_contacts.php

Indentation +143 added lines, -143 removed lines

@@ -34,160 +34,160 @@
  */
 class box_contacts extends ModeleBoxes
 {
-	var $boxcode="lastcontacts";
-	var $boximg="object_contact";
-	var $boxlabel="BoxLastContacts";
-	var $depends = array("societe");
+    var $boxcode="lastcontacts";
+    var $boximg="object_contact";
+    var $boxlabel="BoxLastContacts";
+    var $depends = array("societe");
 
-	/**
+    /**
      * @var DoliDB Database handler.
      */
     public $db;
     
-	var $param;
+    var $param;
 
-	var $info_box_head = array();
-	var $info_box_contents = array();
+    var $info_box_head = array();
+    var $info_box_contents = array();
 
 
-	/**
-	 *  Constructor
-	 *
-	 *  @param  DoliDB  $db         Database handler
-	 *  @param  string  $param      More parameters
-	 */
-	function __construct($db,$param)
-	{
-	    global $user;
+    /**
+     *  Constructor
+     *
+     *  @param  DoliDB  $db         Database handler
+     *  @param  string  $param      More parameters
+     */
+    function __construct($db,$param)
+    {
+        global $user;
 
-	    $this->db=$db;
+        $this->db=$db;
 
-	    $this->hidden=! ($user->rights->societe->lire && $user->rights->societe->contact->lire);
-	}
+        $this->hidden=! ($user->rights->societe->lire && $user->rights->societe->contact->lire);
+    }
 
-	/**
-	 *  Load data into info_box_contents array to show array later.
-	 *
-	 *  @param	int		$max        Maximum number of records to load
+    /**
+     *  Load data into info_box_contents array to show array later.
+     *
+     *  @param	int		$max        Maximum number of records to load
      *  @return	void
-	 */
-	function loadBox($max=5)
-	{
-		global $user, $langs, $db, $conf;
-		$langs->load("boxes");
-
-		$this->max=$max;
-
-		$this->info_box_head = array('text' => $langs->trans("BoxTitleLastModifiedContacts",$max));
-
-		if ($user->rights->societe->lire && $user->rights->societe->contact->lire)
-		{
-			$sql = "SELECT sp.rowid as id, sp.lastname, sp.firstname, sp.civility as civility_id, sp.datec, sp.tms, sp.fk_soc, sp.statut as status";
-			$sql.= ", sp.address, sp.zip, sp.town, sp.phone, sp.phone_perso, sp.phone_mobile";
-			$sql.= ", s.nom as socname, s.name_alias";
-			$sql.= ", s.client, s.fournisseur, s.code_client, s.code_fournisseur";
-			$sql.= " FROM ".MAIN_DB_PREFIX."socpeople as sp";
-			$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON sp.fk_soc = s.rowid";
-			if (! $user->rights->societe->client->voir && ! $user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-			$sql.= " WHERE sp.entity IN (".getEntity('socpeople').")";
-			if (! $user->rights->societe->client->voir && ! $user->societe_id) $sql.= " AND sp.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-			if ($user->societe_id) $sql.= " AND sp.fk_soc = ".$user->societe_id;
-			$sql.= " ORDER BY sp.tms DESC";
-			$sql.= $db->plimit($max, 0);
-
-			$result = $db->query($sql);
-			if ($result) {
-				$num = $db->num_rows($result);
-
-				$contactstatic=new Contact($db);
-				$societestatic=new Societe($db);
-
-				$line = 0;
-				while ($line < $num)
-				{
-					$objp = $db->fetch_object($result);
-					$datec=$db->jdate($objp->datec);
-					$datem=$db->jdate($objp->tms);
-
-					$contactstatic->id=$objp->id;
-					$contactstatic->lastname=$objp->lastname;
-					$contactstatic->firstname=$objp->firstname;
-					$contactstatic->civility_id=$objp->civility_id;
-					$contactstatic->statut=$objp->status;
-					$contactstatic->phone_pro = $objp->phone;
-					$contactstatic->phone_perso = $objp->phone_perso;
-					$contactstatic->phone_mobile = $objp->phone_mobile;
-					$contactstatic->address = $objp->address;
-					$contactstatic->zip = $objp->zip;
-					$contactstatic->town = $objp->town;
-
-					$societestatic->id = $objp->fk_soc;
-					$societestatic->name = $objp->socname;
-					$societestatic->name_alias = $objp->name_alias;
-					$societestatic->code_client = $objp->code_client;
-					$societestatic->code_fournisseur = $objp->code_fournisseur;
-					$societestatic->client = $objp->client;
-					$societestatic->fournisseur = $objp->fournisseur;
-
-					$this->info_box_contents[$line][] = array(
-						'td' => '',
-						'text' => $contactstatic->getNomUrl(1),
-						'asis' => 1,
-					);
-
-					$this->info_box_contents[$line][] = array(
-						'td' => '',
-						'text' => ($objp->fk_soc > 0 ? $societestatic->getNomUrl(1) : ''),
-						'asis' => 1,
-					);
-
-					$this->info_box_contents[$line][] = array(
-						'td' => 'class="right"',
-						'text' => dol_print_date($datem, "day"),
-					);
-
-					$this->info_box_contents[$line][] = array(
-						'td' => 'align="right" class="nowrap" width="18"',
-						'text' => $contactstatic->getLibStatut(3),
-						'asis'=>1,
-					);
-
-					$line++;
-				}
-
-				if ($num==0)
-					$this->info_box_contents[$line][0] = array(
-						'td' => 'align="center"',
-						'text'=>$langs->trans("NoRecordedContacts"),
-					);
-
-				$db->free($result);
-			} else {
-				$this->info_box_contents[0][0] = array(
-					'td' => '',
-					'maxlength'=>500,
-					'text' => ($db->error().' sql='.$sql),
-				);
-			}
-		} else {
-			$this->info_box_contents[0][0] = array(
-				'td' => 'align="left" class="nohover opacitymedium"',
-				'text' => $langs->trans("ReadPermissionNotAllowed")
-			);
-		}
-	}
-
-	/**
-	 *	Method to show box
-	 *
-	 *	@param	array	$head		Array with properties of box title
-	 *	@param  array	$contents	Array with properties of box lines
-	 *	@param	int	$nooutput	No print, only return string
-	 *	@return	string
-	 */
-	function showBox($head = null, $contents = null, $nooutput=0)
-	{
-		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
-	}
+     */
+    function loadBox($max=5)
+    {
+        global $user, $langs, $db, $conf;
+        $langs->load("boxes");
+
+        $this->max=$max;
+
+        $this->info_box_head = array('text' => $langs->trans("BoxTitleLastModifiedContacts",$max));
+
+        if ($user->rights->societe->lire && $user->rights->societe->contact->lire)
+        {
+            $sql = "SELECT sp.rowid as id, sp.lastname, sp.firstname, sp.civility as civility_id, sp.datec, sp.tms, sp.fk_soc, sp.statut as status";
+            $sql.= ", sp.address, sp.zip, sp.town, sp.phone, sp.phone_perso, sp.phone_mobile";
+            $sql.= ", s.nom as socname, s.name_alias";
+            $sql.= ", s.client, s.fournisseur, s.code_client, s.code_fournisseur";
+            $sql.= " FROM ".MAIN_DB_PREFIX."socpeople as sp";
+            $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON sp.fk_soc = s.rowid";
+            if (! $user->rights->societe->client->voir && ! $user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+            $sql.= " WHERE sp.entity IN (".getEntity('socpeople').")";
+            if (! $user->rights->societe->client->voir && ! $user->societe_id) $sql.= " AND sp.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+            if ($user->societe_id) $sql.= " AND sp.fk_soc = ".$user->societe_id;
+            $sql.= " ORDER BY sp.tms DESC";
+            $sql.= $db->plimit($max, 0);
+
+            $result = $db->query($sql);
+            if ($result) {
+                $num = $db->num_rows($result);
+
+                $contactstatic=new Contact($db);
+                $societestatic=new Societe($db);
+
+                $line = 0;
+                while ($line < $num)
+                {
+                    $objp = $db->fetch_object($result);
+                    $datec=$db->jdate($objp->datec);
+                    $datem=$db->jdate($objp->tms);
+
+                    $contactstatic->id=$objp->id;
+                    $contactstatic->lastname=$objp->lastname;
+                    $contactstatic->firstname=$objp->firstname;
+                    $contactstatic->civility_id=$objp->civility_id;
+                    $contactstatic->statut=$objp->status;
+                    $contactstatic->phone_pro = $objp->phone;
+                    $contactstatic->phone_perso = $objp->phone_perso;
+                    $contactstatic->phone_mobile = $objp->phone_mobile;
+                    $contactstatic->address = $objp->address;
+                    $contactstatic->zip = $objp->zip;
+                    $contactstatic->town = $objp->town;
+
+                    $societestatic->id = $objp->fk_soc;
+                    $societestatic->name = $objp->socname;
+                    $societestatic->name_alias = $objp->name_alias;
+                    $societestatic->code_client = $objp->code_client;
+                    $societestatic->code_fournisseur = $objp->code_fournisseur;
+                    $societestatic->client = $objp->client;
+                    $societestatic->fournisseur = $objp->fournisseur;
+
+                    $this->info_box_contents[$line][] = array(
+                        'td' => '',
+                        'text' => $contactstatic->getNomUrl(1),
+                        'asis' => 1,
+                    );
+
+                    $this->info_box_contents[$line][] = array(
+                        'td' => '',
+                        'text' => ($objp->fk_soc > 0 ? $societestatic->getNomUrl(1) : ''),
+                        'asis' => 1,
+                    );
+
+                    $this->info_box_contents[$line][] = array(
+                        'td' => 'class="right"',
+                        'text' => dol_print_date($datem, "day"),
+                    );
+
+                    $this->info_box_contents[$line][] = array(
+                        'td' => 'align="right" class="nowrap" width="18"',
+                        'text' => $contactstatic->getLibStatut(3),
+                        'asis'=>1,
+                    );
+
+                    $line++;
+                }
+
+                if ($num==0)
+                    $this->info_box_contents[$line][0] = array(
+                        'td' => 'align="center"',
+                        'text'=>$langs->trans("NoRecordedContacts"),
+                    );
+
+                $db->free($result);
+            } else {
+                $this->info_box_contents[0][0] = array(
+                    'td' => '',
+                    'maxlength'=>500,
+                    'text' => ($db->error().' sql='.$sql),
+                );
+            }
+        } else {
+            $this->info_box_contents[0][0] = array(
+                'td' => 'align="left" class="nohover opacitymedium"',
+                'text' => $langs->trans("ReadPermissionNotAllowed")
+            );
+        }
+    }
+
+    /**
+     *	Method to show box
+     *
+     *	@param	array	$head		Array with properties of box title
+     *	@param  array	$contents	Array with properties of box lines
+     *	@param	int	$nooutput	No print, only return string
+     *	@return	string
+     */
+    function showBox($head = null, $contents = null, $nooutput=0)
+    {
+        return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+    }
 }
 

Spacing +32 added lines, -32 removed lines

@@ -34,9 +34,9 @@ 
  */
 class box_contacts extends ModeleBoxes
 {
-	var $boxcode="lastcontacts";
-	var $boximg="object_contact";
-	var $boxlabel="BoxLastContacts";
+	var $boxcode = "lastcontacts";
+	var $boximg = "object_contact";
+	var $boxlabel = "BoxLastContacts";
 	var $depends = array("societe");
 
 	/**
@@ -56,13 +56,13 @@ 
 	 *  @param  DoliDB  $db         Database handler
 	 *  @param  string  $param      More parameters
 	 */
-	function __construct($db,$param)
+	function __construct($db, $param)
 	{
 	    global $user;
 
-	    $this->db=$db;
+	    $this->db = $db;
 
-	    $this->hidden=! ($user->rights->societe->lire && $user->rights->societe->contact->lire);
+	    $this->hidden = !($user->rights->societe->lire && $user->rights->societe->contact->lire);
 	}
 
 	/**
@@ -71,49 +71,49 @@ 
 	 *  @param	int		$max        Maximum number of records to load
      *  @return	void
 	 */
-	function loadBox($max=5)
+	function loadBox($max = 5)
 	{
 		global $user, $langs, $db, $conf;
 		$langs->load("boxes");
 
-		$this->max=$max;
+		$this->max = $max;
 
-		$this->info_box_head = array('text' => $langs->trans("BoxTitleLastModifiedContacts",$max));
+		$this->info_box_head = array('text' => $langs->trans("BoxTitleLastModifiedContacts", $max));
 
 		if ($user->rights->societe->lire && $user->rights->societe->contact->lire)
 		{
 			$sql = "SELECT sp.rowid as id, sp.lastname, sp.firstname, sp.civility as civility_id, sp.datec, sp.tms, sp.fk_soc, sp.statut as status";
-			$sql.= ", sp.address, sp.zip, sp.town, sp.phone, sp.phone_perso, sp.phone_mobile";
-			$sql.= ", s.nom as socname, s.name_alias";
-			$sql.= ", s.client, s.fournisseur, s.code_client, s.code_fournisseur";
-			$sql.= " FROM ".MAIN_DB_PREFIX."socpeople as sp";
-			$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON sp.fk_soc = s.rowid";
-			if (! $user->rights->societe->client->voir && ! $user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-			$sql.= " WHERE sp.entity IN (".getEntity('socpeople').")";
-			if (! $user->rights->societe->client->voir && ! $user->societe_id) $sql.= " AND sp.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-			if ($user->societe_id) $sql.= " AND sp.fk_soc = ".$user->societe_id;
-			$sql.= " ORDER BY sp.tms DESC";
-			$sql.= $db->plimit($max, 0);
+			$sql .= ", sp.address, sp.zip, sp.town, sp.phone, sp.phone_perso, sp.phone_mobile";
+			$sql .= ", s.nom as socname, s.name_alias";
+			$sql .= ", s.client, s.fournisseur, s.code_client, s.code_fournisseur";
+			$sql .= " FROM ".MAIN_DB_PREFIX."socpeople as sp";
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON sp.fk_soc = s.rowid";
+			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+			$sql .= " WHERE sp.entity IN (".getEntity('socpeople').")";
+			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= " AND sp.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+			if ($user->societe_id) $sql .= " AND sp.fk_soc = ".$user->societe_id;
+			$sql .= " ORDER BY sp.tms DESC";
+			$sql .= $db->plimit($max, 0);
 
 			$result = $db->query($sql);
 			if ($result) {
 				$num = $db->num_rows($result);
 
-				$contactstatic=new Contact($db);
-				$societestatic=new Societe($db);
+				$contactstatic = new Contact($db);
+				$societestatic = new Societe($db);
 
 				$line = 0;
 				while ($line < $num)
 				{
 					$objp = $db->fetch_object($result);
-					$datec=$db->jdate($objp->datec);
-					$datem=$db->jdate($objp->tms);
-
-					$contactstatic->id=$objp->id;
-					$contactstatic->lastname=$objp->lastname;
-					$contactstatic->firstname=$objp->firstname;
-					$contactstatic->civility_id=$objp->civility_id;
-					$contactstatic->statut=$objp->status;
+					$datec = $db->jdate($objp->datec);
+					$datem = $db->jdate($objp->tms);
+
+					$contactstatic->id = $objp->id;
+					$contactstatic->lastname = $objp->lastname;
+					$contactstatic->firstname = $objp->firstname;
+					$contactstatic->civility_id = $objp->civility_id;
+					$contactstatic->statut = $objp->status;
 					$contactstatic->phone_pro = $objp->phone;
 					$contactstatic->phone_perso = $objp->phone_perso;
 					$contactstatic->phone_mobile = $objp->phone_mobile;
@@ -155,7 +155,7 @@ 
 					$line++;
 				}
 
-				if ($num==0)
+				if ($num == 0)
 					$this->info_box_contents[$line][0] = array(
 						'td' => 'align="center"',
 						'text'=>$langs->trans("NoRecordedContacts"),
@@ -185,7 +185,7 @@ 
 	 *	@param	int	$nooutput	No print, only return string
 	 *	@return	string
 	 */
-	function showBox($head = null, $contents = null, $nooutput=0)
+	function showBox($head = null, $contents = null, $nooutput = 0)
 	{
 		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}

Braces +12 added lines, -5 removed lines

@@ -88,10 +88,16 @@ 
 			$sql.= ", s.client, s.fournisseur, s.code_client, s.code_fournisseur";
 			$sql.= " FROM ".MAIN_DB_PREFIX."socpeople as sp";
 			$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON sp.fk_soc = s.rowid";
-			if (! $user->rights->societe->client->voir && ! $user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+			if (! $user->rights->societe->client->voir && ! $user->societe_id) {
+			    $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+			}
 			$sql.= " WHERE sp.entity IN (".getEntity('socpeople').")";
-			if (! $user->rights->societe->client->voir && ! $user->societe_id) $sql.= " AND sp.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-			if ($user->societe_id) $sql.= " AND sp.fk_soc = ".$user->societe_id;
+			if (! $user->rights->societe->client->voir && ! $user->societe_id) {
+			    $sql.= " AND sp.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+			}
+			if ($user->societe_id) {
+			    $sql.= " AND sp.fk_soc = ".$user->societe_id;
+			}
 			$sql.= " ORDER BY sp.tms DESC";
 			$sql.= $db->plimit($max, 0);
 
@@ -155,11 +161,12 @@ 
 					$line++;
 				}
 
-				if ($num==0)
-					$this->info_box_contents[$line][0] = array(
+				if ($num==0) {
+									$this->info_box_contents[$line][0] = array(
 						'td' => 'align="center"',
 						'text'=>$langs->trans("NoRecordedContacts"),
 					);
+				}
 
 				$db->free($result);
 			} else {

dolibarr/htdocs/core/boxes/box_clients.php

Indentation +82 added lines, -82 removed lines

@@ -32,61 +32,61 @@ 
  */
 class box_clients extends ModeleBoxes
 {
-	var $boxcode="lastcustomers";
-	var $boximg="object_company";
-	var $boxlabel="BoxLastCustomers";
-	var $depends = array("societe");
+    var $boxcode="lastcustomers";
+    var $boximg="object_company";
+    var $boxlabel="BoxLastCustomers";
+    var $depends = array("societe");
 
-	/**
+    /**
      * @var DoliDB Database handler.
      */
     public $db;
     
-	var $enabled = 1;
+    var $enabled = 1;
 
-	var $info_box_head = array();
-	var $info_box_contents = array();
+    var $info_box_head = array();
+    var $info_box_contents = array();
 
 
-	/**
-	 *  Constructor
-	 *
-	 *  @param  DoliDB	$db      	Database handler
+    /**
+     *  Constructor
+     *
+     *  @param  DoliDB	$db      	Database handler
      *  @param	string	$param		More parameters
-	 */
-	function __construct($db,$param='')
-	{
-		global $conf, $user;
+     */
+    function __construct($db,$param='')
+    {
+        global $conf, $user;
 
-		$this->db = $db;
+        $this->db = $db;
 
-		// disable box for such cases
-		if (! empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) $this->enabled=0;	// disabled by this option
+        // disable box for such cases
+        if (! empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) $this->enabled=0;	// disabled by this option
 
-		$this->hidden = ! ($user->rights->societe->lire && empty($user->socid));
-	}
+        $this->hidden = ! ($user->rights->societe->lire && empty($user->socid));
+    }
 
-	/**
+    /**
      *  Load data for box to show them later
      *
      *  @param	int		$max        Maximum number of records to load
      *  @return	void
-	 */
-	function loadBox($max=5)
-	{
-		global $user, $langs, $db, $conf;
-		$langs->load("boxes");
+     */
+    function loadBox($max=5)
+    {
+        global $user, $langs, $db, $conf;
+        $langs->load("boxes");
 
-		$this->max=$max;
+        $this->max=$max;
 
         include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
         $thirdpartystatic=new Societe($db);
 
         $this->info_box_head = array('text' => $langs->trans("BoxTitleLastModifiedCustomers",$max));
 
-		if ($user->rights->societe->lire)
-		{
-			$sql = "SELECT s.nom as name, s.rowid as socid";
+        if ($user->rights->societe->lire)
+        {
+            $sql = "SELECT s.nom as name, s.rowid as socid";
             $sql.= ", s.code_client";
             $sql.= ", s.client";
             $sql.= ", s.code_fournisseur";
@@ -96,27 +96,27 @@ 
             $sql.= ", s.logo";
             $sql.= ", s.email";
             $sql.= ", s.datec, s.tms, s.status";
-			$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
-			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-			$sql.= " WHERE s.client IN (1, 3)";
-			$sql.= " AND s.entity IN (".getEntity('societe').")";
-			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-			if ($user->societe_id) $sql.= " AND s.rowid = $user->societe_id";
-			$sql.= " ORDER BY s.tms DESC";
-			$sql.= $db->plimit($max, 0);
-
-			dol_syslog(get_class($this)."::loadBox", LOG_DEBUG);
-			$result = $db->query($sql);
-			if ($result)
-			{
-				$num = $db->num_rows($result);
-
-				$line = 0;
-				while ($line < $num)
-				{
-					$objp = $db->fetch_object($result);
-					$datec=$db->jdate($objp->datec);
-					$datem=$db->jdate($objp->tms);
+            $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
+            if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+            $sql.= " WHERE s.client IN (1, 3)";
+            $sql.= " AND s.entity IN (".getEntity('societe').")";
+            if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+            if ($user->societe_id) $sql.= " AND s.rowid = $user->societe_id";
+            $sql.= " ORDER BY s.tms DESC";
+            $sql.= $db->plimit($max, 0);
+
+            dol_syslog(get_class($this)."::loadBox", LOG_DEBUG);
+            $result = $db->query($sql);
+            if ($result)
+            {
+                $num = $db->num_rows($result);
+
+                $line = 0;
+                while ($line < $num)
+                {
+                    $objp = $db->fetch_object($result);
+                    $datec=$db->jdate($objp->datec);
+                    $datem=$db->jdate($objp->tms);
                     $thirdpartystatic->id = $objp->socid;
                     $thirdpartystatic->name = $objp->name;
                     $thirdpartystatic->code_client = $objp->code_client;
@@ -144,38 +144,38 @@ 
                         'text' => $thirdpartystatic->LibStatut($objp->status,3)
                     );
 
-					$line++;
-				}
-
-				if ($num==0) $this->info_box_contents[$line][0] = array('td' => 'align="center"','text'=>$langs->trans("NoRecordedCustomers"));
-
-				$db->free($result);
-			}
-			else {
-				$this->info_box_contents[0][0] = array(	'td' => '',
-    	        										'maxlength'=>500,
-	            										'text' => ($db->error().' sql='.$sql));
-			}
-		}
-		else {
-			$this->info_box_contents[0][0] = array(
-			    'td' => 'align="left" class="nohover opacitymedium"',
+                    $line++;
+                }
+
+                if ($num==0) $this->info_box_contents[$line][0] = array('td' => 'align="center"','text'=>$langs->trans("NoRecordedCustomers"));
+
+                $db->free($result);
+            }
+            else {
+                $this->info_box_contents[0][0] = array(	'td' => '',
+                                                        'maxlength'=>500,
+                                                        'text' => ($db->error().' sql='.$sql));
+            }
+        }
+        else {
+            $this->info_box_contents[0][0] = array(
+                'td' => 'align="left" class="nohover opacitymedium"',
                 'text' => $langs->trans("ReadPermissionNotAllowed")
-			);
-		}
-	}
-
-	/**
-	 *	Method to show box
-	 *
-	 *	@param	array	$head       Array with properties of box title
-	 *	@param  array	$contents   Array with properties of box lines
-	 *  @param	int		$nooutput	No print, only return string
-	 *	@return	string
-	 */
+            );
+        }
+    }
+
+    /**
+     *	Method to show box
+     *
+     *	@param	array	$head       Array with properties of box title
+     *	@param  array	$contents   Array with properties of box lines
+     *  @param	int		$nooutput	No print, only return string
+     *	@return	string
+     */
     function showBox($head = null, $contents = null, $nooutput=0)
     {
-		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
-	}
+        return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+    }
 }
 

Spacing +33 added lines, -33 removed lines

@@ -32,9 +32,9 @@ 
  */
 class box_clients extends ModeleBoxes
 {
-	var $boxcode="lastcustomers";
-	var $boximg="object_company";
-	var $boxlabel="BoxLastCustomers";
+	var $boxcode = "lastcustomers";
+	var $boximg = "object_company";
+	var $boxlabel = "BoxLastCustomers";
 	var $depends = array("societe");
 
 	/**
@@ -54,16 +54,16 @@ 
 	 *  @param  DoliDB	$db      	Database handler
      *  @param	string	$param		More parameters
 	 */
-	function __construct($db,$param='')
+	function __construct($db, $param = '')
 	{
 		global $conf, $user;
 
 		$this->db = $db;
 
 		// disable box for such cases
-		if (! empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) $this->enabled=0;	// disabled by this option
+		if (!empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) $this->enabled = 0; // disabled by this option
 
-		$this->hidden = ! ($user->rights->societe->lire && empty($user->socid));
+		$this->hidden = !($user->rights->societe->lire && empty($user->socid));
 	}
 
 	/**
@@ -72,38 +72,38 @@ 
      *  @param	int		$max        Maximum number of records to load
      *  @return	void
 	 */
-	function loadBox($max=5)
+	function loadBox($max = 5)
 	{
 		global $user, $langs, $db, $conf;
 		$langs->load("boxes");
 
-		$this->max=$max;
+		$this->max = $max;
 
         include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
-        $thirdpartystatic=new Societe($db);
+        $thirdpartystatic = new Societe($db);
 
-        $this->info_box_head = array('text' => $langs->trans("BoxTitleLastModifiedCustomers",$max));
+        $this->info_box_head = array('text' => $langs->trans("BoxTitleLastModifiedCustomers", $max));
 
 		if ($user->rights->societe->lire)
 		{
 			$sql = "SELECT s.nom as name, s.rowid as socid";
-            $sql.= ", s.code_client";
-            $sql.= ", s.client";
-            $sql.= ", s.code_fournisseur";
-            $sql.= ", s.fournisseur";
-            $sql.= ", s.code_compta";
-            $sql.= ", s.code_compta_fournisseur";
-            $sql.= ", s.logo";
-            $sql.= ", s.email";
-            $sql.= ", s.datec, s.tms, s.status";
-			$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
-			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-			$sql.= " WHERE s.client IN (1, 3)";
-			$sql.= " AND s.entity IN (".getEntity('societe').")";
-			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-			if ($user->societe_id) $sql.= " AND s.rowid = $user->societe_id";
-			$sql.= " ORDER BY s.tms DESC";
-			$sql.= $db->plimit($max, 0);
+            $sql .= ", s.code_client";
+            $sql .= ", s.client";
+            $sql .= ", s.code_fournisseur";
+            $sql .= ", s.fournisseur";
+            $sql .= ", s.code_compta";
+            $sql .= ", s.code_compta_fournisseur";
+            $sql .= ", s.logo";
+            $sql .= ", s.email";
+            $sql .= ", s.datec, s.tms, s.status";
+			$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+			$sql .= " WHERE s.client IN (1, 3)";
+			$sql .= " AND s.entity IN (".getEntity('societe').")";
+			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+			if ($user->societe_id) $sql .= " AND s.rowid = $user->societe_id";
+			$sql .= " ORDER BY s.tms DESC";
+			$sql .= $db->plimit($max, 0);
 
 			dol_syslog(get_class($this)."::loadBox", LOG_DEBUG);
 			$result = $db->query($sql);
@@ -115,8 +115,8 @@ 
 				while ($line < $num)
 				{
 					$objp = $db->fetch_object($result);
-					$datec=$db->jdate($objp->datec);
-					$datem=$db->jdate($objp->tms);
+					$datec = $db->jdate($objp->datec);
+					$datem = $db->jdate($objp->tms);
                     $thirdpartystatic->id = $objp->socid;
                     $thirdpartystatic->name = $objp->name;
                     $thirdpartystatic->code_client = $objp->code_client;
@@ -141,18 +141,18 @@ 
 
                     $this->info_box_contents[$line][] = array(
                         'td' => 'align="right" width="18"',
-                        'text' => $thirdpartystatic->LibStatut($objp->status,3)
+                        'text' => $thirdpartystatic->LibStatut($objp->status, 3)
                     );
 
 					$line++;
 				}
 
-				if ($num==0) $this->info_box_contents[$line][0] = array('td' => 'align="center"','text'=>$langs->trans("NoRecordedCustomers"));
+				if ($num == 0) $this->info_box_contents[$line][0] = array('td' => 'align="center"', 'text'=>$langs->trans("NoRecordedCustomers"));
 
 				$db->free($result);
 			}
 			else {
-				$this->info_box_contents[0][0] = array(	'td' => '',
+				$this->info_box_contents[0][0] = array('td' => '',
     	        										'maxlength'=>500,
 	            										'text' => ($db->error().' sql='.$sql));
 			}
@@ -173,7 +173,7 @@ 
 	 *  @param	int		$nooutput	No print, only return string
 	 *	@return	string
 	 */
-    function showBox($head = null, $contents = null, $nooutput=0)
+    function showBox($head = null, $contents = null, $nooutput = 0)
     {
 		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}

Braces +18 added lines, -9 removed lines

@@ -61,7 +61,10 @@ 
 		$this->db = $db;
 
 		// disable box for such cases
-		if (! empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) $this->enabled=0;	// disabled by this option
+		if (! empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) {
+		    $this->enabled=0;
+		}
+		// disabled by this option
 
 		$this->hidden = ! ($user->rights->societe->lire && empty($user->socid));
 	}
@@ -97,11 +100,17 @@ 
             $sql.= ", s.email";
             $sql.= ", s.datec, s.tms, s.status";
 			$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
-			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+			if (!$user->rights->societe->client->voir && !$user->societe_id) {
+			    $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+			}
 			$sql.= " WHERE s.client IN (1, 3)";
 			$sql.= " AND s.entity IN (".getEntity('societe').")";
-			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-			if ($user->societe_id) $sql.= " AND s.rowid = $user->societe_id";
+			if (!$user->rights->societe->client->voir && !$user->societe_id) {
+			    $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+			}
+			if ($user->societe_id) {
+			    $sql.= " AND s.rowid = $user->societe_id";
+			}
 			$sql.= " ORDER BY s.tms DESC";
 			$sql.= $db->plimit($max, 0);
 
@@ -147,17 +156,17 @@ 
 					$line++;
 				}
 
-				if ($num==0) $this->info_box_contents[$line][0] = array('td' => 'align="center"','text'=>$langs->trans("NoRecordedCustomers"));
+				if ($num==0) {
+				    $this->info_box_contents[$line][0] = array('td' => 'align="center"','text'=>$langs->trans("NoRecordedCustomers"));
+				}
 
 				$db->free($result);
-			}
-			else {
+			} else {
 				$this->info_box_contents[0][0] = array(	'td' => '',
     	        										'maxlength'=>500,
 	            										'text' => ($db->error().' sql='.$sql));
 			}
-		}
-		else {
+		} else {
 			$this->info_box_contents[0][0] = array(
 			    'td' => 'align="left" class="nohover opacitymedium"',
                 'text' => $langs->trans("ReadPermissionNotAllowed")

dolibarr/htdocs/core/boxes/box_actions.php

Indentation +128 added lines, -128 removed lines

@@ -32,88 +32,88 @@ 
  */
 class box_actions extends ModeleBoxes
 {
-	var $boxcode="lastactions";
-	var $boximg="object_action";
-	var $boxlabel="BoxLastActions";
-	var $depends = array("agenda");
+    var $boxcode="lastactions";
+    var $boximg="object_action";
+    var $boxlabel="BoxLastActions";
+    var $depends = array("agenda");
 
-	/**
+    /**
      * @var DoliDB Database handler.
      */
     public $db;
     
-	var $param;
+    var $param;
 
-	var $info_box_head = array();
-	var $info_box_contents = array();
+    var $info_box_head = array();
+    var $info_box_contents = array();
 
 
-	/**
-	 *  Constructor
-	 *
-	 *  @param  DoliDB	$db      	Database handler
-	 *  @param	string	$param		More parameters
-	 */
-	function __construct($db,$param='')
-	{
-	    global $user;
+    /**
+     *  Constructor
+     *
+     *  @param  DoliDB	$db      	Database handler
+     *  @param	string	$param		More parameters
+     */
+    function __construct($db,$param='')
+    {
+        global $user;
 
-	    $this->db = $db;
+        $this->db = $db;
 
-	    $this->hidden = ! ($user->rights->agenda->myactions->read);
-	}
+        $this->hidden = ! ($user->rights->agenda->myactions->read);
+    }
 
-	/**
+    /**
      *  Load data for box to show them later
      *
      *  @param	int		$max        Maximum number of records to load
      *  @return	void
-	 */
-	function loadBox($max=5)
-	{
-		global $user, $langs, $db, $conf;
+     */
+    function loadBox($max=5)
+    {
+        global $user, $langs, $db, $conf;
 
-		$this->max=$max;
+        $this->max=$max;
 
         include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
         include_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
         $societestatic = new Societe($db);
         $actionstatic = new ActionComm($db);
 
-		$this->info_box_head = array('text' => $langs->trans("BoxTitleLastActionsToDo",$max));
+        $this->info_box_head = array('text' => $langs->trans("BoxTitleLastActionsToDo",$max));
 
         if ($user->rights->agenda->myactions->read) {
-			$sql = "SELECT a.id, a.label, a.datep as dp, a.percent as percentage";
+            $sql = "SELECT a.id, a.label, a.datep as dp, a.percent as percentage";
             $sql.= ", ta.code";
             $sql.= ", ta.libelle as type_label";
             $sql.= ", s.nom as name";
             $sql.= ", s.rowid as socid";
             $sql.= ", s.code_client";
-			$sql.= " FROM (".MAIN_DB_PREFIX."c_actioncomm AS ta, ";
-			$sql.= MAIN_DB_PREFIX."actioncomm AS a)";
-			if (! $user->rights->societe->client->voir && ! $user->societe_id) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON a.fk_soc = sc.fk_soc";
-			$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON a.fk_soc = s.rowid";
-			$sql.= " WHERE a.fk_action = ta.id";
-			$sql.= " AND a.entity = ".$conf->entity;
-			$sql.= " AND a.percent >= 0 AND a.percent < 100";
-			if (! $user->rights->societe->client->voir && ! $user->societe_id) $sql.= " AND (a.fk_soc IS NULL OR sc.fk_user = " .$user->id . ")";
-			if($user->societe_id)   $sql.= " AND s.rowid = ".$user->societe_id;
-			if (! $user->rights->agenda->allactions->read) $sql.= " AND (a.fk_user_author = ".$user->id . " OR a.fk_user_action = ".$user->id . " OR a.fk_user_done = ".$user->id . ")";
-			$sql.= " ORDER BY a.datec DESC";
-			$sql.= $db->plimit($max, 0);
-
-			dol_syslog("Box_actions::loadBox", LOG_DEBUG);
-			$result = $db->query($sql);
+            $sql.= " FROM (".MAIN_DB_PREFIX."c_actioncomm AS ta, ";
+            $sql.= MAIN_DB_PREFIX."actioncomm AS a)";
+            if (! $user->rights->societe->client->voir && ! $user->societe_id) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON a.fk_soc = sc.fk_soc";
+            $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON a.fk_soc = s.rowid";
+            $sql.= " WHERE a.fk_action = ta.id";
+            $sql.= " AND a.entity = ".$conf->entity;
+            $sql.= " AND a.percent >= 0 AND a.percent < 100";
+            if (! $user->rights->societe->client->voir && ! $user->societe_id) $sql.= " AND (a.fk_soc IS NULL OR sc.fk_user = " .$user->id . ")";
+            if($user->societe_id)   $sql.= " AND s.rowid = ".$user->societe_id;
+            if (! $user->rights->agenda->allactions->read) $sql.= " AND (a.fk_user_author = ".$user->id . " OR a.fk_user_action = ".$user->id . " OR a.fk_user_done = ".$user->id . ")";
+            $sql.= " ORDER BY a.datec DESC";
+            $sql.= $db->plimit($max, 0);
+
+            dol_syslog("Box_actions::loadBox", LOG_DEBUG);
+            $result = $db->query($sql);
             if ($result) {
-				$now=dol_now();
-				$delay_warning = $conf->global->MAIN_DELAY_ACTIONS_TODO*24*60*60;
+                $now=dol_now();
+                $delay_warning = $conf->global->MAIN_DELAY_ACTIONS_TODO*24*60*60;
 
-				$num = $db->num_rows($result);
-				$line = 0;
+                $num = $db->num_rows($result);
+                $line = 0;
                 while ($line < $num) {
-					$late = '';
-					$objp = $db->fetch_object($result);
-					$datelimite = $db->jdate($objp->dp);
+                    $late = '';
+                    $objp = $db->fetch_object($result);
+                    $datelimite = $db->jdate($objp->dp);
                     $actionstatic->id = $objp->id;
                     $actionstatic->label = $objp->label;
                     $actionstatic->type_label = $objp->type_label;
@@ -125,8 +125,8 @@ 
                     if ($objp->percentage >= 0 && $objp->percentage < 100 && $datelimite  < ($now - $delay_warning))
                         $late=img_warning($langs->trans("Late"));
 
-					//($langs->transnoentities("Action".$objp->code)!=("Action".$objp->code) ? $langs->transnoentities("Action".$objp->code) : $objp->label)
-					$label = empty($objp->label)?$objp->type_label:$objp->label;
+                    //($langs->transnoentities("Action".$objp->code)!=("Action".$objp->code) ? $langs->transnoentities("Action".$objp->code) : $objp->label)
+                    $label = empty($objp->label)?$objp->type_label:$objp->label;
 
                     $this->info_box_contents[$line][] = array(
                         'td' => '',
@@ -178,86 +178,86 @@ 
                 'td' => 'align="left" class="nohover opacitymedium"',
                 'text' => $langs->trans("ReadPermissionNotAllowed")
             );
-		}
-	}
-
-	/**
-	 *	Method to show box
-	 *
-	 *	@param	array	$head       Array with properties of box title
-	 *	@param  array	$contents   Array with properties of box lines
-	 *  @param	int		$nooutput	No print, only return string
-	 *	@return	string
-	 */
+        }
+    }
+
+    /**
+     *	Method to show box
+     *
+     *	@param	array	$head       Array with properties of box title
+     *	@param  array	$contents   Array with properties of box lines
+     *  @param	int		$nooutput	No print, only return string
+     *	@return	string
+     */
     function showBox($head = null, $contents = null, $nooutput=0)
     {
-		global $langs, $conf;
-		$out = parent::showBox($this->info_box_head, $this->info_box_contents);
+        global $langs, $conf;
+        $out = parent::showBox($this->info_box_head, $this->info_box_contents);
 
         if (! empty($conf->global->SHOW_DIALOG_HOMEPAGE))
         {
-			$actioncejour=false;
-			$contents=$this->info_box_contents;
-			$nblines=count($contents);
-			if ($contents[0][0]['text'] != $langs->trans("NoActionsToDo"))
-			{
-				$out.= '<div id="dialogboxaction" title="'.$nblines." ".$langs->trans("ActionsToDo").'">';
-				$out.= '<table width=100%>';
-				for ($line=0, $n=$nblines; $line < $n; $line++)
-				{
-					if (isset($contents[$line]))
-					{
-						// on affiche que les évènement du jours ou passé
-						// qui ne sont pas à 100%
-						$actioncejour=true;
-
-						// TR
-						$logo=$contents[$line][0]['logo'];
-						$label=$contents[$line][1]['text'];
-						$urlevent=$contents[$line][1]['url'];
-						$logosoc=$contents[$line][2]['logo'];
-						$nomsoc=$contents[$line][3]['text'];
-						$urlsoc=$contents[$line][3]['url'];
-						$dateligne=$contents[$line][4]['text'];
-						$percentage=$contents[$line][5]['text'];
-						$out.= '<tr class="oddeven">';
-						$out.= '<td align=center>';
-						$out.= img_object("",$logo);
-						$out.= '</td>';
-						$out.= '<td align=center><a href="'.$urlevent.'">'.$label.'</a></td>';
-						$out.= '<td align=center><a href="'.$urlsoc.'">'.img_object("",$logosoc)." ".$nomsoc.'</a></td>';
-						$out.= '<td align=center>'.$dateligne.'</td>';
-						$out.= '<td align=center>'.$percentage.'</td>';
-						$out.= '</tr>';
-					}
-				}
-				$out.= '</table>';
-			}
-			$out.= '</div>';
-			if ($actioncejour)
-			{
-				$out.= '<script>';
-				$out.= '$("#dialogboxaction").dialog({ autoOpen: true });';
-				if ($conf->global->SHOW_DIALOG_HOMEPAGE > 1)    // autoclose after this delay
-				{
-					$out.= 'setTimeout(function(){';
-					$out.= '$("#dialogboxaction").dialog("close");';
-					$out.= '}, '.($conf->global->SHOW_DIALOG_HOMEPAGE*1000).');';
-				}
-				$out.= '</script>';
-			}
-			else
-			{
-				$out.= '<script>';
-				$out.= '$("#dialogboxaction").dialog({ autoOpen: false });';
-				$out.= '</script>';
-			}
-		}
-
-		if ($nooutput) return $out;
-		else print $out;
-
-		return '';
-	}
+            $actioncejour=false;
+            $contents=$this->info_box_contents;
+            $nblines=count($contents);
+            if ($contents[0][0]['text'] != $langs->trans("NoActionsToDo"))
+            {
+                $out.= '<div id="dialogboxaction" title="'.$nblines." ".$langs->trans("ActionsToDo").'">';
+                $out.= '<table width=100%>';
+                for ($line=0, $n=$nblines; $line < $n; $line++)
+                {
+                    if (isset($contents[$line]))
+                    {
+                        // on affiche que les évènement du jours ou passé
+                        // qui ne sont pas à 100%
+                        $actioncejour=true;
+
+                        // TR
+                        $logo=$contents[$line][0]['logo'];
+                        $label=$contents[$line][1]['text'];
+                        $urlevent=$contents[$line][1]['url'];
+                        $logosoc=$contents[$line][2]['logo'];
+                        $nomsoc=$contents[$line][3]['text'];
+                        $urlsoc=$contents[$line][3]['url'];
+                        $dateligne=$contents[$line][4]['text'];
+                        $percentage=$contents[$line][5]['text'];
+                        $out.= '<tr class="oddeven">';
+                        $out.= '<td align=center>';
+                        $out.= img_object("",$logo);
+                        $out.= '</td>';
+                        $out.= '<td align=center><a href="'.$urlevent.'">'.$label.'</a></td>';
+                        $out.= '<td align=center><a href="'.$urlsoc.'">'.img_object("",$logosoc)." ".$nomsoc.'</a></td>';
+                        $out.= '<td align=center>'.$dateligne.'</td>';
+                        $out.= '<td align=center>'.$percentage.'</td>';
+                        $out.= '</tr>';
+                    }
+                }
+                $out.= '</table>';
+            }
+            $out.= '</div>';
+            if ($actioncejour)
+            {
+                $out.= '<script>';
+                $out.= '$("#dialogboxaction").dialog({ autoOpen: true });';
+                if ($conf->global->SHOW_DIALOG_HOMEPAGE > 1)    // autoclose after this delay
+                {
+                    $out.= 'setTimeout(function(){';
+                    $out.= '$("#dialogboxaction").dialog("close");';
+                    $out.= '}, '.($conf->global->SHOW_DIALOG_HOMEPAGE*1000).');';
+                }
+                $out.= '</script>';
+            }
+            else
+            {
+                $out.= '<script>';
+                $out.= '$("#dialogboxaction").dialog({ autoOpen: false });';
+                $out.= '</script>';
+            }
+        }
+
+        if ($nooutput) return $out;
+        else print $out;
+
+        return '';
+    }
 }
 

Spacing +70 added lines, -70 removed lines

@@ -32,9 +32,9 @@ 
  */
 class box_actions extends ModeleBoxes
 {
-	var $boxcode="lastactions";
-	var $boximg="object_action";
-	var $boxlabel="BoxLastActions";
+	var $boxcode = "lastactions";
+	var $boximg = "object_action";
+	var $boxlabel = "BoxLastActions";
 	var $depends = array("agenda");
 
 	/**
@@ -54,13 +54,13 @@ 
 	 *  @param  DoliDB	$db      	Database handler
 	 *  @param	string	$param		More parameters
 	 */
-	function __construct($db,$param='')
+	function __construct($db, $param = '')
 	{
 	    global $user;
 
 	    $this->db = $db;
 
-	    $this->hidden = ! ($user->rights->agenda->myactions->read);
+	    $this->hidden = !($user->rights->agenda->myactions->read);
 	}
 
 	/**
@@ -69,44 +69,44 @@ 
      *  @param	int		$max        Maximum number of records to load
      *  @return	void
 	 */
-	function loadBox($max=5)
+	function loadBox($max = 5)
 	{
 		global $user, $langs, $db, $conf;
 
-		$this->max=$max;
+		$this->max = $max;
 
         include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
         include_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
         $societestatic = new Societe($db);
         $actionstatic = new ActionComm($db);
 
-		$this->info_box_head = array('text' => $langs->trans("BoxTitleLastActionsToDo",$max));
+		$this->info_box_head = array('text' => $langs->trans("BoxTitleLastActionsToDo", $max));
 
         if ($user->rights->agenda->myactions->read) {
 			$sql = "SELECT a.id, a.label, a.datep as dp, a.percent as percentage";
-            $sql.= ", ta.code";
-            $sql.= ", ta.libelle as type_label";
-            $sql.= ", s.nom as name";
-            $sql.= ", s.rowid as socid";
-            $sql.= ", s.code_client";
-			$sql.= " FROM (".MAIN_DB_PREFIX."c_actioncomm AS ta, ";
-			$sql.= MAIN_DB_PREFIX."actioncomm AS a)";
-			if (! $user->rights->societe->client->voir && ! $user->societe_id) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON a.fk_soc = sc.fk_soc";
-			$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON a.fk_soc = s.rowid";
-			$sql.= " WHERE a.fk_action = ta.id";
-			$sql.= " AND a.entity = ".$conf->entity;
-			$sql.= " AND a.percent >= 0 AND a.percent < 100";
-			if (! $user->rights->societe->client->voir && ! $user->societe_id) $sql.= " AND (a.fk_soc IS NULL OR sc.fk_user = " .$user->id . ")";
-			if($user->societe_id)   $sql.= " AND s.rowid = ".$user->societe_id;
-			if (! $user->rights->agenda->allactions->read) $sql.= " AND (a.fk_user_author = ".$user->id . " OR a.fk_user_action = ".$user->id . " OR a.fk_user_done = ".$user->id . ")";
-			$sql.= " ORDER BY a.datec DESC";
-			$sql.= $db->plimit($max, 0);
+            $sql .= ", ta.code";
+            $sql .= ", ta.libelle as type_label";
+            $sql .= ", s.nom as name";
+            $sql .= ", s.rowid as socid";
+            $sql .= ", s.code_client";
+			$sql .= " FROM (".MAIN_DB_PREFIX."c_actioncomm AS ta, ";
+			$sql .= MAIN_DB_PREFIX."actioncomm AS a)";
+			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON a.fk_soc = sc.fk_soc";
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON a.fk_soc = s.rowid";
+			$sql .= " WHERE a.fk_action = ta.id";
+			$sql .= " AND a.entity = ".$conf->entity;
+			$sql .= " AND a.percent >= 0 AND a.percent < 100";
+			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= " AND (a.fk_soc IS NULL OR sc.fk_user = ".$user->id.")";
+			if ($user->societe_id)   $sql .= " AND s.rowid = ".$user->societe_id;
+			if (!$user->rights->agenda->allactions->read) $sql .= " AND (a.fk_user_author = ".$user->id." OR a.fk_user_action = ".$user->id." OR a.fk_user_done = ".$user->id.")";
+			$sql .= " ORDER BY a.datec DESC";
+			$sql .= $db->plimit($max, 0);
 
 			dol_syslog("Box_actions::loadBox", LOG_DEBUG);
 			$result = $db->query($sql);
             if ($result) {
-				$now=dol_now();
-				$delay_warning = $conf->global->MAIN_DELAY_ACTIONS_TODO*24*60*60;
+				$now = dol_now();
+				$delay_warning = $conf->global->MAIN_DELAY_ACTIONS_TODO * 24 * 60 * 60;
 
 				$num = $db->num_rows($result);
 				$line = 0;
@@ -122,11 +122,11 @@ 
                     $societestatic->name = $objp->name;
                     $societestatic->code_client = $objp->code_client;
 
-                    if ($objp->percentage >= 0 && $objp->percentage < 100 && $datelimite  < ($now - $delay_warning))
-                        $late=img_warning($langs->trans("Late"));
+                    if ($objp->percentage >= 0 && $objp->percentage < 100 && $datelimite < ($now - $delay_warning))
+                        $late = img_warning($langs->trans("Late"));
 
 					//($langs->transnoentities("Action".$objp->code)!=("Action".$objp->code) ? $langs->transnoentities("Action".$objp->code) : $objp->label)
-					$label = empty($objp->label)?$objp->type_label:$objp->label;
+					$label = empty($objp->label) ? $objp->type_label : $objp->label;
 
                     $this->info_box_contents[$line][] = array(
                         'td' => '',
@@ -148,18 +148,18 @@ 
 
                     $this->info_box_contents[$line][] = array(
                         'td' => 'class="right"',
-                        'text' => ($objp->percentage>= 0?$objp->percentage.'%':''),
+                        'text' => ($objp->percentage >= 0 ? $objp->percentage.'%' : ''),
                     );
 
                     $this->info_box_contents[$line][] = array(
                         'td' => 'align="right" width="18"',
-                        'text' => $actionstatic->LibStatut($objp->percentage,3),
+                        'text' => $actionstatic->LibStatut($objp->percentage, 3),
                     );
 
                     $line++;
                 }
 
-                if ($num==0)
+                if ($num == 0)
                     $this->info_box_contents[$line][0] = array(
                         'td' => 'align="center"',
                         'text'=>$langs->trans("NoActionsToDo"),
@@ -189,68 +189,68 @@ 
 	 *  @param	int		$nooutput	No print, only return string
 	 *	@return	string
 	 */
-    function showBox($head = null, $contents = null, $nooutput=0)
+    function showBox($head = null, $contents = null, $nooutput = 0)
     {
 		global $langs, $conf;
 		$out = parent::showBox($this->info_box_head, $this->info_box_contents);
 
-        if (! empty($conf->global->SHOW_DIALOG_HOMEPAGE))
+        if (!empty($conf->global->SHOW_DIALOG_HOMEPAGE))
         {
-			$actioncejour=false;
-			$contents=$this->info_box_contents;
-			$nblines=count($contents);
+			$actioncejour = false;
+			$contents = $this->info_box_contents;
+			$nblines = count($contents);
 			if ($contents[0][0]['text'] != $langs->trans("NoActionsToDo"))
 			{
-				$out.= '<div id="dialogboxaction" title="'.$nblines." ".$langs->trans("ActionsToDo").'">';
-				$out.= '<table width=100%>';
-				for ($line=0, $n=$nblines; $line < $n; $line++)
+				$out .= '<div id="dialogboxaction" title="'.$nblines." ".$langs->trans("ActionsToDo").'">';
+				$out .= '<table width=100%>';
+				for ($line = 0, $n = $nblines; $line < $n; $line++)
 				{
 					if (isset($contents[$line]))
 					{
 						// on affiche que les évènement du jours ou passé
 						// qui ne sont pas à 100%
-						$actioncejour=true;
+						$actioncejour = true;
 
 						// TR
-						$logo=$contents[$line][0]['logo'];
-						$label=$contents[$line][1]['text'];
-						$urlevent=$contents[$line][1]['url'];
-						$logosoc=$contents[$line][2]['logo'];
-						$nomsoc=$contents[$line][3]['text'];
-						$urlsoc=$contents[$line][3]['url'];
-						$dateligne=$contents[$line][4]['text'];
-						$percentage=$contents[$line][5]['text'];
-						$out.= '<tr class="oddeven">';
-						$out.= '<td align=center>';
-						$out.= img_object("",$logo);
-						$out.= '</td>';
-						$out.= '<td align=center><a href="'.$urlevent.'">'.$label.'</a></td>';
-						$out.= '<td align=center><a href="'.$urlsoc.'">'.img_object("",$logosoc)." ".$nomsoc.'</a></td>';
-						$out.= '<td align=center>'.$dateligne.'</td>';
-						$out.= '<td align=center>'.$percentage.'</td>';
-						$out.= '</tr>';
+						$logo = $contents[$line][0]['logo'];
+						$label = $contents[$line][1]['text'];
+						$urlevent = $contents[$line][1]['url'];
+						$logosoc = $contents[$line][2]['logo'];
+						$nomsoc = $contents[$line][3]['text'];
+						$urlsoc = $contents[$line][3]['url'];
+						$dateligne = $contents[$line][4]['text'];
+						$percentage = $contents[$line][5]['text'];
+						$out .= '<tr class="oddeven">';
+						$out .= '<td align=center>';
+						$out .= img_object("", $logo);
+						$out .= '</td>';
+						$out .= '<td align=center><a href="'.$urlevent.'">'.$label.'</a></td>';
+						$out .= '<td align=center><a href="'.$urlsoc.'">'.img_object("", $logosoc)." ".$nomsoc.'</a></td>';
+						$out .= '<td align=center>'.$dateligne.'</td>';
+						$out .= '<td align=center>'.$percentage.'</td>';
+						$out .= '</tr>';
 					}
 				}
-				$out.= '</table>';
+				$out .= '</table>';
 			}
-			$out.= '</div>';
+			$out .= '</div>';
 			if ($actioncejour)
 			{
-				$out.= '<script>';
-				$out.= '$("#dialogboxaction").dialog({ autoOpen: true });';
+				$out .= '<script>';
+				$out .= '$("#dialogboxaction").dialog({ autoOpen: true });';
 				if ($conf->global->SHOW_DIALOG_HOMEPAGE > 1)    // autoclose after this delay
 				{
-					$out.= 'setTimeout(function(){';
-					$out.= '$("#dialogboxaction").dialog("close");';
-					$out.= '}, '.($conf->global->SHOW_DIALOG_HOMEPAGE*1000).');';
+					$out .= 'setTimeout(function(){';
+					$out .= '$("#dialogboxaction").dialog("close");';
+					$out .= '}, '.($conf->global->SHOW_DIALOG_HOMEPAGE * 1000).');';
 				}
-				$out.= '</script>';
+				$out .= '</script>';
 			}
 			else
 			{
-				$out.= '<script>';
-				$out.= '$("#dialogboxaction").dialog({ autoOpen: false });';
-				$out.= '</script>';
+				$out .= '<script>';
+				$out .= '$("#dialogboxaction").dialog({ autoOpen: false });';
+				$out .= '</script>';
 			}
 		}
 

Braces +27 added lines, -13 removed lines

@@ -91,14 +91,22 @@ 
             $sql.= ", s.code_client";
 			$sql.= " FROM (".MAIN_DB_PREFIX."c_actioncomm AS ta, ";
 			$sql.= MAIN_DB_PREFIX."actioncomm AS a)";
-			if (! $user->rights->societe->client->voir && ! $user->societe_id) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON a.fk_soc = sc.fk_soc";
+			if (! $user->rights->societe->client->voir && ! $user->societe_id) {
+			    $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON a.fk_soc = sc.fk_soc";
+			}
 			$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON a.fk_soc = s.rowid";
 			$sql.= " WHERE a.fk_action = ta.id";
 			$sql.= " AND a.entity = ".$conf->entity;
 			$sql.= " AND a.percent >= 0 AND a.percent < 100";
-			if (! $user->rights->societe->client->voir && ! $user->societe_id) $sql.= " AND (a.fk_soc IS NULL OR sc.fk_user = " .$user->id . ")";
-			if($user->societe_id)   $sql.= " AND s.rowid = ".$user->societe_id;
-			if (! $user->rights->agenda->allactions->read) $sql.= " AND (a.fk_user_author = ".$user->id . " OR a.fk_user_action = ".$user->id . " OR a.fk_user_done = ".$user->id . ")";
+			if (! $user->rights->societe->client->voir && ! $user->societe_id) {
+			    $sql.= " AND (a.fk_soc IS NULL OR sc.fk_user = " .$user->id . ")";
+			}
+			if($user->societe_id) {
+			    $sql.= " AND s.rowid = ".$user->societe_id;
+			}
+			if (! $user->rights->agenda->allactions->read) {
+			    $sql.= " AND (a.fk_user_author = ".$user->id . " OR a.fk_user_action = ".$user->id . " OR a.fk_user_done = ".$user->id . ")";
+			}
 			$sql.= " ORDER BY a.datec DESC";
 			$sql.= $db->plimit($max, 0);
 
@@ -122,8 +130,9 @@ 
                     $societestatic->name = $objp->name;
                     $societestatic->code_client = $objp->code_client;
 
-                    if ($objp->percentage >= 0 && $objp->percentage < 100 && $datelimite  < ($now - $delay_warning))
-                        $late=img_warning($langs->trans("Late"));
+                    if ($objp->percentage >= 0 && $objp->percentage < 100 && $datelimite  < ($now - $delay_warning)) {
+                                            $late=img_warning($langs->trans("Late"));
+                    }
 
 					//($langs->transnoentities("Action".$objp->code)!=("Action".$objp->code) ? $langs->transnoentities("Action".$objp->code) : $objp->label)
 					$label = empty($objp->label)?$objp->type_label:$objp->label;
@@ -159,11 +168,12 @@ 
                     $line++;
                 }
 
-                if ($num==0)
-                    $this->info_box_contents[$line][0] = array(
+                if ($num==0) {
+                                    $this->info_box_contents[$line][0] = array(
                         'td' => 'align="center"',
                         'text'=>$langs->trans("NoActionsToDo"),
                     );
+                }
 
                 $db->free($result);
             } else {
@@ -238,15 +248,16 @@ 
 			{
 				$out.= '<script>';
 				$out.= '$("#dialogboxaction").dialog({ autoOpen: true });';
-				if ($conf->global->SHOW_DIALOG_HOMEPAGE > 1)    // autoclose after this delay
+				if ($conf->global->SHOW_DIALOG_HOMEPAGE > 1) {
+				    // autoclose after this delay
 				{
 					$out.= 'setTimeout(function(){';
+				}
 					$out.= '$("#dialogboxaction").dialog("close");';
 					$out.= '}, '.($conf->global->SHOW_DIALOG_HOMEPAGE*1000).');';
 				}
 				$out.= '</script>';
-			}
-			else
+			} else
 			{
 				$out.= '<script>';
 				$out.= '$("#dialogboxaction").dialog({ autoOpen: false });';
@@ -254,8 +265,11 @@ 
 			}
 		}
 
-		if ($nooutput) return $out;
-		else print $out;
+		if ($nooutput) {
+		    return $out;
+		} else {
+		    print $out;
+		}
 
 		return '';
 	}