alxarafe / alixar

dolibarr/htdocs/core/boxes/box_comptes.php

Indentation +55 added lines, -55 removed lines

@@ -33,71 +33,71 @@ 
  */
 class box_comptes extends ModeleBoxes
 {
-	var $boxcode="currentaccounts";
-	var $boximg="object_bill";
-	var $boxlabel="BoxCurrentAccounts";
-	var $depends = array("banque");     // Box active if module banque active
+    var $boxcode="currentaccounts";
+    var $boximg="object_bill";
+    var $boxlabel="BoxCurrentAccounts";
+    var $depends = array("banque");     // Box active if module banque active
 
-	/**
+    /**
      * @var DoliDB Database handler.
      */
     public $db;
     
-	var $param;
-	var $enabled = 1;
+    var $param;
+    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 module for such cases
-		$listofmodulesforexternal=explode(',',$conf->global->MAIN_MODULES_FOR_EXTERNAL);
-		if (! in_array('banque',$listofmodulesforexternal) && ! empty($user->societe_id)) $this->enabled=0;	// disabled for external users
+        // disable module for such cases
+        $listofmodulesforexternal=explode(',',$conf->global->MAIN_MODULES_FOR_EXTERNAL);
+        if (! in_array('banque',$listofmodulesforexternal) && ! empty($user->societe_id)) $this->enabled=0;	// disabled for external users
 
-		$this->hidden = ! ($user->rights->banque->lire);
-	}
+        $this->hidden = ! ($user->rights->banque->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;
+     */
+    function loadBox($max=5)
+    {
+        global $user, $langs, $db, $conf;
 
-		$this->max=$max;
+        $this->max=$max;
 
-		$this->info_box_head = array('text' => $langs->trans("BoxTitleCurrentAccounts"));
+        $this->info_box_head = array('text' => $langs->trans("BoxTitleCurrentAccounts"));
 
         if ($user->rights->banque->lire) {
-			$sql = "SELECT b.rowid, b.ref, b.label, b.bank,b.number, b.courant, b.clos, b.rappro, b.url";
-			$sql.= ", b.code_banque, b.code_guichet, b.cle_rib, b.bic, b.iban_prefix as iban";
-			$sql.= ", b.domiciliation, b.proprio, b.owner_address";
-			$sql.= ", b.account_number, b.currency_code";
-			$sql.= ", b.min_allowed, b.min_desired, comment";
+            $sql = "SELECT b.rowid, b.ref, b.label, b.bank,b.number, b.courant, b.clos, b.rappro, b.url";
+            $sql.= ", b.code_banque, b.code_guichet, b.cle_rib, b.bic, b.iban_prefix as iban";
+            $sql.= ", b.domiciliation, b.proprio, b.owner_address";
+            $sql.= ", b.account_number, b.currency_code";
+            $sql.= ", b.min_allowed, b.min_desired, comment";
             $sql.= ', b.fk_accountancy_journal';
             $sql.= ', aj.code as accountancy_journal';
             $sql.= " FROM ".MAIN_DB_PREFIX."bank_account as b";
             $sql.= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'accounting_journal as aj ON aj.rowid=b.fk_accountancy_journal';
             $sql.= " WHERE b.entity = ".$conf->entity;
-			$sql.= " AND clos = 0";
-			//$sql.= " AND courant = 1";
-			$sql.= " ORDER BY label";
-			$sql.= $db->plimit($max, 0);
+            $sql.= " AND clos = 0";
+            //$sql.= " AND courant = 1";
+            $sql.= " ORDER BY label";
+            $sql.= $db->plimit($max, 0);
 
             dol_syslog(get_class($this)."::loadBox", LOG_DEBUG);
             $result = $db->query($sql);
@@ -112,7 +112,7 @@ 
                     $objp = $db->fetch_object($result);
 
                     $account_static->id = $objp->rowid;
-					$account_static->ref = $objp->ref;
+                    $account_static->ref = $objp->ref;
                     $account_static->label = $objp->label;
                     $account_static->number = $objp->number;
                     $account_static->account_number = $objp->account_number;
@@ -174,19 +174,19 @@ 
                 '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 +24 added lines, -24 removed lines

@@ -33,10 +33,10 @@ 
  */
 class box_comptes extends ModeleBoxes
 {
-	var $boxcode="currentaccounts";
-	var $boximg="object_bill";
-	var $boxlabel="BoxCurrentAccounts";
-	var $depends = array("banque");     // Box active if module banque active
+	var $boxcode = "currentaccounts";
+	var $boximg = "object_bill";
+	var $boxlabel = "BoxCurrentAccounts";
+	var $depends = array("banque"); // Box active if module banque active
 
 	/**
      * @var DoliDB Database handler.
@@ -56,17 +56,17 @@ 
 	 *  @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 module for such cases
-		$listofmodulesforexternal=explode(',',$conf->global->MAIN_MODULES_FOR_EXTERNAL);
-		if (! in_array('banque',$listofmodulesforexternal) && ! empty($user->societe_id)) $this->enabled=0;	// disabled for external users
+		$listofmodulesforexternal = explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL);
+		if (!in_array('banque', $listofmodulesforexternal) && !empty($user->societe_id)) $this->enabled = 0; // disabled for external users
 
-		$this->hidden = ! ($user->rights->banque->lire);
+		$this->hidden = !($user->rights->banque->lire);
 	}
 
 	/**
@@ -75,29 +75,29 @@ 
 	 *  @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;
 
 		$this->info_box_head = array('text' => $langs->trans("BoxTitleCurrentAccounts"));
 
         if ($user->rights->banque->lire) {
 			$sql = "SELECT b.rowid, b.ref, b.label, b.bank,b.number, b.courant, b.clos, b.rappro, b.url";
-			$sql.= ", b.code_banque, b.code_guichet, b.cle_rib, b.bic, b.iban_prefix as iban";
-			$sql.= ", b.domiciliation, b.proprio, b.owner_address";
-			$sql.= ", b.account_number, b.currency_code";
-			$sql.= ", b.min_allowed, b.min_desired, comment";
-            $sql.= ', b.fk_accountancy_journal';
-            $sql.= ', aj.code as accountancy_journal';
-            $sql.= " FROM ".MAIN_DB_PREFIX."bank_account as b";
-            $sql.= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'accounting_journal as aj ON aj.rowid=b.fk_accountancy_journal';
-            $sql.= " WHERE b.entity = ".$conf->entity;
-			$sql.= " AND clos = 0";
+			$sql .= ", b.code_banque, b.code_guichet, b.cle_rib, b.bic, b.iban_prefix as iban";
+			$sql .= ", b.domiciliation, b.proprio, b.owner_address";
+			$sql .= ", b.account_number, b.currency_code";
+			$sql .= ", b.min_allowed, b.min_desired, comment";
+            $sql .= ', b.fk_accountancy_journal';
+            $sql .= ', aj.code as accountancy_journal';
+            $sql .= " FROM ".MAIN_DB_PREFIX."bank_account as b";
+            $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'accounting_journal as aj ON aj.rowid=b.fk_accountancy_journal';
+            $sql .= " WHERE b.entity = ".$conf->entity;
+			$sql .= " AND clos = 0";
 			//$sql.= " AND courant = 1";
-			$sql.= " ORDER BY label";
-			$sql.= $db->plimit($max, 0);
+			$sql .= " ORDER BY label";
+			$sql .= $db->plimit($max, 0);
 
             dol_syslog(get_class($this)."::loadBox", LOG_DEBUG);
             $result = $db->query($sql);
@@ -118,7 +118,7 @@ 
                     $account_static->account_number = $objp->account_number;
                     $account_static->currency_code = $objp->currency_code;
                     $account_static->accountancy_journal = $objp->accountancy_journal;
-                    $solde=$account_static->solde(0);
+                    $solde = $account_static->solde(0);
 
                     $solde_total[$objp->currency_code] += $solde;
 
@@ -184,7 +184,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, -1 removed lines

@@ -64,7 +64,10 @@
 
 		// disable module for such cases
 		$listofmodulesforexternal=explode(',',$conf->global->MAIN_MODULES_FOR_EXTERNAL);
-		if (! in_array('banque',$listofmodulesforexternal) && ! empty($user->societe_id)) $this->enabled=0;	// disabled for external users
+		if (! in_array('banque',$listofmodulesforexternal) && ! empty($user->societe_id)) {
+		    $this->enabled=0;
+		}
+		// disabled for external users
 
 		$this->hidden = ! ($user->rights->banque->lire);
 	}

dolibarr/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php

Indentation +230 added lines, -230 removed lines

@@ -28,255 +28,255 @@
  */
 class box_graph_invoices_supplier_permonth extends ModeleBoxes
 {
-	var $boxcode="invoicessupplierpermonth";
-	var $boximg="object_bill";
-	var $boxlabel="BoxSuppliersInvoicesPerMonth";
-	var $depends = array("fournisseur");
+    var $boxcode="invoicessupplierpermonth";
+    var $boximg="object_bill";
+    var $boxlabel="BoxSuppliersInvoicesPerMonth";
+    var $depends = array("fournisseur");
 
-	/**
+    /**
      * @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->fournisseur->facture->lire);
-	}
+        $this->hidden = ! ($user->rights->fournisseur->facture->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;
-
-		$this->max=$max;
-
-		$refreshaction='refresh_'.$this->boxcode;
-
-		include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
-
-		$text = $langs->trans("BoxSuppliersInvoicesPerMonth",$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
-
-		if ($user->rights->fournisseur->facture->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.'/compta/facture/class/facturestats.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='supplier';
-			$WIDTH=(($shownb && $showtot) || ! empty($conf->dol_optimize_smallscreen))?'256':'320';
-			$HEIGHT='192';
-
-			$stats = new FactureStats($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));
-
-				$filenamenb = $dir."/".$prefix."invoicessuppliernbinyear-".$year.".png";
-				if ($mode == 'customer') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstats&amp;file=invoicesnbinyear-'.$year.'.png';
-				if ($mode == 'supplier') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstatssupplier&amp;file=invoicessuppliernbinyear-'.$year.'.png';
-
-				$px1 = new DolGraph();
-				$mesg = $px1->isGraphKo();
-				if (! $mesg)
-				{
-				    $langs->load("bills");
-
-				    $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("NumberOfBills"));
-					$px1->SetShading(3);
-					$px1->SetHorizTickIncrement(1);
-					$px1->SetPrecisionY(0);
-					$px1->SetCssPrefix("cssboxes");
-					$px1->mode='depth';
-					$px1->SetTitle($langs->trans("NumberOfBillsByMonth"));
-
-					$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));
-
-				$filenamenb = $dir."/".$prefix."invoicessupplieramountinyear-".$year.".png";
-				if ($mode == 'customer') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstats&amp;file=invoicesamountinyear-'.$year.'.png';
-				if ($mode == 'supplier') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstatssupplier&amp;file=invoicessupplieramountinyear-'.$year.'.png';
-
-				$px2 = new DolGraph();
-				$mesg = $px2->isGraphKo();
-				if (! $mesg)
-				{
-				    $langs->load("bills");
-
-					$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("AmountOfBillsHT"));
-					$px2->SetShading(3);
-					$px2->SetHorizTickIncrement(1);
-					$px2->SetPrecisionY(0);
-					$px2->SetCssPrefix("cssboxes");
-					$px2->mode='depth';
-					$px2->SetTitle($langs->trans("AmountOfBillsByMonthHT"));
-
-					$px2->draw($filenamenb,$fileurlnb);
-				}
-			}
-
-			if (empty($conf->use_javascript_ajax))
-			{
-				$langs->load("errors");
-				$mesg=$langs->trans("WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs");
-			}
-
-			if (! $mesg)
-			{
-				$stringtoshow='';
-				$stringtoshow.='<script type="text/javascript" language="javascript">
+     */
+    function loadBox($max=5)
+    {
+        global $conf, $user, $langs, $db;
+
+        $this->max=$max;
+
+        $refreshaction='refresh_'.$this->boxcode;
+
+        include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
+
+        $text = $langs->trans("BoxSuppliersInvoicesPerMonth",$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
+
+        if ($user->rights->fournisseur->facture->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.'/compta/facture/class/facturestats.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='supplier';
+            $WIDTH=(($shownb && $showtot) || ! empty($conf->dol_optimize_smallscreen))?'256':'320';
+            $HEIGHT='192';
+
+            $stats = new FactureStats($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));
+
+                $filenamenb = $dir."/".$prefix."invoicessuppliernbinyear-".$year.".png";
+                if ($mode == 'customer') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstats&amp;file=invoicesnbinyear-'.$year.'.png';
+                if ($mode == 'supplier') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstatssupplier&amp;file=invoicessuppliernbinyear-'.$year.'.png';
+
+                $px1 = new DolGraph();
+                $mesg = $px1->isGraphKo();
+                if (! $mesg)
+                {
+                    $langs->load("bills");
+
+                    $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("NumberOfBills"));
+                    $px1->SetShading(3);
+                    $px1->SetHorizTickIncrement(1);
+                    $px1->SetPrecisionY(0);
+                    $px1->SetCssPrefix("cssboxes");
+                    $px1->mode='depth';
+                    $px1->SetTitle($langs->trans("NumberOfBillsByMonth"));
+
+                    $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));
+
+                $filenamenb = $dir."/".$prefix."invoicessupplieramountinyear-".$year.".png";
+                if ($mode == 'customer') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstats&amp;file=invoicesamountinyear-'.$year.'.png';
+                if ($mode == 'supplier') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstatssupplier&amp;file=invoicessupplieramountinyear-'.$year.'.png';
+
+                $px2 = new DolGraph();
+                $mesg = $px2->isGraphKo();
+                if (! $mesg)
+                {
+                    $langs->load("bills");
+
+                    $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("AmountOfBillsHT"));
+                    $px2->SetShading(3);
+                    $px2->SetHorizTickIncrement(1);
+                    $px2->SetPrecisionY(0);
+                    $px2->SetCssPrefix("cssboxes");
+                    $px2->mode='depth';
+                    $px2->SetTitle($langs->trans("AmountOfBillsByMonthHT"));
+
+                    $px2->draw($filenamenb,$fileurlnb);
+                }
+            }
+
+            if (empty($conf->use_javascript_ajax))
+            {
+                $langs->load("errors");
+                $mesg=$langs->trans("WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs");
+            }
+
+            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("NumberOfBillsByMonth");
-				$stringtoshow.=' &nbsp; ';
-				$stringtoshow.='<input type="checkbox" name="'.$param_showtot.'"'.($showtot?' checked':'').'> '.$langs->trans("AmountOfBillsByMonthHT");
-				$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("NumberOfBillsByMonth");
+                $stringtoshow.=' &nbsp; ';
+                $stringtoshow.='<input type="checkbox" name="'.$param_showtot.'"'.($showtot?' checked':'').'> '.$langs->trans("AmountOfBillsByMonthHT");
+                $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_invoices_supplier_permonth extends ModeleBoxes
 {
-	var $boxcode="invoicessupplierpermonth";
-	var $boximg="object_bill";
-	var $boxlabel="BoxSuppliersInvoicesPerMonth";
+	var $boxcode = "invoicessupplierpermonth";
+	var $boximg = "object_bill";
+	var $boxlabel = "BoxSuppliersInvoicesPerMonth";
 	var $depends = array("fournisseur");
 
 	/**
@@ -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->fournisseur->facture->lire);
+		$this->hidden = !($user->rights->fournisseur->facture->lire);
 	}
 
 	/**
@@ -63,17 +63,17 @@ 
 	 *  @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.'/fourn/class/fournisseur.facture.class.php';
 
-		$text = $langs->trans("BoxSuppliersInvoicesPerMonth",$max);
+		$text = $langs->trans("BoxSuppliersInvoicesPerMonth", $max);
 		$this->info_box_head = array(
 				'text' => $text,
 				'limit'=> dol_strlen($text),
@@ -85,48 +85,48 @@ 
 				'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->fournisseur->facture->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.'/compta/facture/class/facturestats.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='supplier';
-			$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 = 'supplier';
+			$WIDTH = (($shownb && $showtot) || !empty($conf->dol_optimize_smallscreen)) ? '256' : '320';
+			$HEIGHT = '192';
 
 			$stats = new FactureStats($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."invoicessuppliernbinyear-".$year.".png";
 				if ($mode == 'customer') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstats&amp;file=invoicesnbinyear-'.$year.'.png';
@@ -134,17 +134,17 @@ 
 
 				$px1 = new DolGraph();
 				$mesg = $px1->isGraphKo();
-				if (! $mesg)
+				if (!$mesg)
 				{
 				    $langs->load("bills");
 
 				    $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);
@@ -156,17 +156,17 @@ 
 					$px1->SetHorizTickIncrement(1);
 					$px1->SetPrecisionY(0);
 					$px1->SetCssPrefix("cssboxes");
-					$px1->mode='depth';
+					$px1->mode = 'depth';
 					$px1->SetTitle($langs->trans("NumberOfBillsByMonth"));
 
-					$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."invoicessupplieramountinyear-".$year.".png";
 				if ($mode == 'customer') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstats&amp;file=invoicesamountinyear-'.$year.'.png';
@@ -174,17 +174,17 @@ 
 
 				$px2 = new DolGraph();
 				$mesg = $px2->isGraphKo();
-				if (! $mesg)
+				if (!$mesg)
 				{
 				    $langs->load("bills");
 
 					$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);
@@ -196,64 +196,64 @@ 
 					$px2->SetHorizTickIncrement(1);
 					$px2->SetPrecisionY(0);
 					$px2->SetCssPrefix("cssboxes");
-					$px2->mode='depth';
+					$px2->mode = 'depth';
 					$px2->SetTitle($langs->trans("AmountOfBillsByMonthHT"));
 
-					$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("NumberOfBillsByMonth");
-				$stringtoshow.=' &nbsp; ';
-				$stringtoshow.='<input type="checkbox" name="'.$param_showtot.'"'.($showtot?' checked':'').'> '.$langs->trans("AmountOfBillsByMonthHT");
-				$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("NumberOfBillsByMonth");
+				$stringtoshow .= ' &nbsp; ';
+				$stringtoshow .= '<input type="checkbox" name="'.$param_showtot.'"'.($showtot ? ' checked' : '').'> '.$langs->trans("AmountOfBillsByMonthHT");
+				$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);
 			}
@@ -274,7 +274,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

@@ -88,8 +88,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->fournisseur->facture->lire)
 		{
@@ -105,8 +110,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'];
@@ -115,7 +119,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='supplier';
 			$WIDTH=(($shownb && $showtot) || ! empty($conf->dol_optimize_smallscreen))?'256':'320';
@@ -129,8 +135,12 @@ 
 				$data1 = $stats->getNbByMonthWithPrevYear($endyear,$startyear,(GETPOST('action','aZ09')==$refreshaction?-1:(3600*24)), ($WIDTH<300?2:0));
 
 				$filenamenb = $dir."/".$prefix."invoicessuppliernbinyear-".$year.".png";
-				if ($mode == 'customer') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstats&amp;file=invoicesnbinyear-'.$year.'.png';
-				if ($mode == 'supplier') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstatssupplier&amp;file=invoicessuppliernbinyear-'.$year.'.png';
+				if ($mode == 'customer') {
+				    $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstats&amp;file=invoicesnbinyear-'.$year.'.png';
+				}
+				if ($mode == 'supplier') {
+				    $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstatssupplier&amp;file=invoicessuppliernbinyear-'.$year.'.png';
+				}
 
 				$px1 = new DolGraph();
 				$mesg = $px1->isGraphKo();
@@ -169,8 +179,12 @@ 
 				$data2 = $stats->getAmountByMonthWithPrevYear($endyear,$startyear,(GETPOST('action','aZ09')==$refreshaction?-1:(3600*24)), ($WIDTH<300?2:0));
 
 				$filenamenb = $dir."/".$prefix."invoicessupplieramountinyear-".$year.".png";
-				if ($mode == 'customer') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstats&amp;file=invoicesamountinyear-'.$year.'.png';
-				if ($mode == 'supplier') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstatssupplier&amp;file=invoicessupplieramountinyear-'.$year.'.png';
+				if ($mode == 'customer') {
+				    $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstats&amp;file=invoicesamountinyear-'.$year.'.png';
+				}
+				if ($mode == 'supplier') {
+				    $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstatssupplier&amp;file=invoicessupplieramountinyear-'.$year.'.png';
+				}
 
 				$px2 = new DolGraph();
 				$mesg = $px2->isGraphKo();
@@ -237,28 +251,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_members.php

Indentation +78 added lines, -78 removed lines

@@ -32,96 +32,96 @@ 
  */
 class box_members extends ModeleBoxes
 {
-	var $boxcode="lastmembers";
-	var $boximg="object_user";
-	var $boxlabel="BoxLastMembers";
-	var $depends = array("adherent");
+    var $boxcode="lastmembers";
+    var $boximg="object_user";
+    var $boxlabel="BoxLastMembers";
+    var $depends = array("adherent");
 
-	/**
+    /**
      * @var DoliDB Database handler.
      */
     public $db;
     
-	var $param;
-	var $enabled = 1;
+    var $param;
+    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 module for such cases
-		$listofmodulesforexternal=explode(',',$conf->global->MAIN_MODULES_FOR_EXTERNAL);
-		if (! in_array('adherent',$listofmodulesforexternal) && ! empty($user->societe_id)) $this->enabled=0;	// disabled for external users
+        // disable module for such cases
+        $listofmodulesforexternal=explode(',',$conf->global->MAIN_MODULES_FOR_EXTERNAL);
+        if (! in_array('adherent',$listofmodulesforexternal) && ! empty($user->societe_id)) $this->enabled=0;	// disabled for external users
 
-		$this->hidden=! ($user->rights->adherent->lire);
-	}
+        $this->hidden=! ($user->rights->adherent->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");
+     */
+    function loadBox($max=5)
+    {
+        global $user, $langs, $db, $conf;
+        $langs->load("boxes");
 
-		$this->max=$max;
+        $this->max=$max;
 
         include_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
         $memberstatic=new Adherent($db);
 
-		$this->info_box_head = array('text' => $langs->trans("BoxTitleLastModifiedMembers",$max));
-
-		if ($user->rights->adherent->lire)
-		{
-			$sql = "SELECT a.rowid, a.lastname, a.firstname, a.societe as company, a.fk_soc,";
-			$sql.= " a.datec, a.tms, a.statut as status, a.datefin as date_end_subscription,";
-			$sql.= " t.subscription";
-			$sql.= " FROM ".MAIN_DB_PREFIX."adherent as a, ".MAIN_DB_PREFIX."adherent_type as t";
-			$sql.= " WHERE a.entity IN (".getEntity('member').")";
-			$sql.= " AND a.fk_adherent_type = t.rowid";
-			$sql.= " ORDER BY a.tms DESC";
-			$sql.= $db->plimit($max, 0);
-
-			$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);
-
-					$memberstatic->lastname=$objp->lastname;
-					$memberstatic->firstname=$objp->firstname;
-					$memberstatic->id = $objp->rowid;
+        $this->info_box_head = array('text' => $langs->trans("BoxTitleLastModifiedMembers",$max));
+
+        if ($user->rights->adherent->lire)
+        {
+            $sql = "SELECT a.rowid, a.lastname, a.firstname, a.societe as company, a.fk_soc,";
+            $sql.= " a.datec, a.tms, a.statut as status, a.datefin as date_end_subscription,";
+            $sql.= " t.subscription";
+            $sql.= " FROM ".MAIN_DB_PREFIX."adherent as a, ".MAIN_DB_PREFIX."adherent_type as t";
+            $sql.= " WHERE a.entity IN (".getEntity('member').")";
+            $sql.= " AND a.fk_adherent_type = t.rowid";
+            $sql.= " ORDER BY a.tms DESC";
+            $sql.= $db->plimit($max, 0);
+
+            $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);
+
+                    $memberstatic->lastname=$objp->lastname;
+                    $memberstatic->firstname=$objp->firstname;
+                    $memberstatic->id = $objp->rowid;
                     $memberstatic->ref = $objp->rowid;
                     $memberstatic->company = $objp->company;
 
-					if (! empty($objp->fk_soc)) {
-						$memberstatic->socid = $objp->fk_soc;
-						$memberstatic->fetch_thirdparty();
-						$memberstatic->name=$memberstatic->thirdparty->name;
-					} else {
-						$memberstatic->name=$objp->company;
-					}
+                    if (! empty($objp->fk_soc)) {
+                        $memberstatic->socid = $objp->fk_soc;
+                        $memberstatic->fetch_thirdparty();
+                        $memberstatic->name=$memberstatic->thirdparty->name;
+                    } else {
+                        $memberstatic->name=$objp->company;
+                    }
 
                     $this->info_box_contents[$line][] = array(
                         'td' => '',
@@ -170,17 +170,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 +28 added lines, -28 removed lines

@@ -32,9 +32,9 @@ 
  */
 class box_members extends ModeleBoxes
 {
-	var $boxcode="lastmembers";
-	var $boximg="object_user";
-	var $boxlabel="BoxLastMembers";
+	var $boxcode = "lastmembers";
+	var $boximg = "object_user";
+	var $boxlabel = "BoxLastMembers";
 	var $depends = array("adherent");
 
 	/**
@@ -55,17 +55,17 @@ 
 	 *  @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 module for such cases
-		$listofmodulesforexternal=explode(',',$conf->global->MAIN_MODULES_FOR_EXTERNAL);
-		if (! in_array('adherent',$listofmodulesforexternal) && ! empty($user->societe_id)) $this->enabled=0;	// disabled for external users
+		$listofmodulesforexternal = explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL);
+		if (!in_array('adherent', $listofmodulesforexternal) && !empty($user->societe_id)) $this->enabled = 0; // disabled for external users
 
-		$this->hidden=! ($user->rights->adherent->lire);
+		$this->hidden = !($user->rights->adherent->lire);
 	}
 
 	/**
@@ -74,28 +74,28 @@ 
 	 *  @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.'/adherents/class/adherent.class.php';
-        $memberstatic=new Adherent($db);
+        $memberstatic = new Adherent($db);
 
-		$this->info_box_head = array('text' => $langs->trans("BoxTitleLastModifiedMembers",$max));
+		$this->info_box_head = array('text' => $langs->trans("BoxTitleLastModifiedMembers", $max));
 
 		if ($user->rights->adherent->lire)
 		{
 			$sql = "SELECT a.rowid, a.lastname, a.firstname, a.societe as company, a.fk_soc,";
-			$sql.= " a.datec, a.tms, a.statut as status, a.datefin as date_end_subscription,";
-			$sql.= " t.subscription";
-			$sql.= " FROM ".MAIN_DB_PREFIX."adherent as a, ".MAIN_DB_PREFIX."adherent_type as t";
-			$sql.= " WHERE a.entity IN (".getEntity('member').")";
-			$sql.= " AND a.fk_adherent_type = t.rowid";
-			$sql.= " ORDER BY a.tms DESC";
-			$sql.= $db->plimit($max, 0);
+			$sql .= " a.datec, a.tms, a.statut as status, a.datefin as date_end_subscription,";
+			$sql .= " t.subscription";
+			$sql .= " FROM ".MAIN_DB_PREFIX."adherent as a, ".MAIN_DB_PREFIX."adherent_type as t";
+			$sql .= " WHERE a.entity IN (".getEntity('member').")";
+			$sql .= " AND a.fk_adherent_type = t.rowid";
+			$sql .= " ORDER BY a.tms DESC";
+			$sql .= $db->plimit($max, 0);
 
 			$result = $db->query($sql);
 			if ($result)
@@ -106,21 +106,21 @@ 
 				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);
 
-					$memberstatic->lastname=$objp->lastname;
-					$memberstatic->firstname=$objp->firstname;
+					$memberstatic->lastname = $objp->lastname;
+					$memberstatic->firstname = $objp->firstname;
 					$memberstatic->id = $objp->rowid;
                     $memberstatic->ref = $objp->rowid;
                     $memberstatic->company = $objp->company;
 
-					if (! empty($objp->fk_soc)) {
+					if (!empty($objp->fk_soc)) {
 						$memberstatic->socid = $objp->fk_soc;
 						$memberstatic->fetch_thirdparty();
-						$memberstatic->name=$memberstatic->thirdparty->name;
+						$memberstatic->name = $memberstatic->thirdparty->name;
 					} else {
-						$memberstatic->name=$objp->company;
+						$memberstatic->name = $objp->company;
 					}
 
                     $this->info_box_contents[$line][] = array(
@@ -142,13 +142,13 @@ 
 
                     $this->info_box_contents[$line][] = array(
                         'td' => 'align="right" width="18"',
-                        'text' => $memberstatic->LibStatut($objp->status,$objp->subscription,$db->jdate($objp->date_end_subscription),3),
+                        'text' => $memberstatic->LibStatut($objp->status, $objp->subscription, $db->jdate($objp->date_end_subscription), 3),
                     );
 
                     $line++;
                 }
 
-                if ($num==0)
+                if ($num == 0)
                     $this->info_box_contents[$line][0] = array(
                         'td' => 'align="center"',
                         'text'=>$langs->trans("NoRecordedCustomers"),
@@ -178,7 +178,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 +7 added lines, -3 removed lines

@@ -63,7 +63,10 @@ 
 
 		// disable module for such cases
 		$listofmodulesforexternal=explode(',',$conf->global->MAIN_MODULES_FOR_EXTERNAL);
-		if (! in_array('adherent',$listofmodulesforexternal) && ! empty($user->societe_id)) $this->enabled=0;	// disabled for external users
+		if (! in_array('adherent',$listofmodulesforexternal) && ! empty($user->societe_id)) {
+		    $this->enabled=0;
+		}
+		// disabled for external users
 
 		$this->hidden=! ($user->rights->adherent->lire);
 	}
@@ -148,11 +151,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("NoRecordedCustomers"),
                     );
+                }
 
                 $db->free($result);
             } else {

dolibarr/htdocs/core/boxes/box_prospect.php

Indentation +73 added lines, -73 removed lines

@@ -34,87 +34,87 @@ 
  */
 class box_prospect extends ModeleBoxes
 {
-	var $boxcode="lastprospects";
-	var $boximg="object_company";
-	var $boxlabel="BoxLastProspects";
-	var $depends = array("societe");
+    var $boxcode="lastprospects";
+    var $boximg="object_company";
+    var $boxlabel="BoxLastProspects";
+    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_PROSPECTS)) $this->enabled=0;	// disabled by this option
+        // disable box for such cases
+        if (! empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) $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 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;
+     */
+    function loadBox($max=5)
+    {
+        global $user, $langs, $db, $conf;
 
-		$this->max=$max;
+        $this->max=$max;
 
-		$thirdpartystatic=new Client($db);
+        $thirdpartystatic=new Client($db);
 
-		$this->info_box_head = array('text' => $langs->trans("BoxTitleLastModifiedProspects",$max));
+        $this->info_box_head = array('text' => $langs->trans("BoxTitleLastModifiedProspects",$max));
 
-		if ($user->rights->societe->lire)
-		{
-			$sql = "SELECT s.nom as name, s.rowid as socid";
-			$sql.= ", s.code_client";
+        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.logo";
-			$sql.= ", s.fk_stcomm, 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 (2, 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);
-			$resql = $db->query($sql);
-			if ($resql)
-			{
-				$num = $db->num_rows($resql);
-
-				$line = 0;
-				while ($line < $num)
-				{
-					$objp = $db->fetch_object($resql);
-					$datec=$db->jdate($objp->datec);
-					$datem=$db->jdate($objp->tms);
-					$thirdpartystatic->id = $objp->socid;
+            $sql.= ", s.fk_stcomm, 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 (2, 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);
+            $resql = $db->query($sql);
+            if ($resql)
+            {
+                $num = $db->num_rows($resql);
+
+                $line = 0;
+                while ($line < $num)
+                {
+                    $objp = $db->fetch_object($resql);
+                    $datec=$db->jdate($objp->datec);
+                    $datem=$db->jdate($objp->tms);
+                    $thirdpartystatic->id = $objp->socid;
                     $thirdpartystatic->name = $objp->name;
                     $thirdpartystatic->code_client = $objp->code_client;
                     $thirdpartystatic->code_fournisseur = $objp->code_fournisseur;
@@ -125,7 +125,7 @@ 
                     $this->info_box_contents[$line][] = array(
                         'td' => '',
                         'text' => $thirdpartystatic->getNomUrl(1),
-                    	'asis' => 1,
+                        'asis' => 1,
                     );
 
                     $this->info_box_contents[$line][] = array(
@@ -165,20 +165,20 @@ 
                 '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 +30 added lines, -30 removed lines

@@ -34,9 +34,9 @@ 
  */
 class box_prospect extends ModeleBoxes
 {
-	var $boxcode="lastprospects";
-	var $boximg="object_company";
-	var $boxlabel="BoxLastProspects";
+	var $boxcode = "lastprospects";
+	var $boximg = "object_company";
+	var $boxlabel = "BoxLastProspects";
 	var $depends = array("societe");
 
 	/**
@@ -56,16 +56,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_PROSPECTS)) $this->enabled=0;	// disabled by this option
+		if (!empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) $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));
 	}
 
 	/**
@@ -74,33 +74,33 @@ 
 	 *  @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;
 
-		$thirdpartystatic=new Client($db);
+		$thirdpartystatic = new Client($db);
 
-		$this->info_box_head = array('text' => $langs->trans("BoxTitleLastModifiedProspects",$max));
+		$this->info_box_head = array('text' => $langs->trans("BoxTitleLastModifiedProspects", $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.logo";
-			$sql.= ", s.fk_stcomm, 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 (2, 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.logo";
+			$sql .= ", s.fk_stcomm, 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 (2, 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);
 			$resql = $db->query($sql);
@@ -112,8 +112,8 @@ 
 				while ($line < $num)
 				{
 					$objp = $db->fetch_object($resql);
-					$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;
@@ -135,18 +135,18 @@ 
 
                     $this->info_box_contents[$line][] = array(
                         'td' => 'align="right" width="18"',
-                        'text' => str_replace('img ','img height="14" ',$thirdpartystatic->LibProspCommStatut($objp->fk_stcomm,3)),
+                        'text' => str_replace('img ', 'img height="14" ', $thirdpartystatic->LibProspCommStatut($objp->fk_stcomm, 3)),
                     );
 
                     $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)
+                if ($num == 0)
                     $this->info_box_contents[$line][0] = array(
                         'td' => 'align="center"',
                         'text'=>$langs->trans("NoRecordedProspects"),
@@ -176,7 +176,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 +16 added lines, -6 removed lines

@@ -63,7 +63,10 @@ 
 		$this->db = $db;
 
 		// disable box for such cases
-		if (! empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) $this->enabled=0;	// disabled by this option
+		if (! empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) {
+		    $this->enabled=0;
+		}
+		// disabled by this option
 
 		$this->hidden=! ($user->rights->societe->lire && empty($user->socid));
 	}
@@ -94,11 +97,17 @@ 
             $sql.= ", s.logo";
 			$sql.= ", s.fk_stcomm, 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 (2, 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);
 
@@ -146,11 +155,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("NoRecordedProspects"),
                 );
+                }
 
                 $db->free($resql);
             } else {

dolibarr/htdocs/core/boxes/box_graph_orders_supplier_permonth.php

Indentation +208 added lines, -208 removed lines

@@ -28,253 +28,253 @@
  */
 class box_graph_orders_supplier_permonth extends ModeleBoxes
 {
-	var $boxcode="orderssupplierpermonth";
-	var $boximg="object_order";
-	var $boxlabel="BoxSuppliersOrdersPerMonth";
-	var $depends = array("fournisseur");
+    var $boxcode="orderssupplierpermonth";
+    var $boximg="object_order";
+    var $boxlabel="BoxSuppliersOrdersPerMonth";
+    var $depends = array("fournisseur");
 
-	/**
+    /**
      * @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->fournisseur->commande->lire);
-	}
+        $this->hidden = ! ($user->rights->fournisseur->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.'/fourn/class/fournisseur.commande.class.php';
+        include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
 
-		$text = $langs->trans("BoxSuppliersOrdersPerMonth",$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("BoxSuppliersOrdersPerMonth",$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->fournisseur->commande->lire)
-		{
-		    $langs->load("orders");
+        if ($user->rights->fournisseur->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='supplier';
-			$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='supplier';
+            $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."orderssuppliernbinyear-".$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=orderssuppliernbinyear-'.$endyear.'.png';
+                $filenamenb = $dir."/".$prefix."orderssuppliernbinyear-".$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=orderssuppliernbinyear-'.$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."orderssupplieramountinyear-".$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=orderssupplieramountinyear-'.$endyear.'.png';
+                $filenamenb = $dir."/".$prefix."orderssupplieramountinyear-".$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=orderssupplieramountinyear-'.$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 +73 added lines, -73 removed lines

@@ -28,9 +28,9 @@ 
  */
 class box_graph_orders_supplier_permonth extends ModeleBoxes
 {
-	var $boxcode="orderssupplierpermonth";
-	var $boximg="object_order";
-	var $boxlabel="BoxSuppliersOrdersPerMonth";
+	var $boxcode = "orderssupplierpermonth";
+	var $boximg = "object_order";
+	var $boxlabel = "BoxSuppliersOrdersPerMonth";
 	var $depends = array("fournisseur");
 
 	/**
@@ -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->fournisseur->commande->lire);
+		$this->hidden = !($user->rights->fournisseur->commande->lire);
 	}
 
 	/**
@@ -63,17 +63,17 @@ 
 	 *  @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.'/fourn/class/fournisseur.commande.class.php';
 
-		$text = $langs->trans("BoxSuppliersOrdersPerMonth",$max);
+		$text = $langs->trans("BoxSuppliersOrdersPerMonth", $max);
 		$this->info_box_head = array(
 				'text' => $text,
 				'limit'=> dol_strlen($text),
@@ -85,50 +85,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->fournisseur->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='supplier';
-			$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 = 'supplier';
+			$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."orderssuppliernbinyear-".$endyear.".png";
 				if ($mode == 'customer') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&amp;file=ordersnbinyear-'.$endyear.'.png';
@@ -136,15 +136,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);
@@ -156,17 +156,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."orderssupplieramountinyear-".$endyear.".png";
 				if ($mode == 'customer') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&amp;file=ordersamountinyear-'.$endyear.'.png';
@@ -174,15 +174,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);
@@ -194,60 +194,60 @@ 
 					$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
 			{
@@ -272,7 +272,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

@@ -88,8 +88,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->fournisseur->commande->lire)
 		{
@@ -107,8 +112,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'];
@@ -117,7 +121,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='supplier';
 			$WIDTH=(($shownb && $showtot) || ! empty($conf->dol_optimize_smallscreen))?'256':'320';
@@ -131,8 +137,12 @@ 
 				$data1 = $stats->getNbByMonthWithPrevYear($endyear,$startyear,(GETPOST('action','aZ09')==$refreshaction?-1:(3600*24)), ($WIDTH<300?2:0));
 
 				$filenamenb = $dir."/".$prefix."orderssuppliernbinyear-".$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=orderssuppliernbinyear-'.$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=orderssuppliernbinyear-'.$endyear.'.png';
+				}
 
 				$px1 = new DolGraph();
 				$mesg = $px1->isGraphKo();
@@ -169,8 +179,12 @@ 
 				$data2 = $stats->getAmountByMonthWithPrevYear($endyear,$startyear,(GETPOST('action','aZ09')==$refreshaction?-1:(3600*24)), ($WIDTH<300?2:0));
 
 				$filenamenb = $dir."/".$prefix."orderssupplieramountinyear-".$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=orderssupplieramountinyear-'.$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=orderssupplieramountinyear-'.$endyear.'.png';
+				}
 
 				$px2 = new DolGraph();
 				$mesg = $px2->isGraphKo();
@@ -235,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_last_modified_ticket.php

Indentation +21 added lines, -21 removed lines

@@ -71,12 +71,12 @@ 
 
         $text = $langs->trans("BoxLastModifiedTicketDescription", $max);
         $this->info_box_head = array(
-         'text' => $text,
-         'limit' => dol_strlen($text)
+            'text' => $text,
+            'limit' => dol_strlen($text)
         );
 
         $this->info_box_contents[0][0] = array('td' => 'align="left"',
-         'text' => $langs->trans("BoxLastModifiedTicketContent"));
+            'text' => $langs->trans("BoxLastModifiedTicketContent"));
 
         if ($user->rights->ticket->read) {
             $sql = "SELECT t.rowid as id, t.ref, t.track_id, t.fk_soc, t.fk_user_create, t.fk_user_assign, t.subject, t.message, t.fk_statut, t.type_code, t.category_code, t.severity_code, t.datec, t.date_read, t.date_close, t.origin_email ";
@@ -119,39 +119,39 @@ 
 
                     // Picto
                     $this->info_box_contents[$i][0] = array(
-                     'td' => 'align="left" width="16"',
-                     'logo' => $this->boximg,
-                     'url' => dol_buildpath("/ticket/card.php?track_id=".$objp->track_id, 1));
+                        'td' => 'align="left" width="16"',
+                        'logo' => $this->boximg,
+                        'url' => dol_buildpath("/ticket/card.php?track_id=".$objp->track_id, 1));
                     $r++;
 
                     // Id
                     $this->info_box_contents[$i][$r] = array(
-                     'td' => 'align="left"',
-                     'text' => $objp->ref,
-                     'url' => dol_buildpath("/ticket/card.php?track_id=".$objp->track_id, 1));
+                        'td' => 'align="left"',
+                        'text' => $objp->ref,
+                        'url' => dol_buildpath("/ticket/card.php?track_id=".$objp->track_id, 1));
                     $r++;
 
                     // Subject
                     $this->info_box_contents[$i][$r] = array(
-                     'td' => 'align="left"',
-                     'text' => $objp->subject,    // Some event have no ref
-                     'url' => dol_buildpath("/ticket/card.php?track_id=".$objp->track_id, 1));
+                        'td' => 'align="left"',
+                        'text' => $objp->subject,    // Some event have no ref
+                        'url' => dol_buildpath("/ticket/card.php?track_id=".$objp->track_id, 1));
                     $r++;
 
                     // Customer
                     $this->info_box_contents[$i][$r] = array(
-                     'td' => 'align="left"',
-                     'logo' => ($objp->fk_soc>0?'company':''),
-                     'text' => ($objp->company_name?$objp->company_name:$objp->origin_email),
-                     'url' => ($objp->fk_soc>0?DOL_URL_ROOT."/comm/card.php?socid=".$objp->fk_soc:'')
+                        'td' => 'align="left"',
+                        'logo' => ($objp->fk_soc>0?'company':''),
+                        'text' => ($objp->company_name?$objp->company_name:$objp->origin_email),
+                        'url' => ($objp->fk_soc>0?DOL_URL_ROOT."/comm/card.php?socid=".$objp->fk_soc:'')
                     );
                     $r++;
 
 
                     // Date creation
                     $this->info_box_contents[$i][$r] = array(
-                     'td' => 'align="right"',
-                     'text' => dol_print_date($db->idate($objp->datec), 'dayhour')
+                        'td' => 'align="right"',
+                        'text' => dol_print_date($db->idate($objp->datec), 'dayhour')
                     );
                     $r++;
 
@@ -159,8 +159,8 @@ 
                     $ticketstat = new Ticket($this->db);
                     $ticketstat->fk_statut = $objp->fk_statut;
                     $this->info_box_contents[$i][$r] = array(
-                     'td' => 'align="right"',
-                     'text' => $ticketstat->getLibStatut(3)
+                        'td' => 'align="right"',
+                        'text' => $ticketstat->getLibStatut(3)
                     );
                     $r++;
 
@@ -175,7 +175,7 @@ 
             }
         } else {
             $this->info_box_contents[0][0] = array('td' => 'align="left"',
-             'text' => $langs->trans("ReadPermissionNotAllowed"));
+                'text' => $langs->trans("ReadPermissionNotAllowed"));
         }
     }
 

Spacing +25 added lines, -25 removed lines

@@ -22,7 +22,7 @@ 
  *     \ingroup     ticket
  *     \brief       This box shows latest modified tickets
  */
-require_once DOL_DOCUMENT_ROOT . "/core/boxes/modules_boxes.php";
+require_once DOL_DOCUMENT_ROOT."/core/boxes/modules_boxes.php";
 
 /**
  * Class to manage the box
@@ -80,42 +80,42 @@ 
 
         if ($user->rights->ticket->read) {
             $sql = "SELECT t.rowid as id, t.ref, t.track_id, t.fk_soc, t.fk_user_create, t.fk_user_assign, t.subject, t.message, t.fk_statut, t.type_code, t.category_code, t.severity_code, t.datec, t.date_read, t.date_close, t.origin_email ";
-            $sql.= ", type.label as type_label, category.label as category_label, severity.label as severity_label";
-            $sql.= ", s.nom as company_name";
-            $sql.= " FROM ".MAIN_DB_PREFIX."ticket as t";
-            $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_ticket_type as type ON type.code=t.type_code";
-            $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_ticket_category as category ON category.code=t.category_code";
-            $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_ticket_severity as severity ON severity.code=t.severity_code";
-            $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid=t.fk_soc";
-
-            $sql.= " WHERE t.entity = ".$conf->entity;
+            $sql .= ", type.label as type_label, category.label as category_label, severity.label as severity_label";
+            $sql .= ", s.nom as company_name";
+            $sql .= " FROM ".MAIN_DB_PREFIX."ticket as t";
+            $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_ticket_type as type ON type.code=t.type_code";
+            $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_ticket_category as category ON category.code=t.category_code";
+            $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_ticket_severity as severity ON severity.code=t.severity_code";
+            $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid=t.fk_soc";
+
+            $sql .= " WHERE t.entity = ".$conf->entity;
             //  		$sql.= " AND e.rowid = er.fk_event";
             //if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " WHERE s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
             if ($user->societe_id) {
-                $sql.= " AND t.fk_soc= ".$user->societe_id;
+                $sql .= " AND t.fk_soc= ".$user->societe_id;
             }
 
-            $sql.= " ORDER BY t.tms DESC, t.rowid DESC ";
-            $sql.= $db->plimit($max, 0);
+            $sql .= " ORDER BY t.tms DESC, t.rowid DESC ";
+            $sql .= $db->plimit($max, 0);
 
             $resql = $db->query($sql);
             if ($resql) {
                 $num = $db->num_rows($resql);
-                $now=gmmktime();
+                $now = gmmktime();
 
                 $i = 0;
 
                 while ($i < $num) {
                     $objp = $db->fetch_object($resql);
-                    $datec=$db->jdate($objp->datec);
-                    $dateterm=$db->jdate($objp->fin_validite);
-                    $dateclose=$db->jdate($objp->date_cloture);
+                    $datec = $db->jdate($objp->datec);
+                    $dateterm = $db->jdate($objp->fin_validite);
+                    $dateclose = $db->jdate($objp->date_cloture);
                     $late = '';
 
                     $ticket = new Ticket($this->db);
 
 
-                    $r=0;
+                    $r = 0;
 
                     // Picto
                     $this->info_box_contents[$i][0] = array(
@@ -134,16 +134,16 @@ 
                     // Subject
                     $this->info_box_contents[$i][$r] = array(
                      'td' => 'align="left"',
-                     'text' => $objp->subject,    // Some event have no ref
+                     'text' => $objp->subject, // Some event have no ref
                      'url' => dol_buildpath("/ticket/card.php?track_id=".$objp->track_id, 1));
                     $r++;
 
                     // Customer
                     $this->info_box_contents[$i][$r] = array(
                      'td' => 'align="left"',
-                     'logo' => ($objp->fk_soc>0?'company':''),
-                     'text' => ($objp->company_name?$objp->company_name:$objp->origin_email),
-                     'url' => ($objp->fk_soc>0?DOL_URL_ROOT."/comm/card.php?socid=".$objp->fk_soc:'')
+                     'logo' => ($objp->fk_soc > 0 ? 'company' : ''),
+                     'text' => ($objp->company_name ? $objp->company_name : $objp->origin_email),
+                     'url' => ($objp->fk_soc > 0 ?DOL_URL_ROOT."/comm/card.php?socid=".$objp->fk_soc : '')
                     );
                     $r++;
 
@@ -167,8 +167,8 @@ 
                     $i++;
                 }
 
-                if ($num==0) {
-                    $this->info_box_contents[$i][0] = array('td' => 'align="center"','text'=>$langs->trans("BoxLastModifiedTicketNoRecordedTickets"));
+                if ($num == 0) {
+                    $this->info_box_contents[$i][0] = array('td' => 'align="center"', 'text'=>$langs->trans("BoxLastModifiedTicketNoRecordedTickets"));
                 }
             } else {
                 dol_print_error($db);
@@ -187,7 +187,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)
     {
         parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
     }

dolibarr/htdocs/core/boxes/box_task.php

Braces +2 added lines, -1 removed lines

@@ -131,8 +131,9 @@
 
 					$i++;
 				}
+			} else {
+			    dol_print_error($this->db);
 			}
-			else dol_print_error($this->db);
 		}
 
 

Indentation +75 added lines, -75 removed lines

@@ -69,47 +69,47 @@ 
         $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;
-
-		$this->max=$max;
-
-		$totalMnt = 0;
-		$totalnb = 0;
-		$totalDuree=0;
-		$totalplannedtot=0;
-		$totaldurationtot=0;
+    /**
+     *  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;
+
+        $totalMnt = 0;
+        $totalnb = 0;
+        $totalDuree=0;
+        $totalplannedtot=0;
+        $totaldurationtot=0;
 		
-		include_once DOL_DOCUMENT_ROOT."/projet/class/task.class.php";
-		$taskstatic=new Task($db);
-
-
-		$textHead = $langs->trans("Tasks")." ".date("Y");
-		$this->info_box_head = array('text' => $textHead, 'limit'=> dol_strlen($textHead));
-
-		// list the summary of the orders
-		if ($user->rights->projet->lire) {
-			// FIXME fk_statut on a task is not be used. We use the percent. This means this box is useless.
-			$sql = "SELECT pt.fk_statut, count(DISTINCT pt.rowid) as nb, sum(ptt.task_duration) as durationtot, sum(pt.planned_workload) as plannedtot";
-			$sql.= " FROM ".MAIN_DB_PREFIX."projet_task as pt, ".MAIN_DB_PREFIX."projet_task_time as ptt";
-			$sql.= " WHERE pt.datec BETWEEN '".$this->db->idate(dol_get_first_day(date("Y"), 1))."' AND '".$this->db->idate(dol_get_last_day(date("Y"), 12))."'";
-			$sql.= " AND pt.rowid = ptt.fk_task";
-			$sql.= " GROUP BY pt.fk_statut ";
-			$sql.= " ORDER BY pt.fk_statut DESC";
-			$sql.= $db->plimit($max, 0);
-
-			$result = $db->query($sql);
-			if ($result)
-			{
-				$num = $db->num_rows($result);
-				$i = 0;
+        include_once DOL_DOCUMENT_ROOT."/projet/class/task.class.php";
+        $taskstatic=new Task($db);
+
+
+        $textHead = $langs->trans("Tasks")." ".date("Y");
+        $this->info_box_head = array('text' => $textHead, 'limit'=> dol_strlen($textHead));
+
+        // list the summary of the orders
+        if ($user->rights->projet->lire) {
+            // FIXME fk_statut on a task is not be used. We use the percent. This means this box is useless.
+            $sql = "SELECT pt.fk_statut, count(DISTINCT pt.rowid) as nb, sum(ptt.task_duration) as durationtot, sum(pt.planned_workload) as plannedtot";
+            $sql.= " FROM ".MAIN_DB_PREFIX."projet_task as pt, ".MAIN_DB_PREFIX."projet_task_time as ptt";
+            $sql.= " WHERE pt.datec BETWEEN '".$this->db->idate(dol_get_first_day(date("Y"), 1))."' AND '".$this->db->idate(dol_get_last_day(date("Y"), 12))."'";
+            $sql.= " AND pt.rowid = ptt.fk_task";
+            $sql.= " GROUP BY pt.fk_statut ";
+            $sql.= " ORDER BY pt.fk_statut DESC";
+            $sql.= $db->plimit($max, 0);
+
+            $result = $db->query($sql);
+            if ($result)
+            {
+                $num = $db->num_rows($result);
+                $i = 0;
                 while ($i < $num)
                 {
                     $objp = $db->fetch_object($result);
@@ -124,39 +124,39 @@ 
                         //'url' => DOL_URL_ROOT."/projet/tasks/list.php?leftmenu=projects&viewstatut=".$objp->fk_statut,
                         'url' => BASE_URI . "?controller=projet/tasks&method=list&leftmenu=projects&viewstatut=" . $objp->fk_statut,
                     );
-					$totalnb += $objp->nb;
-					$this->info_box_contents[$i][] = array('td' => 'class="right"', 'text' => ConvertSecondToTime($objp->plannedtot,'all',25200,5));
-					$totalplannedtot += $objp->plannedtot;
-					$this->info_box_contents[$i][] = array('td' => 'class="right"', 'text' => ConvertSecondToTime($objp->durationtot,'all',25200,5));
-					$totaldurationtot += $objp->durationtot;
-
-					$this->info_box_contents[$i][] = array('td' => 'align="right" width="18"', 'text' => $taskstatic->LibStatut($objp->fk_statut,3));
-
-					$i++;
-				}
-			}
-			else dol_print_error($this->db);
-		}
-
-
-		// Add the sum at the bottom of the boxes
-		$this->info_box_contents[$i][] = array('tr' => 'class="liste_total"', 'td' => '', 'text' => $langs->trans("Total")."&nbsp;".$textHead);
-		$this->info_box_contents[$i][] = array('td' => 'align="right" ', 'text' => number_format($totalnb, 0, ',', ' ')."&nbsp;".$langs->trans("Tasks"));
-		$this->info_box_contents[$i][] = array('td' => 'align="right" ', 'text' => ConvertSecondToTime($totalplannedtot,'all',25200,5));
-		$this->info_box_contents[$i][] = array('td' => 'align="right" ', 'text' => ConvertSecondToTime($totaldurationtot,'all',25200,5));
-		$this->info_box_contents[$i][] = array('td' => '', 'text' => "");
-	}
-
-	/**
-	 *	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);
-	}
+                    $totalnb += $objp->nb;
+                    $this->info_box_contents[$i][] = array('td' => 'class="right"', 'text' => ConvertSecondToTime($objp->plannedtot,'all',25200,5));
+                    $totalplannedtot += $objp->plannedtot;
+                    $this->info_box_contents[$i][] = array('td' => 'class="right"', 'text' => ConvertSecondToTime($objp->durationtot,'all',25200,5));
+                    $totaldurationtot += $objp->durationtot;
+
+                    $this->info_box_contents[$i][] = array('td' => 'align="right" width="18"', 'text' => $taskstatic->LibStatut($objp->fk_statut,3));
+
+                    $i++;
+                }
+            }
+            else dol_print_error($this->db);
+        }
+
+
+        // Add the sum at the bottom of the boxes
+        $this->info_box_contents[$i][] = array('tr' => 'class="liste_total"', 'td' => '', 'text' => $langs->trans("Total")."&nbsp;".$textHead);
+        $this->info_box_contents[$i][] = array('td' => 'align="right" ', 'text' => number_format($totalnb, 0, ',', ' ')."&nbsp;".$langs->trans("Tasks"));
+        $this->info_box_contents[$i][] = array('td' => 'align="right" ', 'text' => ConvertSecondToTime($totalplannedtot,'all',25200,5));
+        $this->info_box_contents[$i][] = array('td' => 'align="right" ', 'text' => ConvertSecondToTime($totaldurationtot,'all',25200,5));
+        $this->info_box_contents[$i][] = array('td' => '', 'text' => "");
+    }
+
+    /**
+     *	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 +26 added lines, -26 removed lines

@@ -33,8 +33,8 @@ 
  */
 class box_task extends ModeleBoxes
 {
-    public $boxcode="projet";
-    public $boximg="object_projecttask";
+    public $boxcode = "projet";
+    public $boximg = "object_projecttask";
     public $boxlabel;
     //public $depends = array("projet");
 
@@ -44,7 +44,7 @@ 
     public $db;
 
     public $param;
-    public $enabled = 0;		// Disabled because bugged.
+    public $enabled = 0; // Disabled because bugged.
 
     public $info_box_head = array();
     public $info_box_contents = array();
@@ -56,17 +56,17 @@ 
      *  @param  DoliDB  $db         Database handler
      *  @param  string  $param      More parameters
      */
-    function __construct($db,$param='')
+    function __construct($db, $param = '')
     {
         global $user, $langs;
 
         // Load translation files required by the page
         $langs->loadLangs(array('boxes', 'projects'));
 
-        $this->boxlabel="Tasks";
+        $this->boxlabel = "Tasks";
         $this->db = $db;
 
-        $this->hidden = ! ($user->rights->projet->lire);
+        $this->hidden = !($user->rights->projet->lire);
     }
 
 	/**
@@ -75,20 +75,20 @@ 
 	 *  @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;
-		$totalDuree=0;
-		$totalplannedtot=0;
-		$totaldurationtot=0;
+		$totalDuree = 0;
+		$totalplannedtot = 0;
+		$totaldurationtot = 0;
 		
 		include_once DOL_DOCUMENT_ROOT."/projet/class/task.class.php";
-		$taskstatic=new Task($db);
+		$taskstatic = new Task($db);
 
 
 		$textHead = $langs->trans("Tasks")." ".date("Y");
@@ -98,12 +98,12 @@ 
 		if ($user->rights->projet->lire) {
 			// FIXME fk_statut on a task is not be used. We use the percent. This means this box is useless.
 			$sql = "SELECT pt.fk_statut, count(DISTINCT pt.rowid) as nb, sum(ptt.task_duration) as durationtot, sum(pt.planned_workload) as plannedtot";
-			$sql.= " FROM ".MAIN_DB_PREFIX."projet_task as pt, ".MAIN_DB_PREFIX."projet_task_time as ptt";
-			$sql.= " WHERE pt.datec BETWEEN '".$this->db->idate(dol_get_first_day(date("Y"), 1))."' AND '".$this->db->idate(dol_get_last_day(date("Y"), 12))."'";
-			$sql.= " AND pt.rowid = ptt.fk_task";
-			$sql.= " GROUP BY pt.fk_statut ";
-			$sql.= " ORDER BY pt.fk_statut DESC";
-			$sql.= $db->plimit($max, 0);
+			$sql .= " FROM ".MAIN_DB_PREFIX."projet_task as pt, ".MAIN_DB_PREFIX."projet_task_time as ptt";
+			$sql .= " WHERE pt.datec BETWEEN '".$this->db->idate(dol_get_first_day(date("Y"), 1))."' AND '".$this->db->idate(dol_get_last_day(date("Y"), 12))."'";
+			$sql .= " AND pt.rowid = ptt.fk_task";
+			$sql .= " GROUP BY pt.fk_statut ";
+			$sql .= " ORDER BY pt.fk_statut DESC";
+			$sql .= $db->plimit($max, 0);
 
 			$result = $db->query($sql);
 			if ($result)
@@ -115,22 +115,22 @@ 
                     $objp = $db->fetch_object($result);
                     $this->info_box_contents[$i][] = array(
                         'td' => '',
-                        'text' =>$langs->trans("Task")." ".$taskstatic->LibStatut($objp->fk_statut,0),
+                        'text' =>$langs->trans("Task")." ".$taskstatic->LibStatut($objp->fk_statut, 0),
                     );
 
                     $this->info_box_contents[$i][] = array(
                         'td' => 'class="right"',
                         'text' => $objp->nb." ".$langs->trans("Tasks"),
                         //'url' => DOL_URL_ROOT."/projet/tasks/list.php?leftmenu=projects&viewstatut=".$objp->fk_statut,
-                        'url' => BASE_URI . "?controller=projet/tasks&method=list&leftmenu=projects&viewstatut=" . $objp->fk_statut,
+                        'url' => BASE_URI."?controller=projet/tasks&method=list&leftmenu=projects&viewstatut=".$objp->fk_statut,
                     );
 					$totalnb += $objp->nb;
-					$this->info_box_contents[$i][] = array('td' => 'class="right"', 'text' => ConvertSecondToTime($objp->plannedtot,'all',25200,5));
+					$this->info_box_contents[$i][] = array('td' => 'class="right"', 'text' => ConvertSecondToTime($objp->plannedtot, 'all', 25200, 5));
 					$totalplannedtot += $objp->plannedtot;
-					$this->info_box_contents[$i][] = array('td' => 'class="right"', 'text' => ConvertSecondToTime($objp->durationtot,'all',25200,5));
+					$this->info_box_contents[$i][] = array('td' => 'class="right"', 'text' => ConvertSecondToTime($objp->durationtot, 'all', 25200, 5));
 					$totaldurationtot += $objp->durationtot;
 
-					$this->info_box_contents[$i][] = array('td' => 'align="right" width="18"', 'text' => $taskstatic->LibStatut($objp->fk_statut,3));
+					$this->info_box_contents[$i][] = array('td' => 'align="right" width="18"', 'text' => $taskstatic->LibStatut($objp->fk_statut, 3));
 
 					$i++;
 				}
@@ -142,8 +142,8 @@ 
 		// Add the sum at the bottom of the boxes
 		$this->info_box_contents[$i][] = array('tr' => 'class="liste_total"', 'td' => '', 'text' => $langs->trans("Total")." ".$textHead);
 		$this->info_box_contents[$i][] = array('td' => 'align="right" ', 'text' => number_format($totalnb, 0, ',', ' ')." ".$langs->trans("Tasks"));
-		$this->info_box_contents[$i][] = array('td' => 'align="right" ', 'text' => ConvertSecondToTime($totalplannedtot,'all',25200,5));
-		$this->info_box_contents[$i][] = array('td' => 'align="right" ', 'text' => ConvertSecondToTime($totaldurationtot,'all',25200,5));
+		$this->info_box_contents[$i][] = array('td' => 'align="right" ', 'text' => ConvertSecondToTime($totalplannedtot, 'all', 25200, 5));
+		$this->info_box_contents[$i][] = array('td' => 'align="right" ', 'text' => ConvertSecondToTime($totaldurationtot, 'all', 25200, 5));
 		$this->info_box_contents[$i][] = array('td' => '', 'text' => "");
 	}
 
@@ -155,7 +155,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);
 	}

dolibarr/htdocs/core/boxes/box_graph_invoices_permonth.php

Indentation +231 added lines, -231 removed lines

@@ -28,256 +28,256 @@
  */
 class box_graph_invoices_permonth extends ModeleBoxes
 {
-	var $boxcode="invoicespermonth";
-	var $boximg="object_bill";
-	var $boxlabel="BoxCustomersInvoicesPerMonth";
-	var $depends = array("facture");
+    var $boxcode="invoicespermonth";
+    var $boximg="object_bill";
+    var $boxlabel="BoxCustomersInvoicesPerMonth";
+    var $depends = array("facture");
 
-	/**
+    /**
      * @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->facture->lire);
-	}
+        $this->hidden = ! ($user->rights->facture->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;
-
-		$this->max=$max;
-
-		$refreshaction='refresh_'.$this->boxcode;
-
-		//include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-		//$facturestatic=new Facture($db);
-
-		$text = $langs->trans("BoxCustomersInvoicesPerMonth",$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
-
-		if ($user->rights->facture->lire)
-		{
-			$mesg = '';
-
-			$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.'/compta/facture/class/facturestats.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 FactureStats($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));
-
-				$filenamenb = $dir."/".$prefix."invoicesnbinyear-".$endyear.".png";
-				if ($mode == 'customer') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstats&amp;file=invoicesnbinyear-'.$endyear.'.png';
-				if ($mode == 'supplier') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstatssupplier&amp;file=invoicessuppliernbinyear-'.$endyear.'.png';
-
-				$px1 = new DolGraph();
-				$mesg = $px1->isGraphKo();
-				if (! $mesg)
-				{
-				    $langs->load("bills");
-
-				    $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("NumberOfBills"));
-					$px1->SetShading(3);
-					$px1->SetHorizTickIncrement(1);
-					$px1->SetPrecisionY(0);
-					$px1->SetCssPrefix("cssboxes");
-					$px1->mode='depth';
-					$px1->SetTitle($langs->trans("NumberOfBillsByMonth"));
-
-					$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));
-
-				$filenamenb = $dir."/".$prefix."invoicesamountinyear-".$endyear.".png";
-				if ($mode == 'customer') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstats&amp;file=invoicesamountinyear-'.$endyear.'.png';
-				if ($mode == 'supplier') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstatssupplier&amp;file=invoicessupplieramountinyear-'.$endyear.'.png';
-
-				$px2 = new DolGraph();
-				$mesg = $px2->isGraphKo();
-				if (! $mesg)
-				{
-				    $langs->load("bills");
-
-					$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("AmountOfBillsHT"));
-					$px2->SetShading(3);
-					$px2->SetHorizTickIncrement(1);
-					$px2->SetPrecisionY(0);
-					$px2->SetCssPrefix("cssboxes");
-					$px2->mode='depth';
-					$px2->SetTitle($langs->trans("AmountOfBillsByMonthHT"));
-
-					$px2->draw($filenamenb,$fileurlnb);
-				}
-			}
-
-			if (empty($conf->use_javascript_ajax))
-			{
-				$langs->load("errors");
-				$mesg=$langs->trans("WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs");
-			}
-
-			if (! $mesg)
-			{
-				$stringtoshow='';
-				$stringtoshow.='<script type="text/javascript" language="javascript">
+     */
+    function loadBox($max=5)
+    {
+        global $conf, $user, $langs, $db;
+
+        $this->max=$max;
+
+        $refreshaction='refresh_'.$this->boxcode;
+
+        //include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+        //$facturestatic=new Facture($db);
+
+        $text = $langs->trans("BoxCustomersInvoicesPerMonth",$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
+
+        if ($user->rights->facture->lire)
+        {
+            $mesg = '';
+
+            $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.'/compta/facture/class/facturestats.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 FactureStats($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));
+
+                $filenamenb = $dir."/".$prefix."invoicesnbinyear-".$endyear.".png";
+                if ($mode == 'customer') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstats&amp;file=invoicesnbinyear-'.$endyear.'.png';
+                if ($mode == 'supplier') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstatssupplier&amp;file=invoicessuppliernbinyear-'.$endyear.'.png';
+
+                $px1 = new DolGraph();
+                $mesg = $px1->isGraphKo();
+                if (! $mesg)
+                {
+                    $langs->load("bills");
+
+                    $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("NumberOfBills"));
+                    $px1->SetShading(3);
+                    $px1->SetHorizTickIncrement(1);
+                    $px1->SetPrecisionY(0);
+                    $px1->SetCssPrefix("cssboxes");
+                    $px1->mode='depth';
+                    $px1->SetTitle($langs->trans("NumberOfBillsByMonth"));
+
+                    $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));
+
+                $filenamenb = $dir."/".$prefix."invoicesamountinyear-".$endyear.".png";
+                if ($mode == 'customer') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstats&amp;file=invoicesamountinyear-'.$endyear.'.png';
+                if ($mode == 'supplier') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstatssupplier&amp;file=invoicessupplieramountinyear-'.$endyear.'.png';
+
+                $px2 = new DolGraph();
+                $mesg = $px2->isGraphKo();
+                if (! $mesg)
+                {
+                    $langs->load("bills");
+
+                    $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("AmountOfBillsHT"));
+                    $px2->SetShading(3);
+                    $px2->SetHorizTickIncrement(1);
+                    $px2->SetPrecisionY(0);
+                    $px2->SetCssPrefix("cssboxes");
+                    $px2->mode='depth';
+                    $px2->SetTitle($langs->trans("AmountOfBillsByMonthHT"));
+
+                    $px2->draw($filenamenb,$fileurlnb);
+                }
+            }
+
+            if (empty($conf->use_javascript_ajax))
+            {
+                $langs->load("errors");
+                $mesg=$langs->trans("WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs");
+            }
+
+            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("NumberOfBillsByMonth");
-				$stringtoshow.=' &nbsp; ';
-				$stringtoshow.='<input type="checkbox" name="'.$param_showtot.'"'.($showtot?' checked':'').'> '.$langs->trans("AmountOfBillsByMonthHT");
-				$stringtoshow.='<br>';
-				$stringtoshow.=$langs->trans("Year").' <input class="flat" size="4" type="text" name="'.$param_year.'" value="'.$endyear.'">';
-				$stringtoshow.='<input class="reposition inline-block valigntextbottom" type="image" 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("NumberOfBillsByMonth");
+                $stringtoshow.=' &nbsp; ';
+                $stringtoshow.='<input type="checkbox" name="'.$param_showtot.'"'.($showtot?' checked':'').'> '.$langs->trans("AmountOfBillsByMonthHT");
+                $stringtoshow.='<br>';
+                $stringtoshow.=$langs->trans("Year").' <input class="flat" size="4" type="text" name="'.$param_year.'" value="'.$endyear.'">';
+                $stringtoshow.='<input class="reposition inline-block valigntextbottom" type="image" 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 +73 added lines, -73 removed lines

@@ -28,9 +28,9 @@ 
  */
 class box_graph_invoices_permonth extends ModeleBoxes
 {
-	var $boxcode="invoicespermonth";
-	var $boximg="object_bill";
-	var $boxlabel="BoxCustomersInvoicesPerMonth";
+	var $boxcode = "invoicespermonth";
+	var $boximg = "object_bill";
+	var $boxlabel = "BoxCustomersInvoicesPerMonth";
 	var $depends = array("facture");
 
 	/**
@@ -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->facture->lire);
+		$this->hidden = !($user->rights->facture->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.'/compta/facture/class/facture.class.php';
 		//$facturestatic=new Facture($db);
 
-		$text = $langs->trans("BoxCustomersInvoicesPerMonth",$max);
+		$text = $langs->trans("BoxCustomersInvoicesPerMonth", $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->facture->lire)
 		{
 			$mesg = '';
 
-			$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.'/compta/facture/class/facturestats.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 FactureStats($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."invoicesnbinyear-".$endyear.".png";
 				if ($mode == 'customer') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstats&amp;file=invoicesnbinyear-'.$endyear.'.png';
@@ -137,17 +137,17 @@ 
 
 				$px1 = new DolGraph();
 				$mesg = $px1->isGraphKo();
-				if (! $mesg)
+				if (!$mesg)
 				{
 				    $langs->load("bills");
 
 				    $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);
@@ -159,17 +159,17 @@ 
 					$px1->SetHorizTickIncrement(1);
 					$px1->SetPrecisionY(0);
 					$px1->SetCssPrefix("cssboxes");
-					$px1->mode='depth';
+					$px1->mode = 'depth';
 					$px1->SetTitle($langs->trans("NumberOfBillsByMonth"));
 
-					$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."invoicesamountinyear-".$endyear.".png";
 				if ($mode == 'customer') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstats&amp;file=invoicesamountinyear-'.$endyear.'.png';
@@ -177,17 +177,17 @@ 
 
 				$px2 = new DolGraph();
 				$mesg = $px2->isGraphKo();
-				if (! $mesg)
+				if (!$mesg)
 				{
 				    $langs->load("bills");
 
 					$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);
@@ -199,60 +199,60 @@ 
 					$px2->SetHorizTickIncrement(1);
 					$px2->SetPrecisionY(0);
 					$px2->SetCssPrefix("cssboxes");
-					$px2->mode='depth';
+					$px2->mode = 'depth';
 					$px2->SetTitle($langs->trans("AmountOfBillsByMonthHT"));
 
-					$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("NumberOfBillsByMonth");
-				$stringtoshow.=' &nbsp; ';
-				$stringtoshow.='<input type="checkbox" name="'.$param_showtot.'"'.($showtot?' checked':'').'> '.$langs->trans("AmountOfBillsByMonthHT");
-				$stringtoshow.='<br>';
-				$stringtoshow.=$langs->trans("Year").' <input class="flat" size="4" type="text" name="'.$param_year.'" value="'.$endyear.'">';
-				$stringtoshow.='<input class="reposition inline-block valigntextbottom" type="image" 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("NumberOfBillsByMonth");
+				$stringtoshow .= ' &nbsp; ';
+				$stringtoshow .= '<input type="checkbox" name="'.$param_showtot.'"'.($showtot ? ' checked' : '').'> '.$langs->trans("AmountOfBillsByMonthHT");
+				$stringtoshow .= '<br>';
+				$stringtoshow .= $langs->trans("Year").' <input class="flat" size="4" type="text" name="'.$param_year.'" value="'.$endyear.'">';
+				$stringtoshow .= '<input class="reposition inline-block valigntextbottom" type="image" 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
 			{
@@ -275,7 +275,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->facture->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."invoicesnbinyear-".$endyear.".png";
-				if ($mode == 'customer') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstats&amp;file=invoicesnbinyear-'.$endyear.'.png';
-				if ($mode == 'supplier') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstatssupplier&amp;file=invoicessuppliernbinyear-'.$endyear.'.png';
+				if ($mode == 'customer') {
+				    $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstats&amp;file=invoicesnbinyear-'.$endyear.'.png';
+				}
+				if ($mode == 'supplier') {
+				    $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstatssupplier&amp;file=invoicessuppliernbinyear-'.$endyear.'.png';
+				}
 
 				$px1 = new DolGraph();
 				$mesg = $px1->isGraphKo();
@@ -172,8 +182,12 @@ 
 				$data2 = $stats->getAmountByMonthWithPrevYear($endyear,$startyear,(GETPOST('action','aZ09')==$refreshaction?-1:(3600*24)), ($WIDTH<300?2:0));
 
 				$filenamenb = $dir."/".$prefix."invoicesamountinyear-".$endyear.".png";
-				if ($mode == 'customer') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstats&amp;file=invoicesamountinyear-'.$endyear.'.png';
-				if ($mode == 'supplier') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstatssupplier&amp;file=invoicessupplieramountinyear-'.$endyear.'.png';
+				if ($mode == 'customer') {
+				    $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstats&amp;file=invoicesamountinyear-'.$endyear.'.png';
+				}
+				if ($mode == 'supplier') {
+				    $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstatssupplier&amp;file=invoicessupplieramountinyear-'.$endyear.'.png';
+				}
 
 				$px2 = new DolGraph();
 				$mesg = $px2->isGraphKo();
@@ -240,26 +254,28 @@ 
 					$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/get_menudiv.php

Indentation +15 added lines, -15 removed lines

@@ -176,11 +176,11 @@ 
 
 if (empty($user->societe_id))	// If internal user or not defined
 {
-	$conf->standard_menu=(empty($conf->global->MAIN_MENU_STANDARD_FORCED)?(empty($conf->global->MAIN_MENU_STANDARD)?'eldy_menu.php':$conf->global->MAIN_MENU_STANDARD):$conf->global->MAIN_MENU_STANDARD_FORCED);
+    $conf->standard_menu=(empty($conf->global->MAIN_MENU_STANDARD_FORCED)?(empty($conf->global->MAIN_MENU_STANDARD)?'eldy_menu.php':$conf->global->MAIN_MENU_STANDARD):$conf->global->MAIN_MENU_STANDARD_FORCED);
 }
 else                        	// If external user
 {
-	$conf->standard_menu=(empty($conf->global->MAIN_MENUFRONT_STANDARD_FORCED)?(empty($conf->global->MAIN_MENUFRONT_STANDARD)?'eldy_menu.php':$conf->global->MAIN_MENUFRONT_STANDARD):$conf->global->MAIN_MENUFRONT_STANDARD_FORCED);
+    $conf->standard_menu=(empty($conf->global->MAIN_MENUFRONT_STANDARD_FORCED)?(empty($conf->global->MAIN_MENUFRONT_STANDARD)?'eldy_menu.php':$conf->global->MAIN_MENUFRONT_STANDARD):$conf->global->MAIN_MENUFRONT_STANDARD_FORCED);
 }
 
 // Load the menu manager (only if not already done)
@@ -188,19 +188,19 @@ 
 if (GETPOST('menu')) $file_menu=GETPOST('menu');     // example: menu=eldy_menu.php
 if (! class_exists('MenuManager'))
 {
-	$menufound=0;
-	$dirmenus=array_merge(array("/core/menus/"),(array) $conf->modules_parts['menus']);
-	foreach($dirmenus as $dirmenu)
-	{
-		$menufound=dol_include_once($dirmenu."standard/".$file_menu);
-		if ($menufound) break;
-	}
-	if (! $menufound)	// If failed to include, we try with standard
-	{
-		dol_syslog("You define a menu manager '".$file_menu."' that can not be loaded.", LOG_WARNING);
-		$file_menu='eldy_menu.php';
-		include_once DOL_DOCUMENT_ROOT."/core/menus/standard/".$file_menu;
-	}
+    $menufound=0;
+    $dirmenus=array_merge(array("/core/menus/"),(array) $conf->modules_parts['menus']);
+    foreach($dirmenus as $dirmenu)
+    {
+        $menufound=dol_include_once($dirmenu."standard/".$file_menu);
+        if ($menufound) break;
+    }
+    if (! $menufound)	// If failed to include, we try with standard
+    {
+        dol_syslog("You define a menu manager '".$file_menu."' that can not be loaded.", LOG_WARNING);
+        $file_menu='eldy_menu.php';
+        include_once DOL_DOCUMENT_ROOT."/core/menus/standard/".$file_menu;
+    }
 }
 $menumanager = new MenuManager($db, empty($user->societe_id)?0:1);
 $menumanager->loadMenu('all','all');	// Load this->tabMenu with sql menu entries

Spacing +33 added lines, -33 removed lines

@@ -27,40 +27,40 @@ 
 //if (! defined('NOREQUIREDB'))   define('NOREQUIREDB','1');		// Not disabled cause need to load personalized language
 //if (! defined('NOREQUIRESOC'))    define('NOREQUIRESOC','1');
 //if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1');		// Not disabled cause need to do translations
-if (! defined('NOCSRFCHECK'))     define('NOCSRFCHECK',1);
-if (! defined('NOTOKENRENEWAL'))  define('NOTOKENRENEWAL',1);
+if (!defined('NOCSRFCHECK'))     define('NOCSRFCHECK', 1);
+if (!defined('NOTOKENRENEWAL'))  define('NOTOKENRENEWAL', 1);
 //if (! defined('NOLOGIN')) define('NOLOGIN',1);					// Not disabled cause need to load personalized language
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU',1);
-if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML',1);
-
-if (! defined('DISABLE_JQUERY_TABLEDND'))   define('DISABLE_JQUERY_TABLEDND',1);
-if (! defined('DISABLE_JQUERY_JNOTIFY'))    define('DISABLE_JQUERY_JNOTIFY',1);
-if (! defined('DISABLE_JQUERY_FLOT'))       define('DISABLE_JQUERY_FLOT',1);
-if (! defined('DISABLE_JQUERY_JEDITABLE'))  define('DISABLE_JQUERY_JEDITABLE',1);
-if (! defined('DISABLE_CKEDITOR'))          define('DISABLE_CKEDITOR',1);
-if (! defined('DISABLE_BROWSER_NOTIF'))     define('DISABLE_BROWSER_NOTIF',1);
-if (! defined('DISABLE_DATE_PICKER'))       define('DISABLE_DATE_PICKER',1);
-if (! defined('DISABLE_SELECT2'))           define('DISABLE_SELECT2',1);
+if (!defined('NOREQUIREMENU'))  define('NOREQUIREMENU', 1);
+if (!defined('NOREQUIREHTML'))  define('NOREQUIREHTML', 1);
+
+if (!defined('DISABLE_JQUERY_TABLEDND'))   define('DISABLE_JQUERY_TABLEDND', 1);
+if (!defined('DISABLE_JQUERY_JNOTIFY'))    define('DISABLE_JQUERY_JNOTIFY', 1);
+if (!defined('DISABLE_JQUERY_FLOT'))       define('DISABLE_JQUERY_FLOT', 1);
+if (!defined('DISABLE_JQUERY_JEDITABLE'))  define('DISABLE_JQUERY_JEDITABLE', 1);
+if (!defined('DISABLE_CKEDITOR'))          define('DISABLE_CKEDITOR', 1);
+if (!defined('DISABLE_BROWSER_NOTIF'))     define('DISABLE_BROWSER_NOTIF', 1);
+if (!defined('DISABLE_DATE_PICKER'))       define('DISABLE_DATE_PICKER', 1);
+if (!defined('DISABLE_SELECT2'))           define('DISABLE_SELECT2', 1);
 
 require_once '../main.inc.php';
 
-if (GETPOST('lang', 'aZ09')) $langs->setDefaultLang(GETPOST('lang', 'aZ09'));	// If language was forced on URL by the main.inc.php
+if (GETPOST('lang', 'aZ09')) $langs->setDefaultLang(GETPOST('lang', 'aZ09')); // If language was forced on URL by the main.inc.php
 
 $langs->load("main");
-$right=($langs->trans("DIRECTION")=='rtl'?'left':'right');
-$left=($langs->trans("DIRECTION")=='rtl'?'right':'left');
+$right = ($langs->trans("DIRECTION") == 'rtl' ? 'left' : 'right');
+$left = ($langs->trans("DIRECTION") == 'rtl' ? 'right' : 'left');
 
 
 /*
  * View
  */
 
-$title=$langs->trans("Menu");
+$title = $langs->trans("Menu");
 
 // URL http://mydolibarr/core/get_menudiv.php?dol_use_jmobile=1 can be used for tests
-$head='<!-- Menu -->'."\n";
-$arrayofjs=array();
-$arrayofcss=array();
+$head = '<!-- Menu -->'."\n";
+$arrayofjs = array();
+$arrayofcss = array();
 top_htmlhead($head, $title, 0, 0, $arrayofjs, $arrayofcss);
 
 print '<body>'."\n";
@@ -176,34 +176,34 @@ 
 
 if (empty($user->societe_id))	// If internal user or not defined
 {
-	$conf->standard_menu=(empty($conf->global->MAIN_MENU_STANDARD_FORCED)?(empty($conf->global->MAIN_MENU_STANDARD)?'eldy_menu.php':$conf->global->MAIN_MENU_STANDARD):$conf->global->MAIN_MENU_STANDARD_FORCED);
+	$conf->standard_menu = (empty($conf->global->MAIN_MENU_STANDARD_FORCED) ? (empty($conf->global->MAIN_MENU_STANDARD) ? 'eldy_menu.php' : $conf->global->MAIN_MENU_STANDARD) : $conf->global->MAIN_MENU_STANDARD_FORCED);
 }
 else                        	// If external user
 {
-	$conf->standard_menu=(empty($conf->global->MAIN_MENUFRONT_STANDARD_FORCED)?(empty($conf->global->MAIN_MENUFRONT_STANDARD)?'eldy_menu.php':$conf->global->MAIN_MENUFRONT_STANDARD):$conf->global->MAIN_MENUFRONT_STANDARD_FORCED);
+	$conf->standard_menu = (empty($conf->global->MAIN_MENUFRONT_STANDARD_FORCED) ? (empty($conf->global->MAIN_MENUFRONT_STANDARD) ? 'eldy_menu.php' : $conf->global->MAIN_MENUFRONT_STANDARD) : $conf->global->MAIN_MENUFRONT_STANDARD_FORCED);
 }
 
 // Load the menu manager (only if not already done)
-$file_menu=$conf->standard_menu;
-if (GETPOST('menu')) $file_menu=GETPOST('menu');     // example: menu=eldy_menu.php
-if (! class_exists('MenuManager'))
+$file_menu = $conf->standard_menu;
+if (GETPOST('menu')) $file_menu = GETPOST('menu'); // example: menu=eldy_menu.php
+if (!class_exists('MenuManager'))
 {
-	$menufound=0;
-	$dirmenus=array_merge(array("/core/menus/"),(array) $conf->modules_parts['menus']);
-	foreach($dirmenus as $dirmenu)
+	$menufound = 0;
+	$dirmenus = array_merge(array("/core/menus/"), (array) $conf->modules_parts['menus']);
+	foreach ($dirmenus as $dirmenu)
 	{
-		$menufound=dol_include_once($dirmenu."standard/".$file_menu);
+		$menufound = dol_include_once($dirmenu."standard/".$file_menu);
 		if ($menufound) break;
 	}
-	if (! $menufound)	// If failed to include, we try with standard
+	if (!$menufound)	// If failed to include, we try with standard
 	{
 		dol_syslog("You define a menu manager '".$file_menu."' that can not be loaded.", LOG_WARNING);
-		$file_menu='eldy_menu.php';
+		$file_menu = 'eldy_menu.php';
 		include_once DOL_DOCUMENT_ROOT."/core/menus/standard/".$file_menu;
 	}
 }
-$menumanager = new MenuManager($db, empty($user->societe_id)?0:1);
-$menumanager->loadMenu('all','all');	// Load this->tabMenu with sql menu entries
+$menumanager = new MenuManager($db, empty($user->societe_id) ? 0 : 1);
+$menumanager->loadMenu('all', 'all'); // Load this->tabMenu with sql menu entries
 //var_dump($menumanager);exit;
 $menumanager->showmenu('jmobile');
 

Braces +54 added lines, -19 removed lines

@@ -27,24 +27,51 @@ 
 //if (! defined('NOREQUIREDB'))   define('NOREQUIREDB','1');		// Not disabled cause need to load personalized language
 //if (! defined('NOREQUIRESOC'))    define('NOREQUIRESOC','1');
 //if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1');		// Not disabled cause need to do translations
-if (! defined('NOCSRFCHECK'))     define('NOCSRFCHECK',1);
-if (! defined('NOTOKENRENEWAL'))  define('NOTOKENRENEWAL',1);
+if (! defined('NOCSRFCHECK')) {
+    define('NOCSRFCHECK',1);
+}
+if (! defined('NOTOKENRENEWAL')) {
+    define('NOTOKENRENEWAL',1);
+}
 //if (! defined('NOLOGIN')) define('NOLOGIN',1);					// Not disabled cause need to load personalized language
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU',1);
-if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML',1);
-
-if (! defined('DISABLE_JQUERY_TABLEDND'))   define('DISABLE_JQUERY_TABLEDND',1);
-if (! defined('DISABLE_JQUERY_JNOTIFY'))    define('DISABLE_JQUERY_JNOTIFY',1);
-if (! defined('DISABLE_JQUERY_FLOT'))       define('DISABLE_JQUERY_FLOT',1);
-if (! defined('DISABLE_JQUERY_JEDITABLE'))  define('DISABLE_JQUERY_JEDITABLE',1);
-if (! defined('DISABLE_CKEDITOR'))          define('DISABLE_CKEDITOR',1);
-if (! defined('DISABLE_BROWSER_NOTIF'))     define('DISABLE_BROWSER_NOTIF',1);
-if (! defined('DISABLE_DATE_PICKER'))       define('DISABLE_DATE_PICKER',1);
-if (! defined('DISABLE_SELECT2'))           define('DISABLE_SELECT2',1);
+if (! defined('NOREQUIREMENU')) {
+    define('NOREQUIREMENU',1);
+}
+if (! defined('NOREQUIREHTML')) {
+    define('NOREQUIREHTML',1);
+}
+
+if (! defined('DISABLE_JQUERY_TABLEDND')) {
+    define('DISABLE_JQUERY_TABLEDND',1);
+}
+if (! defined('DISABLE_JQUERY_JNOTIFY')) {
+    define('DISABLE_JQUERY_JNOTIFY',1);
+}
+if (! defined('DISABLE_JQUERY_FLOT')) {
+    define('DISABLE_JQUERY_FLOT',1);
+}
+if (! defined('DISABLE_JQUERY_JEDITABLE')) {
+    define('DISABLE_JQUERY_JEDITABLE',1);
+}
+if (! defined('DISABLE_CKEDITOR')) {
+    define('DISABLE_CKEDITOR',1);
+}
+if (! defined('DISABLE_BROWSER_NOTIF')) {
+    define('DISABLE_BROWSER_NOTIF',1);
+}
+if (! defined('DISABLE_DATE_PICKER')) {
+    define('DISABLE_DATE_PICKER',1);
+}
+if (! defined('DISABLE_SELECT2')) {
+    define('DISABLE_SELECT2',1);
+}
 
 require_once '../main.inc.php';
 
-if (GETPOST('lang', 'aZ09')) $langs->setDefaultLang(GETPOST('lang', 'aZ09'));	// If language was forced on URL by the main.inc.php
+if (GETPOST('lang', 'aZ09')) {
+    $langs->setDefaultLang(GETPOST('lang', 'aZ09'));
+}
+// If language was forced on URL by the main.inc.php
 
 $langs->load("main");
 $right=($langs->trans("DIRECTION")=='rtl'?'left':'right');
@@ -174,18 +201,22 @@ 
 ';
 
 
-if (empty($user->societe_id))	// If internal user or not defined
+if (empty($user->societe_id)) {
+    // If internal user or not defined
 {
 	$conf->standard_menu=(empty($conf->global->MAIN_MENU_STANDARD_FORCED)?(empty($conf->global->MAIN_MENU_STANDARD)?'eldy_menu.php':$conf->global->MAIN_MENU_STANDARD):$conf->global->MAIN_MENU_STANDARD_FORCED);
 }
-else                        	// If external user
+} else                        	// If external user
 {
 	$conf->standard_menu=(empty($conf->global->MAIN_MENUFRONT_STANDARD_FORCED)?(empty($conf->global->MAIN_MENUFRONT_STANDARD)?'eldy_menu.php':$conf->global->MAIN_MENUFRONT_STANDARD):$conf->global->MAIN_MENUFRONT_STANDARD_FORCED);
 }
 
 // Load the menu manager (only if not already done)
 $file_menu=$conf->standard_menu;
-if (GETPOST('menu')) $file_menu=GETPOST('menu');     // example: menu=eldy_menu.php
+if (GETPOST('menu')) {
+    $file_menu=GETPOST('menu');
+}
+// example: menu=eldy_menu.php
 if (! class_exists('MenuManager'))
 {
 	$menufound=0;
@@ -193,11 +224,15 @@ 
 	foreach($dirmenus as $dirmenu)
 	{
 		$menufound=dol_include_once($dirmenu."standard/".$file_menu);
-		if ($menufound) break;
+		if ($menufound) {
+		    break;
+		}
 	}
-	if (! $menufound)	// If failed to include, we try with standard
+	if (! $menufound) {
+	    // If failed to include, we try with standard
 	{
 		dol_syslog("You define a menu manager '".$file_menu."' that can not be loaded.", LOG_WARNING);
+	}
 		$file_menu='eldy_menu.php';
 		include_once DOL_DOCUMENT_ROOT."/core/menus/standard/".$file_menu;
 	}