Dolibarr / dolibarr

htdocs/core/boxes/box_contracts.php

Indentation +141 added lines, -141 removed lines

@@ -31,143 +31,143 @@ 
  */
 class box_contracts extends ModeleBoxes
 {
-    var $boxcode="lastcontracts";
-    var $boximg="object_contract";
-    var $boxlabel="BoxLastContracts";
-    var $depends = array("contrat");	// conf->contrat->enabled
-
-    var $db;
-    var $param;
-
-    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;
-
-        $this->db=$db;
-
-        $this->hidden=! ($user->rights->contrat->lire);
-    }
-
-    /**
-     *  Load data for box to show them later
-     *
-     *  @param	int		$max        Maximum number of records to load
-     *  @return	void
-     */
-    function loadBox($max=5)
-    {
-    	global $user, $langs, $db, $conf;
-
-    	$this->max=$max;
-
-    	include_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
-
-    	$this->info_box_head = array('text' => $langs->trans("BoxTitleLastContracts",$max));
-
-    	if ($user->rights->contrat->lire)
-    	{
-        	$contractstatic=new Contrat($db);
-        	$thirdpartytmp=new Societe($db);
-
-    	    $sql = "SELECT s.nom as name, s.rowid as socid,";
-    		$sql.= " c.rowid, c.ref, c.statut as fk_statut, c.date_contrat, c.datec, c.fin_validite, c.date_cloture";
-    		$sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."contrat as c";
-    		if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-    		$sql.= " WHERE c.fk_soc = s.rowid";
-    		$sql.= " AND c.entity = ".$conf->entity;
-    		if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-    		if($user->societe_id) $sql.= " AND s.rowid = ".$user->societe_id;
-    		if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) $sql.= " ORDER BY c.date_contrat DESC, c.ref DESC ";
-    		else $sql.= " ORDER BY c.tms DESC, c.ref DESC ";
-    		$sql.= $db->plimit($max, 0);
-
-    		$resql = $db->query($sql);
-    		if ($resql)
-    		{
-    			$num = $db->num_rows($resql);
-    			$now=dol_now();
-
-    			$line = 0;
-
-    			$langs->load("contracts");
-
-                while ($line < $num)
-                {
-    				$objp = $db->fetch_object($resql);
-    				$datec=$db->jdate($objp->datec);
-    				$dateterm=$db->jdate($objp->fin_validite);
-    				$dateclose=$db->jdate($objp->date_cloture);
-    				$late = '';
-
-    				$contractstatic->statut=$objp->fk_statut;
-    				$contractstatic->id=$objp->rowid;
-    				$contractstatic->ref=$objp->ref;
-    				$result=$contractstatic->fetch_lines();
-
-    				$thirdpartytmp->name = $objp->name;
-    				$thirdpartytmp->id = $objp->socid;
-
-    				// fin_validite is no more on contract but on services
-    				// if ($objp->fk_statut == 1 && $dateterm < ($now - $conf->contrat->cloture->warning_delay)) { $late = img_warning($langs->trans("Late")); }
-
-                    $this->info_box_contents[$line][] = array(
-                        'td' => '',
-                        'text' => $contractstatic->getNomUrl(1),
-                        'text2'=> $late,
-                        'asis'=>1
-                    );
-
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="tdoverflowmax100 maxwidth100onsmartphone"',
-                        'text' => $thirdpartytmp->getNomUrl(1),
-                        'asis'=>1
-                    );
-
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="right"',
-                        'text' => dol_print_date($datec,'day'),
-                    );
-
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="nowrap right"',
-                        'text' => $contractstatic->getLibStatut(7),
-                        'asis'=>1,
-                    );
-
-                    $line++;
-                }
-
-                if ($num==0)
-                    $this->info_box_contents[$line][0] = array(
-                        'td' => 'align="center opacitymedium"',
-                        'text'=>$langs->trans("NoRecordedContracts"),
-                    );
-
-                $db->free($resql);
-            } else {
-                $this->info_box_contents[0][0] = array(
-                    'td' => '',
-                    'maxlength'=>500,
-                    'text' => ($db->error().' sql='.$sql),
-                );
-            }
-        } else {
-            $this->info_box_contents[0][0] = array(
-                'td' => 'align="left" class="nohover opacitymedium"',
-                'text' => $langs->trans("ReadPermissionNotAllowed")
-            );
-        }
-    }
+	var $boxcode="lastcontracts";
+	var $boximg="object_contract";
+	var $boxlabel="BoxLastContracts";
+	var $depends = array("contrat");	// conf->contrat->enabled
+
+	var $db;
+	var $param;
+
+	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;
+
+		$this->db=$db;
+
+		$this->hidden=! ($user->rights->contrat->lire);
+	}
+
+	/**
+	 *  Load data for box to show them later
+	 *
+	 *  @param	int		$max        Maximum number of records to load
+	 *  @return	void
+	 */
+	function loadBox($max=5)
+	{
+		global $user, $langs, $db, $conf;
+
+		$this->max=$max;
+
+		include_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
+
+		$this->info_box_head = array('text' => $langs->trans("BoxTitleLastContracts",$max));
+
+		if ($user->rights->contrat->lire)
+		{
+			$contractstatic=new Contrat($db);
+			$thirdpartytmp=new Societe($db);
+
+			$sql = "SELECT s.nom as name, s.rowid as socid,";
+			$sql.= " c.rowid, c.ref, c.statut as fk_statut, c.date_contrat, c.datec, c.fin_validite, c.date_cloture";
+			$sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."contrat as c";
+			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+			$sql.= " WHERE c.fk_soc = s.rowid";
+			$sql.= " AND c.entity = ".$conf->entity;
+			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+			if($user->societe_id) $sql.= " AND s.rowid = ".$user->societe_id;
+			if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) $sql.= " ORDER BY c.date_contrat DESC, c.ref DESC ";
+			else $sql.= " ORDER BY c.tms DESC, c.ref DESC ";
+			$sql.= $db->plimit($max, 0);
+
+			$resql = $db->query($sql);
+			if ($resql)
+			{
+				$num = $db->num_rows($resql);
+				$now=dol_now();
+
+				$line = 0;
+
+				$langs->load("contracts");
+
+				while ($line < $num)
+				{
+					$objp = $db->fetch_object($resql);
+					$datec=$db->jdate($objp->datec);
+					$dateterm=$db->jdate($objp->fin_validite);
+					$dateclose=$db->jdate($objp->date_cloture);
+					$late = '';
+
+					$contractstatic->statut=$objp->fk_statut;
+					$contractstatic->id=$objp->rowid;
+					$contractstatic->ref=$objp->ref;
+					$result=$contractstatic->fetch_lines();
+
+					$thirdpartytmp->name = $objp->name;
+					$thirdpartytmp->id = $objp->socid;
+
+					// fin_validite is no more on contract but on services
+					// if ($objp->fk_statut == 1 && $dateterm < ($now - $conf->contrat->cloture->warning_delay)) { $late = img_warning($langs->trans("Late")); }
+
+					$this->info_box_contents[$line][] = array(
+						'td' => '',
+						'text' => $contractstatic->getNomUrl(1),
+						'text2'=> $late,
+						'asis'=>1
+					);
+
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="tdoverflowmax100 maxwidth100onsmartphone"',
+						'text' => $thirdpartytmp->getNomUrl(1),
+						'asis'=>1
+					);
+
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right"',
+						'text' => dol_print_date($datec,'day'),
+					);
+
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="nowrap right"',
+						'text' => $contractstatic->getLibStatut(7),
+						'asis'=>1,
+					);
+
+					$line++;
+				}
+
+				if ($num==0)
+					$this->info_box_contents[$line][0] = array(
+						'td' => 'align="center opacitymedium"',
+						'text'=>$langs->trans("NoRecordedContracts"),
+					);
+
+				$db->free($resql);
+			} else {
+				$this->info_box_contents[0][0] = array(
+					'td' => '',
+					'maxlength'=>500,
+					'text' => ($db->error().' sql='.$sql),
+				);
+			}
+		} else {
+			$this->info_box_contents[0][0] = array(
+				'td' => 'align="left" class="nohover opacitymedium"',
+				'text' => $langs->trans("ReadPermissionNotAllowed")
+			);
+		}
+	}
 
 	/**
 	 *	Method to show box
@@ -177,10 +177,10 @@ 
 	 *  @param	int		$nooutput	No print, only return string
 	 *	@return	string
 	 */
-    function showBox($head = null, $contents = null, $nooutput=0)
-    {
-        return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
-    }
+	function showBox($head = null, $contents = null, $nooutput=0)
+	{
+		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+	}
 
 }
 

Spacing +33 added lines, -33 removed lines

@@ -31,10 +31,10 @@ 
  */
 class box_contracts extends ModeleBoxes
 {
-    var $boxcode="lastcontracts";
-    var $boximg="object_contract";
-    var $boxlabel="BoxLastContracts";
-    var $depends = array("contrat");	// conf->contrat->enabled
+    var $boxcode = "lastcontracts";
+    var $boximg = "object_contract";
+    var $boxlabel = "BoxLastContracts";
+    var $depends = array("contrat"); // conf->contrat->enabled
 
     var $db;
     var $param;
@@ -49,13 +49,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->contrat->lire);
+        $this->hidden = !($user->rights->contrat->lire);
     }
 
     /**
@@ -64,38 +64,38 @@ 
      *  @param	int		$max        Maximum number of records to load
      *  @return	void
      */
-    function loadBox($max=5)
+    function loadBox($max = 5)
     {
     	global $user, $langs, $db, $conf;
 
-    	$this->max=$max;
+    	$this->max = $max;
 
     	include_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
 
-    	$this->info_box_head = array('text' => $langs->trans("BoxTitleLastContracts",$max));
+    	$this->info_box_head = array('text' => $langs->trans("BoxTitleLastContracts", $max));
 
     	if ($user->rights->contrat->lire)
     	{
-        	$contractstatic=new Contrat($db);
-        	$thirdpartytmp=new Societe($db);
+        	$contractstatic = new Contrat($db);
+        	$thirdpartytmp = new Societe($db);
 
     	    $sql = "SELECT s.nom as name, s.rowid as socid,";
-    		$sql.= " c.rowid, c.ref, c.statut as fk_statut, c.date_contrat, c.datec, c.fin_validite, c.date_cloture";
-    		$sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."contrat as c";
-    		if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-    		$sql.= " WHERE c.fk_soc = s.rowid";
-    		$sql.= " AND c.entity = ".$conf->entity;
-    		if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-    		if($user->societe_id) $sql.= " AND s.rowid = ".$user->societe_id;
-    		if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) $sql.= " ORDER BY c.date_contrat DESC, c.ref DESC ";
-    		else $sql.= " ORDER BY c.tms DESC, c.ref DESC ";
-    		$sql.= $db->plimit($max, 0);
+    		$sql .= " c.rowid, c.ref, c.statut as fk_statut, c.date_contrat, c.datec, c.fin_validite, c.date_cloture";
+    		$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."contrat as c";
+    		if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+    		$sql .= " WHERE c.fk_soc = s.rowid";
+    		$sql .= " AND c.entity = ".$conf->entity;
+    		if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+    		if ($user->societe_id) $sql .= " AND s.rowid = ".$user->societe_id;
+    		if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) $sql .= " ORDER BY c.date_contrat DESC, c.ref DESC ";
+    		else $sql .= " ORDER BY c.tms DESC, c.ref DESC ";
+    		$sql .= $db->plimit($max, 0);
 
     		$resql = $db->query($sql);
     		if ($resql)
     		{
     			$num = $db->num_rows($resql);
-    			$now=dol_now();
+    			$now = dol_now();
 
     			$line = 0;
 
@@ -104,15 +104,15 @@ 
                 while ($line < $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 = '';
 
-    				$contractstatic->statut=$objp->fk_statut;
-    				$contractstatic->id=$objp->rowid;
-    				$contractstatic->ref=$objp->ref;
-    				$result=$contractstatic->fetch_lines();
+    				$contractstatic->statut = $objp->fk_statut;
+    				$contractstatic->id = $objp->rowid;
+    				$contractstatic->ref = $objp->ref;
+    				$result = $contractstatic->fetch_lines();
 
     				$thirdpartytmp->name = $objp->name;
     				$thirdpartytmp->id = $objp->socid;
@@ -135,7 +135,7 @@ 
 
                     $this->info_box_contents[$line][] = array(
                         'td' => 'class="right"',
-                        'text' => dol_print_date($datec,'day'),
+                        'text' => dol_print_date($datec, 'day'),
                     );
 
                     $this->info_box_contents[$line][] = array(
@@ -147,7 +147,7 @@ 
                     $line++;
                 }
 
-                if ($num==0)
+                if ($num == 0)
                     $this->info_box_contents[$line][0] = array(
                         'td' => 'align="center opacitymedium"',
                         'text'=>$langs->trans("NoRecordedContracts"),
@@ -177,7 +177,7 @@ 
 	 *  @param	int		$nooutput	No print, only return string
 	 *	@return	string
 	 */
-    function showBox($head = null, $contents = null, $nooutput=0)
+    function showBox($head = null, $contents = null, $nooutput = 0)
     {
         return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
     }

Braces +17 added lines, -7 removed lines

@@ -82,13 +82,22 @@ 
     	    $sql = "SELECT s.nom as name, s.rowid as socid,";
     		$sql.= " c.rowid, c.ref, c.statut as fk_statut, c.date_contrat, c.datec, c.fin_validite, c.date_cloture";
     		$sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."contrat as c";
-    		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 c.fk_soc = s.rowid";
     		$sql.= " AND c.entity = ".$conf->entity;
-    		if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-    		if($user->societe_id) $sql.= " AND s.rowid = ".$user->societe_id;
-    		if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) $sql.= " ORDER BY c.date_contrat DESC, c.ref DESC ";
-    		else $sql.= " ORDER BY c.tms DESC, c.ref DESC ";
+    		if (!$user->rights->societe->client->voir && !$user->societe_id) {
+    			$sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+    		}
+    		if($user->societe_id) {
+    			$sql.= " AND s.rowid = ".$user->societe_id;
+    		}
+    		if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) {
+    			$sql.= " ORDER BY c.date_contrat DESC, c.ref DESC ";
+    		} else {
+    			$sql.= " ORDER BY c.tms DESC, c.ref DESC ";
+    		}
     		$sql.= $db->plimit($max, 0);
 
     		$resql = $db->query($sql);
@@ -147,11 +156,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 opacitymedium"',
                         'text'=>$langs->trans("NoRecordedContracts"),
                     );
+                }
 
                 $db->free($resql);
             } else {

htdocs/core/boxes/box_bookmarks.php

Indentation +60 added lines, -60 removed lines

@@ -48,18 +48,18 @@ 
 	 */
 	function __construct($db,$param)
 	{
-	    global $user;
+		global $user;
 
-	    $this->db=$db;
+		$this->db=$db;
 
-	    $this->hidden=! ($user->rights->bookmark->lire);
+		$this->hidden=! ($user->rights->bookmark->lire);
 	}
 
 	/**
-     *  Load data for box to show them later
-     *
-     *  @param	int		$max        Maximum number of records to load
-     *  @return	void
+	 *  Load data for box to show them later
+	 *
+	 *  @param	int		$max        Maximum number of records to load
+	 *  @return	void
 	 */
 	function loadBox($max=5)
 	{
@@ -69,10 +69,10 @@ 
 		$this->max=$max;
 
 		$this->info_box_head = array(
-            'text' => $langs->trans("BoxMyLastBookmarks",$max),
-            'sublink' => DOL_URL_ROOT.'/bookmarks/list.php',
-        );
-        if ($user->rights->bookmark->creer) {
+			'text' => $langs->trans("BoxMyLastBookmarks",$max),
+			'sublink' => DOL_URL_ROOT.'/bookmarks/list.php',
+		);
+		if ($user->rights->bookmark->creer) {
 			$this->info_box_head['subpicto']='object_bookmark';
 			$this->info_box_head['subtext']=$langs->trans("BookmarksManagement");
 		}
@@ -87,7 +87,7 @@ 
 			$sql = "SELECT b.title, b.url, b.target, b.favicon";
 			$sql.= " FROM ".MAIN_DB_PREFIX."bookmark as b";
 			$sql.= " WHERE fk_user = ".$user->id;
-            $sql.= " AND b.entity = ".$conf->entity;
+			$sql.= " AND b.entity = ".$conf->entity;
 			$sql.= $db->order("position","ASC");
 			$sql.= $db->plimit($max, 0);
 
@@ -98,52 +98,52 @@ 
 
 				$line = 0;
 
-                while ($line < $num) {
-                    $objp = $db->fetch_object($result);
-
-                    $this->info_box_contents[$line][0] = array(
-                        'td' => 'align="left" width="16"',
-                        'logo' => $this->boximg,
-                        'url' => $objp->url,
-                        'tooltip' => $objp->title,
-                        'target' => $objp->target?'newtab':'',
-                    );
-                    $this->info_box_contents[$line][1] = array(
-                        'td' => '',
-                        'text' => $objp->title,
-                        'url' => $objp->url,
-                        'tooltip' => $objp->title,
-                        'target' => $objp->target?'newtab':'',
-                    );
-
-                    $line++;
-                }
-
-                if ($num==0) {
-                    $mytxt=$langs->trans("NoRecordedBookmarks");
-                    if ($user->rights->bookmark->creer) $mytxt.=' '.$langs->trans("ClickToAdd");
-                    $this->info_box_contents[$line][0] = array(
-                        'td' => 'align="center" colspan="2"',
-                        'tooltip' => $mytxt,
-                        'url'=> DOL_URL_ROOT.'/bookmarks/list.php', 'text'=>$mytxt,
-                    );
-                }
-
-                $db->free($result);
-            } else {
-                $this->info_box_contents[0][0] = array(
-                    'td' => '',
-                    'maxlength'=>500,
-                    'text' => ($db->error().' sql='.$sql),
-                );
-            }
-        } else {
-            $this->info_box_contents[0][0] = array(
-                'td' => 'align="left" class="nohover opacitymedium"',
-                'text' => $langs->trans("ReadPermissionNotAllowed")
-            );
-        }
-    }
+				while ($line < $num) {
+					$objp = $db->fetch_object($result);
+
+					$this->info_box_contents[$line][0] = array(
+						'td' => 'align="left" width="16"',
+						'logo' => $this->boximg,
+						'url' => $objp->url,
+						'tooltip' => $objp->title,
+						'target' => $objp->target?'newtab':'',
+					);
+					$this->info_box_contents[$line][1] = array(
+						'td' => '',
+						'text' => $objp->title,
+						'url' => $objp->url,
+						'tooltip' => $objp->title,
+						'target' => $objp->target?'newtab':'',
+					);
+
+					$line++;
+				}
+
+				if ($num==0) {
+					$mytxt=$langs->trans("NoRecordedBookmarks");
+					if ($user->rights->bookmark->creer) $mytxt.=' '.$langs->trans("ClickToAdd");
+					$this->info_box_contents[$line][0] = array(
+						'td' => 'align="center" colspan="2"',
+						'tooltip' => $mytxt,
+						'url'=> DOL_URL_ROOT.'/bookmarks/list.php', 'text'=>$mytxt,
+					);
+				}
+
+				$db->free($result);
+			} else {
+				$this->info_box_contents[0][0] = array(
+					'td' => '',
+					'maxlength'=>500,
+					'text' => ($db->error().' sql='.$sql),
+				);
+			}
+		} else {
+			$this->info_box_contents[0][0] = array(
+				'td' => 'align="left" class="nohover opacitymedium"',
+				'text' => $langs->trans("ReadPermissionNotAllowed")
+			);
+		}
+	}
 
 	/**
 	 *	Method to show box
@@ -153,8 +153,8 @@ 
 	 *  @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);
 	}
 

Spacing +24 added lines, -24 removed lines

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

Braces +4 added lines, -3 removed lines

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

htdocs/core/boxes/box_factures.php

Indentation +94 added lines, -94 removed lines

@@ -50,18 +50,18 @@ 
 	 */
 	function __construct($db,$param)
 	{
-	    global $user;
+		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
-     *  @return	void
+	 *  @return	void
 	 */
 	function loadBox($max=5)
 	{
@@ -69,11 +69,11 @@ 
 
 		$this->max=$max;
 
-        include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-        include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
+		include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+		include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 
-        $facturestatic=new Facture($db);
-        $societestatic = new Societe($db);
+		$facturestatic=new Facture($db);
+		$societestatic = new Societe($db);
 
 		$text = $langs->trans("BoxTitleLast".($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE?"":"Modified")."CustomerBills",$max);
 		$this->info_box_head = array(
@@ -81,16 +81,16 @@ 
 				'limit'=> dol_strlen($text)
 		);
 
-        if ($user->rights->facture->lire) {
-            $sql = "SELECT f.rowid as facid";
-            $sql.= ", f.facnumber, f.type, f.total as total_ht";
-            $sql.= ", f.tva as total_tva";
-            $sql.= ", f.total_ttc";
-            $sql.= ", f.datef as df";
+		if ($user->rights->facture->lire) {
+			$sql = "SELECT f.rowid as facid";
+			$sql.= ", f.facnumber, f.type, f.total as total_ht";
+			$sql.= ", f.tva as total_tva";
+			$sql.= ", f.total_ttc";
+			$sql.= ", f.datef as df";
 			$sql.= ", f.paye, f.fk_statut, f.datec, f.tms";
-            $sql.= ", s.nom as name";
-            $sql.= ", s.rowid as socid";
-            $sql.= ", s.code_client";
+			$sql.= ", s.nom as name";
+			$sql.= ", s.rowid as socid";
+			$sql.= ", s.code_client";
 			$sql.= ", f.date_lim_reglement as datelimite";
 			$sql.= " FROM (".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f";
 			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
@@ -99,8 +99,8 @@ 
 			$sql.= " AND f.entity = ".$conf->entity;
 			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 			if($user->societe_id)	$sql.= " AND s.rowid = ".$user->societe_id;
-            if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) $sql.= " ORDER BY f.datef DESC, f.facnumber DESC ";
-            else $sql.= " ORDER BY f.tms DESC, f.facnumber DESC ";
+			if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) $sql.= " ORDER BY f.datef DESC, f.facnumber DESC ";
+			else $sql.= " ORDER BY f.tms DESC, f.facnumber DESC ";
 			$sql.= $db->plimit($max, 0);
 
 			$result = $db->query($sql);
@@ -112,83 +112,83 @@ 
 				$line = 0;
 				$l_due_date = $langs->trans('Late').' ('.$langs->trans('DateDue').': %s)';
 
-                while ($line < $num) {
-                    $objp = $db->fetch_object($result);
-                    $datelimite = $db->jdate($objp->datelimite);
-                    $date = $db->jdate($objp->df);
-                    $datem = $db->jdate($objp->tms);
-                    $facturestatic->id = $objp->facid;
-                    $facturestatic->ref = $objp->facnumber;
-                    $facturestatic->type = $objp->type;
-                    $facturestatic->total_ht = $objp->total_ht;
-                    $facturestatic->total_tva = $objp->total_tva;
-                    $facturestatic->total_ttc = $objp->total_ttc;
-                    $facturestatic->statut = $objp->fk_statut;
-                    $facturestatic->date_lim_reglement = $db->jdate($objp->datelimite);
-
-                    $societestatic->id = $objp->socid;
-                    $societestatic->name = $objp->name;
-                    $societestatic->code_client = $objp->code_client;
+				while ($line < $num) {
+					$objp = $db->fetch_object($result);
+					$datelimite = $db->jdate($objp->datelimite);
+					$date = $db->jdate($objp->df);
+					$datem = $db->jdate($objp->tms);
+					$facturestatic->id = $objp->facid;
+					$facturestatic->ref = $objp->facnumber;
+					$facturestatic->type = $objp->type;
+					$facturestatic->total_ht = $objp->total_ht;
+					$facturestatic->total_tva = $objp->total_tva;
+					$facturestatic->total_ttc = $objp->total_ttc;
+					$facturestatic->statut = $objp->fk_statut;
+					$facturestatic->date_lim_reglement = $db->jdate($objp->datelimite);
+
+					$societestatic->id = $objp->socid;
+					$societestatic->name = $objp->name;
+					$societestatic->code_client = $objp->code_client;
 
 
 					$late = '';
 					if ($facturestatic->hasDelay()) {
-                        $late = img_warning(sprintf($l_due_date, dol_print_date($datelimite,'day')));
-                    }
-
-                    $this->info_box_contents[$line][] = array(
-                        'td' => '',
-                        'text' => $facturestatic->getNomUrl(1),
-                        'text2'=> $late,
-                        'asis' => 1,
-                    );
-
-                    $this->info_box_contents[$line][] = array(
-                        'td' => '',
-                        'text' => $societestatic->getNomUrl(1, '', 40),
-                        'asis' => 1,
-                    );
-
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="right"',
-                        'text' => price($objp->total_ht, 0, $langs, 0, -1, -1, $conf->currency),
-                    );
-
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="right"',
-                        'text' => dol_print_date($date,'day'),
-                    );
-
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'align="right" width="18"',
-                        'text' => $facturestatic->LibStatut($objp->paye,$objp->fk_statut,3),
-                    );
-
-                    $line++;
-                }
-
-                if ($num==0)
-                    $this->info_box_contents[$line][0] = array(
-                        'td' => 'align="center"',
-                        'text'=>$langs->trans("NoRecordedInvoices"),
-                    );
-
-                $db->free($result);
-            } else {
-                $this->info_box_contents[0][0] = array(
-                    'td' => '',
-                    'maxlength'=>500,
-                    'text' => ($db->error().' sql='.$sql),
-                );
-            }
-
-        } else {
-            $this->info_box_contents[0][0] = array(
-                'td' => 'align="left" class="nohover opacitymedium"',
-                'text' => $langs->trans("ReadPermissionNotAllowed")
-            );
-        }
-    }
+						$late = img_warning(sprintf($l_due_date, dol_print_date($datelimite,'day')));
+					}
+
+					$this->info_box_contents[$line][] = array(
+						'td' => '',
+						'text' => $facturestatic->getNomUrl(1),
+						'text2'=> $late,
+						'asis' => 1,
+					);
+
+					$this->info_box_contents[$line][] = array(
+						'td' => '',
+						'text' => $societestatic->getNomUrl(1, '', 40),
+						'asis' => 1,
+					);
+
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right"',
+						'text' => price($objp->total_ht, 0, $langs, 0, -1, -1, $conf->currency),
+					);
+
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right"',
+						'text' => dol_print_date($date,'day'),
+					);
+
+					$this->info_box_contents[$line][] = array(
+						'td' => 'align="right" width="18"',
+						'text' => $facturestatic->LibStatut($objp->paye,$objp->fk_statut,3),
+					);
+
+					$line++;
+				}
+
+				if ($num==0)
+					$this->info_box_contents[$line][0] = array(
+						'td' => 'align="center"',
+						'text'=>$langs->trans("NoRecordedInvoices"),
+					);
+
+				$db->free($result);
+			} else {
+				$this->info_box_contents[0][0] = array(
+					'td' => '',
+					'maxlength'=>500,
+					'text' => ($db->error().' sql='.$sql),
+				);
+			}
+
+		} else {
+			$this->info_box_contents[0][0] = array(
+				'td' => 'align="left" class="nohover opacitymedium"',
+				'text' => $langs->trans("ReadPermissionNotAllowed")
+			);
+		}
+	}
 
 	/**
 	 *  Method to show box
@@ -198,8 +198,8 @@ 
 	 *  @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);
 	}
 

Spacing +35 added lines, -35 removed lines

@@ -30,9 +30,9 @@ 
  */
 class box_factures extends ModeleBoxes
 {
-	var $boxcode="lastcustomerbills";
-	var $boximg="object_bill";
-	var $boxlabel="BoxLastCustomerBills";
+	var $boxcode = "lastcustomerbills";
+	var $boximg = "object_bill";
+	var $boxlabel = "BoxLastCustomerBills";
 	var $depends = array("facture");
 
 	var $db;
@@ -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,19 +63,19 @@ 
 	 *  @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;
 
         include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
         include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 
-        $facturestatic=new Facture($db);
+        $facturestatic = new Facture($db);
         $societestatic = new Societe($db);
 
-		$text = $langs->trans("BoxTitleLast".($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE?"":"Modified")."CustomerBills",$max);
+		$text = $langs->trans("BoxTitleLast".($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE ? "" : "Modified")."CustomerBills", $max);
 		$this->info_box_head = array(
 				'text' => $text,
 				'limit'=> dol_strlen($text)
@@ -83,31 +83,31 @@ 
 
         if ($user->rights->facture->lire) {
             $sql = "SELECT f.rowid as facid";
-            $sql.= ", f.facnumber, f.type, f.total as total_ht";
-            $sql.= ", f.tva as total_tva";
-            $sql.= ", f.total_ttc";
-            $sql.= ", f.datef as df";
-			$sql.= ", f.paye, f.fk_statut, f.datec, f.tms";
-            $sql.= ", s.nom as name";
-            $sql.= ", s.rowid as socid";
-            $sql.= ", s.code_client";
-			$sql.= ", f.date_lim_reglement as datelimite";
-			$sql.= " FROM (".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f";
-			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-			$sql.= ")";
-			$sql.= " WHERE f.fk_soc = s.rowid";
-			$sql.= " AND f.entity = ".$conf->entity;
-			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-			if($user->societe_id)	$sql.= " AND s.rowid = ".$user->societe_id;
-            if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) $sql.= " ORDER BY f.datef DESC, f.facnumber DESC ";
-            else $sql.= " ORDER BY f.tms DESC, f.facnumber DESC ";
-			$sql.= $db->plimit($max, 0);
+            $sql .= ", f.facnumber, f.type, f.total as total_ht";
+            $sql .= ", f.tva as total_tva";
+            $sql .= ", f.total_ttc";
+            $sql .= ", f.datef as df";
+			$sql .= ", f.paye, f.fk_statut, f.datec, f.tms";
+            $sql .= ", s.nom as name";
+            $sql .= ", s.rowid as socid";
+            $sql .= ", s.code_client";
+			$sql .= ", f.date_lim_reglement as datelimite";
+			$sql .= " FROM (".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f";
+			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+			$sql .= ")";
+			$sql .= " WHERE f.fk_soc = s.rowid";
+			$sql .= " AND f.entity = ".$conf->entity;
+			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+			if ($user->societe_id)	$sql .= " AND s.rowid = ".$user->societe_id;
+            if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) $sql .= " ORDER BY f.datef DESC, f.facnumber DESC ";
+            else $sql .= " ORDER BY f.tms DESC, f.facnumber DESC ";
+			$sql .= $db->plimit($max, 0);
 
 			$result = $db->query($sql);
 			if ($result)
 			{
 				$num = $db->num_rows($result);
-				$now=dol_now();
+				$now = dol_now();
 
 				$line = 0;
 				$l_due_date = $langs->trans('Late').' ('.$langs->trans('DateDue').': %s)';
@@ -133,7 +133,7 @@ 
 
 					$late = '';
 					if ($facturestatic->hasDelay()) {
-                        $late = img_warning(sprintf($l_due_date, dol_print_date($datelimite,'day')));
+                        $late = img_warning(sprintf($l_due_date, dol_print_date($datelimite, 'day')));
                     }
 
                     $this->info_box_contents[$line][] = array(
@@ -156,18 +156,18 @@ 
 
                     $this->info_box_contents[$line][] = array(
                         'td' => 'class="right"',
-                        'text' => dol_print_date($date,'day'),
+                        'text' => dol_print_date($date, 'day'),
                     );
 
                     $this->info_box_contents[$line][] = array(
                         'td' => 'align="right" width="18"',
-                        'text' => $facturestatic->LibStatut($objp->paye,$objp->fk_statut,3),
+                        'text' => $facturestatic->LibStatut($objp->paye, $objp->fk_statut, 3),
                     );
 
                     $line++;
                 }
 
-                if ($num==0)
+                if ($num == 0)
                     $this->info_box_contents[$line][0] = array(
                         'td' => 'align="center"',
                         'text'=>$langs->trans("NoRecordedInvoices"),
@@ -198,7 +198,7 @@ 
 	 *  @param	int		$nooutput	No print, only return string
 	 *	@return	string
 	 */
-    function showBox($head = null, $contents = null, $nooutput=0)
+    function showBox($head = null, $contents = null, $nooutput = 0)
     {
 		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}

Braces +17 added lines, -7 removed lines

@@ -93,14 +93,23 @@ 
             $sql.= ", s.code_client";
 			$sql.= ", f.date_lim_reglement as datelimite";
 			$sql.= " FROM (".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f";
-			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.= ")";
 			$sql.= " WHERE f.fk_soc = s.rowid";
 			$sql.= " AND f.entity = ".$conf->entity;
-			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-			if($user->societe_id)	$sql.= " AND s.rowid = ".$user->societe_id;
-            if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) $sql.= " ORDER BY f.datef DESC, f.facnumber DESC ";
-            else $sql.= " ORDER BY f.tms DESC, f.facnumber DESC ";
+			if (!$user->rights->societe->client->voir && !$user->societe_id) {
+				$sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+			}
+			if($user->societe_id) {
+				$sql.= " AND s.rowid = ".$user->societe_id;
+			}
+            if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) {
+            	$sql.= " ORDER BY f.datef DESC, f.facnumber DESC ";
+            } else {
+            	$sql.= " ORDER BY f.tms DESC, f.facnumber DESC ";
+            }
 			$sql.= $db->plimit($max, 0);
 
 			$result = $db->query($sql);
@@ -167,11 +176,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("NoRecordedInvoices"),
                     );
+                }
 
                 $db->free($result);
             } else {

htdocs/core/boxes/box_services_expired.php

Indentation +102 added lines, -102 removed lines

@@ -30,137 +30,137 @@ 
 class box_services_expired extends ModeleBoxes
 {
 
-    var $boxcode="expiredservices";     // id of box
-    var $boximg="object_contract";
-    var $boxlabel="BoxOldestExpiredServices";
-    var $depends = array("contrat");	// conf->propal->enabled
+	var $boxcode="expiredservices";     // id of box
+	var $boximg="object_contract";
+	var $boxlabel="BoxOldestExpiredServices";
+	var $depends = array("contrat");	// conf->propal->enabled
 
-    var $db;
-    var $param;
+	var $db;
+	var $param;
 
-    var $info_box_head = array();
-    var $info_box_contents = array();
+	var $info_box_head = array();
+	var $info_box_contents = array();
 
 
-    /**
-     *  Constructor
-     *
-     *  @param  DoliDB  $db         Database handler
-     *  @param  string  $param      More parameters
-     */
-    function __construct($db,$param)
-    {
-        global $user;
+	/**
+	 *  Constructor
+	 *
+	 *  @param  DoliDB  $db         Database handler
+	 *  @param  string  $param      More parameters
+	 */
+	function __construct($db,$param)
+	{
+		global $user;
 
-        $this->db=$db;
+		$this->db=$db;
 
-        $this->hidden=! ($user->rights->contrat->lire);
-    }
+		$this->hidden=! ($user->rights->contrat->lire);
+	}
 
-    /**
-     *  Load data for box to show them later
-     *
-     *  @param	int		$max        Maximum number of records to load
-     *  @return	void
-     */
-    function loadBox($max=5)
-    {
-    	global $user, $langs, $db, $conf;
+	/**
+	 *  Load data for box to show them later
+	 *
+	 *  @param	int		$max        Maximum number of records to load
+	 *  @return	void
+	 */
+	function loadBox($max=5)
+	{
+		global $user, $langs, $db, $conf;
 
-    	$this->max=$max;
+		$this->max=$max;
 
-    	$now=dol_now();
+		$now=dol_now();
 
-    	$this->info_box_head = array('text' => $langs->trans("BoxLastExpiredServices",$max));
+		$this->info_box_head = array('text' => $langs->trans("BoxLastExpiredServices",$max));
 
-    	if ($user->rights->contrat->lire)
-    	{
-    	    // Select contracts with at least one expired service
+		if ($user->rights->contrat->lire)
+		{
+			// Select contracts with at least one expired service
 			$sql = "SELECT ";
-    		$sql.= " c.rowid, c.ref, c.statut as fk_statut, c.date_contrat,";
+			$sql.= " c.rowid, c.ref, c.statut as fk_statut, c.date_contrat,";
 			$sql.= " s.nom as name, s.rowid as socid,";
 			$sql.= " MIN(cd.date_fin_validite) as date_line, COUNT(cd.rowid) as nb_services";
-    		$sql.= " FROM ".MAIN_DB_PREFIX."contrat as c, ".MAIN_DB_PREFIX."societe s, ".MAIN_DB_PREFIX."contratdet as cd";
-            if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-    		$sql.= " WHERE cd.statut = 4 AND cd.date_fin_validite <= '".$db->idate($now)."'";
-    		$sql.= " AND c.entity = ".$conf->entity;
-    		$sql.= " AND c.fk_soc=s.rowid AND cd.fk_contrat=c.rowid AND c.statut > 0";
-            if ($user->societe_id) $sql.=' AND c.fk_soc = '.$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;
-    		$sql.= " GROUP BY c.rowid, c.ref, c.statut, c.date_contrat, s.nom, s.rowid";
-    		$sql.= " ORDER BY date_line ASC";
-    		$sql.= $db->plimit($max, 0);
+			$sql.= " FROM ".MAIN_DB_PREFIX."contrat as c, ".MAIN_DB_PREFIX."societe s, ".MAIN_DB_PREFIX."contratdet as cd";
+			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+			$sql.= " WHERE cd.statut = 4 AND cd.date_fin_validite <= '".$db->idate($now)."'";
+			$sql.= " AND c.entity = ".$conf->entity;
+			$sql.= " AND c.fk_soc=s.rowid AND cd.fk_contrat=c.rowid AND c.statut > 0";
+			if ($user->societe_id) $sql.=' AND c.fk_soc = '.$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;
+			$sql.= " GROUP BY c.rowid, c.ref, c.statut, c.date_contrat, s.nom, s.rowid";
+			$sql.= " ORDER BY date_line ASC";
+			$sql.= $db->plimit($max, 0);
 
-    		$resql = $db->query($sql);
-    		if ($resql)
-    		{
-    			$num = $db->num_rows($resql);
+			$resql = $db->query($sql);
+			if ($resql)
+			{
+				$num = $db->num_rows($resql);
 
-    			$i = 0;
+				$i = 0;
 
-    			$thirdpartytmp = new Societe($this->db);
+				$thirdpartytmp = new Societe($this->db);
 
-    			while ($i < $num)
-    			{
-    			    $late='';
+				while ($i < $num)
+				{
+					$late='';
 
-    				$objp = $db->fetch_object($resql);
+					$objp = $db->fetch_object($resql);
 
 					$dateline=$db->jdate($objp->date_line);
 					if (($dateline + $conf->contrat->services->expires->warning_delay) < $now) $late=img_warning($langs->trans("Late"));
 
-    				$this->info_box_contents[$i][0] = array('td' => 'align="left" width="16"',
-    				'logo' => $this->boximg,
-    				'url' => DOL_URL_ROOT."/contrat/card.php?id=".$objp->rowid);
+					$this->info_box_contents[$i][0] = array('td' => 'align="left" width="16"',
+					'logo' => $this->boximg,
+					'url' => DOL_URL_ROOT."/contrat/card.php?id=".$objp->rowid);
 
-    				$this->info_box_contents[$i][1] = array('td' => '',
-    				'text' => ($objp->ref?$objp->ref:$objp->rowid),	// Some contracts have no ref
-    				'url' => DOL_URL_ROOT."/contrat/card.php?id=".$objp->rowid);
+					$this->info_box_contents[$i][1] = array('td' => '',
+					'text' => ($objp->ref?$objp->ref:$objp->rowid),	// Some contracts have no ref
+					'url' => DOL_URL_ROOT."/contrat/card.php?id=".$objp->rowid);
 
-    				$thirdpartytmp->id = $objp->socid;
-    				$thirdpartytmp->name = $objp->name;
+					$thirdpartytmp->id = $objp->socid;
+					$thirdpartytmp->name = $objp->name;
 
-    				$this->info_box_contents[$i][2] = array('td' => 'class="tdoverflowmax100 maxwidth100onsmartphone" align="left"',
-    				'text' => $thirdpartytmp->getNomUrl(1, 'customer'),
-    				'asis' => 1
-    				);
+					$this->info_box_contents[$i][2] = array('td' => 'class="tdoverflowmax100 maxwidth100onsmartphone" align="left"',
+					'text' => $thirdpartytmp->getNomUrl(1, 'customer'),
+					'asis' => 1
+					);
 
-    				$this->info_box_contents[$i][4] = array('td' => 'align="center"',
-    				'text' => dol_print_date($dateline,'day'),
-    				'text2'=> $late);
+					$this->info_box_contents[$i][4] = array('td' => 'align="center"',
+					'text' => dol_print_date($dateline,'day'),
+					'text2'=> $late);
 
-    				$this->info_box_contents[$i][5] = array('td' => 'class="right"',
-    				'text' => $objp->nb_services);
+					$this->info_box_contents[$i][5] = array('td' => 'class="right"',
+					'text' => $objp->nb_services);
 
 
-    				$i++;
-    			}
+					$i++;
+				}
 
-    			if ($num==0)
-    			{
-    			    $langs->load("contracts");
-    			    $this->info_box_contents[$i][0] = array('td' => 'align="center"','text'=>$langs->trans("NoExpiredServices"));
-    			}
+				if ($num==0)
+				{
+					$langs->load("contracts");
+					$this->info_box_contents[$i][0] = array('td' => 'align="center"','text'=>$langs->trans("NoExpiredServices"));
+				}
 
 				$db->free($resql);
-    		}
-    		else
-    		{
-    			$this->info_box_contents[0][0] = array(  'td' => '',
-                                                        'maxlength'=>500,
-                                                        'text' => ($db->error().' sql='.$sql));
-    		}
-
-
-    	}
-    	else
-    	{
-    		$this->info_box_contents[0][0] = array(
-    		    'td' => 'align="left" class="nohover opacitymedium"',
-    		    'text' => $langs->trans("ReadPermissionNotAllowed")
-    		);
-    	}
-    }
+			}
+			else
+			{
+				$this->info_box_contents[0][0] = array(  'td' => '',
+														'maxlength'=>500,
+														'text' => ($db->error().' sql='.$sql));
+			}
+
+
+		}
+		else
+		{
+			$this->info_box_contents[0][0] = array(
+				'td' => 'align="left" class="nohover opacitymedium"',
+				'text' => $langs->trans("ReadPermissionNotAllowed")
+			);
+		}
+	}
 
 	/**
 	 *	Method to show box
@@ -170,10 +170,10 @@ 
 	 *  @param	int		$nooutput	No print, only return string
 	 *	@return	string
 	 */
-    function showBox($head = null, $contents = null, $nooutput=0)
-    {
-        return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
-    }
+	function showBox($head = null, $contents = null, $nooutput=0)
+	{
+		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+	}
 
  }
 

Spacing +33 added lines, -33 removed lines

@@ -30,10 +30,10 @@ 
 class box_services_expired extends ModeleBoxes
 {
 
-    var $boxcode="expiredservices";     // id of box
-    var $boximg="object_contract";
-    var $boxlabel="BoxOldestExpiredServices";
-    var $depends = array("contrat");	// conf->propal->enabled
+    var $boxcode = "expiredservices"; // id of box
+    var $boximg = "object_contract";
+    var $boxlabel = "BoxOldestExpiredServices";
+    var $depends = array("contrat"); // conf->propal->enabled
 
     var $db;
     var $param;
@@ -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->contrat->lire);
+        $this->hidden = !($user->rights->contrat->lire);
     }
 
     /**
@@ -63,33 +63,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;
 
-    	$now=dol_now();
+    	$now = dol_now();
 
-    	$this->info_box_head = array('text' => $langs->trans("BoxLastExpiredServices",$max));
+    	$this->info_box_head = array('text' => $langs->trans("BoxLastExpiredServices", $max));
 
     	if ($user->rights->contrat->lire)
     	{
     	    // Select contracts with at least one expired service
 			$sql = "SELECT ";
-    		$sql.= " c.rowid, c.ref, c.statut as fk_statut, c.date_contrat,";
-			$sql.= " s.nom as name, s.rowid as socid,";
-			$sql.= " MIN(cd.date_fin_validite) as date_line, COUNT(cd.rowid) as nb_services";
-    		$sql.= " FROM ".MAIN_DB_PREFIX."contrat as c, ".MAIN_DB_PREFIX."societe s, ".MAIN_DB_PREFIX."contratdet as cd";
-            if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-    		$sql.= " WHERE cd.statut = 4 AND cd.date_fin_validite <= '".$db->idate($now)."'";
-    		$sql.= " AND c.entity = ".$conf->entity;
-    		$sql.= " AND c.fk_soc=s.rowid AND cd.fk_contrat=c.rowid AND c.statut > 0";
-            if ($user->societe_id) $sql.=' AND c.fk_soc = '.$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;
-    		$sql.= " GROUP BY c.rowid, c.ref, c.statut, c.date_contrat, s.nom, s.rowid";
-    		$sql.= " ORDER BY date_line ASC";
-    		$sql.= $db->plimit($max, 0);
+    		$sql .= " c.rowid, c.ref, c.statut as fk_statut, c.date_contrat,";
+			$sql .= " s.nom as name, s.rowid as socid,";
+			$sql .= " MIN(cd.date_fin_validite) as date_line, COUNT(cd.rowid) as nb_services";
+    		$sql .= " FROM ".MAIN_DB_PREFIX."contrat as c, ".MAIN_DB_PREFIX."societe s, ".MAIN_DB_PREFIX."contratdet as cd";
+            if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+    		$sql .= " WHERE cd.statut = 4 AND cd.date_fin_validite <= '".$db->idate($now)."'";
+    		$sql .= " AND c.entity = ".$conf->entity;
+    		$sql .= " AND c.fk_soc=s.rowid AND cd.fk_contrat=c.rowid AND c.statut > 0";
+            if ($user->societe_id) $sql .= ' AND c.fk_soc = '.$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;
+    		$sql .= " GROUP BY c.rowid, c.ref, c.statut, c.date_contrat, s.nom, s.rowid";
+    		$sql .= " ORDER BY date_line ASC";
+    		$sql .= $db->plimit($max, 0);
 
     		$resql = $db->query($sql);
     		if ($resql)
@@ -102,19 +102,19 @@ 
 
     			while ($i < $num)
     			{
-    			    $late='';
+    			    $late = '';
 
     				$objp = $db->fetch_object($resql);
 
-					$dateline=$db->jdate($objp->date_line);
-					if (($dateline + $conf->contrat->services->expires->warning_delay) < $now) $late=img_warning($langs->trans("Late"));
+					$dateline = $db->jdate($objp->date_line);
+					if (($dateline + $conf->contrat->services->expires->warning_delay) < $now) $late = img_warning($langs->trans("Late"));
 
     				$this->info_box_contents[$i][0] = array('td' => 'align="left" width="16"',
     				'logo' => $this->boximg,
     				'url' => DOL_URL_ROOT."/contrat/card.php?id=".$objp->rowid);
 
     				$this->info_box_contents[$i][1] = array('td' => '',
-    				'text' => ($objp->ref?$objp->ref:$objp->rowid),	// Some contracts have no ref
+    				'text' => ($objp->ref ? $objp->ref : $objp->rowid), // Some contracts have no ref
     				'url' => DOL_URL_ROOT."/contrat/card.php?id=".$objp->rowid);
 
     				$thirdpartytmp->id = $objp->socid;
@@ -126,7 +126,7 @@ 
     				);
 
     				$this->info_box_contents[$i][4] = array('td' => 'align="center"',
-    				'text' => dol_print_date($dateline,'day'),
+    				'text' => dol_print_date($dateline, 'day'),
     				'text2'=> $late);
 
     				$this->info_box_contents[$i][5] = array('td' => 'class="right"',
@@ -136,17 +136,17 @@ 
     				$i++;
     			}
 
-    			if ($num==0)
+    			if ($num == 0)
     			{
     			    $langs->load("contracts");
-    			    $this->info_box_contents[$i][0] = array('td' => 'align="center"','text'=>$langs->trans("NoExpiredServices"));
+    			    $this->info_box_contents[$i][0] = array('td' => 'align="center"', 'text'=>$langs->trans("NoExpiredServices"));
     			}
 
 				$db->free($resql);
     		}
     		else
     		{
-    			$this->info_box_contents[0][0] = array(  'td' => '',
+    			$this->info_box_contents[0][0] = array('td' => '',
                                                         'maxlength'=>500,
                                                         'text' => ($db->error().' sql='.$sql));
     		}
@@ -170,7 +170,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 +14 added lines, -8 removed lines

@@ -81,12 +81,18 @@ 
 			$sql.= " s.nom as name, s.rowid as socid,";
 			$sql.= " MIN(cd.date_fin_validite) as date_line, COUNT(cd.rowid) as nb_services";
     		$sql.= " FROM ".MAIN_DB_PREFIX."contrat as c, ".MAIN_DB_PREFIX."societe s, ".MAIN_DB_PREFIX."contratdet as cd";
-            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 cd.statut = 4 AND cd.date_fin_validite <= '".$db->idate($now)."'";
     		$sql.= " AND c.entity = ".$conf->entity;
     		$sql.= " AND c.fk_soc=s.rowid AND cd.fk_contrat=c.rowid AND c.statut > 0";
-            if ($user->societe_id) $sql.=' AND c.fk_soc = '.$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 c.fk_soc = '.$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;
+            }
     		$sql.= " GROUP BY c.rowid, c.ref, c.statut, c.date_contrat, s.nom, s.rowid";
     		$sql.= " ORDER BY date_line ASC";
     		$sql.= $db->plimit($max, 0);
@@ -107,7 +113,9 @@ 
     				$objp = $db->fetch_object($resql);
 
 					$dateline=$db->jdate($objp->date_line);
-					if (($dateline + $conf->contrat->services->expires->warning_delay) < $now) $late=img_warning($langs->trans("Late"));
+					if (($dateline + $conf->contrat->services->expires->warning_delay) < $now) {
+						$late=img_warning($langs->trans("Late"));
+					}
 
     				$this->info_box_contents[$i][0] = array('td' => 'align="left" width="16"',
     				'logo' => $this->boximg,
@@ -143,8 +151,7 @@ 
     			}
 
 				$db->free($resql);
-    		}
-    		else
+    		} else
     		{
     			$this->info_box_contents[0][0] = array(  'td' => '',
                                                         'maxlength'=>500,
@@ -152,8 +159,7 @@ 
     		}
 
 
-    	}
-    	else
+    	} else
     	{
     		$this->info_box_contents[0][0] = array(
     		    'td' => 'align="left" class="nohover opacitymedium"',

htdocs/core/boxes/box_graph_orders_supplier_permonth.php

Indentation +9 added lines, -9 removed lines

@@ -58,7 +58,7 @@ 
 	 *  Load data into info_box_contents array to show array later.
 	 *
 	 *  @param	int		$max        Maximum number of records to load
-     *  @return	void
+	 *  @return	void
 	 */
 	function loadBox($max=5)
 	{
@@ -90,9 +90,9 @@ 
 
 		if ($user->rights->fournisseur->commande->lire)
 		{
-		    $langs->load("orders");
+			$langs->load("orders");
 
-		    $param_year='DOLUSERCOOKIE_box_'.$this->boxcode.'_year';
+			$param_year='DOLUSERCOOKIE_box_'.$this->boxcode.'_year';
 			$param_shownb='DOLUSERCOOKIE_box_'.$this->boxcode.'_shownb';
 			$param_showtot='DOLUSERCOOKIE_box_'.$this->boxcode.'_showtot';
 
@@ -248,15 +248,15 @@ 
 			else
 			{
 				$this->info_box_contents[0][0] = array(	'td' => 'align="left" class="nohover"',
-    	        										'maxlength'=>500,
-	            										'text' => $mesg);
+														'maxlength'=>500,
+														'text' => $mesg);
 			}
 
 		}
 		else {
 			$this->info_box_contents[0][0] = array(
-			    'td' => 'align="left" class="nohover opacitymedium"',
-                'text' => $langs->trans("ReadPermissionNotAllowed")
+				'td' => 'align="left" class="nohover opacitymedium"',
+				'text' => $langs->trans("ReadPermissionNotAllowed")
 			);
 		}
 	}
@@ -269,8 +269,8 @@ 
 	 *  @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);
 	}
 

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");
 
 	var $db;
@@ -45,13 +45,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);
 	}
 
 	/**
@@ -60,17 +60,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),
@@ -82,50 +82,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)) $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)) $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)));
+				$data1 = $stats->getNbByMonthWithPrevYear($endyear, $startyear, (GETPOST('action', 'aZ09') == $refreshaction ?-1 : (3600 * 24)));
 
 				$filenamenb = $dir."/".$prefix."orderssuppliernbinyear-".$endyear.".png";
 				if ($mode == 'customer') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersnbinyear-'.$endyear.'.png';
@@ -133,15 +133,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);
@@ -153,17 +153,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)));
+				$data2 = $stats->getAmountByMonthWithPrevYear($endyear, $startyear, (GETPOST('action', 'aZ09') == $refreshaction ?-1 : (3600 * 24)));
 
 				$filenamenb = $dir."/".$prefix."orderssupplieramountinyear-".$endyear.".png";
 				if ($mode == 'customer') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&amp;file=ordersamountinyear-'.$endyear.'.png';
@@ -171,15 +171,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);
@@ -191,63 +191,63 @@ 
 					$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="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" 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="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" 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('td' => 'align="center" class="nohover"','textnoformat'=>$stringtoshow);
+				$this->info_box_contents[0][0] = array('td' => 'align="center" class="nohover"', 'textnoformat'=>$stringtoshow);
 			}
 			else
 			{
-				$this->info_box_contents[0][0] = array(	'td' => 'align="left" class="nohover"',
+				$this->info_box_contents[0][0] = array('td' => 'align="left" class="nohover"',
     	        										'maxlength'=>500,
 	            										'text' => $mesg);
 			}
@@ -269,7 +269,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 +34 added lines, -16 removed lines

@@ -85,8 +85,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)
 		{
@@ -104,17 +109,20 @@ 
 				$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'];
 				$shownb=$tmparray['shownb'];
 				$showtot=$tmparray['showtot'];
 			}
-			if (empty($shownb) && empty($showtot)) $showtot=1;
+			if (empty($shownb) && empty($showtot)) {
+				$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';
@@ -128,8 +136,12 @@ 
 				$data1 = $stats->getNbByMonthWithPrevYear($endyear,$startyear,(GETPOST('action','aZ09')==$refreshaction?-1:(3600*24)));
 
 				$filenamenb = $dir."/".$prefix."orderssuppliernbinyear-".$endyear.".png";
-				if ($mode == 'customer') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersnbinyear-'.$endyear.'.png';
-				if ($mode == 'supplier') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=orderssuppliernbinyear-'.$endyear.'.png';
+				if ($mode == 'customer') {
+					$fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersnbinyear-'.$endyear.'.png';
+				}
+				if ($mode == 'supplier') {
+					$fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=orderssuppliernbinyear-'.$endyear.'.png';
+				}
 
 				$px1 = new DolGraph();
 				$mesg = $px1->isGraphKo();
@@ -166,8 +178,12 @@ 
 				$data2 = $stats->getAmountByMonthWithPrevYear($endyear,$startyear,(GETPOST('action','aZ09')==$refreshaction?-1:(3600*24)));
 
 				$filenamenb = $dir."/".$prefix."orderssupplieramountinyear-".$endyear.".png";
-				if ($mode == 'customer') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersamountinyear-'.$endyear.'.png';
-				if ($mode == 'supplier') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=orderssupplieramountinyear-'.$endyear.'.png';
+				if ($mode == 'customer') {
+					$fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersamountinyear-'.$endyear.'.png';
+				}
+				if ($mode == 'supplier') {
+					$fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=orderssupplieramountinyear-'.$endyear.'.png';
+				}
 
 				$px2 = new DolGraph();
 				$mesg = $px2->isGraphKo();
@@ -231,29 +247,31 @@ 
 					$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('td' => 'align="center" class="nohover"','textnoformat'=>$stringtoshow);
-			}
-			else
+			} else
 			{
 				$this->info_box_contents[0][0] = array(	'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")

htdocs/core/boxes/box_factures_imp.php

Indentation +62 added lines, -62 removed lines

@@ -53,18 +53,18 @@ 
 	 */
 	function __construct($db,$param)
 	{
-	    global $user;
+		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
-     *  @return	void
+	 *  @return	void
 	 */
 	function loadBox($max=5)
 	{
@@ -73,24 +73,24 @@ 
 		$this->max=$max;
 
 		include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-        include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
+		include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 
-        $facturestatic = new Facture($db);
-        $societestatic = new Societe($db);
+		$facturestatic = new Facture($db);
+		$societestatic = new Societe($db);
 
 		$this->info_box_head = array('text' => $langs->trans("BoxTitleOldestUnpaidCustomerBills",$max));
 
 		if ($user->rights->facture->lire)
 		{
 			$sql = "SELECT s.nom as name, s.rowid as socid,";
-            $sql.= " s.code_client,";
-            $sql.= " s.logo,";
+			$sql.= " s.code_client,";
+			$sql.= " s.logo,";
 			$sql.= " f.facnumber, f.date_lim_reglement as datelimite,";
-            $sql.= " f.type,";
+			$sql.= " f.type,";
 			$sql.= " f.amount, f.datef as df,";
-            $sql.= " f.total as total_ht,";
-            $sql.= " f.tva as total_tva,";
-            $sql.= " f.total_ttc,";
+			$sql.= " f.total as total_ht,";
+			$sql.= " f.tva as total_tva,";
+			$sql.= " f.total_ttc,";
 			$sql.= " f.paye, f.fk_statut, f.rowid as facid";
 			$sql.= ", sum(pf.amount) as am";
 			$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
@@ -122,52 +122,52 @@ 
 				{
 					$objp = $db->fetch_object($result);
 					$datelimite=$db->jdate($objp->datelimite);
-                    $facturestatic->id = $objp->facid;
-                    $facturestatic->ref = $objp->facnumber;
-                    $facturestatic->type = $objp->type;
-                    $facturestatic->total_ht = $objp->total_ht;
-                    $facturestatic->total_tva = $objp->total_tva;
-                    $facturestatic->total_ttc = $objp->total_ttc;
+					$facturestatic->id = $objp->facid;
+					$facturestatic->ref = $objp->facnumber;
+					$facturestatic->type = $objp->type;
+					$facturestatic->total_ht = $objp->total_ht;
+					$facturestatic->total_tva = $objp->total_tva;
+					$facturestatic->total_ttc = $objp->total_ttc;
 					$facturestatic->statut = $objp->fk_statut;
 					$facturestatic->date_lim_reglement = $db->jdate($objp->datelimite);
-                    $societestatic->id = $objp->socid;
-                    $societestatic->name = $objp->name;
-                    $societestatic->client = 1;
-                    $societestatic->code_client = $objp->code_client;
-                    $societestatic->logo = $objp->logo;
+					$societestatic->id = $objp->socid;
+					$societestatic->name = $objp->name;
+					$societestatic->client = 1;
+					$societestatic->code_client = $objp->code_client;
+					$societestatic->logo = $objp->logo;
 
 					$late='';
 					if ($facturestatic->hasDelay()) {
 						$late = img_warning(sprintf($l_due_date,dol_print_date($datelimite,'day')));
 					}
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => '',
-                        'text' => $facturestatic->getNomUrl(1),
-                        'text2'=> $late,
-                        'asis' => 1,
-                    );
-
-                    $this->info_box_contents[$line][] = array(
-                        'td' => '',
-                        'text' => $societestatic->getNomUrl(1, '', 44),
-                        'asis' => 1,
-                    );
-
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="right"',
-                        'text' => price($objp->total_ht, 0, $langs, 0, -1, -1, $conf->currency),
-                    );
-
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="right"',
-                        'text' => dol_print_date($datelimite,'day'),
-                    );
-
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'align="right" width="18"',
-                        'text' => $facturestatic->LibStatut($objp->paye,$objp->fk_statut,3,$objp->am),
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => '',
+						'text' => $facturestatic->getNomUrl(1),
+						'text2'=> $late,
+						'asis' => 1,
+					);
+
+					$this->info_box_contents[$line][] = array(
+						'td' => '',
+						'text' => $societestatic->getNomUrl(1, '', 44),
+						'asis' => 1,
+					);
+
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right"',
+						'text' => price($objp->total_ht, 0, $langs, 0, -1, -1, $conf->currency),
+					);
+
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right"',
+						'text' => dol_print_date($datelimite,'day'),
+					);
+
+					$this->info_box_contents[$line][] = array(
+						'td' => 'align="right" width="18"',
+						'text' => $facturestatic->LibStatut($objp->paye,$objp->fk_statut,3,$objp->am),
+					);
 
 					$line++;
 				}
@@ -178,18 +178,18 @@ 
 			}
 			else
 			{
-                $this->info_box_contents[0][0] = array(
-                    'td' => '',
-                    'maxlength'=>500,
-                    'text' => ($db->error().' sql='.$sql),
-                );
+				$this->info_box_contents[0][0] = array(
+					'td' => '',
+					'maxlength'=>500,
+					'text' => ($db->error().' sql='.$sql),
+				);
 			}
 		}
 		else {
-            $this->info_box_contents[0][0] = array(
-                'td' => 'align="left" class="nohover opacitymedium"',
-                'text' => $langs->trans("ReadPermissionNotAllowed")
-            );
+			$this->info_box_contents[0][0] = array(
+				'td' => 'align="left" class="nohover opacitymedium"',
+				'text' => $langs->trans("ReadPermissionNotAllowed")
+			);
 		}
 	}
 
@@ -201,8 +201,8 @@ 
 	 *  @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);
 	}
 

Spacing +41 added lines, -41 removed lines

@@ -33,9 +33,9 @@ 
  */
 class box_factures_imp extends ModeleBoxes
 {
-	var $boxcode="oldestunpaidcustomerbills";
-	var $boximg="object_bill";
-	var $boxlabel="BoxOldestUnpaidCustomerBills";
+	var $boxcode = "oldestunpaidcustomerbills";
+	var $boximg = "object_bill";
+	var $boxlabel = "BoxOldestUnpaidCustomerBills";
 	var $depends = array("facture");
 
 	var $db;
@@ -51,13 +51,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);
 	}
 
 	/**
@@ -66,11 +66,11 @@ 
 	 *  @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;
 
 		include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
         include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
@@ -78,42 +78,42 @@ 
         $facturestatic = new Facture($db);
         $societestatic = new Societe($db);
 
-		$this->info_box_head = array('text' => $langs->trans("BoxTitleOldestUnpaidCustomerBills",$max));
+		$this->info_box_head = array('text' => $langs->trans("BoxTitleOldestUnpaidCustomerBills", $max));
 
 		if ($user->rights->facture->lire)
 		{
 			$sql = "SELECT s.nom as name, s.rowid as socid,";
-            $sql.= " s.code_client,";
-            $sql.= " s.logo,";
-			$sql.= " f.facnumber, f.date_lim_reglement as datelimite,";
-            $sql.= " f.type,";
-			$sql.= " f.amount, f.datef as df,";
-            $sql.= " f.total as total_ht,";
-            $sql.= " f.tva as total_tva,";
-            $sql.= " f.total_ttc,";
-			$sql.= " f.paye, f.fk_statut, f.rowid as facid";
-			$sql.= ", sum(pf.amount) as am";
-			$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.= ", ".MAIN_DB_PREFIX."facture as f";
-			$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON f.rowid=pf.fk_facture ";
-			$sql.= " WHERE f.fk_soc = s.rowid";
-			$sql.= " AND f.entity = ".$conf->entity;
-			$sql.= " AND f.paye = 0";
-			$sql.= " AND fk_statut = 1";
-			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.= " GROUP BY s.nom, s.rowid, s.code_client, s.logo, f.facnumber, f.date_lim_reglement,";
-			$sql.= " f.type, f.amount, f.datef, f.total, f.tva, f.total_ttc, f.paye, f.fk_statut, f.rowid";
+            $sql .= " s.code_client,";
+            $sql .= " s.logo,";
+			$sql .= " f.facnumber, f.date_lim_reglement as datelimite,";
+            $sql .= " f.type,";
+			$sql .= " f.amount, f.datef as df,";
+            $sql .= " f.total as total_ht,";
+            $sql .= " f.tva as total_tva,";
+            $sql .= " f.total_ttc,";
+			$sql .= " f.paye, f.fk_statut, f.rowid as facid";
+			$sql .= ", sum(pf.amount) as am";
+			$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 .= ", ".MAIN_DB_PREFIX."facture as f";
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON f.rowid=pf.fk_facture ";
+			$sql .= " WHERE f.fk_soc = s.rowid";
+			$sql .= " AND f.entity = ".$conf->entity;
+			$sql .= " AND f.paye = 0";
+			$sql .= " AND fk_statut = 1";
+			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 .= " GROUP BY s.nom, s.rowid, s.code_client, s.logo, f.facnumber, f.date_lim_reglement,";
+			$sql .= " f.type, f.amount, f.datef, f.total, f.tva, f.total_ttc, f.paye, f.fk_statut, f.rowid";
 			//$sql.= " ORDER BY f.datef DESC, f.facnumber DESC ";
-			$sql.= " ORDER BY datelimite ASC, f.facnumber ASC ";
-			$sql.= $db->plimit($max, 0);
+			$sql .= " ORDER BY datelimite ASC, f.facnumber ASC ";
+			$sql .= $db->plimit($max, 0);
 
 			$result = $db->query($sql);
 			if ($result)
 			{
 				$num = $db->num_rows($result);
-				$now=dol_now();
+				$now = dol_now();
 
 				$line = 0;
 				$l_due_date = $langs->trans('Late').' ('.strtolower($langs->trans('DateDue')).': %s)';
@@ -121,7 +121,7 @@ 
 				while ($line < $num)
 				{
 					$objp = $db->fetch_object($result);
-					$datelimite=$db->jdate($objp->datelimite);
+					$datelimite = $db->jdate($objp->datelimite);
                     $facturestatic->id = $objp->facid;
                     $facturestatic->ref = $objp->facnumber;
                     $facturestatic->type = $objp->type;
@@ -136,9 +136,9 @@ 
                     $societestatic->code_client = $objp->code_client;
                     $societestatic->logo = $objp->logo;
 
-					$late='';
+					$late = '';
 					if ($facturestatic->hasDelay()) {
-						$late = img_warning(sprintf($l_due_date,dol_print_date($datelimite,'day')));
+						$late = img_warning(sprintf($l_due_date, dol_print_date($datelimite, 'day')));
 					}
 
                     $this->info_box_contents[$line][] = array(
@@ -161,18 +161,18 @@ 
 
                     $this->info_box_contents[$line][] = array(
                         'td' => 'class="right"',
-                        'text' => dol_print_date($datelimite,'day'),
+                        'text' => dol_print_date($datelimite, 'day'),
                     );
 
                     $this->info_box_contents[$line][] = array(
                         'td' => 'align="right" width="18"',
-                        'text' => $facturestatic->LibStatut($objp->paye,$objp->fk_statut,3,$objp->am),
+                        'text' => $facturestatic->LibStatut($objp->paye, $objp->fk_statut, 3, $objp->am),
                     );
 
 					$line++;
 				}
 
-				if ($num==0) $this->info_box_contents[$line][0] = array('td' => 'align="center"','text'=>$langs->trans("NoUnpaidCustomerBills"));
+				if ($num == 0) $this->info_box_contents[$line][0] = array('td' => 'align="center"', 'text'=>$langs->trans("NoUnpaidCustomerBills"));
 
 				$db->free($result);
 			}
@@ -201,7 +201,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 +14 added lines, -8 removed lines

@@ -94,15 +94,21 @@ 
 			$sql.= " f.paye, f.fk_statut, f.rowid as facid";
 			$sql.= ", sum(pf.amount) as am";
 			$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.= ", ".MAIN_DB_PREFIX."facture as f";
 			$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON f.rowid=pf.fk_facture ";
 			$sql.= " WHERE f.fk_soc = s.rowid";
 			$sql.= " AND f.entity = ".$conf->entity;
 			$sql.= " AND f.paye = 0";
 			$sql.= " AND fk_statut = 1";
-			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.= " GROUP BY s.nom, s.rowid, s.code_client, s.logo, f.facnumber, f.date_lim_reglement,";
 			$sql.= " f.type, f.amount, f.datef, f.total, f.tva, f.total_ttc, f.paye, f.fk_statut, f.rowid";
 			//$sql.= " ORDER BY f.datef DESC, f.facnumber DESC ";
@@ -172,11 +178,12 @@ 
 					$line++;
 				}
 
-				if ($num==0) $this->info_box_contents[$line][0] = array('td' => 'align="center"','text'=>$langs->trans("NoUnpaidCustomerBills"));
+				if ($num==0) {
+					$this->info_box_contents[$line][0] = array('td' => 'align="center"','text'=>$langs->trans("NoUnpaidCustomerBills"));
+				}
 
 				$db->free($result);
-			}
-			else
+			} else
 			{
                 $this->info_box_contents[0][0] = array(
                     'td' => '',
@@ -184,8 +191,7 @@ 
                     'text' => ($db->error().' sql='.$sql),
                 );
 			}
-		}
-		else {
+		} else {
             $this->info_box_contents[0][0] = array(
                 'td' => 'align="left" class="nohover opacitymedium"',
                 'text' => $langs->trans("ReadPermissionNotAllowed")

htdocs/core/boxes/box_graph_propales_permonth.php

Indentation +7 added lines, -7 removed lines

@@ -58,7 +58,7 @@ 
 	 *  Load data into info_box_contents array to show array later.
 	 *
 	 *  @param	int		$max        Maximum number of records to load
-     *  @return	void
+	 *  @return	void
 	 */
 	function loadBox($max=5)
 	{
@@ -250,15 +250,15 @@ 
 			else
 			{
 				$this->info_box_contents[0][0] = array(	'td' => 'align="left" class="nohover"',
-    	        										'maxlength'=>500,
-	            										'text' => $mesg);
+														'maxlength'=>500,
+														'text' => $mesg);
 			}
 
 		}
 		else {
 			$this->info_box_contents[0][0] = array(
-			    'td' => 'align="left" class="nohover opacitymedium"',
-                'text' => $langs->trans("ReadPermissionNotAllowed")
+				'td' => 'align="left" class="nohover opacitymedium"',
+				'text' => $langs->trans("ReadPermissionNotAllowed")
 			);
 		}
 	}
@@ -271,8 +271,8 @@ 
 	 *  @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);
 	}
 

Spacing +75 added lines, -75 removed lines

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

@@ -86,8 +86,13 @@ 
 		$dir=''; 	// We don't need a path because image file will not be saved into disk
 		$prefix='';
 		$socid=0;
-		if ($user->societe_id) $socid=$user->societe_id;
-		if (! $user->rights->societe->client->voir || $socid) $prefix.='private-'.$user->id.'-';	// If user has no permission to see all, output dir is specific to user
+		if ($user->societe_id) {
+			$socid=$user->societe_id;
+		}
+		if (! $user->rights->societe->client->voir || $socid) {
+			$prefix.='private-'.$user->id.'-';
+		}
+		// If user has no permission to see all, output dir is specific to user
 
 		if ($user->rights->propale->lire)
 		{
@@ -103,17 +108,20 @@ 
 				$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'];
 				$shownb=$tmparray['shownb'];
 				$showtot=$tmparray['showtot'];
 			}
-			if (empty($shownb) && empty($showtot)) $showtot=1;
+			if (empty($shownb) && empty($showtot)) {
+				$showtot=1;
+			}
 			$nowarray=dol_getdate(dol_now(),true);
-			if (empty($endyear)) $endyear=$nowarray['year'];
+			if (empty($endyear)) {
+				$endyear=$nowarray['year'];
+			}
 			$startyear=$endyear-1;
 			$WIDTH=(($shownb && $showtot) || ! empty($conf->dol_optimize_smallscreen))?'256':'320';
 			$HEIGHT='192';
@@ -167,8 +175,12 @@ 
 				//$datatype2 = array('lines','bars');
 
 				$filenamenb = $dir."/".$prefix."propalsamountinyear-".$endyear.".png";
-				if ($mode == 'customer') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=propalstats&file=propalsamountinyear-'.$endyear.'.png';
-				if ($mode == 'supplier') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=propalstatssupplier&file=propalsamountinyear-'.$endyear.'.png';
+				if ($mode == 'customer') {
+					$fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=propalstats&file=propalsamountinyear-'.$endyear.'.png';
+				}
+				if ($mode == 'supplier') {
+					$fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=propalstatssupplier&file=propalsamountinyear-'.$endyear.'.png';
+				}
 
 				$px2 = new DolGraph();
 				$mesg = $px2->isGraphKo();
@@ -233,29 +245,31 @@ 
 					$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('td' => 'align="center" class="nohover"','textnoformat'=>$stringtoshow);
-			}
-			else
+			} else
 			{
 				$this->info_box_contents[0][0] = array(	'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")

htdocs/core/boxes/box_graph_product_distribution.php

Indentation +7 added lines, -7 removed lines

@@ -53,7 +53,7 @@ 
 		$this->db=$db;
 
 		$this->hidden = ! (
-		    (! empty($conf->facture->enabled) && ! empty($user->rights->facture->lire))
+			(! empty($conf->facture->enabled) && ! empty($user->rights->facture->lire))
 		 || (! empty($conf->commande->enabled) && ! empty($user->rights->commande->lire))
 		 || (! empty($conf->propal->enabled) && ! empty($user->rights->propale->lire))
 		);
@@ -63,7 +63,7 @@ 
 	 *  Load data into info_box_contents array to show array later.
 	 *
 	 *  @param	int		$max        Maximum number of records to load
-     *  @return	void
+	 *  @return	void
 	 */
 	function loadBox($max=5)
 	{
@@ -316,8 +316,8 @@ 
 
 		if (empty($nbofgraph))
 		{
-		    $langs->load("errors");
-		    $mesg=$langs->trans("ReadPermissionNotAllowed");
+			$langs->load("errors");
+			$mesg=$langs->trans("ReadPermissionNotAllowed");
 		}
 		if (empty($conf->use_javascript_ajax))
 		{
@@ -391,7 +391,7 @@ 
 		else
 		{
 			$this->info_box_contents[0][0] = array(
-			    'td' => 'align="left" class="nohover opacitymedium"',
+				'td' => 'align="left" class="nohover opacitymedium"',
 				'maxlength'=>500,
 				'text' => $mesg
 			);
@@ -407,8 +407,8 @@ 
 	 *  @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);
 	}
 

Spacing +122 added lines, -122 removed lines

@@ -28,10 +28,10 @@ 
  */
 class box_graph_product_distribution extends ModeleBoxes
 {
-	var $boxcode="productdistribution";
-	var $boximg="object_product";
-	var $boxlabel="BoxProductDistribution";
-	var $depends = array("product|service","facture|propal|commande");
+	var $boxcode = "productdistribution";
+	var $boximg = "object_product";
+	var $boxlabel = "BoxProductDistribution";
+	var $depends = array("product|service", "facture|propal|commande");
 
 	var $db;
 	var $param;
@@ -46,16 +46,16 @@ 
 	 * 	@param	DoliDB	$db			Database handler
 	 *  @param	string	$param		More parameters
 	 */
-	function __construct($db,$param)
+	function __construct($db, $param)
 	{
 		global $user, $conf;
 
-		$this->db=$db;
+		$this->db = $db;
 
-		$this->hidden = ! (
-		    (! empty($conf->facture->enabled) && ! empty($user->rights->facture->lire))
-		 || (! empty($conf->commande->enabled) && ! empty($user->rights->commande->lire))
-		 || (! empty($conf->propal->enabled) && ! empty($user->rights->propale->lire))
+		$this->hidden = !(
+		    (!empty($conf->facture->enabled) && !empty($user->rights->facture->lire))
+		 || (!empty($conf->commande->enabled) && !empty($user->rights->commande->lire))
+		 || (!empty($conf->propal->enabled) && !empty($user->rights->propale->lire))
 		);
 	}
 
@@ -65,52 +65,52 @@ 
 	 *  @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';
 		include_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
 		include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 
-		$param_year='DOLUSERCOOKIE_box_'.$this->boxcode.'_year';
-		$param_showinvoicenb='DOLUSERCOOKIE_box_'.$this->boxcode.'_showinvoicenb';
-		$param_showpropalnb='DOLUSERCOOKIE_box_'.$this->boxcode.'_showpropalnb';
-		$param_showordernb='DOLUSERCOOKIE_box_'.$this->boxcode.'_showordernb';
-		$autosetarray=preg_split("/[,;:]+/",GETPOST('DOL_AUTOSET_COOKIE'));
-		if (in_array('DOLUSERCOOKIE_box_'.$this->boxcode,$autosetarray))
+		$param_year = 'DOLUSERCOOKIE_box_'.$this->boxcode.'_year';
+		$param_showinvoicenb = 'DOLUSERCOOKIE_box_'.$this->boxcode.'_showinvoicenb';
+		$param_showpropalnb = 'DOLUSERCOOKIE_box_'.$this->boxcode.'_showpropalnb';
+		$param_showordernb = 'DOLUSERCOOKIE_box_'.$this->boxcode.'_showordernb';
+		$autosetarray = preg_split("/[,;:]+/", GETPOST('DOL_AUTOSET_COOKIE'));
+		if (in_array('DOLUSERCOOKIE_box_'.$this->boxcode, $autosetarray))
 		{
-			$year=GETPOST($param_year,'int');
-			$showinvoicenb=GETPOST($param_showinvoicenb,'alpha');
-			$showpropalnb=GETPOST($param_showpropalnb,'alpha');
-			$showordernb=GETPOST($param_showordernb,'alpha');
+			$year = GETPOST($param_year, 'int');
+			$showinvoicenb = GETPOST($param_showinvoicenb, 'alpha');
+			$showpropalnb = GETPOST($param_showpropalnb, 'alpha');
+			$showordernb = GETPOST($param_showordernb, 'alpha');
 		}
 		else
 		{
-			$tmparray=json_decode($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode],true);
-			$year=$tmparray['year'];
-			$showinvoicenb=$tmparray['showinvoicenb'];
-			$showpropalnb=$tmparray['showpropalnb'];
-			$showordernb=$tmparray['showordernb'];
+			$tmparray = json_decode($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode], true);
+			$year = $tmparray['year'];
+			$showinvoicenb = $tmparray['showinvoicenb'];
+			$showpropalnb = $tmparray['showpropalnb'];
+			$showordernb = $tmparray['showordernb'];
 		}
-		if (empty($showinvoicenb) && empty($showpropalnb) && empty($showordernb)) { $showpropalnb=1; $showinvoicenb=1; $showordernb=1; }
-		if (empty($conf->facture->enabled) || empty($user->rights->facture->lire)) $showinvoicenb=0;
-		if (empty($conf->propal->enabled) || empty($user->rights->propale->lire)) $showpropalnb=0;
-		if (empty($conf->commande->enabled) || empty($user->rights->commande->lire)) $showordernb=0;
+		if (empty($showinvoicenb) && empty($showpropalnb) && empty($showordernb)) { $showpropalnb = 1; $showinvoicenb = 1; $showordernb = 1; }
+		if (empty($conf->facture->enabled) || empty($user->rights->facture->lire)) $showinvoicenb = 0;
+		if (empty($conf->propal->enabled) || empty($user->rights->propale->lire)) $showpropalnb = 0;
+		if (empty($conf->commande->enabled) || empty($user->rights->commande->lire)) $showordernb = 0;
 
-		$nowarray=dol_getdate(dol_now(),true);
-		if (empty($year)) $year=$nowarray['year'];
+		$nowarray = dol_getdate(dol_now(), true);
+		if (empty($year)) $year = $nowarray['year'];
 
-		$nbofgraph=0;
+		$nbofgraph = 0;
 		if ($showinvoicenb) $nbofgraph++;
 		if ($showpropalnb)  $nbofgraph++;
 		if ($showordernb)   $nbofgraph++;
 
-		$text = $langs->trans("BoxProductDistribution",$max).' - '.$langs->trans("Year").': '.$year;
+		$text = $langs->trans("BoxProductDistribution", $max).' - '.$langs->trans("Year").': '.$year;
 		$this->info_box_head = array(
 				'text' => $text,
 				'limit'=> dol_strlen($text),
@@ -123,17 +123,17 @@ 
 		);
 
 
-		$paramtitle=$langs->transnoentitiesnoconv("Products").'/'.$langs->transnoentitiesnoconv("Services");
-		if (empty($conf->produit->enabled)) $paramtitle=$langs->transnoentitiesnoconv("Services");
-		if (empty($conf->service->enabled)) $paramtitle=$langs->transnoentitiesnoconv("Products");
+		$paramtitle = $langs->transnoentitiesnoconv("Products").'/'.$langs->transnoentitiesnoconv("Services");
+		if (empty($conf->produit->enabled)) $paramtitle = $langs->transnoentitiesnoconv("Services");
+		if (empty($conf->service->enabled)) $paramtitle = $langs->transnoentitiesnoconv("Products");
 
-		$socid=empty($user->societe_id)?0:$user->societe_id;
-		$userid=0;	// No filter on user creation
+		$socid = empty($user->societe_id) ? 0 : $user->societe_id;
+		$userid = 0; // No filter on user creation
 
-		$WIDTH=($nbofgraph >= 2 || ! empty($conf->dol_optimize_smallscreen))?'160':'320';
-		$HEIGHT='192';
+		$WIDTH = ($nbofgraph >= 2 || !empty($conf->dol_optimize_smallscreen)) ? '160' : '320';
+		$HEIGHT = '192';
 
-		if (! empty($conf->facture->enabled) && ! empty($user->rights->facture->lire))
+		if (!empty($conf->facture->enabled) && !empty($user->rights->facture->lire))
 		{
 
 			// Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...)
@@ -142,34 +142,34 @@ 
 				include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facturestats.class.php';
 
 				$showpointvalue = 1; $nocolor = 0;
-				$mode='customer';
-				$stats_invoice = new FactureStats($this->db, $socid, $mode, ($userid>0?$userid:0));
-				$data1 = $stats_invoice->getAllByProductEntry($year,(GETPOST('action','aZ09')==$refreshaction?-1:(3600*24)));
+				$mode = 'customer';
+				$stats_invoice = new FactureStats($this->db, $socid, $mode, ($userid > 0 ? $userid : 0));
+				$data1 = $stats_invoice->getAllByProductEntry($year, (GETPOST('action', 'aZ09') == $refreshaction ?-1 : (3600 * 24)));
 				if (empty($data1))
 				{
-					$showpointvalue=0;
-					$nocolor=1;
-					$data1=array(array(0=>$langs->trans("None"),1=>1));
+					$showpointvalue = 0;
+					$nocolor = 1;
+					$data1 = array(array(0=>$langs->trans("None"), 1=>1));
 				}
 				$filenamenb = $dir."/prodserforinvoice-".$year.".png";
 				$fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=productstats&file=prodserforinvoice-'.$year.'.png';
 
 				$px1 = new DolGraph();
 				$mesg = $px1->isGraphKo();
-				if (! $mesg)
+				if (!$mesg)
 				{
-					$i=0;$tot=count($data1);$legend=array();
+					$i = 0; $tot = count($data1); $legend = array();
 					while ($i <= $tot)
 					{
-						$data1[$i][0]=dol_trunc($data1[$i][0],5);	// Required to avoid error "Could not draw pie with labels contained inside canvas"
-						$legend[]=$data1[$i][0];
+						$data1[$i][0] = dol_trunc($data1[$i][0], 5); // Required to avoid error "Could not draw pie with labels contained inside canvas"
+						$legend[] = $data1[$i][0];
 						$i++;
 					}
 
 					$px1->SetData($data1);
 					unset($data1);
 
-					if ($nocolor) $px1->SetDataColor(array(array(220,220,220)));
+					if ($nocolor) $px1->SetDataColor(array(array(220, 220, 220)));
 					$px1->SetPrecisionY(0);
 					$px1->SetLegend($legend);
 					$px1->setShowLegend(0);
@@ -185,15 +185,15 @@ 
 					$px1->SetCssPrefix("cssboxes");
 					//$px1->mode='depth';
 					$px1->SetType(array('pie'));
-					$px1->SetTitle($langs->trans("BoxProductDistributionFor",$paramtitle,$langs->transnoentitiesnoconv("Invoices")));
+					$px1->SetTitle($langs->trans("BoxProductDistributionFor", $paramtitle, $langs->transnoentitiesnoconv("Invoices")));
 					$px1->combine = 0.05;
 
-					$px1->draw($filenamenb,$fileurlnb);
+					$px1->draw($filenamenb, $fileurlnb);
 				}
 			}
 		}
 
-		if (! empty($conf->propal->enabled) && ! empty($user->rights->propale->lire))
+		if (!empty($conf->propal->enabled) && !empty($user->rights->propale->lire))
 		{
 			// Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...)
 			if ($showpropalnb)
@@ -201,13 +201,13 @@ 
 				include_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propalestats.class.php';
 
 				$showpointvalue = 1; $nocolor = 0;
-				$stats_proposal = new PropaleStats($this->db, $socid, ($userid>0?$userid:0));
-				$data2 = $stats_proposal->getAllByProductEntry($year,(GETPOST('action','aZ09')==$refreshaction?-1:(3600*24)));
+				$stats_proposal = new PropaleStats($this->db, $socid, ($userid > 0 ? $userid : 0));
+				$data2 = $stats_proposal->getAllByProductEntry($year, (GETPOST('action', 'aZ09') == $refreshaction ?-1 : (3600 * 24)));
 				if (empty($data2))
 				{
 					$showpointvalue = 0;
 					$nocolor = 1;
-					$data2=array(array(0=>$langs->trans("None"),1=>1));
+					$data2 = array(array(0=>$langs->trans("None"), 1=>1));
 				}
 
 				$filenamenb = $dir."/prodserforpropal-".$year.".png";
@@ -215,20 +215,20 @@ 
 
 				$px2 = new DolGraph();
 				$mesg = $px2->isGraphKo();
-				if (! $mesg)
+				if (!$mesg)
 				{
-					$i=0;$tot=count($data2);$legend=array();
+					$i = 0; $tot = count($data2); $legend = array();
 					while ($i <= $tot)
 					{
-						$data2[$i][0]=dol_trunc($data2[$i][0],5);	// Required to avoid error "Could not draw pie with labels contained inside canvas"
-						$legend[]=$data2[$i][0];
+						$data2[$i][0] = dol_trunc($data2[$i][0], 5); // Required to avoid error "Could not draw pie with labels contained inside canvas"
+						$legend[] = $data2[$i][0];
 						$i++;
 					}
 
 					$px2->SetData($data2);
 					unset($data2);
 
-					if ($nocolor) $px2->SetDataColor(array(array(220,220,220)));
+					if ($nocolor) $px2->SetDataColor(array(array(220, 220, 220)));
 					$px2->SetPrecisionY(0);
 					$px2->SetLegend($legend);
 					$px2->setShowLegend(0);
@@ -244,15 +244,15 @@ 
 					$px2->SetCssPrefix("cssboxes");
 					//$px2->mode='depth';
 					$px2->SetType(array('pie'));
-					$px2->SetTitle($langs->trans("BoxProductDistributionFor",$paramtitle,$langs->transnoentitiesnoconv("Proposals")));
+					$px2->SetTitle($langs->trans("BoxProductDistributionFor", $paramtitle, $langs->transnoentitiesnoconv("Proposals")));
 					$px2->combine = 0.05;
 
-					$px2->draw($filenamenb,$fileurlnb);
+					$px2->draw($filenamenb, $fileurlnb);
 				}
 			}
 		}
 
-		if (! empty($conf->commande->enabled) && ! empty($user->rights->commande->lire))
+		if (!empty($conf->commande->enabled) && !empty($user->rights->commande->lire))
 		{
 			$langs->load("orders");
 
@@ -262,14 +262,14 @@ 
 				include_once DOL_DOCUMENT_ROOT.'/commande/class/commandestats.class.php';
 
 				$showpointvalue = 1; $nocolor = 0;
-				$mode='customer';
-				$stats_order = new CommandeStats($this->db, $socid, $mode, ($userid>0?$userid:0));
-				$data3 = $stats_order->getAllByProductEntry($year,(GETPOST('action','aZ09')==$refreshaction?-1:(3600*24)));
+				$mode = 'customer';
+				$stats_order = new CommandeStats($this->db, $socid, $mode, ($userid > 0 ? $userid : 0));
+				$data3 = $stats_order->getAllByProductEntry($year, (GETPOST('action', 'aZ09') == $refreshaction ?-1 : (3600 * 24)));
 				if (empty($data3))
 				{
 					$showpointvalue = 0;
 					$nocolor = 1;
-					$data3=array(array(0=>$langs->trans("None"),1=>1));
+					$data3 = array(array(0=>$langs->trans("None"), 1=>1));
 				}
 
 				$filenamenb = $dir."/prodserfororder-".$year.".png";
@@ -277,20 +277,20 @@ 
 
 				$px3 = new DolGraph();
 				$mesg = $px3->isGraphKo();
-				if (! $mesg)
+				if (!$mesg)
 				{
-					$i=0;$tot=count($data3);$legend=array();
+					$i = 0; $tot = count($data3); $legend = array();
 					while ($i <= $tot)
 					{
-						$data3[$i][0]=dol_trunc($data3[$i][0],5);	// Required to avoid error "Could not draw pie with labels contained inside canvas"
-						$legend[]=$data3[$i][0];
+						$data3[$i][0] = dol_trunc($data3[$i][0], 5); // Required to avoid error "Could not draw pie with labels contained inside canvas"
+						$legend[] = $data3[$i][0];
 						$i++;
 					}
 
 					$px3->SetData($data3);
 					unset($data3);
 
-					if ($nocolor) $px3->SetDataColor(array(array(220,220,220)));
+					if ($nocolor) $px3->SetDataColor(array(array(220, 220, 220)));
 					$px3->SetPrecisionY(0);
 					$px3->SetLegend($legend);
 					$px3->setShowLegend(0);
@@ -306,10 +306,10 @@ 
 					$px3->SetCssPrefix("cssboxes");
 					//$px3->mode='depth';
 					$px3->SetType(array('pie'));
-					$px3->SetTitle($langs->trans("BoxProductDistributionFor",$paramtitle,$langs->transnoentitiesnoconv("Orders")));
+					$px3->SetTitle($langs->trans("BoxProductDistributionFor", $paramtitle, $langs->transnoentitiesnoconv("Orders")));
 					$px3->combine = 0.05;
 
-					$px3->draw($filenamenb,$fileurlnb);
+					$px3->draw($filenamenb, $fileurlnb);
 				}
 			}
 		}
@@ -317,76 +317,76 @@ 
 		if (empty($nbofgraph))
 		{
 		    $langs->load("errors");
-		    $mesg=$langs->trans("ReadPermissionNotAllowed");
+		    $mesg = $langs->trans("ReadPermissionNotAllowed");
 		}
 		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="DOL_AUTOSET_COOKIE" value="DOLUSERCOOKIE_box_'.$this->boxcode.':year,showinvoicenb,showpropalnb,showordernb">';
-			if (! empty($conf->facture->enabled) || ! empty($user->rights->facture->lire))
+			$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="DOL_AUTOSET_COOKIE" value="DOLUSERCOOKIE_box_'.$this->boxcode.':year,showinvoicenb,showpropalnb,showordernb">';
+			if (!empty($conf->facture->enabled) || !empty($user->rights->facture->lire))
 			{
-				$stringtoshow.='<input type="checkbox" name="'.$param_showinvoicenb.'"'.($showinvoicenb?' checked':'').'> '.$langs->trans("ForCustomersInvoices");
-				$stringtoshow.=' &nbsp; ';
+				$stringtoshow .= '<input type="checkbox" name="'.$param_showinvoicenb.'"'.($showinvoicenb ? ' checked' : '').'> '.$langs->trans("ForCustomersInvoices");
+				$stringtoshow .= ' &nbsp; ';
 			}
-			if (! empty($conf->propal->enabled) || ! empty($user->rights->propale->lire))
+			if (!empty($conf->propal->enabled) || !empty($user->rights->propale->lire))
 			{
-				$stringtoshow.='<input type="checkbox" name="'.$param_showpropalnb.'"'.($showpropalnb?' checked':'').'> '.$langs->trans("ForProposals");
-				$stringtoshow.='&nbsp;';
+				$stringtoshow .= '<input type="checkbox" name="'.$param_showpropalnb.'"'.($showpropalnb ? ' checked' : '').'> '.$langs->trans("ForProposals");
+				$stringtoshow .= '&nbsp;';
 			}
-			if (! empty($conf->commande->enabled) || ! empty($user->rights->commande->lire))
+			if (!empty($conf->commande->enabled) || !empty($user->rights->commande->lire))
 			{
-				$stringtoshow.='<input type="checkbox" name="'.$param_showordernb.'"'.($showordernb?' checked':'').'> '.$langs->trans("ForCustomersOrders");
+				$stringtoshow .= '<input type="checkbox" name="'.$param_showordernb.'"'.($showordernb ? ' checked' : '').'> '.$langs->trans("ForCustomersOrders");
 			}
-			$stringtoshow.='<br>';
-			$stringtoshow.=$langs->trans("Year").' <input class="flat" size="4" type="text" name="'.$param_year.'" value="'.$year.'">';
-			$stringtoshow.='<input type="image" alt="'.$langs->trans("Refresh").'" src="'.img_picto('','refresh.png','','',1).'">';
-			$stringtoshow.='</form>';
-			$stringtoshow.='</div>';
+			$stringtoshow .= '<br>';
+			$stringtoshow .= $langs->trans("Year").' <input class="flat" size="4" type="text" name="'.$param_year.'" value="'.$year.'">';
+			$stringtoshow .= '<input type="image" alt="'.$langs->trans("Refresh").'" src="'.img_picto('', 'refresh.png', '', '', 1).'">';
+			$stringtoshow .= '</form>';
+			$stringtoshow .= '</div>';
 
 			if ($nbofgraph == 1)
 			{
-				if ($showinvoicenb) $stringtoshow.=$px1->show();
-				else if ($showpropalnb) $stringtoshow.=$px2->show();
-				else $stringtoshow.=$px3->show();
+				if ($showinvoicenb) $stringtoshow .= $px1->show();
+				else if ($showpropalnb) $stringtoshow .= $px2->show();
+				else $stringtoshow .= $px3->show();
 			}
 			if ($nbofgraph == 2)
 			{
-				$stringtoshow.='<div class="fichecenter"><div class="containercenter"><div class="fichehalfleft">';
-				if ($showinvoicenb) $stringtoshow.=$px1->show();
-				else if ($showpropalnb) $stringtoshow.=$px2->show();
-				$stringtoshow.='</div><div class="fichehalfright">';
-				if ($showordernb) $stringtoshow.=$px3->show();
-				else if ($showpropalnb) $stringtoshow.=$px2->show();
-				$stringtoshow.='</div></div></div>';
+				$stringtoshow .= '<div class="fichecenter"><div class="containercenter"><div class="fichehalfleft">';
+				if ($showinvoicenb) $stringtoshow .= $px1->show();
+				else if ($showpropalnb) $stringtoshow .= $px2->show();
+				$stringtoshow .= '</div><div class="fichehalfright">';
+				if ($showordernb) $stringtoshow .= $px3->show();
+				else if ($showpropalnb) $stringtoshow .= $px2->show();
+				$stringtoshow .= '</div></div></div>';
 			}
 			if ($nbofgraph == 3)
 			{
-				$stringtoshow.='<div class="fichecenter"><div class="containercenter"><div class="fichehalfleft">';
-				$stringtoshow.=$px1->show();
-				$stringtoshow.='</div><div class="fichehalfright">';
-				$stringtoshow.=$px2->show();
-				$stringtoshow.='</div></div></div>';
-				$stringtoshow.='<div class="fichecenter"><div class="containercenter">';
-				$stringtoshow.=$px3->show();
-				$stringtoshow.='</div></div>';
+				$stringtoshow .= '<div class="fichecenter"><div class="containercenter"><div class="fichehalfleft">';
+				$stringtoshow .= $px1->show();
+				$stringtoshow .= '</div><div class="fichehalfright">';
+				$stringtoshow .= $px2->show();
+				$stringtoshow .= '</div></div></div>';
+				$stringtoshow .= '<div class="fichecenter"><div class="containercenter">';
+				$stringtoshow .= $px3->show();
+				$stringtoshow .= '</div></div>';
 			}
-			$this->info_box_contents[0][0] = array('td' => 'align="center" class="nohover"','textnoformat'=>$stringtoshow);
+			$this->info_box_contents[0][0] = array('td' => 'align="center" class="nohover"', 'textnoformat'=>$stringtoshow);
 		}
 		else
 		{
@@ -407,7 +407,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 +55 added lines, -23 removed lines

@@ -88,8 +88,7 @@ 
 			$showinvoicenb=GETPOST($param_showinvoicenb,'alpha');
 			$showpropalnb=GETPOST($param_showpropalnb,'alpha');
 			$showordernb=GETPOST($param_showordernb,'alpha');
-		}
-		else
+		} else
 		{
 			$tmparray=json_decode($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode],true);
 			$year=$tmparray['year'];
@@ -98,17 +97,31 @@ 
 			$showordernb=$tmparray['showordernb'];
 		}
 		if (empty($showinvoicenb) && empty($showpropalnb) && empty($showordernb)) { $showpropalnb=1; $showinvoicenb=1; $showordernb=1; }
-		if (empty($conf->facture->enabled) || empty($user->rights->facture->lire)) $showinvoicenb=0;
-		if (empty($conf->propal->enabled) || empty($user->rights->propale->lire)) $showpropalnb=0;
-		if (empty($conf->commande->enabled) || empty($user->rights->commande->lire)) $showordernb=0;
+		if (empty($conf->facture->enabled) || empty($user->rights->facture->lire)) {
+			$showinvoicenb=0;
+		}
+		if (empty($conf->propal->enabled) || empty($user->rights->propale->lire)) {
+			$showpropalnb=0;
+		}
+		if (empty($conf->commande->enabled) || empty($user->rights->commande->lire)) {
+			$showordernb=0;
+		}
 
 		$nowarray=dol_getdate(dol_now(),true);
-		if (empty($year)) $year=$nowarray['year'];
+		if (empty($year)) {
+			$year=$nowarray['year'];
+		}
 
 		$nbofgraph=0;
-		if ($showinvoicenb) $nbofgraph++;
-		if ($showpropalnb)  $nbofgraph++;
-		if ($showordernb)   $nbofgraph++;
+		if ($showinvoicenb) {
+			$nbofgraph++;
+		}
+		if ($showpropalnb) {
+			$nbofgraph++;
+		}
+		if ($showordernb) {
+			$nbofgraph++;
+		}
 
 		$text = $langs->trans("BoxProductDistribution",$max).' - '.$langs->trans("Year").': '.$year;
 		$this->info_box_head = array(
@@ -124,8 +137,12 @@ 
 
 
 		$paramtitle=$langs->transnoentitiesnoconv("Products").'/'.$langs->transnoentitiesnoconv("Services");
-		if (empty($conf->produit->enabled)) $paramtitle=$langs->transnoentitiesnoconv("Services");
-		if (empty($conf->service->enabled)) $paramtitle=$langs->transnoentitiesnoconv("Products");
+		if (empty($conf->produit->enabled)) {
+			$paramtitle=$langs->transnoentitiesnoconv("Services");
+		}
+		if (empty($conf->service->enabled)) {
+			$paramtitle=$langs->transnoentitiesnoconv("Products");
+		}
 
 		$socid=empty($user->societe_id)?0:$user->societe_id;
 		$userid=0;	// No filter on user creation
@@ -169,7 +186,9 @@ 
 					$px1->SetData($data1);
 					unset($data1);
 
-					if ($nocolor) $px1->SetDataColor(array(array(220,220,220)));
+					if ($nocolor) {
+						$px1->SetDataColor(array(array(220,220,220)));
+					}
 					$px1->SetPrecisionY(0);
 					$px1->SetLegend($legend);
 					$px1->setShowLegend(0);
@@ -228,7 +247,9 @@ 
 					$px2->SetData($data2);
 					unset($data2);
 
-					if ($nocolor) $px2->SetDataColor(array(array(220,220,220)));
+					if ($nocolor) {
+						$px2->SetDataColor(array(array(220,220,220)));
+					}
 					$px2->SetPrecisionY(0);
 					$px2->SetLegend($legend);
 					$px2->setShowLegend(0);
@@ -290,7 +311,9 @@ 
 					$px3->SetData($data3);
 					unset($data3);
 
-					if ($nocolor) $px3->SetDataColor(array(array(220,220,220)));
+					if ($nocolor) {
+						$px3->SetDataColor(array(array(220,220,220)));
+					}
 					$px3->SetPrecisionY(0);
 					$px3->SetLegend($legend);
 					$px3->setShowLegend(0);
@@ -361,18 +384,28 @@ 
 
 			if ($nbofgraph == 1)
 			{
-				if ($showinvoicenb) $stringtoshow.=$px1->show();
-				else if ($showpropalnb) $stringtoshow.=$px2->show();
-				else $stringtoshow.=$px3->show();
+				if ($showinvoicenb) {
+					$stringtoshow.=$px1->show();
+				} else if ($showpropalnb) {
+					$stringtoshow.=$px2->show();
+				} else {
+					$stringtoshow.=$px3->show();
+				}
 			}
 			if ($nbofgraph == 2)
 			{
 				$stringtoshow.='<div class="fichecenter"><div class="containercenter"><div class="fichehalfleft">';
-				if ($showinvoicenb) $stringtoshow.=$px1->show();
-				else if ($showpropalnb) $stringtoshow.=$px2->show();
+				if ($showinvoicenb) {
+					$stringtoshow.=$px1->show();
+				} else if ($showpropalnb) {
+					$stringtoshow.=$px2->show();
+				}
 				$stringtoshow.='</div><div class="fichehalfright">';
-				if ($showordernb) $stringtoshow.=$px3->show();
-				else if ($showpropalnb) $stringtoshow.=$px2->show();
+				if ($showordernb) {
+					$stringtoshow.=$px3->show();
+				} else if ($showpropalnb) {
+					$stringtoshow.=$px2->show();
+				}
 				$stringtoshow.='</div></div></div>';
 			}
 			if ($nbofgraph == 3)
@@ -387,8 +420,7 @@ 
 				$stringtoshow.='</div></div>';
 			}
 			$this->info_box_contents[0][0] = array('td' => 'align="center" class="nohover"','textnoformat'=>$stringtoshow);
-		}
-		else
+		} else
 		{
 			$this->info_box_contents[0][0] = array(
 			    'td' => 'align="left" class="nohover opacitymedium"',

htdocs/core/boxes/box_graph_invoices_permonth.php

Indentation +10 added lines, -10 removed lines

@@ -58,7 +58,7 @@ 
 	 *  Load data into info_box_contents array to show array later.
 	 *
 	 *  @param	int		$max        Maximum number of records to load
-     *  @return	void
+	 *  @return	void
 	 */
 	function loadBox($max=5)
 	{
@@ -134,9 +134,9 @@ 
 				$mesg = $px1->isGraphKo();
 				if (! $mesg)
 				{
-				    $langs->load("bills");
+					$langs->load("bills");
 
-				    $px1->SetData($data1);
+					$px1->SetData($data1);
 					unset($data1);
 					$px1->SetPrecisionY(0);
 					$i=$startyear;$legend=array();
@@ -174,7 +174,7 @@ 
 				$mesg = $px2->isGraphKo();
 				if (! $mesg)
 				{
-				    $langs->load("bills");
+					$langs->load("bills");
 
 					$px2->SetData($data2);
 					unset($data2);
@@ -251,15 +251,15 @@ 
 			else
 			{
 				$this->info_box_contents[0][0] = array(	'td' => 'align="left" class="nohover"',
-    	        										'maxlength'=>500,
-	            										'text' => $mesg);
+														'maxlength'=>500,
+														'text' => $mesg);
 			}
 
 		}
 		else {
 			$this->info_box_contents[0][0] = array(
-			    'td' => 'align="left" class="nohover opacitymedium"',
-                'text' => $langs->trans("ReadPermissionNotAllowed")
+				'td' => 'align="left" class="nohover opacitymedium"',
+				'text' => $langs->trans("ReadPermissionNotAllowed")
 			);
 		}
 	}
@@ -272,8 +272,8 @@ 
 	 *  @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);
 	}
 

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");
 
 	var $db;
@@ -45,13 +45,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);
 	}
 
 	/**
@@ -60,18 +60,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),
@@ -83,48 +83,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->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)) $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)) $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)));
+				$data1 = $stats->getNbByMonthWithPrevYear($endyear, $startyear, (GETPOST('action', 'aZ09') == $refreshaction ?-1 : (3600 * 24)));
 
 				$filenamenb = $dir."/".$prefix."invoicesnbinyear-".$endyear.".png";
 				if ($mode == 'customer') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstats&file=invoicesnbinyear-'.$endyear.'.png';
@@ -132,17 +132,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);
@@ -154,17 +154,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)));
+				$data2 = $stats->getAmountByMonthWithPrevYear($endyear, $startyear, (GETPOST('action', 'aZ09') == $refreshaction ?-1 : (3600 * 24)));
 
 				$filenamenb = $dir."/".$prefix."invoicesamountinyear-".$endyear.".png";
 				if ($mode == 'customer') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstats&amp;file=invoicesamountinyear-'.$endyear.'.png';
@@ -172,17 +172,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);
@@ -194,63 +194,63 @@ 
 					$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="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" 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="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" 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('td' => 'align="center" class="nohover"','textnoformat'=>$stringtoshow);
+				$this->info_box_contents[0][0] = array('td' => 'align="center" class="nohover"', 'textnoformat'=>$stringtoshow);
 			}
 			else
 			{
-				$this->info_box_contents[0][0] = array(	'td' => 'align="left" class="nohover"',
+				$this->info_box_contents[0][0] = array('td' => 'align="left" class="nohover"',
     	        										'maxlength'=>500,
 	            										'text' => $mesg);
 			}
@@ -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 +34 added lines, -16 removed lines

@@ -86,8 +86,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)
 		{
@@ -103,17 +108,20 @@ 
 				$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'];
 				$shownb=$tmparray['shownb'];
 				$showtot=$tmparray['showtot'];
 			}
-			if (empty($shownb) && empty($showtot)) $showtot=1;
+			if (empty($shownb) && empty($showtot)) {
+				$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';
@@ -127,8 +135,12 @@ 
 				$data1 = $stats->getNbByMonthWithPrevYear($endyear,$startyear,(GETPOST('action','aZ09')==$refreshaction?-1:(3600*24)));
 
 				$filenamenb = $dir."/".$prefix."invoicesnbinyear-".$endyear.".png";
-				if ($mode == 'customer') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstats&file=invoicesnbinyear-'.$endyear.'.png';
-				if ($mode == 'supplier') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstatssupplier&file=invoicessuppliernbinyear-'.$endyear.'.png';
+				if ($mode == 'customer') {
+					$fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstats&file=invoicesnbinyear-'.$endyear.'.png';
+				}
+				if ($mode == 'supplier') {
+					$fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstatssupplier&file=invoicessuppliernbinyear-'.$endyear.'.png';
+				}
 
 				$px1 = new DolGraph();
 				$mesg = $px1->isGraphKo();
@@ -167,8 +179,12 @@ 
 				$data2 = $stats->getAmountByMonthWithPrevYear($endyear,$startyear,(GETPOST('action','aZ09')==$refreshaction?-1:(3600*24)));
 
 				$filenamenb = $dir."/".$prefix."invoicesamountinyear-".$endyear.".png";
-				if ($mode == 'customer') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstats&file=invoicesamountinyear-'.$endyear.'.png';
-				if ($mode == 'supplier') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstatssupplier&file=invoicessupplieramountinyear-'.$endyear.'.png';
+				if ($mode == 'customer') {
+					$fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstats&file=invoicesamountinyear-'.$endyear.'.png';
+				}
+				if ($mode == 'supplier') {
+					$fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstatssupplier&file=invoicessupplieramountinyear-'.$endyear.'.png';
+				}
 
 				$px2 = new DolGraph();
 				$mesg = $px2->isGraphKo();
@@ -234,29 +250,31 @@ 
 					$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('td' => 'align="center" class="nohover"','textnoformat'=>$stringtoshow);
-			}
-			else
+			} else
 			{
 				$this->info_box_contents[0][0] = array(	'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")