Dolibarr / dolibarr

htdocs/core/boxes/box_project.php

Indentation +98 added lines, -98 removed lines

@@ -40,30 +40,30 @@ 
 	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, $langs;
-        $langs->load("boxes");
-        $langs->load("projects");
-
-        $this->db = $db;
-        $this->boxlabel="Projects";
-
-        $this->hidden=! ($user->rights->projet->lire);
-    }
+	/**
+	 *  Constructor
+	 *
+	 *  @param  DoliDB  $db         Database handler
+	 *  @param  string  $param      More parameters
+	 */
+	function __construct($db,$param='')
+	{
+		global $user, $langs;
+		$langs->load("boxes");
+		$langs->load("projects");
+
+		$this->db = $db;
+		$this->boxlabel="Projects";
+
+		$this->hidden=! ($user->rights->projet->lire);
+	}
 
 	/**
-	*  Load data for box to show them later
-	*
-	*  @param   int		$max        Maximum number of records to load
-	*  @return  void
-	*/
+	 *  Load data for box to show them later
+	 *
+	 *  @param   int		$max        Maximum number of records to load
+	 *  @return  void
+	 */
 	function loadBox($max=5)
 	{
 		global $conf, $user, $langs, $db;
@@ -80,72 +80,72 @@ 
 		// list the summary of the orders
 		if ($user->rights->projet->lire) {
 
-		    include_once(DOL_DOCUMENT_ROOT.'/projet/class/project.class.php');
-		    $projectstatic = new Project($this->db);
+			include_once(DOL_DOCUMENT_ROOT.'/projet/class/project.class.php');
+			$projectstatic = new Project($this->db);
 
-		    $socid=$user->societe_id;
+			$socid=$user->societe_id;
 
-    		// Get list of project id allowed to user (in a string list separated by coma)
-		    $projectsListId='';
-    		if (! $user->rights->projet->all->lire) $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user,0,1,$socid);
+			// Get list of project id allowed to user (in a string list separated by coma)
+			$projectsListId='';
+			if (! $user->rights->projet->all->lire) $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user,0,1,$socid);
 
-		    $sql = "SELECT p.rowid, p.ref, p.title, p.fk_statut, p.public";
+			$sql = "SELECT p.rowid, p.ref, p.title, p.fk_statut, p.public";
 			$sql.= " FROM ".MAIN_DB_PREFIX."projet as p";
-            if($user->socid) $sql.= " INNER JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid=p.fk_soc";
+			if($user->socid) $sql.= " INNER JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid=p.fk_soc";
 			$sql.= " WHERE p.entity IN (".getEntity('project').')';
-            if (! $user->rights->projet->all->lire) $sql.= " AND p.rowid IN (".$projectsListId.")";     // public and assigned to, or restricted to company for external users
+			if (! $user->rights->projet->all->lire) $sql.= " AND p.rowid IN (".$projectsListId.")";     // public and assigned to, or restricted to company for external users
 			if ($user->socid) $sql.= " AND s.rowid = ".$user->socid;
-            $sql.= " AND p.fk_statut = 1"; // Seulement les projets ouverts
-            if ($socid) $sql.= " AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
-            if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND ((s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id.") OR (s.rowid IS NULL))";
+			$sql.= " AND p.fk_statut = 1"; // Seulement les projets ouverts
+			if ($socid) $sql.= " AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
+			if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND ((s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id.") OR (s.rowid IS NULL))";
 
-            $sql.= " ORDER BY p.datec DESC";
+			$sql.= " ORDER BY p.datec DESC";
 			//$sql.= $db->plimit($max, 0);
 
-            $result = $db->query($sql);
-
-            if ($result) {
-                $num = $db->num_rows($result);
-                $i = 0;
-                while ($i < min($num, $max)) {
-                    $objp = $db->fetch_object($result);
-
-                    $tooltip = $langs->trans('Project') . ': ' . $objp->ref;
-                    $this->info_box_contents[$i][0] = array(
-                        'td' => 'align="left" width="16"',
-                        'logo' => 'object_project'.($objp->public?'pub':''),
-                        'tooltip' => $tooltip,
-                        'url' => DOL_URL_ROOT."/projet/card.php?id=".$objp->rowid,
-                    );
-
-                    $this->info_box_contents[$i][1] = array(
-                        'td' => '',
-                        'text' => $objp->ref,
-                        'tooltip' => $tooltip,
-                        'url' => DOL_URL_ROOT."/projet/card.php?id=".$objp->rowid,
-                    );
-
-                    $this->info_box_contents[$i][2] = array(
-                        'td' => '',
-                        'text' => $objp->title,
-                    );
+			$result = $db->query($sql);
+
+			if ($result) {
+				$num = $db->num_rows($result);
+				$i = 0;
+				while ($i < min($num, $max)) {
+					$objp = $db->fetch_object($result);
+
+					$tooltip = $langs->trans('Project') . ': ' . $objp->ref;
+					$this->info_box_contents[$i][0] = array(
+						'td' => 'align="left" width="16"',
+						'logo' => 'object_project'.($objp->public?'pub':''),
+						'tooltip' => $tooltip,
+						'url' => DOL_URL_ROOT."/projet/card.php?id=".$objp->rowid,
+					);
+
+					$this->info_box_contents[$i][1] = array(
+						'td' => '',
+						'text' => $objp->ref,
+						'tooltip' => $tooltip,
+						'url' => DOL_URL_ROOT."/projet/card.php?id=".$objp->rowid,
+					);
+
+					$this->info_box_contents[$i][2] = array(
+						'td' => '',
+						'text' => $objp->title,
+					);
 
 					$sql ="SELECT count(*) as nb, sum(progress) as totprogress";
 					$sql.=" FROM ".MAIN_DB_PREFIX."projet as p LEFT JOIN ".MAIN_DB_PREFIX."projet_task as pt on pt.fk_projet = p.rowid";
-	           		$sql.= " WHERE p.entity IN (".getEntity('project').')';
-    				$sql.=" AND p.rowid = ".$objp->rowid;
+			   		$sql.= " WHERE p.entity IN (".getEntity('project').')';
+					$sql.=" AND p.rowid = ".$objp->rowid;
 					$resultTask = $db->query($sql);
 					if ($resultTask) {
 						$objTask = $db->fetch_object($resultTask);
-                        $this->info_box_contents[$i][3] = array(
-                            'td' => 'class="right"',
-                            'text' => $objTask->nb."&nbsp;".$langs->trans("Tasks"),
-                        );
+						$this->info_box_contents[$i][3] = array(
+							'td' => 'class="right"',
+							'text' => $objTask->nb."&nbsp;".$langs->trans("Tasks"),
+						);
 						if ($objTask->nb  > 0)
-                            $this->info_box_contents[$i][4] = array(
-                                'td' => 'class="right"',
-                                'text' => round($objTask->totprogress/$objTask->nb, 0)."%",
-                            );
+							$this->info_box_contents[$i][4] = array(
+								'td' => 'class="right"',
+								'text' => round($objTask->totprogress/$objTask->nb, 0)."%",
+							);
 						else
 							$this->info_box_contents[$i][4] = array('td' => 'class="right"', 'text' => "N/A&nbsp;");
 						$totalnbTask += $objTask->nb;
@@ -158,36 +158,36 @@ 
 				}
 				if ($max < $num)
 				{
-				    $this->info_box_contents[$i][0] = array('td' => 'colspan="5"', 'text' => '...');
-				    $i++;
+					$this->info_box_contents[$i][0] = array('td' => 'colspan="5"', 'text' => '...');
+					$i++;
 				}
 			}
 		}
 
 
 		// Add the sum à the bottom of the boxes
-        $this->info_box_contents[$i][0] = array(
-            'tr' => 'class="liste_total"',
-            'td' => 'align="left" ',
-            'text' => "&nbsp;",
-       );
-        $this->info_box_contents[$i][1] = array(
-            'td' => '',
-            'text' => $langs->trans("Total")."&nbsp;".$textHead,
-             'text' => "&nbsp;",
-        );
-        $this->info_box_contents[$i][2] = array(
-            'td' => 'align="right" ',
-            'text' => round($num, 0)."&nbsp;".$langs->trans("Projects"),
-        );
-        $this->info_box_contents[$i][3] = array(
-            'td' => 'align="right" ',
-            'text' => (($max < $num) ? '' : (round($totalnbTask, 0)."&nbsp;".$langs->trans("Tasks"))),
-        );
-        $this->info_box_contents[$i][4] = array(
-            'td' => '',
-            'text' => "&nbsp;",
-        );
+		$this->info_box_contents[$i][0] = array(
+			'tr' => 'class="liste_total"',
+			'td' => 'align="left" ',
+			'text' => "&nbsp;",
+	   );
+		$this->info_box_contents[$i][1] = array(
+			'td' => '',
+			'text' => $langs->trans("Total")."&nbsp;".$textHead,
+			 'text' => "&nbsp;",
+		);
+		$this->info_box_contents[$i][2] = array(
+			'td' => 'align="right" ',
+			'text' => round($num, 0)."&nbsp;".$langs->trans("Projects"),
+		);
+		$this->info_box_contents[$i][3] = array(
+			'td' => 'align="right" ',
+			'text' => (($max < $num) ? '' : (round($totalnbTask, 0)."&nbsp;".$langs->trans("Tasks"))),
+		);
+		$this->info_box_contents[$i][4] = array(
+			'td' => '',
+			'text' => "&nbsp;",
+		);
 
 	}
 
@@ -199,8 +199,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 +30 added lines, -30 removed lines

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

Braces +24 added lines, -10 removed lines

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

htdocs/core/boxes/box_graph_orders_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)
 	{
@@ -91,9 +91,9 @@ 
 
 		if ($user->rights->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';
 
@@ -249,15 +249,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")
 			);
 		}
 	}
@@ -270,8 +270,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_permonth extends ModeleBoxes
 {
-	var $boxcode="orderspermonth";
-	var $boximg="object_order";
-	var $boxlabel="BoxCustomersOrdersPerMonth";
+	var $boxcode = "orderspermonth";
+	var $boximg = "object_order";
+	var $boxlabel = "BoxCustomersOrdersPerMonth";
 	var $depends = array("commande");
 
 	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->commande->lire);
+		$this->hidden = !($user->rights->commande->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.'/commande/class/commande.class.php';
 		//$commandestatic=new Commande($db);
 
-		$text = $langs->trans("BoxCustomersOrdersPerMonth",$max);
+		$text = $langs->trans("BoxCustomersOrdersPerMonth", $max);
 		$this->info_box_head = array(
 				'text' => $text,
 				'limit'=> dol_strlen($text),
@@ -83,50 +83,50 @@ 
 				'target'=>'none'	// Set '' to get target="_blank"
 		);
 
-		$dir=''; 	// We don't need a path because image file will not be saved into disk
-		$prefix='';
-		$socid=0;
-		if ($user->societe_id) $socid=$user->societe_id;
-		if (! $user->rights->societe->client->voir || $socid) $prefix.='private-'.$user->id.'-';	// If user has no permission to see all, output dir is specific to user
+		$dir = ''; // We don't need a path because image file will not be saved into disk
+		$prefix = '';
+		$socid = 0;
+		if ($user->societe_id) $socid = $user->societe_id;
+		if (!$user->rights->societe->client->voir || $socid) $prefix .= 'private-'.$user->id.'-'; // If user has no permission to see all, output dir is specific to user
 
 		if ($user->rights->commande->lire)
 		{
 		    $langs->load("orders");
 
-		    $param_year='DOLUSERCOOKIE_box_'.$this->boxcode.'_year';
-			$param_shownb='DOLUSERCOOKIE_box_'.$this->boxcode.'_shownb';
-			$param_showtot='DOLUSERCOOKIE_box_'.$this->boxcode.'_showtot';
+		    $param_year = 'DOLUSERCOOKIE_box_'.$this->boxcode.'_year';
+			$param_shownb = 'DOLUSERCOOKIE_box_'.$this->boxcode.'_shownb';
+			$param_showtot = 'DOLUSERCOOKIE_box_'.$this->boxcode.'_showtot';
 
 			include_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
 			include_once DOL_DOCUMENT_ROOT.'/commande/class/commandestats.class.php';
-			$autosetarray=preg_split("/[,;:]+/",GETPOST('DOL_AUTOSET_COOKIE'));
-			if (in_array('DOLUSERCOOKIE_box_'.$this->boxcode,$autosetarray))
+			$autosetarray = preg_split("/[,;:]+/", GETPOST('DOL_AUTOSET_COOKIE'));
+			if (in_array('DOLUSERCOOKIE_box_'.$this->boxcode, $autosetarray))
 			{
-				$endyear=GETPOST($param_year,'int');
-				$shownb=GETPOST($param_shownb,'alpha');
-				$showtot=GETPOST($param_showtot,'alpha');
+				$endyear = GETPOST($param_year, 'int');
+				$shownb = GETPOST($param_shownb, 'alpha');
+				$showtot = GETPOST($param_showtot, 'alpha');
 			}
 			else
 			{
-				$tmparray=json_decode($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode],true);
-				$endyear=$tmparray['year'];
-				$shownb=$tmparray['shownb'];
-				$showtot=$tmparray['showtot'];
+				$tmparray = json_decode($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode], true);
+				$endyear = $tmparray['year'];
+				$shownb = $tmparray['shownb'];
+				$showtot = $tmparray['showtot'];
 			}
-			if (empty($shownb) && empty($showtot)) $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 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."ordersnbinyear-".$endyear.".png";
 				if ($mode == 'customer') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersnbinyear-'.$endyear.'.png';
@@ -134,15 +134,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);
@@ -154,17 +154,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."ordersamountinyear-".$endyear.".png";
 				if ($mode == 'customer') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&amp;file=ordersamountinyear-'.$endyear.'.png';
@@ -172,15 +172,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);
@@ -192,63 +192,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);
 			}
@@ -270,7 +270,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->commande->lire)
 		{
@@ -105,17 +110,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';
@@ -129,8 +137,12 @@ 
 				$data1 = $stats->getNbByMonthWithPrevYear($endyear,$startyear,(GETPOST('action','aZ09')==$refreshaction?-1:(3600*24)));
 
 				$filenamenb = $dir."/".$prefix."ordersnbinyear-".$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=ordersnbinyear-'.$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=ordersnbinyear-'.$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."ordersamountinyear-".$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=ordersamountinyear-'.$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=ordersamountinyear-'.$endyear.'.png';
+				}
 
 				$px2 = new DolGraph();
 				$mesg = $px2->isGraphKo();
@@ -232,29 +248,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_prospect.php

Indentation +58 added lines, -58 removed lines

@@ -50,7 +50,7 @@ 
 	 *  Constructor
 	 *
 	 *  @param  DoliDB	$db      	Database handler
-     *  @param	string	$param		More parameters
+	 *  @param	string	$param		More parameters
 	 */
 	function __construct($db,$param='')
 	{
@@ -68,7 +68,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)
 	{
@@ -84,10 +84,10 @@ 
 		{
 			$sql = "SELECT s.nom as name, s.rowid as socid";
 			$sql.= ", s.code_client";
-            $sql.= ", s.client";
-            $sql.= ", s.code_fournisseur";
-            $sql.= ", s.fournisseur";
-            $sql.= ", s.logo";
+			$sql.= ", s.client";
+			$sql.= ", s.code_fournisseur";
+			$sql.= ", s.fournisseur";
+			$sql.= ", s.logo";
 			$sql.= ", s.fk_stcomm, s.datec, s.tms, s.status";
 			$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
 			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
@@ -111,56 +111,56 @@ 
 					$datec=$db->jdate($objp->datec);
 					$datem=$db->jdate($objp->tms);
 					$thirdpartystatic->id = $objp->socid;
-                    $thirdpartystatic->name = $objp->name;
-                    $thirdpartystatic->code_client = $objp->code_client;
-                    $thirdpartystatic->code_fournisseur = $objp->code_fournisseur;
-                    $thirdpartystatic->client = $objp->client;
-                    $thirdpartystatic->fournisseur = $objp->fournisseur;
-                    $thirdpartystatic->logo = $objp->logo;
-
-                    $this->info_box_contents[$line][] = array(
-                        'td' => '',
-                        'text' => $thirdpartystatic->getNomUrl(1),
-                    	'asis' => 1,
-                    );
-
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="right"',
-                        'text' => dol_print_date($datem, "day"),
-                    );
-
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'align="right" width="18"',
-                        'text' => str_replace('img ','img height="14" ',$thirdpartystatic->LibProspCommStatut($objp->fk_stcomm,3)),
-                    );
-
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'align="right" width="18"',
-                        'text' => $thirdpartystatic->LibStatut($objp->status,3),
-                    );
-
-                    $line++;
-                }
-
-                if ($num==0)
-                    $this->info_box_contents[$line][0] = array(
-                        'td' => 'align="center"',
-                        'text'=>$langs->trans("NoRecordedProspects"),
-                );
-
-                $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")
-            );
+					$thirdpartystatic->name = $objp->name;
+					$thirdpartystatic->code_client = $objp->code_client;
+					$thirdpartystatic->code_fournisseur = $objp->code_fournisseur;
+					$thirdpartystatic->client = $objp->client;
+					$thirdpartystatic->fournisseur = $objp->fournisseur;
+					$thirdpartystatic->logo = $objp->logo;
+
+					$this->info_box_contents[$line][] = array(
+						'td' => '',
+						'text' => $thirdpartystatic->getNomUrl(1),
+						'asis' => 1,
+					);
+
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right"',
+						'text' => dol_print_date($datem, "day"),
+					);
+
+					$this->info_box_contents[$line][] = array(
+						'td' => 'align="right" width="18"',
+						'text' => str_replace('img ','img height="14" ',$thirdpartystatic->LibProspCommStatut($objp->fk_stcomm,3)),
+					);
+
+					$this->info_box_contents[$line][] = array(
+						'td' => 'align="right" width="18"',
+						'text' => $thirdpartystatic->LibStatut($objp->status,3),
+					);
+
+					$line++;
+				}
+
+				if ($num==0)
+					$this->info_box_contents[$line][0] = array(
+						'td' => 'align="center"',
+						'text'=>$langs->trans("NoRecordedProspects"),
+				);
+
+				$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")
+			);
 		}
 	}
 
@@ -172,8 +172,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 +30 added lines, -30 removed lines

@@ -34,9 +34,9 @@ 
  */
 class box_prospect extends ModeleBoxes
 {
-	var $boxcode="lastprospects";
-	var $boximg="object_company";
-	var $boxlabel="BoxLastProspects";
+	var $boxcode = "lastprospects";
+	var $boximg = "object_company";
+	var $boxlabel = "BoxLastProspects";
 	var $depends = array("societe");
 
 	var $db;
@@ -52,16 +52,16 @@ 
 	 *  @param  DoliDB	$db      	Database handler
      *  @param	string	$param		More parameters
 	 */
-	function __construct($db,$param='')
+	function __construct($db, $param = '')
 	{
 		global $conf, $user;
 
 		$this->db = $db;
 
 		// disable box for such cases
-		if (! empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) $this->enabled=0;	// disabled by this option
+		if (!empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) $this->enabled = 0; // disabled by this option
 
-		$this->hidden=! ($user->rights->societe->lire && empty($user->socid));
+		$this->hidden = !($user->rights->societe->lire && empty($user->socid));
 	}
 
 	/**
@@ -70,33 +70,33 @@ 
 	 *  @param	int		$max        Maximum number of records to load
      *  @return	void
 	 */
-	function loadBox($max=5)
+	function loadBox($max = 5)
 	{
 		global $user, $langs, $db, $conf;
 
-		$this->max=$max;
+		$this->max = $max;
 
-		$thirdpartystatic=new Client($db);
+		$thirdpartystatic = new Client($db);
 
-		$this->info_box_head = array('text' => $langs->trans("BoxTitleLastModifiedProspects",$max));
+		$this->info_box_head = array('text' => $langs->trans("BoxTitleLastModifiedProspects", $max));
 
 		if ($user->rights->societe->lire)
 		{
 			$sql = "SELECT s.nom as name, s.rowid as socid";
-			$sql.= ", s.code_client";
-            $sql.= ", s.client";
-            $sql.= ", s.code_fournisseur";
-            $sql.= ", s.fournisseur";
-            $sql.= ", s.logo";
-			$sql.= ", s.fk_stcomm, s.datec, s.tms, s.status";
-			$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
-			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-			$sql.= " WHERE s.client IN (2, 3)";
-			$sql.= " AND s.entity IN (".getEntity('societe').")";
-			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-			if ($user->societe_id) $sql.= " AND s.rowid = ".$user->societe_id;
-			$sql.= " ORDER BY s.tms DESC";
-			$sql.= $db->plimit($max, 0);
+			$sql .= ", s.code_client";
+            $sql .= ", s.client";
+            $sql .= ", s.code_fournisseur";
+            $sql .= ", s.fournisseur";
+            $sql .= ", s.logo";
+			$sql .= ", s.fk_stcomm, s.datec, s.tms, s.status";
+			$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+			$sql .= " WHERE s.client IN (2, 3)";
+			$sql .= " AND s.entity IN (".getEntity('societe').")";
+			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+			if ($user->societe_id) $sql .= " AND s.rowid = ".$user->societe_id;
+			$sql .= " ORDER BY s.tms DESC";
+			$sql .= $db->plimit($max, 0);
 
 			dol_syslog(get_class($this)."::loadBox", LOG_DEBUG);
 			$resql = $db->query($sql);
@@ -108,8 +108,8 @@ 
 				while ($line < $num)
 				{
 					$objp = $db->fetch_object($resql);
-					$datec=$db->jdate($objp->datec);
-					$datem=$db->jdate($objp->tms);
+					$datec = $db->jdate($objp->datec);
+					$datem = $db->jdate($objp->tms);
 					$thirdpartystatic->id = $objp->socid;
                     $thirdpartystatic->name = $objp->name;
                     $thirdpartystatic->code_client = $objp->code_client;
@@ -131,18 +131,18 @@ 
 
                     $this->info_box_contents[$line][] = array(
                         'td' => 'align="right" width="18"',
-                        'text' => str_replace('img ','img height="14" ',$thirdpartystatic->LibProspCommStatut($objp->fk_stcomm,3)),
+                        'text' => str_replace('img ', 'img height="14" ', $thirdpartystatic->LibProspCommStatut($objp->fk_stcomm, 3)),
                     );
 
                     $this->info_box_contents[$line][] = array(
                         'td' => 'align="right" width="18"',
-                        'text' => $thirdpartystatic->LibStatut($objp->status,3),
+                        'text' => $thirdpartystatic->LibStatut($objp->status, 3),
                     );
 
                     $line++;
                 }
 
-                if ($num==0)
+                if ($num == 0)
                     $this->info_box_contents[$line][0] = array(
                         'td' => 'align="center"',
                         'text'=>$langs->trans("NoRecordedProspects"),
@@ -172,7 +172,7 @@ 
 	 *  @param	int		$nooutput	No print, only return string
 	 *	@return	string
 	 */
-    function showBox($head = null, $contents = null, $nooutput=0)
+    function showBox($head = null, $contents = null, $nooutput = 0)
     {
 		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}

Braces +16 added lines, -6 removed lines

@@ -59,7 +59,10 @@ 
 		$this->db = $db;
 
 		// disable box for such cases
-		if (! empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) $this->enabled=0;	// disabled by this option
+		if (! empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) {
+			$this->enabled=0;
+		}
+		// disabled by this option
 
 		$this->hidden=! ($user->rights->societe->lire && empty($user->socid));
 	}
@@ -90,11 +93,17 @@ 
             $sql.= ", s.logo";
 			$sql.= ", s.fk_stcomm, s.datec, s.tms, s.status";
 			$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
-			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+			if (!$user->rights->societe->client->voir && !$user->societe_id) {
+				$sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+			}
 			$sql.= " WHERE s.client IN (2, 3)";
 			$sql.= " AND s.entity IN (".getEntity('societe').")";
-			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-			if ($user->societe_id) $sql.= " AND s.rowid = ".$user->societe_id;
+			if (!$user->rights->societe->client->voir && !$user->societe_id) {
+				$sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+			}
+			if ($user->societe_id) {
+				$sql.= " AND s.rowid = ".$user->societe_id;
+			}
 			$sql.= " ORDER BY s.tms DESC";
 			$sql.= $db->plimit($max, 0);
 
@@ -142,11 +151,12 @@ 
                     $line++;
                 }
 
-                if ($num==0)
-                    $this->info_box_contents[$line][0] = array(
+                if ($num==0) {
+                                    $this->info_box_contents[$line][0] = array(
                         'td' => 'align="center"',
                         'text'=>$langs->trans("NoRecordedProspects"),
                 );
+                }
 
                 $db->free($resql);
             } else {

htdocs/core/boxes/box_graph_invoices_supplier_permonth.php

Spacing +73 added lines, -73 removed lines

@@ -28,9 +28,9 @@ 
  */
 class box_graph_invoices_supplier_permonth extends ModeleBoxes
 {
-	var $boxcode="invoicessupplierpermonth";
-	var $boximg="object_bill";
-	var $boxlabel="BoxSuppliersInvoicesPerMonth";
+	var $boxcode = "invoicessupplierpermonth";
+	var $boximg = "object_bill";
+	var $boxlabel = "BoxSuppliersInvoicesPerMonth";
 	var $depends = array("fournisseur");
 
 	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->facture->lire);
+		$this->hidden = !($user->rights->fournisseur->facture->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.facture.class.php';
 
-		$text = $langs->trans("BoxSuppliersInvoicesPerMonth",$max);
+		$text = $langs->trans("BoxSuppliersInvoicesPerMonth", $max);
 		$this->info_box_head = array(
 				'text' => $text,
 				'limit'=> dol_strlen($text),
@@ -82,48 +82,48 @@ 
 				'target'=>'none'	// Set '' to get target="_blank"
 		);
 
-		$dir=''; 	// We don't need a path because image file will not be saved into disk
-		$prefix='';
-		$socid=0;
-		if ($user->societe_id) $socid=$user->societe_id;
-		if (! $user->rights->societe->client->voir || $socid) $prefix.='private-'.$user->id.'-';	// If user has no permission to see all, output dir is specific to user
+		$dir = ''; // We don't need a path because image file will not be saved into disk
+		$prefix = '';
+		$socid = 0;
+		if ($user->societe_id) $socid = $user->societe_id;
+		if (!$user->rights->societe->client->voir || $socid) $prefix .= 'private-'.$user->id.'-'; // If user has no permission to see all, output dir is specific to user
 
 		if ($user->rights->fournisseur->facture->lire)
 		{
-			$param_year='DOLUSERCOOKIE_box_'.$this->boxcode.'_year';
-			$param_shownb='DOLUSERCOOKIE_box_'.$this->boxcode.'_shownb';
-			$param_showtot='DOLUSERCOOKIE_box_'.$this->boxcode.'_showtot';
+			$param_year = 'DOLUSERCOOKIE_box_'.$this->boxcode.'_year';
+			$param_shownb = 'DOLUSERCOOKIE_box_'.$this->boxcode.'_shownb';
+			$param_showtot = 'DOLUSERCOOKIE_box_'.$this->boxcode.'_showtot';
 
 			include_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
 			include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facturestats.class.php';
-			$autosetarray=preg_split("/[,;:]+/",GETPOST('DOL_AUTOSET_COOKIE'));
-			if (in_array('DOLUSERCOOKIE_box_'.$this->boxcode,$autosetarray))
+			$autosetarray = preg_split("/[,;:]+/", GETPOST('DOL_AUTOSET_COOKIE'));
+			if (in_array('DOLUSERCOOKIE_box_'.$this->boxcode, $autosetarray))
 			{
-				$endyear=GETPOST($param_year,'int');
-				$shownb=GETPOST($param_shownb,'alpha');
-				$showtot=GETPOST($param_showtot,'alpha');
+				$endyear = GETPOST($param_year, 'int');
+				$shownb = GETPOST($param_shownb, 'alpha');
+				$showtot = GETPOST($param_showtot, 'alpha');
 			}
 			else
 			{
-				$tmparray=json_decode($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode],true);
-				$endyear=$tmparray['year'];
-				$shownb=$tmparray['shownb'];
-				$showtot=$tmparray['showtot'];
+				$tmparray = json_decode($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode], true);
+				$endyear = $tmparray['year'];
+				$shownb = $tmparray['shownb'];
+				$showtot = $tmparray['showtot'];
 			}
-			if (empty($shownb) && empty($showtot)) $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 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."invoicessuppliernbinyear-".$year.".png";
 				if ($mode == 'customer') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstats&file=invoicesnbinyear-'.$year.'.png';
@@ -131,17 +131,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);
@@ -153,17 +153,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."invoicessupplieramountinyear-".$year.".png";
 				if ($mode == 'customer') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstats&amp;file=invoicesamountinyear-'.$year.'.png';
@@ -171,17 +171,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);
@@ -193,63 +193,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" class="inline-block valigntextbottom" alt="'.$langs->trans("Refresh").'" src="'.img_picto($langs->trans("Refresh"),'refresh.png','','',1).'">';
-				$stringtoshow.='</form>';
-				$stringtoshow.='</div>';
+				$stringtoshow .= '<div class="center hideobject" id="idfilter'.$this->boxcode.'">'; // hideobject is to start hidden
+				$stringtoshow .= '<form class="flat formboxfilter" method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+				$stringtoshow .= '<input type="hidden" name="action" value="'.$refreshaction.'">';
+				$stringtoshow .= '<input type="hidden" name="DOL_AUTOSET_COOKIE" value="DOLUSERCOOKIE_box_'.$this->boxcode.':year,shownb,showtot">';
+				$stringtoshow .= '<input type="checkbox" name="'.$param_shownb.'"'.($shownb ? ' checked' : '').'> '.$langs->trans("NumberOfBillsByMonth");
+				$stringtoshow .= ' &nbsp; ';
+				$stringtoshow .= '<input type="checkbox" name="'.$param_showtot.'"'.($showtot ? ' checked' : '').'> '.$langs->trans("AmountOfBillsByMonthHT");
+				$stringtoshow .= '<br>';
+				$stringtoshow .= $langs->trans("Year").' <input class="flat" size="4" type="text" name="'.$param_year.'" value="'.$endyear.'">';
+				$stringtoshow .= '<input type="image" class="inline-block valigntextbottom" alt="'.$langs->trans("Refresh").'" src="'.img_picto($langs->trans("Refresh"), 'refresh.png', '', '', 1).'">';
+				$stringtoshow .= '</form>';
+				$stringtoshow .= '</div>';
 				if ($shownb && $showtot)
 				{
-					$stringtoshow.='<div class="fichecenter">';
-					$stringtoshow.='<div class="fichehalfleft">';
+					$stringtoshow .= '<div class="fichecenter">';
+					$stringtoshow .= '<div class="fichehalfleft">';
 				}
-				if ($shownb) $stringtoshow.=$px1->show();
+				if ($shownb) $stringtoshow .= $px1->show();
 				if ($shownb && $showtot)
 				{
-					$stringtoshow.='</div>';
-					$stringtoshow.='<div class="fichehalfright">';
+					$stringtoshow .= '</div>';
+					$stringtoshow .= '<div class="fichehalfright">';
 				}
-				if ($showtot) $stringtoshow.=$px2->show();
+				if ($showtot) $stringtoshow .= $px2->show();
 				if ($shownb && $showtot)
 				{
-					$stringtoshow.='</div>';
-					$stringtoshow.='</div>';
+					$stringtoshow .= '</div>';
+					$stringtoshow .= '</div>';
 				}
-				$this->info_box_contents[0][0] = array('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 +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->facture->lire)
 		{
@@ -102,17 +107,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';
@@ -126,8 +134,12 @@ 
 				$data1 = $stats->getNbByMonthWithPrevYear($endyear,$startyear,(GETPOST('action','aZ09')==$refreshaction?-1:(3600*24)));
 
 				$filenamenb = $dir."/".$prefix."invoicessuppliernbinyear-".$year.".png";
-				if ($mode == 'customer') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstats&file=invoicesnbinyear-'.$year.'.png';
-				if ($mode == 'supplier') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstatssupplier&file=invoicessuppliernbinyear-'.$year.'.png';
+				if ($mode == 'customer') {
+					$fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstats&file=invoicesnbinyear-'.$year.'.png';
+				}
+				if ($mode == 'supplier') {
+					$fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstatssupplier&file=invoicessuppliernbinyear-'.$year.'.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."invoicessupplieramountinyear-".$year.".png";
-				if ($mode == 'customer') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstats&file=invoicesamountinyear-'.$year.'.png';
-				if ($mode == 'supplier') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstatssupplier&file=invoicessupplieramountinyear-'.$year.'.png';
+				if ($mode == 'customer') {
+					$fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstats&file=invoicesamountinyear-'.$year.'.png';
+				}
+				if ($mode == 'supplier') {
+					$fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstatssupplier&file=invoicessupplieramountinyear-'.$year.'.png';
+				}
 
 				$px2 = new DolGraph();
 				$mesg = $px2->isGraphKo();
@@ -233,29 +249,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")

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

htdocs/core/boxes/box_produits.php

Indentation +77 added lines, -77 removed lines

@@ -53,18 +53,18 @@ 
 	 */
 	function __construct($db,$param)
 	{
-	    global $user;
+		global $user;
 
-	    $this->db=$db;
+		$this->db=$db;
 
-	    $this->hidden=! ($user->rights->produit->lire || $user->rights->service->lire);
+		$this->hidden=! ($user->rights->produit->lire || $user->rights->service->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)
 	{
@@ -87,9 +87,9 @@ 
 			// Add where from hooks
 			if (is_object($hookmanager))
 			{
-			    $parameters=array('boxproductlist'=>1);
-			    $reshook=$hookmanager->executeHooks('printFieldListWhere',$parameters);    // Note that $action and $object may have been modified by hook
-			    $sql.=$hookmanager->resPrint;
+				$parameters=array('boxproductlist'=>1);
+				$reshook=$hookmanager->executeHooks('printFieldListWhere',$parameters);    // Note that $action and $object may have been modified by hook
+				$sql.=$hookmanager->resPrint;
 			}
 			$sql.= $db->order('p.datec', 'DESC');
 			$sql.= $db->plimit($max, 0);
@@ -121,33 +121,33 @@ 
 								$objp->label = $objtp->label;
 						}
 					}
-                    $productstatic->id = $objp->rowid;
-                    $productstatic->ref = $objp->ref;
-                    $productstatic->type = $objp->fk_product_type;
-                    $productstatic->label = $objp->label;
+					$productstatic->id = $objp->rowid;
+					$productstatic->ref = $objp->ref;
+					$productstatic->type = $objp->fk_product_type;
+					$productstatic->label = $objp->label;
 					$productstatic->entity = $objp->entity;
 
 					$this->info_box_contents[$line][] = array(
-                        'td' => 'class="tdoverflowmax100 maxwidth100onsmartphone"',
-                        'text' => $productstatic->getNomUrl(1),
-                        'asis' => 1,
-                    );
-
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="tdoverflowmax100 maxwidth100onsmartphone"',
-                        'text' => $objp->label,
-                    );
-
-                    if (empty($conf->dynamicprices->enabled) || empty($objp->fk_price_expression)) {
-                        $price_base_type=$langs->trans($objp->price_base_type);
-                        $price=($objp->price_base_type == 'HT')?price($objp->price):$price=price($objp->price_ttc);
-	                }
-	                else //Parse the dynamic price
-	               	{
+						'td' => 'class="tdoverflowmax100 maxwidth100onsmartphone"',
+						'text' => $productstatic->getNomUrl(1),
+						'asis' => 1,
+					);
+
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="tdoverflowmax100 maxwidth100onsmartphone"',
+						'text' => $objp->label,
+					);
+
+					if (empty($conf->dynamicprices->enabled) || empty($objp->fk_price_expression)) {
+						$price_base_type=$langs->trans($objp->price_base_type);
+						$price=($objp->price_base_type == 'HT')?price($objp->price):$price=price($objp->price_ttc);
+					}
+					else //Parse the dynamic price
+				   	{
 						$productstatic->fetch($objp->rowid, '', '', 1);
-	                    $priceparser = new PriceParser($this->db);
-	                    $price_result = $priceparser->parseProduct($productstatic);
-	                    if ($price_result >= 0) {
+						$priceparser = new PriceParser($this->db);
+						$price_result = $priceparser->parseProduct($productstatic);
+						if ($price_result >= 0) {
 							if ($objp->price_base_type == 'HT')
 							{
 								$price_base_type=$langs->trans("HT");
@@ -158,58 +158,58 @@ 
 								$price_base_type=$langs->trans("TTC");
 							}
 							$price=price($price_result);
-	                    }
-	               	}
+						}
+				   	}
 					$this->info_box_contents[$line][] = array(
-                        'td' => 'class="right"',
-                        'text' => $price,
-                    );
+						'td' => 'class="right"',
+						'text' => $price,
+					);
 
 					$this->info_box_contents[$line][] = array(
-                        'td' => 'class="nowrap"',
-                        'text' => $price_base_type,
-                    );
+						'td' => 'class="nowrap"',
+						'text' => $price_base_type,
+					);
 
 					$this->info_box_contents[$line][] = array(
-                        'td' => 'class="right"',
-                        'text' => dol_print_date($datem,'day'),
-                    );
+						'td' => 'class="right"',
+						'text' => dol_print_date($datem,'day'),
+					);
 
 					$this->info_box_contents[$line][] = array(
-                        'td' => 'align="right" width="18"',
-                        'text' => '<span class="statusrefsell">'.$productstatic->LibStatut($objp->tosell,3,0).'<span>',
-					    'asis' => 1
-                    );
-
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'align="right" width="18"',
-                        'text' => '<span class="statusrefbuy">'.$productstatic->LibStatut($objp->tobuy,3,1).'</span>',
-					    'asis' => 1
-                    );
-
-                    $line++;
-                }
-                if ($num==0)
-                    $this->info_box_contents[$line][0] = array(
-                        'td' => 'align="center"',
-                        'text'=>$langs->trans("NoRecordedProducts"),
-                    );
-
-                $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")
-            );
-        }
-    }
+						'td' => 'align="right" width="18"',
+						'text' => '<span class="statusrefsell">'.$productstatic->LibStatut($objp->tosell,3,0).'<span>',
+						'asis' => 1
+					);
+
+					$this->info_box_contents[$line][] = array(
+						'td' => 'align="right" width="18"',
+						'text' => '<span class="statusrefbuy">'.$productstatic->LibStatut($objp->tobuy,3,1).'</span>',
+						'asis' => 1
+					);
+
+					$line++;
+				}
+				if ($num==0)
+					$this->info_box_contents[$line][0] = array(
+						'td' => 'align="center"',
+						'text'=>$langs->trans("NoRecordedProducts"),
+					);
+
+				$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
@@ -219,8 +219,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);
 	}
 

Braces +17 added lines, -11 removed lines

@@ -82,8 +82,12 @@ 
 			$sql = "SELECT p.rowid, p.label, p.ref, p.price, p.price_base_type, p.price_ttc, p.fk_product_type, p.tms, p.tosell, p.tobuy, p.fk_price_expression, p.entity";
 			$sql.= " FROM ".MAIN_DB_PREFIX."product as p";
 			$sql.= ' WHERE p.entity IN ('.getEntity($productstatic->element, 1).')';
-			if (empty($user->rights->produit->lire)) $sql.=' AND p.fk_product_type != 0';
-			if (empty($user->rights->service->lire)) $sql.=' AND p.fk_product_type != 1';
+			if (empty($user->rights->produit->lire)) {
+				$sql.=' AND p.fk_product_type != 0';
+			}
+			if (empty($user->rights->service->lire)) {
+				$sql.=' AND p.fk_product_type != 1';
+			}
 			// Add where from hooks
 			if (is_object($hookmanager))
 			{
@@ -105,9 +109,11 @@ 
 					$datem=$db->jdate($objp->tms);
 
 					// Multilangs
-					if (! empty($conf->global->MAIN_MULTILANGS)) // si l'option est active
+					if (! empty($conf->global->MAIN_MULTILANGS)) {
+						// si l'option est active
 					{
 						$sqld = "SELECT label";
+					}
 						$sqld.= " FROM ".MAIN_DB_PREFIX."product_lang";
 						$sqld.= " WHERE fk_product=".$objp->rowid;
 						$sqld.= " AND lang='". $langs->getDefaultLang() ."'";
@@ -117,8 +123,9 @@ 
 						if ($resultd)
 						{
 							$objtp = $db->fetch_object($resultd);
-							if (isset($objtp->label) && $objtp->label != '')
-								$objp->label = $objtp->label;
+							if (isset($objtp->label) && $objtp->label != '') {
+															$objp->label = $objtp->label;
+							}
 						}
 					}
                     $productstatic->id = $objp->rowid;
@@ -141,8 +148,7 @@ 
                     if (empty($conf->dynamicprices->enabled) || empty($objp->fk_price_expression)) {
                         $price_base_type=$langs->trans($objp->price_base_type);
                         $price=($objp->price_base_type == 'HT')?price($objp->price):$price=price($objp->price_ttc);
-	                }
-	                else //Parse the dynamic price
+	                } else //Parse the dynamic price
 	               	{
 						$productstatic->fetch($objp->rowid, '', '', 1);
 	                    $priceparser = new PriceParser($this->db);
@@ -151,8 +157,7 @@ 
 							if ($objp->price_base_type == 'HT')
 							{
 								$price_base_type=$langs->trans("HT");
-							}
-							else
+							} else
 							{
 								$price_result = $price_result * (1 + ($productstatic->tva_tx / 100));
 								$price_base_type=$langs->trans("TTC");
@@ -189,11 +194,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("NoRecordedProducts"),
                     );
+                }
 
                 $db->free($result);
             } else {

Spacing +35 added lines, -35 removed lines

@@ -33,9 +33,9 @@ 
  */
 class box_produits extends ModeleBoxes
 {
-	var $boxcode="lastproducts";
-	var $boximg="object_product";
-	var $boxlabel="BoxLastProducts";
+	var $boxcode = "lastproducts";
+	var $boximg = "object_product";
+	var $boxlabel = "BoxLastProducts";
 	var $depends = array("produit");
 
 	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->produit->lire || $user->rights->service->lire);
+	    $this->hidden = !($user->rights->produit->lire || $user->rights->service->lire);
 	}
 
 	/**
@@ -66,33 +66,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, $hookmanager;
 
-		$this->max=$max;
+		$this->max = $max;
 
 		include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
-		$productstatic=new Product($db);
+		$productstatic = new Product($db);
 
-		$this->info_box_head = array('text' => $langs->trans("BoxTitleLastProducts",$max));
+		$this->info_box_head = array('text' => $langs->trans("BoxTitleLastProducts", $max));
 
 		if ($user->rights->produit->lire || $user->rights->service->lire)
 		{
 			$sql = "SELECT p.rowid, p.label, p.ref, p.price, p.price_base_type, p.price_ttc, p.fk_product_type, p.tms, p.tosell, p.tobuy, p.fk_price_expression, p.entity";
-			$sql.= " FROM ".MAIN_DB_PREFIX."product as p";
-			$sql.= ' WHERE p.entity IN ('.getEntity($productstatic->element, 1).')';
-			if (empty($user->rights->produit->lire)) $sql.=' AND p.fk_product_type != 0';
-			if (empty($user->rights->service->lire)) $sql.=' AND p.fk_product_type != 1';
+			$sql .= " FROM ".MAIN_DB_PREFIX."product as p";
+			$sql .= ' WHERE p.entity IN ('.getEntity($productstatic->element, 1).')';
+			if (empty($user->rights->produit->lire)) $sql .= ' AND p.fk_product_type != 0';
+			if (empty($user->rights->service->lire)) $sql .= ' AND p.fk_product_type != 1';
 			// Add where from hooks
 			if (is_object($hookmanager))
 			{
-			    $parameters=array('boxproductlist'=>1);
-			    $reshook=$hookmanager->executeHooks('printFieldListWhere',$parameters);    // Note that $action and $object may have been modified by hook
-			    $sql.=$hookmanager->resPrint;
+			    $parameters = array('boxproductlist'=>1);
+			    $reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook
+			    $sql .= $hookmanager->resPrint;
 			}
-			$sql.= $db->order('p.datec', 'DESC');
-			$sql.= $db->plimit($max, 0);
+			$sql .= $db->order('p.datec', 'DESC');
+			$sql .= $db->plimit($max, 0);
 
 			$result = $db->query($sql);
 			if ($result)
@@ -102,16 +102,16 @@ 
 				while ($line < $num)
 				{
 					$objp = $db->fetch_object($result);
-					$datem=$db->jdate($objp->tms);
+					$datem = $db->jdate($objp->tms);
 
 					// Multilangs
-					if (! empty($conf->global->MAIN_MULTILANGS)) // si l'option est active
+					if (!empty($conf->global->MAIN_MULTILANGS)) // si l'option est active
 					{
 						$sqld = "SELECT label";
-						$sqld.= " FROM ".MAIN_DB_PREFIX."product_lang";
-						$sqld.= " WHERE fk_product=".$objp->rowid;
-						$sqld.= " AND lang='". $langs->getDefaultLang() ."'";
-						$sqld.= " LIMIT 1";
+						$sqld .= " FROM ".MAIN_DB_PREFIX."product_lang";
+						$sqld .= " WHERE fk_product=".$objp->rowid;
+						$sqld .= " AND lang='".$langs->getDefaultLang()."'";
+						$sqld .= " LIMIT 1";
 
 						$resultd = $db->query($sqld);
 						if ($resultd)
@@ -139,8 +139,8 @@ 
                     );
 
                     if (empty($conf->dynamicprices->enabled) || empty($objp->fk_price_expression)) {
-                        $price_base_type=$langs->trans($objp->price_base_type);
-                        $price=($objp->price_base_type == 'HT')?price($objp->price):$price=price($objp->price_ttc);
+                        $price_base_type = $langs->trans($objp->price_base_type);
+                        $price = ($objp->price_base_type == 'HT') ?price($objp->price) : $price = price($objp->price_ttc);
 	                }
 	                else //Parse the dynamic price
 	               	{
@@ -150,14 +150,14 @@ 
 	                    if ($price_result >= 0) {
 							if ($objp->price_base_type == 'HT')
 							{
-								$price_base_type=$langs->trans("HT");
+								$price_base_type = $langs->trans("HT");
 							}
 							else
 							{
 								$price_result = $price_result * (1 + ($productstatic->tva_tx / 100));
-								$price_base_type=$langs->trans("TTC");
+								$price_base_type = $langs->trans("TTC");
 							}
-							$price=price($price_result);
+							$price = price($price_result);
 	                    }
 	               	}
 					$this->info_box_contents[$line][] = array(
@@ -172,24 +172,24 @@ 
 
 					$this->info_box_contents[$line][] = array(
                         'td' => 'class="right"',
-                        'text' => dol_print_date($datem,'day'),
+                        'text' => dol_print_date($datem, 'day'),
                     );
 
 					$this->info_box_contents[$line][] = array(
                         'td' => 'align="right" width="18"',
-                        'text' => '<span class="statusrefsell">'.$productstatic->LibStatut($objp->tosell,3,0).'<span>',
+                        'text' => '<span class="statusrefsell">'.$productstatic->LibStatut($objp->tosell, 3, 0).'<span>',
 					    'asis' => 1
                     );
 
                     $this->info_box_contents[$line][] = array(
                         'td' => 'align="right" width="18"',
-                        'text' => '<span class="statusrefbuy">'.$productstatic->LibStatut($objp->tobuy,3,1).'</span>',
+                        'text' => '<span class="statusrefbuy">'.$productstatic->LibStatut($objp->tobuy, 3, 1).'</span>',
 					    'asis' => 1
                     );
 
                     $line++;
                 }
-                if ($num==0)
+                if ($num == 0)
                     $this->info_box_contents[$line][0] = array(
                         'td' => 'align="center"',
                         'text'=>$langs->trans("NoRecordedProducts"),
@@ -219,7 +219,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);
 	}

htdocs/core/class/ccountry.class.php

Braces +34 added lines, -20 removed lines

@@ -72,10 +72,18 @@ 
 		$error=0;
 
 		// Clean parameters
-		if (isset($this->code)) $this->code=trim($this->code);
-		if (isset($this->code_iso)) $this->code_iso=trim($this->code_iso);
-		if (isset($this->label)) $this->label=trim($this->label);
-		if (isset($this->active)) $this->active=trim($this->active);
+		if (isset($this->code)) {
+			$this->code=trim($this->code);
+		}
+		if (isset($this->code_iso)) {
+			$this->code_iso=trim($this->code_iso);
+		}
+		if (isset($this->label)) {
+			$this->label=trim($this->label);
+		}
+		if (isset($this->active)) {
+			$this->active=trim($this->active);
+		}
 
 		// Check parameters
 		// Put here code to add control on parameters values
@@ -129,8 +137,7 @@ 
 			}
 			$this->db->rollback();
 			return -1*$error;
-		}
-		else
+		} else
 		{
 			$this->db->commit();
             return $this->id;
@@ -155,8 +162,11 @@ 
 		$sql.= " t.label,";
 		$sql.= " t.active";
         $sql.= " FROM ".MAIN_DB_PREFIX."c_country as t";
-        if ($id)   $sql.= " WHERE t.rowid = ".$id;
-        elseif ($code) $sql.= " WHERE t.code = '".$this->db->escape($code)."'";
+        if ($id) {
+        	$sql.= " WHERE t.rowid = ".$id;
+        } elseif ($code) {
+        	$sql.= " WHERE t.code = '".$this->db->escape($code)."'";
+        }
 
     	dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
         $resql=$this->db->query($sql);
@@ -174,12 +184,10 @@ 
 
                 $this->db->free($resql);
                 return 1;
-            }
-            else {
+            } else {
                 return 0;
             }
-        }
-        else
+        } else
         {
       	    $this->error="Error ".$this->db->lasterror();
             return -1;
@@ -200,10 +208,18 @@ 
 		$error=0;
 
 		// Clean parameters
-		if (isset($this->code)) $this->code=trim($this->code);
-		if (isset($this->code_iso)) $this->code_iso=trim($this->code_iso);
-		if (isset($this->label)) $this->label=trim($this->label);
-		if (isset($this->active)) $this->active=trim($this->active);
+		if (isset($this->code)) {
+			$this->code=trim($this->code);
+		}
+		if (isset($this->code_iso)) {
+			$this->code_iso=trim($this->code_iso);
+		}
+		if (isset($this->label)) {
+			$this->label=trim($this->label);
+		}
+		if (isset($this->active)) {
+			$this->active=trim($this->active);
+		}
 
 
 		// Check parameters
@@ -249,8 +265,7 @@ 
 			}
 			$this->db->rollback();
 			return -1*$error;
-		}
-		else
+		} else
 		{
 			$this->db->commit();
 			return 1;
@@ -305,8 +320,7 @@ 
 			}
 			$this->db->rollback();
 			return -1*$error;
-		}
-		else
+		} else
 		{
 			$this->db->commit();
 			return 1;

Indentation +130 added lines, -130 removed lines

@@ -38,7 +38,7 @@ 
 	//var $element='ccountry';			//!< Id that identify managed objects
 	//var $table_element='ccountry';	//!< Name of table without prefix where object is stored
 
-    var $id;
+	var $id;
 	var $code;
 	var $code_iso;
 	var $label;
@@ -47,28 +47,28 @@ 
 
 
 
-    /**
-     *  Constructor
-     *
-     *  @param      DoliDb		$db      Database handler
-     */
-    function __construct($db)
-    {
-        $this->db = $db;
-        return 1;
-    }
+	/**
+	 *  Constructor
+	 *
+	 *  @param      DoliDb		$db      Database handler
+	 */
+	function __construct($db)
+	{
+		$this->db = $db;
+		return 1;
+	}
 
 
-    /**
-     *  Create object into database
-     *
-     *  @param      User	$user        User that create
-     *  @param      int		$notrigger   0=launch triggers after, 1=disable triggers
-     *  @return     int      		   	 <0 if KO, Id of created object if OK
-     */
-    function create($user, $notrigger=0)
-    {
-    	global $conf, $langs;
+	/**
+	 *  Create object into database
+	 *
+	 *  @param      User	$user        User that create
+	 *  @param      int		$notrigger   0=launch triggers after, 1=disable triggers
+	 *  @return     int      		   	 <0 if KO, Id of created object if OK
+	 */
+	function create($user, $notrigger=0)
+	{
+		global $conf, $langs;
 		$error=0;
 
 		// Clean parameters
@@ -80,14 +80,14 @@ 
 		// Check parameters
 		// Put here code to add control on parameters values
 
-        // Insert request
+		// Insert request
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."c_country(";
 		$sql.= "rowid,";
 		$sql.= "code,";
 		$sql.= "code_iso,";
 		$sql.= "label,";
 		$sql.= "active";
-        $sql.= ") VALUES (";
+		$sql.= ") VALUES (";
 		$sql.= " ".(! isset($this->rowid)?'NULL':"'".$this->db->escape($this->rowid)."'").",";
 		$sql.= " ".(! isset($this->code)?'NULL':"'".$this->db->escape($this->code)."'").",";
 		$sql.= " ".(! isset($this->code_iso)?'NULL':"'".$this->db->escape($this->code_iso)."'").",";
@@ -98,34 +98,34 @@ 
 		$this->db->begin();
 
 	   	dol_syslog(get_class($this)."::create", LOG_DEBUG);
-        $resql=$this->db->query($sql);
-    	if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+		$resql=$this->db->query($sql);
+		if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
 
 		if (! $error)
-        {
-            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."c_country");
+		{
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."c_country");
 
 			if (! $notrigger)
 			{
-	            // Uncomment this and change MYOBJECT to your own tag if you
-	            // want this action call a trigger.
-
-	            //// Call triggers
-	            //include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-	            //$interface=new Interfaces($this->db);
-	            //$result=$interface->run_triggers('MYOBJECT_CREATE',$this,$user,$langs,$conf);
-	            //if ($result < 0) { $error++; $this->errors=$interface->errors; }
-	            //// End call triggers
+				// Uncomment this and change MYOBJECT to your own tag if you
+				// want this action call a trigger.
+
+				//// Call triggers
+				//include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+				//$interface=new Interfaces($this->db);
+				//$result=$interface->run_triggers('MYOBJECT_CREATE',$this,$user,$langs,$conf);
+				//if ($result < 0) { $error++; $this->errors=$interface->errors; }
+				//// End call triggers
 			}
-        }
+		}
 
-        // Commit or rollback
-        if ($error)
+		// Commit or rollback
+		if ($error)
 		{
 			foreach($this->errors as $errmsg)
 			{
-	            dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
-	            $this->error.=($this->error?', '.$errmsg:$errmsg);
+				dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
+				$this->error.=($this->error?', '.$errmsg:$errmsg);
 			}
 			$this->db->rollback();
 			return -1*$error;
@@ -133,70 +133,70 @@ 
 		else
 		{
 			$this->db->commit();
-            return $this->id;
+			return $this->id;
 		}
-    }
-
-
-    /**
-     *  Load object in memory from database
-     *
-     *  @param      int		$id    	Id object
-     *  @param		string	$code	Code
-     *  @return     int          	>0 if OK, 0 if not found, <0 if KO
-     */
-    function fetch($id,$code='')
-    {
-    	global $langs;
-        $sql = "SELECT";
+	}
+
+
+	/**
+	 *  Load object in memory from database
+	 *
+	 *  @param      int		$id    	Id object
+	 *  @param		string	$code	Code
+	 *  @return     int          	>0 if OK, 0 if not found, <0 if KO
+	 */
+	function fetch($id,$code='')
+	{
+		global $langs;
+		$sql = "SELECT";
 		$sql.= " t.rowid,";
 		$sql.= " t.code,";
 		$sql.= " t.code_iso,";
 		$sql.= " t.label,";
 		$sql.= " t.active";
-        $sql.= " FROM ".MAIN_DB_PREFIX."c_country as t";
-        if ($id)   $sql.= " WHERE t.rowid = ".$id;
-        elseif ($code) $sql.= " WHERE t.code = '".$this->db->escape($code)."'";
-
-    	dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
-        $resql=$this->db->query($sql);
-        if ($resql)
-        {
-            if ($this->db->num_rows($resql))
-            {
-                $obj = $this->db->fetch_object($resql);
-
-                $this->id    = $obj->rowid;
+		$sql.= " FROM ".MAIN_DB_PREFIX."c_country as t";
+		if ($id)   $sql.= " WHERE t.rowid = ".$id;
+		elseif ($code) $sql.= " WHERE t.code = '".$this->db->escape($code)."'";
+
+		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
+		$resql=$this->db->query($sql);
+		if ($resql)
+		{
+			if ($this->db->num_rows($resql))
+			{
+				$obj = $this->db->fetch_object($resql);
+
+				$this->id    = $obj->rowid;
 				$this->code = $obj->code;
 				$this->code_iso = $obj->code_iso;
 				$this->label = $obj->label;
 				$this->active = $obj->active;
 
-                $this->db->free($resql);
-                return 1;
-            }
-            else {
-                return 0;
-            }
-        }
-        else
-        {
-      	    $this->error="Error ".$this->db->lasterror();
-            return -1;
-        }
-    }
-
-
-    /**
-     *  Update object into database
-     *
-     *  @param      User	$user        User that modify
-     *  @param      int		$notrigger	 0=launch triggers after, 1=disable triggers
-     *  @return     int     		   	 <0 if KO, >0 if OK
-     */
-    function update($user=null, $notrigger=0)
-    {
-    	global $conf, $langs;
+				$this->db->free($resql);
+				return 1;
+			}
+			else {
+				return 0;
+			}
+		}
+		else
+		{
+	  		$this->error="Error ".$this->db->lasterror();
+			return -1;
+		}
+	}
+
+
+	/**
+	 *  Update object into database
+	 *
+	 *  @param      User	$user        User that modify
+	 *  @param      int		$notrigger	 0=launch triggers after, 1=disable triggers
+	 *  @return     int     		   	 <0 if KO, >0 if OK
+	 */
+	function update($user=null, $notrigger=0)
+	{
+		global $conf, $langs;
 		$error=0;
 
 		// Clean parameters
@@ -209,43 +209,43 @@ 
 		// Check parameters
 		// Put here code to add control on parameters values
 
-        // Update request
-        $sql = "UPDATE ".MAIN_DB_PREFIX."c_country SET";
+		// Update request
+		$sql = "UPDATE ".MAIN_DB_PREFIX."c_country SET";
 		$sql.= " code=".(isset($this->code)?"'".$this->db->escape($this->code)."'":"null").",";
 		$sql.= " code_iso=".(isset($this->code_iso)?"'".$this->db->escape($this->code_iso)."'":"null").",";
 		$sql.= " label=".(isset($this->label)?"'".$this->db->escape($this->label)."'":"null").",";
 		$sql.= " active=".(isset($this->active)?$this->active:"null")."";
-        $sql.= " WHERE rowid=".$this->id;
+		$sql.= " WHERE rowid=".$this->id;
 
 		$this->db->begin();
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-    	if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+		$resql = $this->db->query($sql);
+		if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
 
 		if (! $error)
 		{
 			if (! $notrigger)
 			{
-	            // Uncomment this and change MYOBJECT to your own tag if you
-	            // want this action call a trigger.
-
-	            //// Call triggers
-	            //include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-	            //$interface=new Interfaces($this->db);
-	            //$result=$interface->run_triggers('MYOBJECT_MODIFY',$this,$user,$langs,$conf);
-	            //if ($result < 0) { $error++; $this->errors=$interface->errors; }
-	            //// End call triggers
-	    	}
+				// Uncomment this and change MYOBJECT to your own tag if you
+				// want this action call a trigger.
+
+				//// Call triggers
+				//include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+				//$interface=new Interfaces($this->db);
+				//$result=$interface->run_triggers('MYOBJECT_MODIFY',$this,$user,$langs,$conf);
+				//if ($result < 0) { $error++; $this->errors=$interface->errors; }
+				//// End call triggers
+			}
 		}
 
-        // Commit or rollback
+		// Commit or rollback
 		if ($error)
 		{
 			foreach($this->errors as $errmsg)
 			{
-	            dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
-	            $this->error.=($this->error?', '.$errmsg:$errmsg);
+				dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
+				$this->error.=($this->error?', '.$errmsg:$errmsg);
 			}
 			$this->db->rollback();
 			return -1*$error;
@@ -255,16 +255,16 @@ 
 			$this->db->commit();
 			return 1;
 		}
-    }
+	}
 
 
  	/**
  	 *  Delete object in database
-	 *
-     *	@param  User	$user        User that delete
-     *  @param	int		$notrigger	 0=launch triggers after, 1=disable triggers
-	 *  @return	int					 <0 if KO, >0 if OK
-	 */
+ 	 *
+ 	 *	@param  User	$user        User that delete
+ 	 *  @param	int		$notrigger	 0=launch triggers after, 1=disable triggers
+ 	 *  @return	int					 <0 if KO, >0 if OK
+ 	 */
 	function delete($user, $notrigger=0)
 	{
 		global $conf, $langs;
@@ -277,31 +277,31 @@ 
 
 		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-    	if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+		if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
 
 		if (! $error)
 		{
 			if (! $notrigger)
 			{
 				// Uncomment this and change MYOBJECT to your own tag if you
-		        // want this action call a trigger.
-
-		        //// Call triggers
-		        //include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-		        //$interface=new Interfaces($this->db);
-		        //$result=$interface->run_triggers('MYOBJECT_DELETE',$this,$user,$langs,$conf);
-		        //if ($result < 0) { $error++; $this->errors=$interface->errors; }
-		        //// End call triggers
+				// want this action call a trigger.
+
+				//// Call triggers
+				//include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+				//$interface=new Interfaces($this->db);
+				//$result=$interface->run_triggers('MYOBJECT_DELETE',$this,$user,$langs,$conf);
+				//if ($result < 0) { $error++; $this->errors=$interface->errors; }
+				//// End call triggers
 			}
 		}
 
-        // Commit or rollback
+		// Commit or rollback
 		if ($error)
 		{
 			foreach($this->errors as $errmsg)
 			{
-	            dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
-	            $this->error.=($this->error?', '.$errmsg:$errmsg);
+				dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
+				$this->error.=($this->error?', '.$errmsg:$errmsg);
 			}
 			$this->db->rollback();
 			return -1*$error;

Spacing +66 added lines, -66 removed lines

@@ -32,9 +32,9 @@ 
  */
 class Ccountry // extends CommonObject
 {
-	var $db;							//!< To store db handler
-	var $error;							//!< To return error code (or message)
-	var $errors=array();				//!< To return several error codes (or messages)
+	var $db; //!< To store db handler
+	var $error; //!< To return error code (or message)
+	var $errors = array(); //!< To return several error codes (or messages)
 	//var $element='ccountry';			//!< Id that identify managed objects
 	//var $table_element='ccountry';	//!< Name of table without prefix where object is stored
 
@@ -66,46 +66,46 @@ 
      *  @param      int		$notrigger   0=launch triggers after, 1=disable triggers
      *  @return     int      		   	 <0 if KO, Id of created object if OK
      */
-    function create($user, $notrigger=0)
+    function create($user, $notrigger = 0)
     {
     	global $conf, $langs;
-		$error=0;
+		$error = 0;
 
 		// Clean parameters
-		if (isset($this->code)) $this->code=trim($this->code);
-		if (isset($this->code_iso)) $this->code_iso=trim($this->code_iso);
-		if (isset($this->label)) $this->label=trim($this->label);
-		if (isset($this->active)) $this->active=trim($this->active);
+		if (isset($this->code)) $this->code = trim($this->code);
+		if (isset($this->code_iso)) $this->code_iso = trim($this->code_iso);
+		if (isset($this->label)) $this->label = trim($this->label);
+		if (isset($this->active)) $this->active = trim($this->active);
 
 		// Check parameters
 		// Put here code to add control on parameters values
 
         // Insert request
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."c_country(";
-		$sql.= "rowid,";
-		$sql.= "code,";
-		$sql.= "code_iso,";
-		$sql.= "label,";
-		$sql.= "active";
-        $sql.= ") VALUES (";
-		$sql.= " ".(! isset($this->rowid)?'NULL':"'".$this->db->escape($this->rowid)."'").",";
-		$sql.= " ".(! isset($this->code)?'NULL':"'".$this->db->escape($this->code)."'").",";
-		$sql.= " ".(! isset($this->code_iso)?'NULL':"'".$this->db->escape($this->code_iso)."'").",";
-		$sql.= " ".(! isset($this->label)?'NULL':"'".$this->db->escape($this->label)."'").",";
-		$sql.= " ".(! isset($this->active)?'NULL':"'".$this->db->escape($this->active)."'")."";
-		$sql.= ")";
+		$sql .= "rowid,";
+		$sql .= "code,";
+		$sql .= "code_iso,";
+		$sql .= "label,";
+		$sql .= "active";
+        $sql .= ") VALUES (";
+		$sql .= " ".(!isset($this->rowid) ? 'NULL' : "'".$this->db->escape($this->rowid)."'").",";
+		$sql .= " ".(!isset($this->code) ? 'NULL' : "'".$this->db->escape($this->code)."'").",";
+		$sql .= " ".(!isset($this->code_iso) ? 'NULL' : "'".$this->db->escape($this->code_iso)."'").",";
+		$sql .= " ".(!isset($this->label) ? 'NULL' : "'".$this->db->escape($this->label)."'").",";
+		$sql .= " ".(!isset($this->active) ? 'NULL' : "'".$this->db->escape($this->active)."'")."";
+		$sql .= ")";
 
 		$this->db->begin();
 
 	   	dol_syslog(get_class($this)."::create", LOG_DEBUG);
-        $resql=$this->db->query($sql);
-    	if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+        $resql = $this->db->query($sql);
+    	if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
-		if (! $error)
+		if (!$error)
         {
             $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."c_country");
 
-			if (! $notrigger)
+			if (!$notrigger)
 			{
 	            // Uncomment this and change MYOBJECT to your own tag if you
 	            // want this action call a trigger.
@@ -122,13 +122,13 @@ 
         // Commit or rollback
         if ($error)
 		{
-			foreach($this->errors as $errmsg)
+			foreach ($this->errors as $errmsg)
 			{
 	            dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
-	            $this->error.=($this->error?', '.$errmsg:$errmsg);
+	            $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
-			return -1*$error;
+			return -1 * $error;
 		}
 		else
 		{
@@ -145,28 +145,28 @@ 
      *  @param		string	$code	Code
      *  @return     int          	>0 if OK, 0 if not found, <0 if KO
      */
-    function fetch($id,$code='')
+    function fetch($id, $code = '')
     {
     	global $langs;
         $sql = "SELECT";
-		$sql.= " t.rowid,";
-		$sql.= " t.code,";
-		$sql.= " t.code_iso,";
-		$sql.= " t.label,";
-		$sql.= " t.active";
-        $sql.= " FROM ".MAIN_DB_PREFIX."c_country as t";
-        if ($id)   $sql.= " WHERE t.rowid = ".$id;
-        elseif ($code) $sql.= " WHERE t.code = '".$this->db->escape($code)."'";
+		$sql .= " t.rowid,";
+		$sql .= " t.code,";
+		$sql .= " t.code_iso,";
+		$sql .= " t.label,";
+		$sql .= " t.active";
+        $sql .= " FROM ".MAIN_DB_PREFIX."c_country as t";
+        if ($id)   $sql .= " WHERE t.rowid = ".$id;
+        elseif ($code) $sql .= " WHERE t.code = '".$this->db->escape($code)."'";
 
     	dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
-        $resql=$this->db->query($sql);
+        $resql = $this->db->query($sql);
         if ($resql)
         {
             if ($this->db->num_rows($resql))
             {
                 $obj = $this->db->fetch_object($resql);
 
-                $this->id    = $obj->rowid;
+                $this->id = $obj->rowid;
 				$this->code = $obj->code;
 				$this->code_iso = $obj->code_iso;
 				$this->label = $obj->label;
@@ -181,7 +181,7 @@ 
         }
         else
         {
-      	    $this->error="Error ".$this->db->lasterror();
+      	    $this->error = "Error ".$this->db->lasterror();
             return -1;
         }
     }
@@ -194,16 +194,16 @@ 
      *  @param      int		$notrigger	 0=launch triggers after, 1=disable triggers
      *  @return     int     		   	 <0 if KO, >0 if OK
      */
-    function update($user=null, $notrigger=0)
+    function update($user = null, $notrigger = 0)
     {
     	global $conf, $langs;
-		$error=0;
+		$error = 0;
 
 		// Clean parameters
-		if (isset($this->code)) $this->code=trim($this->code);
-		if (isset($this->code_iso)) $this->code_iso=trim($this->code_iso);
-		if (isset($this->label)) $this->label=trim($this->label);
-		if (isset($this->active)) $this->active=trim($this->active);
+		if (isset($this->code)) $this->code = trim($this->code);
+		if (isset($this->code_iso)) $this->code_iso = trim($this->code_iso);
+		if (isset($this->label)) $this->label = trim($this->label);
+		if (isset($this->active)) $this->active = trim($this->active);
 
 
 		// Check parameters
@@ -211,21 +211,21 @@ 
 
         // Update request
         $sql = "UPDATE ".MAIN_DB_PREFIX."c_country SET";
-		$sql.= " code=".(isset($this->code)?"'".$this->db->escape($this->code)."'":"null").",";
-		$sql.= " code_iso=".(isset($this->code_iso)?"'".$this->db->escape($this->code_iso)."'":"null").",";
-		$sql.= " label=".(isset($this->label)?"'".$this->db->escape($this->label)."'":"null").",";
-		$sql.= " active=".(isset($this->active)?$this->active:"null")."";
-        $sql.= " WHERE rowid=".$this->id;
+		$sql .= " code=".(isset($this->code) ? "'".$this->db->escape($this->code)."'" : "null").",";
+		$sql .= " code_iso=".(isset($this->code_iso) ? "'".$this->db->escape($this->code_iso)."'" : "null").",";
+		$sql .= " label=".(isset($this->label) ? "'".$this->db->escape($this->label)."'" : "null").",";
+		$sql .= " active=".(isset($this->active) ? $this->active : "null")."";
+        $sql .= " WHERE rowid=".$this->id;
 
 		$this->db->begin();
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
         $resql = $this->db->query($sql);
-    	if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+    	if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
-		if (! $error)
+		if (!$error)
 		{
-			if (! $notrigger)
+			if (!$notrigger)
 			{
 	            // Uncomment this and change MYOBJECT to your own tag if you
 	            // want this action call a trigger.
@@ -242,13 +242,13 @@ 
         // Commit or rollback
 		if ($error)
 		{
-			foreach($this->errors as $errmsg)
+			foreach ($this->errors as $errmsg)
 			{
 	            dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
-	            $this->error.=($this->error?', '.$errmsg:$errmsg);
+	            $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
-			return -1*$error;
+			return -1 * $error;
 		}
 		else
 		{
@@ -265,23 +265,23 @@ 
      *  @param	int		$notrigger	 0=launch triggers after, 1=disable triggers
 	 *  @return	int					 <0 if KO, >0 if OK
 	 */
-	function delete($user, $notrigger=0)
+	function delete($user, $notrigger = 0)
 	{
 		global $conf, $langs;
-		$error=0;
+		$error = 0;
 
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."c_country";
-		$sql.= " WHERE rowid=".$this->id;
+		$sql .= " WHERE rowid=".$this->id;
 
 		$this->db->begin();
 
 		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-    	if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+    	if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
-		if (! $error)
+		if (!$error)
 		{
-			if (! $notrigger)
+			if (!$notrigger)
 			{
 				// Uncomment this and change MYOBJECT to your own tag if you
 		        // want this action call a trigger.
@@ -298,13 +298,13 @@ 
         // Commit or rollback
 		if ($error)
 		{
-			foreach($this->errors as $errmsg)
+			foreach ($this->errors as $errmsg)
 			{
 	            dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
-	            $this->error.=($this->error?', '.$errmsg:$errmsg);
+	            $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
-			return -1*$error;
+			return -1 * $error;
 		}
 		else
 		{

htdocs/core/class/coreobject.class.php

Indentation +232 added lines, -232 removed lines

@@ -34,23 +34,23 @@ 
 	 */
 	protected $fields=array();
 
-    /**
+	/**
 	 *  Constructor
 	 *
 	 *  @param      DoliDB		$db      Database handler
 	 */
 	function __construct(DoliDB &$db)
-    {
-        $this->db = $db;
+	{
+		$this->db = $db;
 	}
 
-    /**
-     * Function to init fields
-     *
-     * @return bool
-     */
+	/**
+	 * Function to init fields
+	 *
+	 * @return bool
+	 */
 	protected function init()
-    {
+	{
 		$this->id = 0;
 		$this->datec = 0;
 		$this->tms = 0;
@@ -59,73 +59,73 @@ 
 		{
 			foreach ($this->fields as $field=>$info)
 			{
-		        if ($this->isDate($info)) $this->{$field} = time();
-		        elseif ($this->isArray($info)) $this->{$field} = array();
-		        elseif ($this->isInt($info)) $this->{$field} = (int) 0;
-		        elseif ($this->isFloat($info)) $this->{$field} = (double) 0;
+				if ($this->isDate($info)) $this->{$field} = time();
+				elseif ($this->isArray($info)) $this->{$field} = array();
+				elseif ($this->isInt($info)) $this->{$field} = (int) 0;
+				elseif ($this->isFloat($info)) $this->{$field} = (double) 0;
 				else $this->{$field} = '';
-		    }
+			}
 
-            $this->to_delete=false;
-            $this->is_clone=false;
+			$this->to_delete=false;
+			$this->is_clone=false;
 			
 			return true;
 		}
 		else
-        {
+		{
 			return false;
 		}
 			
 	}
 
-    /**
-     * Test type of field
-     *
-     * @param   string  $field  name of field
-     * @param   string  $type   type of field to test
-     * @return                  value of field or false
-     */
-    private function checkFieldType($field, $type)
-    {
+	/**
+	 * Test type of field
+	 *
+	 * @param   string  $field  name of field
+	 * @param   string  $type   type of field to test
+	 * @return                  value of field or false
+	 */
+	private function checkFieldType($field, $type)
+	{
 		if (isset($this->fields[$field]) && method_exists($this, 'is_'.$type))
 		{
 			return $this->{'is_'.$type}($this->fields[$field]);
 		}
 		else
-        {
-            return false;
-        }
+		{
+			return false;
+		}
 	}
 
-    /**
-     *	Get object and children from database
-     *
-     *	@param      int			$id       		Id of object to load
-     * 	@param		bool		$loadChild		used to load children from database
-     *	@return     int         				>0 if OK, <0 if KO, 0 if not found
-     */
+	/**
+	 *	Get object and children from database
+	 *
+	 *	@param      int			$id       		Id of object to load
+	 * 	@param		bool		$loadChild		used to load children from database
+	 *	@return     int         				>0 if OK, <0 if KO, 0 if not found
+	 */
 	public function fetch($id, $loadChild = true)
-    {
-    	$res = $this->fetchCommon($id);
-    	if($res>0) {
-    		if ($loadChild) $this->fetchChild();
-    	}
+	{
+		$res = $this->fetchCommon($id);
+		if($res>0) {
+			if ($loadChild) $this->fetchChild();
+		}
     	
-    	return $res;
+		return $res;
 	}
 
 
-    /**
-     * Function to instantiate a new child
-     *
-     * @param   string  $tabName        Table name of child
-     * @param   int     $id             If id is given, we try to return his key if exist or load if we try_to_load
-     * @param   string  $key            Attribute name of the object id
-     * @param   bool    $try_to_load    Force the fetch if an id is given
-     * @return                          int
-     */
-    public function addChild($tabName, $id=0, $key='id', $try_to_load = false)
-    {
+	/**
+	 * Function to instantiate a new child
+	 *
+	 * @param   string  $tabName        Table name of child
+	 * @param   int     $id             If id is given, we try to return his key if exist or load if we try_to_load
+	 * @param   string  $key            Attribute name of the object id
+	 * @param   bool    $try_to_load    Force the fetch if an id is given
+	 * @return                          int
+	 */
+	public function addChild($tabName, $id=0, $key='id', $try_to_load = false)
+	{
 		if(!empty($id))
 		{
 			foreach($this->{$tabName} as $k=>&$object)
@@ -147,16 +147,16 @@ 
 	}
 
 
-    /**
-     * Function to set a child as to delete
-     *
-     * @param   string  $tabName        Table name of child
-     * @param   int     $id             Id of child to set as to delete
-     * @param   string  $key            Attribute name of the object id
-     * @return                          bool
-     */
-    public function removeChild($tabName, $id, $key='id')
-    {
+	/**
+	 * Function to set a child as to delete
+	 *
+	 * @param   string  $tabName        Table name of child
+	 * @param   int     $id             Id of child to set as to delete
+	 * @param   string  $key            Attribute name of the object id
+	 * @return                          bool
+	 */
+	public function removeChild($tabName, $id, $key='id')
+	{
 		foreach ($this->{$tabName} as &$object)
 		{
 			if ($object->{$key} == $id)
@@ -169,47 +169,47 @@ 
 	}
 
 
-    /**
-     * Function to fetch children objects
-     */
-    public function fetchChild()
-    {
+	/**
+	 * Function to fetch children objects
+	 */
+	public function fetchChild()
+	{
 		if($this->withChild && !empty($this->childtables) && !empty($this->fk_element))
 		{
 			foreach($this->childtables as &$childTable)
 			{
-                $className = ucfirst($childTable);
-
-                $this->{$className}=array();
-
-                $sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.$childTable.' WHERE '.$this->fk_element.' = '.$this->id;
-                $res = $this->db->query($sql);
-
-                if($res)
-                {
-                    while($obj = $this->db->fetch_object($res))
-                    {
-                        $o=new $className($this->db);
-                        $o->fetch($obj->rowid);
-
-                        $this->{$className}[] = $o;
-                    }
-                }
-                else
-                {
-                    $this->errors[] = $this->db->lasterror();
-                }
+				$className = ucfirst($childTable);
+
+				$this->{$className}=array();
+
+				$sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.$childTable.' WHERE '.$this->fk_element.' = '.$this->id;
+				$res = $this->db->query($sql);
+
+				if($res)
+				{
+					while($obj = $this->db->fetch_object($res))
+					{
+						$o=new $className($this->db);
+						$o->fetch($obj->rowid);
+
+						$this->{$className}[] = $o;
+					}
+				}
+				else
+				{
+					$this->errors[] = $this->db->lasterror();
+				}
 			}
 		}
 	}
 
-    /**
-     * Function to update children data
-     *
-     * @param   User    $user   user object
-     */
+	/**
+	 * Function to update children data
+	 *
+	 * @param   User    $user   user object
+	 */
 	public function saveChild(User &$user)
-    {
+	{
 		if($this->withChild && !empty($this->childtables) && !empty($this->fk_element))
 		{
 			foreach($this->childtables as &$childTable)
@@ -230,169 +230,169 @@ 
 	}
 
 
-    /**
-     * Function to update object or create or delete if needed
-     *
-     * @param   User    $user   user object
-     * @return                  < 0 if ko, > 0 if ok
-     */
-    public function update(User &$user)
-    {
+	/**
+	 * Function to update object or create or delete if needed
+	 *
+	 * @param   User    $user   user object
+	 * @return                  < 0 if ko, > 0 if ok
+	 */
+	public function update(User &$user)
+	{
 		if (empty($this->id)) return $this->create($user); // To test, with that, no need to test on high level object, the core decide it, update just needed
-        elseif (isset($this->to_delete) && $this->to_delete==true) return $this->delete($user);
-
-        $error = 0;
-        $this->db->begin();
-
-        $res = $this->updateCommon($user);
-        if ($res)
-        {
-            $result = $this->call_trigger(strtoupper($this->element). '_UPDATE', $user);
-            if ($result < 0) $error++;
-            else $this->saveChild($user);
-        }
-        else
-        {
-            $error++;
-            $this->error = $this->db->lasterror();
-            $this->errors[] = $this->error;
-        }
-
-        if (empty($error))
-        {
-            $this->db->commit();
-            return $this->id;
-        }
-        else
-        {
-            $this->db->rollback();
-            return -1;
-        }
+		elseif (isset($this->to_delete) && $this->to_delete==true) return $this->delete($user);
+
+		$error = 0;
+		$this->db->begin();
+
+		$res = $this->updateCommon($user);
+		if ($res)
+		{
+			$result = $this->call_trigger(strtoupper($this->element). '_UPDATE', $user);
+			if ($result < 0) $error++;
+			else $this->saveChild($user);
+		}
+		else
+		{
+			$error++;
+			$this->error = $this->db->lasterror();
+			$this->errors[] = $this->error;
+		}
+
+		if (empty($error))
+		{
+			$this->db->commit();
+			return $this->id;
+		}
+		else
+		{
+			$this->db->rollback();
+			return -1;
+		}
 
 	}
 
-    /**
-     * Function to create object in database
-     *
-     * @param   User    $user   user object
-     * @return                  < 0 if ko, > 0 if ok
-     */
-    public function create(User &$user)
-    {
+	/**
+	 * Function to create object in database
+	 *
+	 * @param   User    $user   user object
+	 * @return                  < 0 if ko, > 0 if ok
+	 */
+	public function create(User &$user)
+	{
 		if($this->id > 0) return $this->update($user);
 
-        $error = 0;
-        $this->db->begin();
+		$error = 0;
+		$this->db->begin();
 
-        $res = $this->createCommon($user);
+		$res = $this->createCommon($user);
 		if($res)
 		{
 			$this->id = $this->db->last_insert_id($this->table_element);
 
 			$result = $this->call_trigger(strtoupper($this->element). '_CREATE', $user);
-            if ($result < 0) $error++;
-            else $this->saveChild($user);
+			if ($result < 0) $error++;
+			else $this->saveChild($user);
 		}
 		else
-        {
-            $error++;
-            $this->error = $this->db->lasterror();
-            $this->errors[] = $this->error;
+		{
+			$error++;
+			$this->error = $this->db->lasterror();
+			$this->errors[] = $this->error;
 		}
 
-        if (empty($error))
-        {
-            $this->db->commit();
-            return $this->id;
-        }
-        else
-        {
-            $this->db->rollback();
-            return -1;
-        }
+		if (empty($error))
+		{
+			$this->db->commit();
+			return $this->id;
+		}
+		else
+		{
+			$this->db->rollback();
+			return -1;
+		}
 	}
 
-    /**
-     * Function to delete object in database
-     *
-     * @param   User    $user   user object
-     * @return                  < 0 if ko, > 0 if ok
-     */
+	/**
+	 * Function to delete object in database
+	 *
+	 * @param   User    $user   user object
+	 * @return                  < 0 if ko, > 0 if ok
+	 */
 	public function delete(User &$user)
-    {
+	{
 		if ($this->id <= 0) return 0;
 
-        $error = 0;
-        $this->db->begin();
-
-        $result = $this->call_trigger(strtoupper($this->element). '_DELETE', $user);
-        if ($result < 0) $error++;
-
-        if (!$error)
-        {
-            $this->deleteCommon($user);
-            if($this->withChild && !empty($this->childtables))
-            {
-                foreach($this->childtables as &$childTable)
-                {
-                    $className = ucfirst($childTable);
-                    if (!empty($this->{$className}))
-                    {
-                        foreach($this->{$className} as &$object)
-                        {
-                            $object->delete($user);
-                        }
-                    }
-                }
-            }
-        }
-
-        if (empty($error))
-        {
-            $this->db->commit();
-            return 1;
-        }
-        else
-        {
-            $this->error = $this->db->lasterror();
-            $this->errors[] = $this->error;
-            $this->db->rollback();
-            return -1;
-        }
+		$error = 0;
+		$this->db->begin();
+
+		$result = $this->call_trigger(strtoupper($this->element). '_DELETE', $user);
+		if ($result < 0) $error++;
+
+		if (!$error)
+		{
+			$this->deleteCommon($user);
+			if($this->withChild && !empty($this->childtables))
+			{
+				foreach($this->childtables as &$childTable)
+				{
+					$className = ucfirst($childTable);
+					if (!empty($this->{$className}))
+					{
+						foreach($this->{$className} as &$object)
+						{
+							$object->delete($user);
+						}
+					}
+				}
+			}
+		}
+
+		if (empty($error))
+		{
+			$this->db->commit();
+			return 1;
+		}
+		else
+		{
+			$this->error = $this->db->lasterror();
+			$this->errors[] = $this->error;
+			$this->db->rollback();
+			return -1;
+		}
 	}
 
 
-    /**
-     * Function to get a formatted date
-     *
-     * @param   string  $field  Attribute to return
-     * @param   string  $format Output date format
-     * @return          string
-     */
-    public function getDate($field, $format='')
-    {
+	/**
+	 * Function to get a formatted date
+	 *
+	 * @param   string  $field  Attribute to return
+	 * @param   string  $format Output date format
+	 * @return          string
+	 */
+	public function getDate($field, $format='')
+	{
 		if(empty($this->{$field})) return '';
 		else
-        {
+		{
 			return dol_print_date($this->{$field}, $format);
 		}
 	}
 
-    /**
-     * Function to set date in field
-     *
-     * @param   string  $field  field to set
-     * @param   string  $date   formatted date to convert
-     * @return                  mixed
-     */
-    public function setDate($field, $date)
-    {
+	/**
+	 * Function to set date in field
+	 *
+	 * @param   string  $field  field to set
+	 * @param   string  $date   formatted date to convert
+	 * @return                  mixed
+	 */
+	public function setDate($field, $date)
+	{
 	  	if (empty($date))
 	  	{
 	  		$this->{$field} = 0;
 	  	}
 		else
-        {
+		{
 			require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 			$this->{$field} = dol_stringtotime($date);
 		}
@@ -401,14 +401,14 @@ 
 	}
 
 
-    /**
-     * Function to update current object
-     *
-     * @param   array   $Tab    Array of values
-     * @return                  int
-     */
-    public function setValues(&$Tab)
-    {
+	/**
+	 * Function to update current object
+	 *
+	 * @param   array   $Tab    Array of values
+	 * @return                  int
+	 */
+	public function setValues(&$Tab)
+	{
 		foreach ($Tab as $key => $value)
 		{
 			if($this->checkFieldType($key, 'date'))
@@ -427,7 +427,7 @@ 
 				$this->{$key} = (int) price2num($value);
 			}
 			else
-            {
+			{
 				$this->{$key} = $value;
 			}
 		}

Spacing +41 added lines, -41 removed lines

@@ -32,14 +32,14 @@ 
 	/**
 	 *  @var Array $_fields Fields to synchronize with Database
 	 */
-	protected $fields=array();
+	protected $fields = array();
 
     /**
 	 *  Constructor
 	 *
 	 *  @param      DoliDB		$db      Database handler
 	 */
-	function __construct(DoliDB &$db)
+	function __construct(DoliDB & $db)
     {
         $this->db = $db;
 	}
@@ -66,8 +66,8 @@ 
 				else $this->{$field} = '';
 		    }
 
-            $this->to_delete=false;
-            $this->is_clone=false;
+            $this->to_delete = false;
+            $this->is_clone = false;
 			
 			return true;
 		}
@@ -107,7 +107,7 @@ 
 	public function fetch($id, $loadChild = true)
     {
     	$res = $this->fetchCommon($id);
-    	if($res>0) {
+    	if ($res > 0) {
     		if ($loadChild) $this->fetchChild();
     	}
     	
@@ -124,13 +124,13 @@ 
      * @param   bool    $try_to_load    Force the fetch if an id is given
      * @return                          int
      */
-    public function addChild($tabName, $id=0, $key='id', $try_to_load = false)
+    public function addChild($tabName, $id = 0, $key = 'id', $try_to_load = false)
     {
-		if(!empty($id))
+		if (!empty($id))
 		{
-			foreach($this->{$tabName} as $k=>&$object)
+			foreach ($this->{$tabName} as $k=>&$object)
 			{
-				if($object->{$key} === $id) return $k;
+				if ($object->{$key} === $id) return $k;
 			}
 		}
 	
@@ -138,7 +138,7 @@ 
 	
 		$className = ucfirst($tabName);
 		$this->{$tabName}[$k] = new $className($this->db);
-		if($id>0 && $key==='id' && $try_to_load)
+		if ($id > 0 && $key === 'id' && $try_to_load)
 		{
 			$this->{$tabName}[$k]->fetch($id); 
 		}
@@ -155,7 +155,7 @@ 
      * @param   string  $key            Attribute name of the object id
      * @return                          bool
      */
-    public function removeChild($tabName, $id, $key='id')
+    public function removeChild($tabName, $id, $key = 'id')
     {
 		foreach ($this->{$tabName} as &$object)
 		{
@@ -174,22 +174,22 @@ 
      */
     public function fetchChild()
     {
-		if($this->withChild && !empty($this->childtables) && !empty($this->fk_element))
+		if ($this->withChild && !empty($this->childtables) && !empty($this->fk_element))
 		{
-			foreach($this->childtables as &$childTable)
+			foreach ($this->childtables as &$childTable)
 			{
                 $className = ucfirst($childTable);
 
-                $this->{$className}=array();
+                $this->{$className} = array();
 
                 $sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.$childTable.' WHERE '.$this->fk_element.' = '.$this->id;
                 $res = $this->db->query($sql);
 
-                if($res)
+                if ($res)
                 {
-                    while($obj = $this->db->fetch_object($res))
+                    while ($obj = $this->db->fetch_object($res))
                     {
-                        $o=new $className($this->db);
+                        $o = new $className($this->db);
                         $o->fetch($obj->rowid);
 
                         $this->{$className}[] = $o;
@@ -208,21 +208,21 @@ 
      *
      * @param   User    $user   user object
      */
-	public function saveChild(User &$user)
+	public function saveChild(User & $user)
     {
-		if($this->withChild && !empty($this->childtables) && !empty($this->fk_element))
+		if ($this->withChild && !empty($this->childtables) && !empty($this->fk_element))
 		{
-			foreach($this->childtables as &$childTable)
+			foreach ($this->childtables as &$childTable)
 			{
 				$className = ucfirst($childTable);
-				if(!empty($this->{$className}))
+				if (!empty($this->{$className}))
 				{
-					foreach($this->{$className} as $i => &$object)
+					foreach ($this->{$className} as $i => &$object)
 					{
 						$object->{$this->fk_element} = $this->id;
 						
 						$object->update($user);
-						if($this->unsetChildDeleted && isset($object->to_delete) && $object->to_delete==true) unset($this->{$className}[$i]);
+						if ($this->unsetChildDeleted && isset($object->to_delete) && $object->to_delete == true) unset($this->{$className}[$i]);
 					}
 				}
 			}
@@ -236,10 +236,10 @@ 
      * @param   User    $user   user object
      * @return                  < 0 if ko, > 0 if ok
      */
-    public function update(User &$user)
+    public function update(User & $user)
     {
 		if (empty($this->id)) return $this->create($user); // To test, with that, no need to test on high level object, the core decide it, update just needed
-        elseif (isset($this->to_delete) && $this->to_delete==true) return $this->delete($user);
+        elseif (isset($this->to_delete) && $this->to_delete == true) return $this->delete($user);
 
         $error = 0;
         $this->db->begin();
@@ -247,7 +247,7 @@ 
         $res = $this->updateCommon($user);
         if ($res)
         {
-            $result = $this->call_trigger(strtoupper($this->element). '_UPDATE', $user);
+            $result = $this->call_trigger(strtoupper($this->element).'_UPDATE', $user);
             if ($result < 0) $error++;
             else $this->saveChild($user);
         }
@@ -277,19 +277,19 @@ 
      * @param   User    $user   user object
      * @return                  < 0 if ko, > 0 if ok
      */
-    public function create(User &$user)
+    public function create(User & $user)
     {
-		if($this->id > 0) return $this->update($user);
+		if ($this->id > 0) return $this->update($user);
 
         $error = 0;
         $this->db->begin();
 
         $res = $this->createCommon($user);
-		if($res)
+		if ($res)
 		{
 			$this->id = $this->db->last_insert_id($this->table_element);
 
-			$result = $this->call_trigger(strtoupper($this->element). '_CREATE', $user);
+			$result = $this->call_trigger(strtoupper($this->element).'_CREATE', $user);
             if ($result < 0) $error++;
             else $this->saveChild($user);
 		}
@@ -318,27 +318,27 @@ 
      * @param   User    $user   user object
      * @return                  < 0 if ko, > 0 if ok
      */
-	public function delete(User &$user)
+	public function delete(User & $user)
     {
 		if ($this->id <= 0) return 0;
 
         $error = 0;
         $this->db->begin();
 
-        $result = $this->call_trigger(strtoupper($this->element). '_DELETE', $user);
+        $result = $this->call_trigger(strtoupper($this->element).'_DELETE', $user);
         if ($result < 0) $error++;
 
         if (!$error)
         {
             $this->deleteCommon($user);
-            if($this->withChild && !empty($this->childtables))
+            if ($this->withChild && !empty($this->childtables))
             {
-                foreach($this->childtables as &$childTable)
+                foreach ($this->childtables as &$childTable)
                 {
                     $className = ucfirst($childTable);
                     if (!empty($this->{$className}))
                     {
-                        foreach($this->{$className} as &$object)
+                        foreach ($this->{$className} as &$object)
                         {
                             $object->delete($user);
                         }
@@ -369,9 +369,9 @@ 
      * @param   string  $format Output date format
      * @return          string
      */
-    public function getDate($field, $format='')
+    public function getDate($field, $format = '')
     {
-		if(empty($this->{$field})) return '';
+		if (empty($this->{$field})) return '';
 		else
         {
 			return dol_print_date($this->{$field}, $format);
@@ -411,19 +411,19 @@ 
     {
 		foreach ($Tab as $key => $value)
 		{
-			if($this->checkFieldType($key, 'date'))
+			if ($this->checkFieldType($key, 'date'))
 			{
 				$this->setDate($key, $value);
 			}
-			else if( $this->checkFieldType($key, 'array'))
+			else if ($this->checkFieldType($key, 'array'))
 			{
 				$this->{$key} = $value;
 			}
-			else if( $this->checkFieldType($key, 'float') )
+			else if ($this->checkFieldType($key, 'float'))
 			{
 				$this->{$key} = (double) price2num($value);
 			}
-			else if( $this->checkFieldType($key, 'int') ) {
+			else if ($this->checkFieldType($key, 'int')) {
 				$this->{$key} = (int) price2num($value);
 			}
 			else

Braces +62 added lines, -45 removed lines

@@ -59,19 +59,24 @@ 
 		{
 			foreach ($this->fields as $field=>$info)
 			{
-		        if ($this->isDate($info)) $this->{$field} = time();
-		        elseif ($this->isArray($info)) $this->{$field} = array();
-		        elseif ($this->isInt($info)) $this->{$field} = (int) 0;
-		        elseif ($this->isFloat($info)) $this->{$field} = (double) 0;
-				else $this->{$field} = '';
+		        if ($this->isDate($info)) {
+		        	$this->{$field} = time();
+		        } elseif ($this->isArray($info)) {
+		        	$this->{$field} = array();
+		        } elseif ($this->isInt($info)) {
+		        	$this->{$field} = (int) 0;
+		        } elseif ($this->isFloat($info)) {
+		        	$this->{$field} = (double) 0;
+		        } else {
+					$this->{$field} = '';
+				}
 		    }
 
             $this->to_delete=false;
             $this->is_clone=false;
 			
 			return true;
-		}
-		else
+		} else
         {
 			return false;
 		}
@@ -90,8 +95,7 @@ 
 		if (isset($this->fields[$field]) && method_exists($this, 'is_'.$type))
 		{
 			return $this->{'is_'.$type}($this->fields[$field]);
-		}
-		else
+		} else
         {
             return false;
         }
@@ -108,7 +112,9 @@ 
     {
     	$res = $this->fetchCommon($id);
     	if($res>0) {
-    		if ($loadChild) $this->fetchChild();
+    		if ($loadChild) {
+    			$this->fetchChild();
+    		}
     	}
     	
     	return $res;
@@ -130,7 +136,9 @@ 
 		{
 			foreach($this->{$tabName} as $k=>&$object)
 			{
-				if($object->{$key} === $id) return $k;
+				if($object->{$key} === $id) {
+					return $k;
+				}
 			}
 		}
 	
@@ -194,8 +202,7 @@ 
 
                         $this->{$className}[] = $o;
                     }
-                }
-                else
+                } else
                 {
                     $this->errors[] = $this->db->lasterror();
                 }
@@ -222,7 +229,9 @@ 
 						$object->{$this->fk_element} = $this->id;
 						
 						$object->update($user);
-						if($this->unsetChildDeleted && isset($object->to_delete) && $object->to_delete==true) unset($this->{$className}[$i]);
+						if($this->unsetChildDeleted && isset($object->to_delete) && $object->to_delete==true) {
+							unset($this->{$className}[$i]);
+						}
 					}
 				}
 			}
@@ -238,8 +247,13 @@ 
      */
     public function update(User &$user)
     {
-		if (empty($this->id)) return $this->create($user); // To test, with that, no need to test on high level object, the core decide it, update just needed
-        elseif (isset($this->to_delete) && $this->to_delete==true) return $this->delete($user);
+		if (empty($this->id)) {
+			return $this->create($user);
+		}
+		// To test, with that, no need to test on high level object, the core decide it, update just needed
+        elseif (isset($this->to_delete) && $this->to_delete==true) {
+        	return $this->delete($user);
+        }
 
         $error = 0;
         $this->db->begin();
@@ -248,10 +262,12 @@ 
         if ($res)
         {
             $result = $this->call_trigger(strtoupper($this->element). '_UPDATE', $user);
-            if ($result < 0) $error++;
-            else $this->saveChild($user);
-        }
-        else
+            if ($result < 0) {
+            	$error++;
+            } else {
+            	$this->saveChild($user);
+            }
+        } else
         {
             $error++;
             $this->error = $this->db->lasterror();
@@ -262,8 +278,7 @@ 
         {
             $this->db->commit();
             return $this->id;
-        }
-        else
+        } else
         {
             $this->db->rollback();
             return -1;
@@ -279,7 +294,9 @@ 
      */
     public function create(User &$user)
     {
-		if($this->id > 0) return $this->update($user);
+		if($this->id > 0) {
+			return $this->update($user);
+		}
 
         $error = 0;
         $this->db->begin();
@@ -290,10 +307,12 @@ 
 			$this->id = $this->db->last_insert_id($this->table_element);
 
 			$result = $this->call_trigger(strtoupper($this->element). '_CREATE', $user);
-            if ($result < 0) $error++;
-            else $this->saveChild($user);
-		}
-		else
+            if ($result < 0) {
+            	$error++;
+            } else {
+            	$this->saveChild($user);
+            }
+		} else
         {
             $error++;
             $this->error = $this->db->lasterror();
@@ -304,8 +323,7 @@ 
         {
             $this->db->commit();
             return $this->id;
-        }
-        else
+        } else
         {
             $this->db->rollback();
             return -1;
@@ -320,13 +338,17 @@ 
      */
 	public function delete(User &$user)
     {
-		if ($this->id <= 0) return 0;
+		if ($this->id <= 0) {
+			return 0;
+		}
 
         $error = 0;
         $this->db->begin();
 
         $result = $this->call_trigger(strtoupper($this->element). '_DELETE', $user);
-        if ($result < 0) $error++;
+        if ($result < 0) {
+        	$error++;
+        }
 
         if (!$error)
         {
@@ -351,8 +373,7 @@ 
         {
             $this->db->commit();
             return 1;
-        }
-        else
+        } else
         {
             $this->error = $this->db->lasterror();
             $this->errors[] = $this->error;
@@ -371,8 +392,9 @@ 
      */
     public function getDate($field, $format='')
     {
-		if(empty($this->{$field})) return '';
-		else
+		if(empty($this->{$field})) {
+			return '';
+		} else
         {
 			return dol_print_date($this->{$field}, $format);
 		}
@@ -390,8 +412,7 @@ 
 	  	if (empty($date))
 	  	{
 	  		$this->{$field} = 0;
-	  	}
-		else
+	  	} else
         {
 			require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 			$this->{$field} = dol_stringtotime($date);
@@ -414,19 +435,15 @@ 
 			if($this->checkFieldType($key, 'date'))
 			{
 				$this->setDate($key, $value);
-			}
-			else if( $this->checkFieldType($key, 'array'))
+			} else if( $this->checkFieldType($key, 'array'))
 			{
 				$this->{$key} = $value;
-			}
-			else if( $this->checkFieldType($key, 'float') )
+			} else if( $this->checkFieldType($key, 'float') )
 			{
 				$this->{$key} = (double) price2num($value);
-			}
-			else if( $this->checkFieldType($key, 'int') ) {
+			} else if( $this->checkFieldType($key, 'int') ) {
 				$this->{$key} = (int) price2num($value);
-			}
-			else
+			} else
             {
 				$this->{$key} = $value;
 			}

htdocs/core/class/html.formbank.class.php

Indentation +23 added lines, -23 removed lines

@@ -29,33 +29,33 @@
  */
 class FormBank
 {
-    var $db;
-    var $error;
+	var $db;
+	var $error;
 
 
-    /**
-     * Constructor
-     *
-     * @param		DoliDB		$db      Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
-    }
+	/**
+	 * Constructor
+	 *
+	 * @param		DoliDB		$db      Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+	}
 
-    /**
-     *  Retourne la liste des types de comptes financiers
-     *
-     *  @param	integer	$selected        Type pre-selectionne
-     *  @param  string	$htmlname        Nom champ formulaire
-     *  @return	void
-     */
-    public function selectTypeOfBankAccount($selected = Account::TYPE_CURRENT, $htmlname = 'type')
-    {
-        $account = new Account($this->db);
+	/**
+	 *  Retourne la liste des types de comptes financiers
+	 *
+	 *  @param	integer	$selected        Type pre-selectionne
+	 *  @param  string	$htmlname        Nom champ formulaire
+	 *  @return	void
+	 */
+	public function selectTypeOfBankAccount($selected = Account::TYPE_CURRENT, $htmlname = 'type')
+	{
+		$account = new Account($this->db);
 
-        print Form::selectarray($htmlname, $account->type_lib, $selected);
-    }
+		print Form::selectarray($htmlname, $account->type_lib, $selected);
+	}
 
 	/**
 	 * Returns the name of the Iban label. India uses 'IFSC' and the rest of the world 'IBAN' name.

htdocs/core/class/rssparser.class.php

Indentation +734 added lines, -734 removed lines

@@ -26,695 +26,695 @@ 
  */
 class RssParser
 {
-    var $db;
-    var $error;
-
-    private $_format='';
-    private $_urlRSS;
-    private $_language;
-    private $_generator;
-    private $_copyright;
-    private $_lastbuilddate;
-    private $_imageurl;
-    private $_link;
-    private $_title;
-    private $_description;
-    private $_lastfetchdate;    // Last successful fetch
-    private $_rssarray=array();
-
-    // For parsing with xmlparser
-    var $stack               = array(); // parser stack
-    var $_CONTENT_CONSTRUCTS = array('content', 'summary', 'info', 'title', 'tagline', 'copyright');
-
-
-    /**
-     *	Constructor
-     *
-     *  @param		DoliDB		$db      Database handler
-     */
-    public function __construct($db)
-    {
-    	$this->db=$db;
-    }
-
-    /**
-     * getFormat
-     *
-     * @return string
-     */
-    public function getFormat()
-    {
-        return $this->_format;
-    }
-
-    /**
-     * getUrlRss
-     *
-     * @return string
-     */
-    public function getUrlRss()
-    {
-        return $this->_urlRSS;
-    }
-    /**
-     * getLanguage
-     *
-     * @return string
-     */
-    public function getLanguage()
-    {
-        return $this->_language;
-    }
-    /**
-     * getGenerator
-     *
-     * @return string
-     */
-    public function getGenerator()
-    {
-        return $this->_generator;
-    }
-    /**
-     * getCopyright
-     *
-     * @return string
-     */
-    public function getCopyright()
-    {
-        return $this->_copyright;
-    }
-    /**
-     * getLastBuildDate
-     *
-     * @return string
-     */
-    public function getLastBuildDate()
-    {
-        return $this->_lastbuilddate;
-    }
-    /**
-     * getImageUrl
-     *
-     * @return string
-     */
-    public function getImageUrl()
-    {
-        return $this->_imageurl;
-    }
-    /**
-     * getLink
-     *
-     * @return string
-     */
-    public function getLink()
-    {
-        return $this->_link;
-    }
-    /**
-     * getTitle
-     *
-     * @return string
-     */
-    public function getTitle()
-    {
-        return $this->_title;
-    }
-    /**
-     * getDescription
-     *
-     * @return string
-     */
-    public function getDescription()
-    {
-        return $this->_description;
-    }
-    /**
-     * getLastFetchDate
-     *
-     * @return string
-     */
-    public function getLastFetchDate()
-    {
-        return $this->_lastfetchdate;
-    }
-    /**
-     * getItems
-     *
-     * @return string
-     */
-    public function getItems()
-    {
-        return $this->_rssarray;
-    }
-
-
-    /**
-     * 	Parse rss URL
-     *
-     * 	@param	string	$urlRSS		Url to parse
-     * 	@param	int		$maxNb		Max nb of records to get (0 for no limit)
-     * 	@param	int		$cachedelay	0=No cache, nb of seconds we accept cache files (cachedir must also be defined)
-     * 	@param	string	$cachedir	Directory where to save cache file
-     *	@return	int					<0 if KO, >0 if OK
-     */
-    public function parser($urlRSS, $maxNb=0, $cachedelay=60, $cachedir='')
-    {
-        global $conf;
-
-        include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-
-        $rss='';
-        $str='';    // This will contain content of feed
-
-        // Check parameters
-        if (! dol_is_url($urlRSS))
-        {
-            $this->error="ErrorBadUrl";
-            return -1;
-        }
-
-        $this->_urlRSS = $urlRSS;
-        $newpathofdestfile=$cachedir.'/'.dol_hash($this->_urlRSS,3);	// Force md5 hash (does not contains special chars)
-        $newmask='0644';
-
-        //dol_syslog("RssPArser::parser parse url=".$urlRSS." => cache file=".$newpathofdestfile);
-        $nowgmt = dol_now();
-
-        // Search into cache
-        $foundintocache=0;
-        if ($cachedelay > 0 && $cachedir)
-        {
-            $filedate=dol_filemtime($newpathofdestfile);
-            if ($filedate >= ($nowgmt - $cachedelay))
-            {
-                //dol_syslog("RssParser::parser cache file ".$newpathofdestfile." is not older than now - cachedelay (".$nowgmt." - ".$cachedelay.") so we use it.");
-                $foundintocache=1;
-
-                $this->_lastfetchdate=$filedate;
-            }
-            else
-            {
-                dol_syslog(get_class($this)."::parser cache file ".$newpathofdestfile." is not found or older than now - cachedelay (".$nowgmt." - ".$cachedelay.") so we can't use it.");
-            }
-        }
-
-        // Load file into $str
-        if ($foundintocache)    // Cache file found and is not too old
-        {
-            $str = file_get_contents($newpathofdestfile);
-        }
-        else
-        {
-            try {
-                ini_set("user_agent","Dolibarr ERP-CRM RSS reader");
-                ini_set("max_execution_time", $conf->global->MAIN_USE_RESPONSE_TIMEOUT);
-                ini_set("default_socket_timeout", $conf->global->MAIN_USE_RESPONSE_TIMEOUT);
-
-                $opts = array('http'=>array('method'=>"GET"));
-                if (! empty($conf->global->MAIN_USE_CONNECT_TIMEOUT)) $opts['http']['timeout']=$conf->global->MAIN_USE_CONNECT_TIMEOUT;
-                if (! empty($conf->global->MAIN_PROXY_USE))           $opts['http']['proxy']='tcp://'.$conf->global->MAIN_PROXY_HOST.':'.$conf->global->MAIN_PROXY_PORT;
-                //var_dump($opts);exit;
-                $context = stream_context_create($opts);
-
-                $str = file_get_contents($this->_urlRSS, false, $context);
-            }
-            catch (Exception $e) {
-                print 'Error retrieving URL '.$this->urlRSS.' - '.$e->getMessage();
-            }
-        }
-
-        if ($str !== false)
-        {
-	        // Convert $str into xml
-	        if (! empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
-	        {
-	            //print 'xx'.LIBXML_NOCDATA;
-	            libxml_use_internal_errors(false);
-	            $rss = simplexml_load_string($str, "SimpleXMLElement", LIBXML_NOCDATA);
-	        }
-	        else
-	        {
-	            $xmlparser=xml_parser_create('');
-	            if (!is_resource($xmlparser)) {
-	                $this->error="ErrorFailedToCreateParser"; return -1;
-	            }
-
-	            xml_set_object($xmlparser, $this);
-	            xml_set_element_handler($xmlparser, 'feed_start_element', 'feed_end_element');
-	            xml_set_character_data_handler($xmlparser, 'feed_cdata');
-	            $status = xml_parse($xmlparser, $str);
-	            xml_parser_free($xmlparser);
-	            $rss=$this;
-	            //var_dump($rss->_format);exit;
-	        }
-        }
-
-        // If $rss loaded
-        if ($rss)
-        {
-            // Save file into cache
-            if (empty($foundintocache) && $cachedir)
-            {
-                dol_syslog(get_class($this)."::parser cache file ".$newpathofdestfile." is saved onto disk.");
-                if (! dol_is_dir($cachedir)) dol_mkdir($cachedir);
-                $fp = fopen($newpathofdestfile, 'w');
-                fwrite($fp, $str);
-                fclose($fp);
-                if (! empty($conf->global->MAIN_UMASK)) $newmask=$conf->global->MAIN_UMASK;
-                @chmod($newpathofdestfile, octdec($newmask));
-
-                $this->_lastfetchdate=$nowgmt;
-            }
-
-            unset($str);    // Free memory
-
-            if (empty($rss->_format))    // If format not detected automatically
-            {
-                $rss->_format='rss';
-                if (empty($rss->channel)) $rss->_format='atom';
-            }
-
-            $items=array();
-
-            // Save description entries
-            if ($rss->_format == 'rss')
-            {
-                //var_dump($rss);
-                if (! empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
-                {
-                    if (!empty($rss->channel->language))      $this->_language = (string) $rss->channel->language;
-                    if (!empty($rss->channel->generator))     $this->_generator = (string) $rss->channel->generator;
-                    if (!empty($rss->channel->copyright))     $this->_copyright = (string) $rss->channel->copyright;
-                    if (!empty($rss->channel->lastbuilddate)) $this->_lastbuilddate = (string) $rss->channel->lastbuilddate;
-                    if (!empty($rss->channel->image->url[0])) $this->_imageurl = (string) $rss->channel->image->url[0];
-                    if (!empty($rss->channel->link))		  $this->_link = (string) $rss->channel->link;
-                    if (!empty($rss->channel->title))         $this->_title = (string) $rss->channel->title;
-                    if (!empty($rss->channel->description))	  $this->_description = (string) $rss->channel->description;
-                }
-                else
-                {
-                    //var_dump($rss->channel);
-                    if (!empty($rss->channel['language']))      $this->_language = (string) $rss->channel['language'];
-                    if (!empty($rss->channel['generator']))     $this->_generator = (string) $rss->channel['generator'];
-                    if (!empty($rss->channel['copyright']))     $this->_copyright = (string) $rss->channel['copyright'];
-                    if (!empty($rss->channel['lastbuilddate'])) $this->_lastbuilddate = (string) $rss->channel['lastbuilddate'];
-                    if (!empty($rss->image['url']))             $this->_imageurl = (string) $rss->image['url'];
-                    if (!empty($rss->channel['link']))		    $this->_link = (string) $rss->channel['link'];
-                    if (!empty($rss->channel['title']))         $this->_title = (string) $rss->channel['title'];
-                    if (!empty($rss->channel['description']))   $this->_description = (string) $rss->channel['description'];
-                }
-
-                if (! empty($conf->global->EXTERNALRSS_USE_SIMPLEXML)) $items=$rss->channel->item;    // With simplexml
-                else $items=$rss->items;                                                              // With xmlparse
-                //var_dump($items);exit;
-            }
-            else if ($rss->_format == 'atom')
-            {
-                //var_dump($rss);
-                if (! empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
-                {
-                    if (!empty($rss->generator))     $this->_generator = (string) $rss->generator;
-                    if (!empty($rss->lastbuilddate)) $this->_lastbuilddate = (string) $rss->modified;
-                    if (!empty($rss->link->href))    $this->_link = (string) $rss->link->href;
-                    if (!empty($rss->title))         $this->_title = (string) $rss->title;
-                    if (!empty($rss->description))	 $this->_description = (string) $rss->description;
-                }
-                else
-                {
-                    //if (!empty($rss->channel['rss_language']))      $this->_language = (string) $rss->channel['rss_language'];
-                    if (!empty($rss->channel['generator']))     $this->_generator = (string) $rss->channel['generator'];
-                    //if (!empty($rss->channel['rss_copyright']))     $this->_copyright = (string) $rss->channel['rss_copyright'];
-                    if (!empty($rss->channel['modified'])) $this->_lastbuilddate = (string) $rss->channel['modified'];
-                    //if (!empty($rss->image['rss_url']))             $this->_imageurl = (string) $rss->image['rss_url'];
-                    if (!empty($rss->channel['link']))		    $this->_link = (string) $rss->channel['link'];
-                    if (!empty($rss->channel['title']))         $this->_title = (string) $rss->channel['title'];
-                    //if (!empty($rss->channel['rss_description']))   $this->_description = (string) $rss->channel['rss_description'];
-                }
-                if (! empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))  {
-                    $tmprss=xml2php($rss); $items=$tmprss['entry'];
-                } // With simplexml
-                else $items=$rss->items;                                                              // With xmlparse
-                //var_dump($items);exit;
-            }
-
-            $i = 0;
-
-            // Loop on each record
-            if (is_array($items))
-            {
-                foreach($items as $item)
-                {
-                    //var_dump($item);exit;
-                    if ($rss->_format == 'rss')
-                    {
-                        if (! empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
-                        {
-                            $itemLink = (string) $item->link;
-                            $itemTitle = (string) $item->title;
-                            $itemDescription = (string) $item->description;
-                            $itemPubDate = (string) $item->pubDate;
-                            $itemId = '';
-                            $itemAuthor = '';
-                        }
-                        else
-                        {
-                            $itemLink = (string) $item['link'];
-                            $itemTitle = (string) $item['title'];
-                            $itemDescription = (string) $item['description'];
-                            $itemPubDate = (string) $item['pubdate'];
-                            $itemId = (string) $item['guid'];
-                            $itemAuthor = (string) $item['author'];
-                        }
-
-                        // Loop on each category
-                        $itemCategory=array();
-                        if (is_array($item->category))
-                        {
-                            foreach ($item->category as $cat)
-                            {
-                                $itemCategory[] = (string) $cat;
-                            }
-                        }
-                    }
-                    else if ($rss->_format == 'atom')
-                    {
-                        if (! empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
-                        {
-                            $itemLink = (isset($item['link']['href']) ? (string) $item['link']['href'] : '');
-                            $itemTitle = (string) $item['title'];
-                            $itemDescription = (string) $item['summary'];
-                            $itemPubDate = (string) $item['created'];
-                            $itemId = (string) $item['id'];
-                            $itemAuthor = (string) ($item['author']?$item['author']:$item['author_name']);
-                        }
-                        else
-                        {
-                            $itemLink = (isset($item['link']['href']) ? (string) $item['link']['href'] : '');
-                            $itemTitle = (string) $item['title'];
-                            $itemDescription = (string) $item['summary'];
-                            $itemPubDate = (string) $item['created'];
-                            $itemId = (string) $item['id'];
-                            $itemAuthor = (string) ($item['author']?$item['author']:$item['author_name']);
-                        }
-                    }
-                    else print 'ErrorBadFeedFormat';
-
-                    // Add record to result array
-                    $this->_rssarray[$i] = array(
-    					'link'=>$itemLink,
-    					'title'=>$itemTitle,
-    					'description'=>$itemDescription,
-    					'pubDate'=>$itemPubDate,
-    					'category'=>$itemCategory,
-    				    'id'=>$itemId,
-    				    'author'=>$itemAuthor);
-                    //var_dump($this->_rssarray);
-
-                    $i++;
-
-                    if ($i > $maxNb)    break;    // We get all records we want
-                }
-            }
-
-            return 1;
-        }
-        else
-        {
-            $this->error='ErrorFailedToLoadRSSFile';
-            return -1;
-        }
-    }
-
-
-
-    /**
-     * 	Triggered when opened tag is found
-     *
-     * 	@param	string		$p			Start
-     *  @param	string		$element	Tag
-     *  @param	array		$attrs		Attributes of tags
-     *  @return	void
-     */
-    function feed_start_element($p, $element, &$attrs)
-    {
-        $el = $element = strtolower($element);
-        $attrs = array_change_key_case($attrs, CASE_LOWER);
-
-        // check for a namespace, and split if found
-        $ns = false;
-        if (strpos($element, ':'))
-        {
-            list($ns, $el) = explode(':', $element, 2);
-        }
-        if ( $ns and $ns != 'rdf' )
-        {
-            $this->current_namespace = $ns;
-        }
-
-        // if feed type isn't set, then this is first element of feed identify feed from root element
-        if (empty($this->_format))
-        {
-            if ( $el == 'rdf' ) {
-                $this->_format = 'rss';
-                $this->feed_version = '1.0';
-            }
-            elseif ( $el == 'rss' ) {
-                $this->_format = 'rss';
-                $this->feed_version = $attrs['version'];
-            }
-            elseif ( $el == 'feed' ) {
-                $this->_format = 'atom';
-                $this->feed_version = $attrs['version'];
-                $this->inchannel = true;
-            }
-            return;
-        }
-
-        if ( $el == 'channel' )
-        {
-            $this->inchannel = true;
-        }
-        elseif ($el == 'item' or $el == 'entry' )
-        {
-            $this->initem = true;
-            if ( isset($attrs['rdf:about']) ) {
-                $this->current_item['about'] = $attrs['rdf:about'];
-            }
-        }
-
-        // if we're in the default namespace of an RSS feed,
-        //  record textinput or image fields
-        elseif (
-        $this->_format == 'rss' and
-        $this->current_namespace == '' and
-        $el == 'textinput' )
-        {
-            $this->intextinput = true;
-        }
-
-        elseif (
-        $this->_format == 'rss' and
-        $this->current_namespace == '' and
-        $el == 'image' )
-        {
-            $this->inimage = true;
-        }
-
-        // handle atom content constructs
-        elseif ( $this->_format == 'atom' and in_array($el, $this->_CONTENT_CONSTRUCTS) )
-        {
-            // avoid clashing w/ RSS mod_content
-            if ($el == 'content' ) {
-                $el = 'atom_content';
-            }
-
-            $this->incontent = $el;
-
-
-        }
-
-        // if inside an Atom content construct (e.g. content or summary) field treat tags as text
-        elseif ($this->_format == 'atom' and $this->incontent )
-        {
-            // if tags are inlined, then flatten
-            $attrs_str = join(' ', array_map('map_attrs', array_keys($attrs), array_values($attrs)));
-
-            $this->append_content("<$element $attrs_str>");
-
-            array_unshift($this->stack, $el);
-        }
-
-        // Atom support many links per containging element.
-        // Magpie treats link elements of type rel='alternate'
-        // as being equivalent to RSS's simple link element.
-        //
-        elseif ($this->_format == 'atom' and $el == 'link' )
-        {
-            if ( isset($attrs['rel']) && $attrs['rel'] == 'alternate' )
-            {
-                $link_el = 'link';
-            }
-            else {
-                $link_el = 'link_' . $attrs['rel'];
-            }
-
-            $this->append($link_el, $attrs['href']);
-        }
-        // set stack[0] to current element
-        else {
-            array_unshift($this->stack, $el);
-        }
-    }
-
-
-    /**
-     * 	Triggered when CDATA is found
-     *
-     * 	@param	string	$p		P
-     *  @param	string	$text	Tag
-     *  @return	void
-     */
-    function feed_cdata($p, $text)
-    {
-        if ($this->_format == 'atom' and $this->incontent)
-        {
-            $this->append_content($text);
-        }
-        else
-        {
-            $current_el = join('_', array_reverse($this->stack));
-            $this->append($current_el, $text);
-        }
-    }
-
-    /**
-     * 	Triggered when closed tag is found
-     *
-     * 	@param	string		$p		P
-     *  @param	string		$el		Tag
-     *  @return	void
-     */
-    function feed_end_element($p, $el)
-    {
-        $el = strtolower($el);
-
-        if ($el == 'item' or $el == 'entry')
-        {
-            $this->items[] = $this->current_item;
-            $this->current_item = array();
-            $this->initem = false;
-        }
-        elseif ($this->_format == 'rss' and $this->current_namespace == '' and $el == 'textinput' )
-        {
-            $this->intextinput = false;
-        }
-        elseif ($this->_format == 'rss' and $this->current_namespace == '' and $el == 'image' )
-        {
-            $this->inimage = false;
-        }
-        elseif ($this->_format == 'atom' and in_array($el, $this->_CONTENT_CONSTRUCTS) )
-        {
-            $this->incontent = false;
-        }
-        elseif ($el == 'channel' or $el == 'feed' )
-        {
-            $this->inchannel = false;
-        }
-        elseif ($this->_format == 'atom' and $this->incontent  ) {
-            // balance tags properly
-            // note:  i don't think this is actually neccessary
-            if ( $this->stack[0] == $el )
-            {
-                $this->append_content("</$el>");
-            }
-            else {
-                $this->append_content("<$el />");
-            }
-
-            array_shift($this->stack);
-        }
-        else {
-            array_shift($this->stack);
-        }
-
-        $this->current_namespace = false;
-    }
-
-
-    /**
-     * 	To concat 2 string with no warning if an operand is not defined
-     *
-     * 	@param	string	$str1		Str1
-     *  @param	string	$str2		Str2
-     *  @return	string				String cancatenated
-     */
-    function concat(&$str1, $str2="")
-    {
-        if (!isset($str1) ) {
-            $str1="";
-        }
-        $str1 .= $str2;
-    }
-
-    /**
-     * Enter description here ...
-     *
-     * @param	string	$text		Text
-     * @return	void
-     */
-    function append_content($text)
-    {
-        if ( $this->initem ) {
-            $this->concat($this->current_item[ $this->incontent ], $text);
-        }
-        elseif ( $this->inchannel ) {
-            $this->concat($this->channel[ $this->incontent ], $text);
-        }
-    }
-
-    /**
-     * 	smart append - field and namespace aware
-     *
-     * 	@param	string	$el		El
-     * 	@param	string	$text	Text
-     * 	@return	void
-     */
-    function append($el, $text)
-    {
-        if (!$el) {
-            return;
-        }
-        if ( $this->current_namespace )
-        {
-            if ( $this->initem ) {
-                $this->concat($this->current_item[ $this->current_namespace ][ $el ], $text);
-            }
-            elseif ($this->inchannel) {
-                $this->concat($this->channel[ $this->current_namespace][ $el ], $text);
-            }
-            elseif ($this->intextinput) {
-                $this->concat($this->textinput[ $this->current_namespace][ $el ], $text);
-            }
-            elseif ($this->inimage) {
-                $this->concat($this->image[ $this->current_namespace ][ $el ], $text);
-            }
-        }
-        else {
-            if ( $this->initem ) {
-                $this->concat($this->current_item[ $el ], $text);
-            }
-            elseif ($this->intextinput) {
-                $this->concat($this->textinput[ $el ], $text);
-            }
-            elseif ($this->inimage) {
-                $this->concat($this->image[ $el ], $text);
-            }
-            elseif ($this->inchannel) {
-                $this->concat($this->channel[ $el ], $text);
-            }
-
-        }
-    }
+	var $db;
+	var $error;
+
+	private $_format='';
+	private $_urlRSS;
+	private $_language;
+	private $_generator;
+	private $_copyright;
+	private $_lastbuilddate;
+	private $_imageurl;
+	private $_link;
+	private $_title;
+	private $_description;
+	private $_lastfetchdate;    // Last successful fetch
+	private $_rssarray=array();
+
+	// For parsing with xmlparser
+	var $stack               = array(); // parser stack
+	var $_CONTENT_CONSTRUCTS = array('content', 'summary', 'info', 'title', 'tagline', 'copyright');
+
+
+	/**
+	 *	Constructor
+	 *
+	 *  @param		DoliDB		$db      Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db=$db;
+	}
+
+	/**
+	 * getFormat
+	 *
+	 * @return string
+	 */
+	public function getFormat()
+	{
+		return $this->_format;
+	}
+
+	/**
+	 * getUrlRss
+	 *
+	 * @return string
+	 */
+	public function getUrlRss()
+	{
+		return $this->_urlRSS;
+	}
+	/**
+	 * getLanguage
+	 *
+	 * @return string
+	 */
+	public function getLanguage()
+	{
+		return $this->_language;
+	}
+	/**
+	 * getGenerator
+	 *
+	 * @return string
+	 */
+	public function getGenerator()
+	{
+		return $this->_generator;
+	}
+	/**
+	 * getCopyright
+	 *
+	 * @return string
+	 */
+	public function getCopyright()
+	{
+		return $this->_copyright;
+	}
+	/**
+	 * getLastBuildDate
+	 *
+	 * @return string
+	 */
+	public function getLastBuildDate()
+	{
+		return $this->_lastbuilddate;
+	}
+	/**
+	 * getImageUrl
+	 *
+	 * @return string
+	 */
+	public function getImageUrl()
+	{
+		return $this->_imageurl;
+	}
+	/**
+	 * getLink
+	 *
+	 * @return string
+	 */
+	public function getLink()
+	{
+		return $this->_link;
+	}
+	/**
+	 * getTitle
+	 *
+	 * @return string
+	 */
+	public function getTitle()
+	{
+		return $this->_title;
+	}
+	/**
+	 * getDescription
+	 *
+	 * @return string
+	 */
+	public function getDescription()
+	{
+		return $this->_description;
+	}
+	/**
+	 * getLastFetchDate
+	 *
+	 * @return string
+	 */
+	public function getLastFetchDate()
+	{
+		return $this->_lastfetchdate;
+	}
+	/**
+	 * getItems
+	 *
+	 * @return string
+	 */
+	public function getItems()
+	{
+		return $this->_rssarray;
+	}
+
+
+	/**
+	 * 	Parse rss URL
+	 *
+	 * 	@param	string	$urlRSS		Url to parse
+	 * 	@param	int		$maxNb		Max nb of records to get (0 for no limit)
+	 * 	@param	int		$cachedelay	0=No cache, nb of seconds we accept cache files (cachedir must also be defined)
+	 * 	@param	string	$cachedir	Directory where to save cache file
+	 *	@return	int					<0 if KO, >0 if OK
+	 */
+	public function parser($urlRSS, $maxNb=0, $cachedelay=60, $cachedir='')
+	{
+		global $conf;
+
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+
+		$rss='';
+		$str='';    // This will contain content of feed
+
+		// Check parameters
+		if (! dol_is_url($urlRSS))
+		{
+			$this->error="ErrorBadUrl";
+			return -1;
+		}
+
+		$this->_urlRSS = $urlRSS;
+		$newpathofdestfile=$cachedir.'/'.dol_hash($this->_urlRSS,3);	// Force md5 hash (does not contains special chars)
+		$newmask='0644';
+
+		//dol_syslog("RssPArser::parser parse url=".$urlRSS." => cache file=".$newpathofdestfile);
+		$nowgmt = dol_now();
+
+		// Search into cache
+		$foundintocache=0;
+		if ($cachedelay > 0 && $cachedir)
+		{
+			$filedate=dol_filemtime($newpathofdestfile);
+			if ($filedate >= ($nowgmt - $cachedelay))
+			{
+				//dol_syslog("RssParser::parser cache file ".$newpathofdestfile." is not older than now - cachedelay (".$nowgmt." - ".$cachedelay.") so we use it.");
+				$foundintocache=1;
+
+				$this->_lastfetchdate=$filedate;
+			}
+			else
+			{
+				dol_syslog(get_class($this)."::parser cache file ".$newpathofdestfile." is not found or older than now - cachedelay (".$nowgmt." - ".$cachedelay.") so we can't use it.");
+			}
+		}
+
+		// Load file into $str
+		if ($foundintocache)    // Cache file found and is not too old
+		{
+			$str = file_get_contents($newpathofdestfile);
+		}
+		else
+		{
+			try {
+				ini_set("user_agent","Dolibarr ERP-CRM RSS reader");
+				ini_set("max_execution_time", $conf->global->MAIN_USE_RESPONSE_TIMEOUT);
+				ini_set("default_socket_timeout", $conf->global->MAIN_USE_RESPONSE_TIMEOUT);
+
+				$opts = array('http'=>array('method'=>"GET"));
+				if (! empty($conf->global->MAIN_USE_CONNECT_TIMEOUT)) $opts['http']['timeout']=$conf->global->MAIN_USE_CONNECT_TIMEOUT;
+				if (! empty($conf->global->MAIN_PROXY_USE))           $opts['http']['proxy']='tcp://'.$conf->global->MAIN_PROXY_HOST.':'.$conf->global->MAIN_PROXY_PORT;
+				//var_dump($opts);exit;
+				$context = stream_context_create($opts);
+
+				$str = file_get_contents($this->_urlRSS, false, $context);
+			}
+			catch (Exception $e) {
+				print 'Error retrieving URL '.$this->urlRSS.' - '.$e->getMessage();
+			}
+		}
+
+		if ($str !== false)
+		{
+			// Convert $str into xml
+			if (! empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
+			{
+				//print 'xx'.LIBXML_NOCDATA;
+				libxml_use_internal_errors(false);
+				$rss = simplexml_load_string($str, "SimpleXMLElement", LIBXML_NOCDATA);
+			}
+			else
+			{
+				$xmlparser=xml_parser_create('');
+				if (!is_resource($xmlparser)) {
+					$this->error="ErrorFailedToCreateParser"; return -1;
+				}
+
+				xml_set_object($xmlparser, $this);
+				xml_set_element_handler($xmlparser, 'feed_start_element', 'feed_end_element');
+				xml_set_character_data_handler($xmlparser, 'feed_cdata');
+				$status = xml_parse($xmlparser, $str);
+				xml_parser_free($xmlparser);
+				$rss=$this;
+				//var_dump($rss->_format);exit;
+			}
+		}
+
+		// If $rss loaded
+		if ($rss)
+		{
+			// Save file into cache
+			if (empty($foundintocache) && $cachedir)
+			{
+				dol_syslog(get_class($this)."::parser cache file ".$newpathofdestfile." is saved onto disk.");
+				if (! dol_is_dir($cachedir)) dol_mkdir($cachedir);
+				$fp = fopen($newpathofdestfile, 'w');
+				fwrite($fp, $str);
+				fclose($fp);
+				if (! empty($conf->global->MAIN_UMASK)) $newmask=$conf->global->MAIN_UMASK;
+				@chmod($newpathofdestfile, octdec($newmask));
+
+				$this->_lastfetchdate=$nowgmt;
+			}
+
+			unset($str);    // Free memory
+
+			if (empty($rss->_format))    // If format not detected automatically
+			{
+				$rss->_format='rss';
+				if (empty($rss->channel)) $rss->_format='atom';
+			}
+
+			$items=array();
+
+			// Save description entries
+			if ($rss->_format == 'rss')
+			{
+				//var_dump($rss);
+				if (! empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
+				{
+					if (!empty($rss->channel->language))      $this->_language = (string) $rss->channel->language;
+					if (!empty($rss->channel->generator))     $this->_generator = (string) $rss->channel->generator;
+					if (!empty($rss->channel->copyright))     $this->_copyright = (string) $rss->channel->copyright;
+					if (!empty($rss->channel->lastbuilddate)) $this->_lastbuilddate = (string) $rss->channel->lastbuilddate;
+					if (!empty($rss->channel->image->url[0])) $this->_imageurl = (string) $rss->channel->image->url[0];
+					if (!empty($rss->channel->link))		  $this->_link = (string) $rss->channel->link;
+					if (!empty($rss->channel->title))         $this->_title = (string) $rss->channel->title;
+					if (!empty($rss->channel->description))	  $this->_description = (string) $rss->channel->description;
+				}
+				else
+				{
+					//var_dump($rss->channel);
+					if (!empty($rss->channel['language']))      $this->_language = (string) $rss->channel['language'];
+					if (!empty($rss->channel['generator']))     $this->_generator = (string) $rss->channel['generator'];
+					if (!empty($rss->channel['copyright']))     $this->_copyright = (string) $rss->channel['copyright'];
+					if (!empty($rss->channel['lastbuilddate'])) $this->_lastbuilddate = (string) $rss->channel['lastbuilddate'];
+					if (!empty($rss->image['url']))             $this->_imageurl = (string) $rss->image['url'];
+					if (!empty($rss->channel['link']))		    $this->_link = (string) $rss->channel['link'];
+					if (!empty($rss->channel['title']))         $this->_title = (string) $rss->channel['title'];
+					if (!empty($rss->channel['description']))   $this->_description = (string) $rss->channel['description'];
+				}
+
+				if (! empty($conf->global->EXTERNALRSS_USE_SIMPLEXML)) $items=$rss->channel->item;    // With simplexml
+				else $items=$rss->items;                                                              // With xmlparse
+				//var_dump($items);exit;
+			}
+			else if ($rss->_format == 'atom')
+			{
+				//var_dump($rss);
+				if (! empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
+				{
+					if (!empty($rss->generator))     $this->_generator = (string) $rss->generator;
+					if (!empty($rss->lastbuilddate)) $this->_lastbuilddate = (string) $rss->modified;
+					if (!empty($rss->link->href))    $this->_link = (string) $rss->link->href;
+					if (!empty($rss->title))         $this->_title = (string) $rss->title;
+					if (!empty($rss->description))	 $this->_description = (string) $rss->description;
+				}
+				else
+				{
+					//if (!empty($rss->channel['rss_language']))      $this->_language = (string) $rss->channel['rss_language'];
+					if (!empty($rss->channel['generator']))     $this->_generator = (string) $rss->channel['generator'];
+					//if (!empty($rss->channel['rss_copyright']))     $this->_copyright = (string) $rss->channel['rss_copyright'];
+					if (!empty($rss->channel['modified'])) $this->_lastbuilddate = (string) $rss->channel['modified'];
+					//if (!empty($rss->image['rss_url']))             $this->_imageurl = (string) $rss->image['rss_url'];
+					if (!empty($rss->channel['link']))		    $this->_link = (string) $rss->channel['link'];
+					if (!empty($rss->channel['title']))         $this->_title = (string) $rss->channel['title'];
+					//if (!empty($rss->channel['rss_description']))   $this->_description = (string) $rss->channel['rss_description'];
+				}
+				if (! empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))  {
+					$tmprss=xml2php($rss); $items=$tmprss['entry'];
+				} // With simplexml
+				else $items=$rss->items;                                                              // With xmlparse
+				//var_dump($items);exit;
+			}
+
+			$i = 0;
+
+			// Loop on each record
+			if (is_array($items))
+			{
+				foreach($items as $item)
+				{
+					//var_dump($item);exit;
+					if ($rss->_format == 'rss')
+					{
+						if (! empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
+						{
+							$itemLink = (string) $item->link;
+							$itemTitle = (string) $item->title;
+							$itemDescription = (string) $item->description;
+							$itemPubDate = (string) $item->pubDate;
+							$itemId = '';
+							$itemAuthor = '';
+						}
+						else
+						{
+							$itemLink = (string) $item['link'];
+							$itemTitle = (string) $item['title'];
+							$itemDescription = (string) $item['description'];
+							$itemPubDate = (string) $item['pubdate'];
+							$itemId = (string) $item['guid'];
+							$itemAuthor = (string) $item['author'];
+						}
+
+						// Loop on each category
+						$itemCategory=array();
+						if (is_array($item->category))
+						{
+							foreach ($item->category as $cat)
+							{
+								$itemCategory[] = (string) $cat;
+							}
+						}
+					}
+					else if ($rss->_format == 'atom')
+					{
+						if (! empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
+						{
+							$itemLink = (isset($item['link']['href']) ? (string) $item['link']['href'] : '');
+							$itemTitle = (string) $item['title'];
+							$itemDescription = (string) $item['summary'];
+							$itemPubDate = (string) $item['created'];
+							$itemId = (string) $item['id'];
+							$itemAuthor = (string) ($item['author']?$item['author']:$item['author_name']);
+						}
+						else
+						{
+							$itemLink = (isset($item['link']['href']) ? (string) $item['link']['href'] : '');
+							$itemTitle = (string) $item['title'];
+							$itemDescription = (string) $item['summary'];
+							$itemPubDate = (string) $item['created'];
+							$itemId = (string) $item['id'];
+							$itemAuthor = (string) ($item['author']?$item['author']:$item['author_name']);
+						}
+					}
+					else print 'ErrorBadFeedFormat';
+
+					// Add record to result array
+					$this->_rssarray[$i] = array(
+						'link'=>$itemLink,
+						'title'=>$itemTitle,
+						'description'=>$itemDescription,
+						'pubDate'=>$itemPubDate,
+						'category'=>$itemCategory,
+						'id'=>$itemId,
+						'author'=>$itemAuthor);
+					//var_dump($this->_rssarray);
+
+					$i++;
+
+					if ($i > $maxNb)    break;    // We get all records we want
+				}
+			}
+
+			return 1;
+		}
+		else
+		{
+			$this->error='ErrorFailedToLoadRSSFile';
+			return -1;
+		}
+	}
+
+
+
+	/**
+	 * 	Triggered when opened tag is found
+	 *
+	 * 	@param	string		$p			Start
+	 *  @param	string		$element	Tag
+	 *  @param	array		$attrs		Attributes of tags
+	 *  @return	void
+	 */
+	function feed_start_element($p, $element, &$attrs)
+	{
+		$el = $element = strtolower($element);
+		$attrs = array_change_key_case($attrs, CASE_LOWER);
+
+		// check for a namespace, and split if found
+		$ns = false;
+		if (strpos($element, ':'))
+		{
+			list($ns, $el) = explode(':', $element, 2);
+		}
+		if ( $ns and $ns != 'rdf' )
+		{
+			$this->current_namespace = $ns;
+		}
+
+		// if feed type isn't set, then this is first element of feed identify feed from root element
+		if (empty($this->_format))
+		{
+			if ( $el == 'rdf' ) {
+				$this->_format = 'rss';
+				$this->feed_version = '1.0';
+			}
+			elseif ( $el == 'rss' ) {
+				$this->_format = 'rss';
+				$this->feed_version = $attrs['version'];
+			}
+			elseif ( $el == 'feed' ) {
+				$this->_format = 'atom';
+				$this->feed_version = $attrs['version'];
+				$this->inchannel = true;
+			}
+			return;
+		}
+
+		if ( $el == 'channel' )
+		{
+			$this->inchannel = true;
+		}
+		elseif ($el == 'item' or $el == 'entry' )
+		{
+			$this->initem = true;
+			if ( isset($attrs['rdf:about']) ) {
+				$this->current_item['about'] = $attrs['rdf:about'];
+			}
+		}
+
+		// if we're in the default namespace of an RSS feed,
+		//  record textinput or image fields
+		elseif (
+		$this->_format == 'rss' and
+		$this->current_namespace == '' and
+		$el == 'textinput' )
+		{
+			$this->intextinput = true;
+		}
+
+		elseif (
+		$this->_format == 'rss' and
+		$this->current_namespace == '' and
+		$el == 'image' )
+		{
+			$this->inimage = true;
+		}
+
+		// handle atom content constructs
+		elseif ( $this->_format == 'atom' and in_array($el, $this->_CONTENT_CONSTRUCTS) )
+		{
+			// avoid clashing w/ RSS mod_content
+			if ($el == 'content' ) {
+				$el = 'atom_content';
+			}
+
+			$this->incontent = $el;
+
+
+		}
+
+		// if inside an Atom content construct (e.g. content or summary) field treat tags as text
+		elseif ($this->_format == 'atom' and $this->incontent )
+		{
+			// if tags are inlined, then flatten
+			$attrs_str = join(' ', array_map('map_attrs', array_keys($attrs), array_values($attrs)));
+
+			$this->append_content("<$element $attrs_str>");
+
+			array_unshift($this->stack, $el);
+		}
+
+		// Atom support many links per containging element.
+		// Magpie treats link elements of type rel='alternate'
+		// as being equivalent to RSS's simple link element.
+		//
+		elseif ($this->_format == 'atom' and $el == 'link' )
+		{
+			if ( isset($attrs['rel']) && $attrs['rel'] == 'alternate' )
+			{
+				$link_el = 'link';
+			}
+			else {
+				$link_el = 'link_' . $attrs['rel'];
+			}
+
+			$this->append($link_el, $attrs['href']);
+		}
+		// set stack[0] to current element
+		else {
+			array_unshift($this->stack, $el);
+		}
+	}
+
+
+	/**
+	 * 	Triggered when CDATA is found
+	 *
+	 * 	@param	string	$p		P
+	 *  @param	string	$text	Tag
+	 *  @return	void
+	 */
+	function feed_cdata($p, $text)
+	{
+		if ($this->_format == 'atom' and $this->incontent)
+		{
+			$this->append_content($text);
+		}
+		else
+		{
+			$current_el = join('_', array_reverse($this->stack));
+			$this->append($current_el, $text);
+		}
+	}
+
+	/**
+	 * 	Triggered when closed tag is found
+	 *
+	 * 	@param	string		$p		P
+	 *  @param	string		$el		Tag
+	 *  @return	void
+	 */
+	function feed_end_element($p, $el)
+	{
+		$el = strtolower($el);
+
+		if ($el == 'item' or $el == 'entry')
+		{
+			$this->items[] = $this->current_item;
+			$this->current_item = array();
+			$this->initem = false;
+		}
+		elseif ($this->_format == 'rss' and $this->current_namespace == '' and $el == 'textinput' )
+		{
+			$this->intextinput = false;
+		}
+		elseif ($this->_format == 'rss' and $this->current_namespace == '' and $el == 'image' )
+		{
+			$this->inimage = false;
+		}
+		elseif ($this->_format == 'atom' and in_array($el, $this->_CONTENT_CONSTRUCTS) )
+		{
+			$this->incontent = false;
+		}
+		elseif ($el == 'channel' or $el == 'feed' )
+		{
+			$this->inchannel = false;
+		}
+		elseif ($this->_format == 'atom' and $this->incontent  ) {
+			// balance tags properly
+			// note:  i don't think this is actually neccessary
+			if ( $this->stack[0] == $el )
+			{
+				$this->append_content("</$el>");
+			}
+			else {
+				$this->append_content("<$el />");
+			}
+
+			array_shift($this->stack);
+		}
+		else {
+			array_shift($this->stack);
+		}
+
+		$this->current_namespace = false;
+	}
+
+
+	/**
+	 * 	To concat 2 string with no warning if an operand is not defined
+	 *
+	 * 	@param	string	$str1		Str1
+	 *  @param	string	$str2		Str2
+	 *  @return	string				String cancatenated
+	 */
+	function concat(&$str1, $str2="")
+	{
+		if (!isset($str1) ) {
+			$str1="";
+		}
+		$str1 .= $str2;
+	}
+
+	/**
+	 * Enter description here ...
+	 *
+	 * @param	string	$text		Text
+	 * @return	void
+	 */
+	function append_content($text)
+	{
+		if ( $this->initem ) {
+			$this->concat($this->current_item[ $this->incontent ], $text);
+		}
+		elseif ( $this->inchannel ) {
+			$this->concat($this->channel[ $this->incontent ], $text);
+		}
+	}
+
+	/**
+	 * 	smart append - field and namespace aware
+	 *
+	 * 	@param	string	$el		El
+	 * 	@param	string	$text	Text
+	 * 	@return	void
+	 */
+	function append($el, $text)
+	{
+		if (!$el) {
+			return;
+		}
+		if ( $this->current_namespace )
+		{
+			if ( $this->initem ) {
+				$this->concat($this->current_item[ $this->current_namespace ][ $el ], $text);
+			}
+			elseif ($this->inchannel) {
+				$this->concat($this->channel[ $this->current_namespace][ $el ], $text);
+			}
+			elseif ($this->intextinput) {
+				$this->concat($this->textinput[ $this->current_namespace][ $el ], $text);
+			}
+			elseif ($this->inimage) {
+				$this->concat($this->image[ $this->current_namespace ][ $el ], $text);
+			}
+		}
+		else {
+			if ( $this->initem ) {
+				$this->concat($this->current_item[ $el ], $text);
+			}
+			elseif ($this->intextinput) {
+				$this->concat($this->textinput[ $el ], $text);
+			}
+			elseif ($this->inimage) {
+				$this->concat($this->image[ $el ], $text);
+			}
+			elseif ($this->inchannel) {
+				$this->concat($this->channel[ $el ], $text);
+			}
+
+		}
+	}
 
 }
 
@@ -727,51 +727,51 @@ 
  */
 function xml2php($xml)
 {
-    $fils = 0;
-    $tab = false;
-    $array = array();
-    foreach($xml->children() as $key => $value)
-    {
-        $child = xml2php($value);
-
-        //To deal with the attributes
-        foreach($value->attributes() as $ak=>$av)
-        {
-            $child[$ak] = (string) $av;
-
-        }
-
-        //Let see if the new child is not in the array
-        if($tab==false && in_array($key,array_keys($array)))
-        {
-            //If this element is already in the array we will create an indexed array
-            $tmp = $array[$key];
-            $array[$key] = NULL;
-            $array[$key][] = $tmp;
-            $array[$key][] = $child;
-            $tab = true;
-        }
-        elseif($tab == true)
-        {
-            //Add an element in an existing array
-            $array[$key][] = $child;
-        }
-        else
-        {
-            //Add a simple element
-            $array[$key] = $child;
-        }
-
-        $fils++;
-    }
-
-
-    if($fils==0)
-    {
-        return (string) $xml;
-    }
-
-    return $array;
+	$fils = 0;
+	$tab = false;
+	$array = array();
+	foreach($xml->children() as $key => $value)
+	{
+		$child = xml2php($value);
+
+		//To deal with the attributes
+		foreach($value->attributes() as $ak=>$av)
+		{
+			$child[$ak] = (string) $av;
+
+		}
+
+		//Let see if the new child is not in the array
+		if($tab==false && in_array($key,array_keys($array)))
+		{
+			//If this element is already in the array we will create an indexed array
+			$tmp = $array[$key];
+			$array[$key] = NULL;
+			$array[$key][] = $tmp;
+			$array[$key][] = $child;
+			$tab = true;
+		}
+		elseif($tab == true)
+		{
+			//Add an element in an existing array
+			$array[$key][] = $child;
+		}
+		else
+		{
+			//Add a simple element
+			$array[$key] = $child;
+		}
+
+		$fils++;
+	}
+
+
+	if($fils==0)
+	{
+		return (string) $xml;
+	}
+
+	return $array;
 
 }
 

Spacing +86 added lines, -86 removed lines

@@ -29,7 +29,7 @@ 
     var $db;
     var $error;
 
-    private $_format='';
+    private $_format = '';
     private $_urlRSS;
     private $_language;
     private $_generator;
@@ -39,8 +39,8 @@ 
     private $_link;
     private $_title;
     private $_description;
-    private $_lastfetchdate;    // Last successful fetch
-    private $_rssarray=array();
+    private $_lastfetchdate; // Last successful fetch
+    private $_rssarray = array();
 
     // For parsing with xmlparser
     var $stack               = array(); // parser stack
@@ -54,7 +54,7 @@ 
      */
     public function __construct($db)
     {
-    	$this->db=$db;
+    	$this->db = $db;
     }
 
     /**
@@ -177,40 +177,40 @@ 
      * 	@param	string	$cachedir	Directory where to save cache file
      *	@return	int					<0 if KO, >0 if OK
      */
-    public function parser($urlRSS, $maxNb=0, $cachedelay=60, $cachedir='')
+    public function parser($urlRSS, $maxNb = 0, $cachedelay = 60, $cachedir = '')
     {
         global $conf;
 
         include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-        $rss='';
-        $str='';    // This will contain content of feed
+        $rss = '';
+        $str = ''; // This will contain content of feed
 
         // Check parameters
-        if (! dol_is_url($urlRSS))
+        if (!dol_is_url($urlRSS))
         {
-            $this->error="ErrorBadUrl";
+            $this->error = "ErrorBadUrl";
             return -1;
         }
 
         $this->_urlRSS = $urlRSS;
-        $newpathofdestfile=$cachedir.'/'.dol_hash($this->_urlRSS,3);	// Force md5 hash (does not contains special chars)
-        $newmask='0644';
+        $newpathofdestfile = $cachedir.'/'.dol_hash($this->_urlRSS, 3); // Force md5 hash (does not contains special chars)
+        $newmask = '0644';
 
         //dol_syslog("RssPArser::parser parse url=".$urlRSS." => cache file=".$newpathofdestfile);
         $nowgmt = dol_now();
 
         // Search into cache
-        $foundintocache=0;
+        $foundintocache = 0;
         if ($cachedelay > 0 && $cachedir)
         {
-            $filedate=dol_filemtime($newpathofdestfile);
+            $filedate = dol_filemtime($newpathofdestfile);
             if ($filedate >= ($nowgmt - $cachedelay))
             {
                 //dol_syslog("RssParser::parser cache file ".$newpathofdestfile." is not older than now - cachedelay (".$nowgmt." - ".$cachedelay.") so we use it.");
-                $foundintocache=1;
+                $foundintocache = 1;
 
-                $this->_lastfetchdate=$filedate;
+                $this->_lastfetchdate = $filedate;
             }
             else
             {
@@ -226,13 +226,13 @@ 
         else
         {
             try {
-                ini_set("user_agent","Dolibarr ERP-CRM RSS reader");
+                ini_set("user_agent", "Dolibarr ERP-CRM RSS reader");
                 ini_set("max_execution_time", $conf->global->MAIN_USE_RESPONSE_TIMEOUT);
                 ini_set("default_socket_timeout", $conf->global->MAIN_USE_RESPONSE_TIMEOUT);
 
                 $opts = array('http'=>array('method'=>"GET"));
-                if (! empty($conf->global->MAIN_USE_CONNECT_TIMEOUT)) $opts['http']['timeout']=$conf->global->MAIN_USE_CONNECT_TIMEOUT;
-                if (! empty($conf->global->MAIN_PROXY_USE))           $opts['http']['proxy']='tcp://'.$conf->global->MAIN_PROXY_HOST.':'.$conf->global->MAIN_PROXY_PORT;
+                if (!empty($conf->global->MAIN_USE_CONNECT_TIMEOUT)) $opts['http']['timeout'] = $conf->global->MAIN_USE_CONNECT_TIMEOUT;
+                if (!empty($conf->global->MAIN_PROXY_USE))           $opts['http']['proxy'] = 'tcp://'.$conf->global->MAIN_PROXY_HOST.':'.$conf->global->MAIN_PROXY_PORT;
                 //var_dump($opts);exit;
                 $context = stream_context_create($opts);
 
@@ -246,7 +246,7 @@ 
         if ($str !== false)
         {
 	        // Convert $str into xml
-	        if (! empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
+	        if (!empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
 	        {
 	            //print 'xx'.LIBXML_NOCDATA;
 	            libxml_use_internal_errors(false);
@@ -254,9 +254,9 @@ 
 	        }
 	        else
 	        {
-	            $xmlparser=xml_parser_create('');
+	            $xmlparser = xml_parser_create('');
 	            if (!is_resource($xmlparser)) {
-	                $this->error="ErrorFailedToCreateParser"; return -1;
+	                $this->error = "ErrorFailedToCreateParser"; return -1;
 	            }
 
 	            xml_set_object($xmlparser, $this);
@@ -264,7 +264,7 @@ 
 	            xml_set_character_data_handler($xmlparser, 'feed_cdata');
 	            $status = xml_parse($xmlparser, $str);
 	            xml_parser_free($xmlparser);
-	            $rss=$this;
+	            $rss = $this;
 	            //var_dump($rss->_format);exit;
 	        }
         }
@@ -276,31 +276,31 @@ 
             if (empty($foundintocache) && $cachedir)
             {
                 dol_syslog(get_class($this)."::parser cache file ".$newpathofdestfile." is saved onto disk.");
-                if (! dol_is_dir($cachedir)) dol_mkdir($cachedir);
+                if (!dol_is_dir($cachedir)) dol_mkdir($cachedir);
                 $fp = fopen($newpathofdestfile, 'w');
                 fwrite($fp, $str);
                 fclose($fp);
-                if (! empty($conf->global->MAIN_UMASK)) $newmask=$conf->global->MAIN_UMASK;
+                if (!empty($conf->global->MAIN_UMASK)) $newmask = $conf->global->MAIN_UMASK;
                 @chmod($newpathofdestfile, octdec($newmask));
 
-                $this->_lastfetchdate=$nowgmt;
+                $this->_lastfetchdate = $nowgmt;
             }
 
-            unset($str);    // Free memory
+            unset($str); // Free memory
 
             if (empty($rss->_format))    // If format not detected automatically
             {
-                $rss->_format='rss';
-                if (empty($rss->channel)) $rss->_format='atom';
+                $rss->_format = 'rss';
+                if (empty($rss->channel)) $rss->_format = 'atom';
             }
 
-            $items=array();
+            $items = array();
 
             // Save description entries
             if ($rss->_format == 'rss')
             {
                 //var_dump($rss);
-                if (! empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
+                if (!empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
                 {
                     if (!empty($rss->channel->language))      $this->_language = (string) $rss->channel->language;
                     if (!empty($rss->channel->generator))     $this->_generator = (string) $rss->channel->generator;
@@ -324,14 +324,14 @@ 
                     if (!empty($rss->channel['description']))   $this->_description = (string) $rss->channel['description'];
                 }
 
-                if (! empty($conf->global->EXTERNALRSS_USE_SIMPLEXML)) $items=$rss->channel->item;    // With simplexml
-                else $items=$rss->items;                                                              // With xmlparse
+                if (!empty($conf->global->EXTERNALRSS_USE_SIMPLEXML)) $items = $rss->channel->item; // With simplexml
+                else $items = $rss->items; // With xmlparse
                 //var_dump($items);exit;
             }
             else if ($rss->_format == 'atom')
             {
                 //var_dump($rss);
-                if (! empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
+                if (!empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
                 {
                     if (!empty($rss->generator))     $this->_generator = (string) $rss->generator;
                     if (!empty($rss->lastbuilddate)) $this->_lastbuilddate = (string) $rss->modified;
@@ -350,10 +350,10 @@ 
                     if (!empty($rss->channel['title']))         $this->_title = (string) $rss->channel['title'];
                     //if (!empty($rss->channel['rss_description']))   $this->_description = (string) $rss->channel['rss_description'];
                 }
-                if (! empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))  {
-                    $tmprss=xml2php($rss); $items=$tmprss['entry'];
+                if (!empty($conf->global->EXTERNALRSS_USE_SIMPLEXML)) {
+                    $tmprss = xml2php($rss); $items = $tmprss['entry'];
                 } // With simplexml
-                else $items=$rss->items;                                                              // With xmlparse
+                else $items = $rss->items; // With xmlparse
                 //var_dump($items);exit;
             }
 
@@ -362,12 +362,12 @@ 
             // Loop on each record
             if (is_array($items))
             {
-                foreach($items as $item)
+                foreach ($items as $item)
                 {
                     //var_dump($item);exit;
                     if ($rss->_format == 'rss')
                     {
-                        if (! empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
+                        if (!empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
                         {
                             $itemLink = (string) $item->link;
                             $itemTitle = (string) $item->title;
@@ -387,7 +387,7 @@ 
                         }
 
                         // Loop on each category
-                        $itemCategory=array();
+                        $itemCategory = array();
                         if (is_array($item->category))
                         {
                             foreach ($item->category as $cat)
@@ -398,14 +398,14 @@ 
                     }
                     else if ($rss->_format == 'atom')
                     {
-                        if (! empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
+                        if (!empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
                         {
                             $itemLink = (isset($item['link']['href']) ? (string) $item['link']['href'] : '');
                             $itemTitle = (string) $item['title'];
                             $itemDescription = (string) $item['summary'];
                             $itemPubDate = (string) $item['created'];
                             $itemId = (string) $item['id'];
-                            $itemAuthor = (string) ($item['author']?$item['author']:$item['author_name']);
+                            $itemAuthor = (string) ($item['author'] ? $item['author'] : $item['author_name']);
                         }
                         else
                         {
@@ -414,7 +414,7 @@ 
                             $itemDescription = (string) $item['summary'];
                             $itemPubDate = (string) $item['created'];
                             $itemId = (string) $item['id'];
-                            $itemAuthor = (string) ($item['author']?$item['author']:$item['author_name']);
+                            $itemAuthor = (string) ($item['author'] ? $item['author'] : $item['author_name']);
                         }
                     }
                     else print 'ErrorBadFeedFormat';
@@ -432,7 +432,7 @@ 
 
                     $i++;
 
-                    if ($i > $maxNb)    break;    // We get all records we want
+                    if ($i > $maxNb)    break; // We get all records we want
                 }
             }
 
@@ -440,7 +440,7 @@ 
         }
         else
         {
-            $this->error='ErrorFailedToLoadRSSFile';
+            $this->error = 'ErrorFailedToLoadRSSFile';
             return -1;
         }
     }
@@ -466,7 +466,7 @@ 
         {
             list($ns, $el) = explode(':', $element, 2);
         }
-        if ( $ns and $ns != 'rdf' )
+        if ($ns and $ns != 'rdf')
         {
             $this->current_namespace = $ns;
         }
@@ -474,15 +474,15 @@ 
         // if feed type isn't set, then this is first element of feed identify feed from root element
         if (empty($this->_format))
         {
-            if ( $el == 'rdf' ) {
+            if ($el == 'rdf') {
                 $this->_format = 'rss';
                 $this->feed_version = '1.0';
             }
-            elseif ( $el == 'rss' ) {
+            elseif ($el == 'rss') {
                 $this->_format = 'rss';
                 $this->feed_version = $attrs['version'];
             }
-            elseif ( $el == 'feed' ) {
+            elseif ($el == 'feed') {
                 $this->_format = 'atom';
                 $this->feed_version = $attrs['version'];
                 $this->inchannel = true;
@@ -490,14 +490,14 @@ 
             return;
         }
 
-        if ( $el == 'channel' )
+        if ($el == 'channel')
         {
             $this->inchannel = true;
         }
-        elseif ($el == 'item' or $el == 'entry' )
+        elseif ($el == 'item' or $el == 'entry')
         {
             $this->initem = true;
-            if ( isset($attrs['rdf:about']) ) {
+            if (isset($attrs['rdf:about'])) {
                 $this->current_item['about'] = $attrs['rdf:about'];
             }
         }
@@ -521,10 +521,10 @@ 
         }
 
         // handle atom content constructs
-        elseif ( $this->_format == 'atom' and in_array($el, $this->_CONTENT_CONSTRUCTS) )
+        elseif ($this->_format == 'atom' and in_array($el, $this->_CONTENT_CONSTRUCTS))
         {
             // avoid clashing w/ RSS mod_content
-            if ($el == 'content' ) {
+            if ($el == 'content') {
                 $el = 'atom_content';
             }
 
@@ -534,7 +534,7 @@ 
         }
 
         // if inside an Atom content construct (e.g. content or summary) field treat tags as text
-        elseif ($this->_format == 'atom' and $this->incontent )
+        elseif ($this->_format == 'atom' and $this->incontent)
         {
             // if tags are inlined, then flatten
             $attrs_str = join(' ', array_map('map_attrs', array_keys($attrs), array_values($attrs)));
@@ -548,14 +548,14 @@ 
         // Magpie treats link elements of type rel='alternate'
         // as being equivalent to RSS's simple link element.
         //
-        elseif ($this->_format == 'atom' and $el == 'link' )
+        elseif ($this->_format == 'atom' and $el == 'link')
         {
-            if ( isset($attrs['rel']) && $attrs['rel'] == 'alternate' )
+            if (isset($attrs['rel']) && $attrs['rel'] == 'alternate')
             {
                 $link_el = 'link';
             }
             else {
-                $link_el = 'link_' . $attrs['rel'];
+                $link_el = 'link_'.$attrs['rel'];
             }
 
             $this->append($link_el, $attrs['href']);
@@ -604,26 +604,26 @@ 
             $this->current_item = array();
             $this->initem = false;
         }
-        elseif ($this->_format == 'rss' and $this->current_namespace == '' and $el == 'textinput' )
+        elseif ($this->_format == 'rss' and $this->current_namespace == '' and $el == 'textinput')
         {
             $this->intextinput = false;
         }
-        elseif ($this->_format == 'rss' and $this->current_namespace == '' and $el == 'image' )
+        elseif ($this->_format == 'rss' and $this->current_namespace == '' and $el == 'image')
         {
             $this->inimage = false;
         }
-        elseif ($this->_format == 'atom' and in_array($el, $this->_CONTENT_CONSTRUCTS) )
+        elseif ($this->_format == 'atom' and in_array($el, $this->_CONTENT_CONSTRUCTS))
         {
             $this->incontent = false;
         }
-        elseif ($el == 'channel' or $el == 'feed' )
+        elseif ($el == 'channel' or $el == 'feed')
         {
             $this->inchannel = false;
         }
-        elseif ($this->_format == 'atom' and $this->incontent  ) {
+        elseif ($this->_format == 'atom' and $this->incontent) {
             // balance tags properly
             // note:  i don't think this is actually neccessary
-            if ( $this->stack[0] == $el )
+            if ($this->stack[0] == $el)
             {
                 $this->append_content("</$el>");
             }
@@ -648,10 +648,10 @@ 
      *  @param	string	$str2		Str2
      *  @return	string				String cancatenated
      */
-    function concat(&$str1, $str2="")
+    function concat(&$str1, $str2 = "")
     {
-        if (!isset($str1) ) {
-            $str1="";
+        if (!isset($str1)) {
+            $str1 = "";
         }
         $str1 .= $str2;
     }
@@ -664,11 +664,11 @@ 
      */
     function append_content($text)
     {
-        if ( $this->initem ) {
-            $this->concat($this->current_item[ $this->incontent ], $text);
+        if ($this->initem) {
+            $this->concat($this->current_item[$this->incontent], $text);
         }
-        elseif ( $this->inchannel ) {
-            $this->concat($this->channel[ $this->incontent ], $text);
+        elseif ($this->inchannel) {
+            $this->concat($this->channel[$this->incontent], $text);
         }
     }
 
@@ -684,33 +684,33 @@ 
         if (!$el) {
             return;
         }
-        if ( $this->current_namespace )
+        if ($this->current_namespace)
         {
-            if ( $this->initem ) {
-                $this->concat($this->current_item[ $this->current_namespace ][ $el ], $text);
+            if ($this->initem) {
+                $this->concat($this->current_item[$this->current_namespace][$el], $text);
             }
             elseif ($this->inchannel) {
-                $this->concat($this->channel[ $this->current_namespace][ $el ], $text);
+                $this->concat($this->channel[$this->current_namespace][$el], $text);
             }
             elseif ($this->intextinput) {
-                $this->concat($this->textinput[ $this->current_namespace][ $el ], $text);
+                $this->concat($this->textinput[$this->current_namespace][$el], $text);
             }
             elseif ($this->inimage) {
-                $this->concat($this->image[ $this->current_namespace ][ $el ], $text);
+                $this->concat($this->image[$this->current_namespace][$el], $text);
             }
         }
         else {
-            if ( $this->initem ) {
-                $this->concat($this->current_item[ $el ], $text);
+            if ($this->initem) {
+                $this->concat($this->current_item[$el], $text);
             }
             elseif ($this->intextinput) {
-                $this->concat($this->textinput[ $el ], $text);
+                $this->concat($this->textinput[$el], $text);
             }
             elseif ($this->inimage) {
-                $this->concat($this->image[ $el ], $text);
+                $this->concat($this->image[$el], $text);
             }
             elseif ($this->inchannel) {
-                $this->concat($this->channel[ $el ], $text);
+                $this->concat($this->channel[$el], $text);
             }
 
         }
@@ -730,19 +730,19 @@ 
     $fils = 0;
     $tab = false;
     $array = array();
-    foreach($xml->children() as $key => $value)
+    foreach ($xml->children() as $key => $value)
     {
         $child = xml2php($value);
 
         //To deal with the attributes
-        foreach($value->attributes() as $ak=>$av)
+        foreach ($value->attributes() as $ak=>$av)
         {
             $child[$ak] = (string) $av;
 
         }
 
         //Let see if the new child is not in the array
-        if($tab==false && in_array($key,array_keys($array)))
+        if ($tab == false && in_array($key, array_keys($array)))
         {
             //If this element is already in the array we will create an indexed array
             $tmp = $array[$key];
@@ -751,7 +751,7 @@ 
             $array[$key][] = $child;
             $tab = true;
         }
-        elseif($tab == true)
+        elseif ($tab == true)
         {
             //Add an element in an existing array
             $array[$key][] = $child;
@@ -766,7 +766,7 @@ 
     }
 
 
-    if($fils==0)
+    if ($fils == 0)
     {
         return (string) $xml;
     }

Braces +147 added lines, -105 removed lines

@@ -211,19 +211,19 @@ 
                 $foundintocache=1;
 
                 $this->_lastfetchdate=$filedate;
-            }
-            else
+            } else
             {
                 dol_syslog(get_class($this)."::parser cache file ".$newpathofdestfile." is not found or older than now - cachedelay (".$nowgmt." - ".$cachedelay.") so we can't use it.");
             }
         }
 
         // Load file into $str
-        if ($foundintocache)    // Cache file found and is not too old
+        if ($foundintocache) {
+        	// Cache file found and is not too old
         {
             $str = file_get_contents($newpathofdestfile);
         }
-        else
+        } else
         {
             try {
                 ini_set("user_agent","Dolibarr ERP-CRM RSS reader");
@@ -231,14 +231,17 @@ 
                 ini_set("default_socket_timeout", $conf->global->MAIN_USE_RESPONSE_TIMEOUT);
 
                 $opts = array('http'=>array('method'=>"GET"));
-                if (! empty($conf->global->MAIN_USE_CONNECT_TIMEOUT)) $opts['http']['timeout']=$conf->global->MAIN_USE_CONNECT_TIMEOUT;
-                if (! empty($conf->global->MAIN_PROXY_USE))           $opts['http']['proxy']='tcp://'.$conf->global->MAIN_PROXY_HOST.':'.$conf->global->MAIN_PROXY_PORT;
+                if (! empty($conf->global->MAIN_USE_CONNECT_TIMEOUT)) {
+                	$opts['http']['timeout']=$conf->global->MAIN_USE_CONNECT_TIMEOUT;
+                }
+                if (! empty($conf->global->MAIN_PROXY_USE)) {
+                	$opts['http']['proxy']='tcp://'.$conf->global->MAIN_PROXY_HOST.':'.$conf->global->MAIN_PROXY_PORT;
+                }
                 //var_dump($opts);exit;
                 $context = stream_context_create($opts);
 
                 $str = file_get_contents($this->_urlRSS, false, $context);
-            }
-            catch (Exception $e) {
+            } catch (Exception $e) {
                 print 'Error retrieving URL '.$this->urlRSS.' - '.$e->getMessage();
             }
         }
@@ -251,8 +254,7 @@ 
 	            //print 'xx'.LIBXML_NOCDATA;
 	            libxml_use_internal_errors(false);
 	            $rss = simplexml_load_string($str, "SimpleXMLElement", LIBXML_NOCDATA);
-	        }
-	        else
+	        } else
 	        {
 	            $xmlparser=xml_parser_create('');
 	            if (!is_resource($xmlparser)) {
@@ -276,11 +278,15 @@ 
             if (empty($foundintocache) && $cachedir)
             {
                 dol_syslog(get_class($this)."::parser cache file ".$newpathofdestfile." is saved onto disk.");
-                if (! dol_is_dir($cachedir)) dol_mkdir($cachedir);
+                if (! dol_is_dir($cachedir)) {
+                	dol_mkdir($cachedir);
+                }
                 $fp = fopen($newpathofdestfile, 'w');
                 fwrite($fp, $str);
                 fclose($fp);
-                if (! empty($conf->global->MAIN_UMASK)) $newmask=$conf->global->MAIN_UMASK;
+                if (! empty($conf->global->MAIN_UMASK)) {
+                	$newmask=$conf->global->MAIN_UMASK;
+                }
                 @chmod($newpathofdestfile, octdec($newmask));
 
                 $this->_lastfetchdate=$nowgmt;
@@ -288,10 +294,14 @@ 
 
             unset($str);    // Free memory
 
-            if (empty($rss->_format))    // If format not detected automatically
+            if (empty($rss->_format)) {
+            	// If format not detected automatically
             {
                 $rss->_format='rss';
-                if (empty($rss->channel)) $rss->_format='atom';
+            }
+                if (empty($rss->channel)) {
+                	$rss->_format='atom';
+                }
             }
 
             $items=array();
@@ -302,58 +312,114 @@ 
                 //var_dump($rss);
                 if (! empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
                 {
-                    if (!empty($rss->channel->language))      $this->_language = (string) $rss->channel->language;
-                    if (!empty($rss->channel->generator))     $this->_generator = (string) $rss->channel->generator;
-                    if (!empty($rss->channel->copyright))     $this->_copyright = (string) $rss->channel->copyright;
-                    if (!empty($rss->channel->lastbuilddate)) $this->_lastbuilddate = (string) $rss->channel->lastbuilddate;
-                    if (!empty($rss->channel->image->url[0])) $this->_imageurl = (string) $rss->channel->image->url[0];
-                    if (!empty($rss->channel->link))		  $this->_link = (string) $rss->channel->link;
-                    if (!empty($rss->channel->title))         $this->_title = (string) $rss->channel->title;
-                    if (!empty($rss->channel->description))	  $this->_description = (string) $rss->channel->description;
-                }
-                else
+                    if (!empty($rss->channel->language)) {
+                    	$this->_language = (string) $rss->channel->language;
+                    }
+                    if (!empty($rss->channel->generator)) {
+                    	$this->_generator = (string) $rss->channel->generator;
+                    }
+                    if (!empty($rss->channel->copyright)) {
+                    	$this->_copyright = (string) $rss->channel->copyright;
+                    }
+                    if (!empty($rss->channel->lastbuilddate)) {
+                    	$this->_lastbuilddate = (string) $rss->channel->lastbuilddate;
+                    }
+                    if (!empty($rss->channel->image->url[0])) {
+                    	$this->_imageurl = (string) $rss->channel->image->url[0];
+                    }
+                    if (!empty($rss->channel->link)) {
+                    	$this->_link = (string) $rss->channel->link;
+                    }
+                    if (!empty($rss->channel->title)) {
+                    	$this->_title = (string) $rss->channel->title;
+                    }
+                    if (!empty($rss->channel->description)) {
+                    	$this->_description = (string) $rss->channel->description;
+                    }
+                } else
                 {
                     //var_dump($rss->channel);
-                    if (!empty($rss->channel['language']))      $this->_language = (string) $rss->channel['language'];
-                    if (!empty($rss->channel['generator']))     $this->_generator = (string) $rss->channel['generator'];
-                    if (!empty($rss->channel['copyright']))     $this->_copyright = (string) $rss->channel['copyright'];
-                    if (!empty($rss->channel['lastbuilddate'])) $this->_lastbuilddate = (string) $rss->channel['lastbuilddate'];
-                    if (!empty($rss->image['url']))             $this->_imageurl = (string) $rss->image['url'];
-                    if (!empty($rss->channel['link']))		    $this->_link = (string) $rss->channel['link'];
-                    if (!empty($rss->channel['title']))         $this->_title = (string) $rss->channel['title'];
-                    if (!empty($rss->channel['description']))   $this->_description = (string) $rss->channel['description'];
+                    if (!empty($rss->channel['language'])) {
+                    	$this->_language = (string) $rss->channel['language'];
+                    }
+                    if (!empty($rss->channel['generator'])) {
+                    	$this->_generator = (string) $rss->channel['generator'];
+                    }
+                    if (!empty($rss->channel['copyright'])) {
+                    	$this->_copyright = (string) $rss->channel['copyright'];
+                    }
+                    if (!empty($rss->channel['lastbuilddate'])) {
+                    	$this->_lastbuilddate = (string) $rss->channel['lastbuilddate'];
+                    }
+                    if (!empty($rss->image['url'])) {
+                    	$this->_imageurl = (string) $rss->image['url'];
+                    }
+                    if (!empty($rss->channel['link'])) {
+                    	$this->_link = (string) $rss->channel['link'];
+                    }
+                    if (!empty($rss->channel['title'])) {
+                    	$this->_title = (string) $rss->channel['title'];
+                    }
+                    if (!empty($rss->channel['description'])) {
+                    	$this->_description = (string) $rss->channel['description'];
+                    }
                 }
 
-                if (! empty($conf->global->EXTERNALRSS_USE_SIMPLEXML)) $items=$rss->channel->item;    // With simplexml
-                else $items=$rss->items;                                                              // With xmlparse
+                if (! empty($conf->global->EXTERNALRSS_USE_SIMPLEXML)) {
+                	$items=$rss->channel->item;
+                }
+                // With simplexml
+                else {
+                	$items=$rss->items;
+                }
+                // With xmlparse
                 //var_dump($items);exit;
-            }
-            else if ($rss->_format == 'atom')
+            } else if ($rss->_format == 'atom')
             {
                 //var_dump($rss);
                 if (! empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
                 {
-                    if (!empty($rss->generator))     $this->_generator = (string) $rss->generator;
-                    if (!empty($rss->lastbuilddate)) $this->_lastbuilddate = (string) $rss->modified;
-                    if (!empty($rss->link->href))    $this->_link = (string) $rss->link->href;
-                    if (!empty($rss->title))         $this->_title = (string) $rss->title;
-                    if (!empty($rss->description))	 $this->_description = (string) $rss->description;
-                }
-                else
+                    if (!empty($rss->generator)) {
+                    	$this->_generator = (string) $rss->generator;
+                    }
+                    if (!empty($rss->lastbuilddate)) {
+                    	$this->_lastbuilddate = (string) $rss->modified;
+                    }
+                    if (!empty($rss->link->href)) {
+                    	$this->_link = (string) $rss->link->href;
+                    }
+                    if (!empty($rss->title)) {
+                    	$this->_title = (string) $rss->title;
+                    }
+                    if (!empty($rss->description)) {
+                    	$this->_description = (string) $rss->description;
+                    }
+                } else
                 {
                     //if (!empty($rss->channel['rss_language']))      $this->_language = (string) $rss->channel['rss_language'];
-                    if (!empty($rss->channel['generator']))     $this->_generator = (string) $rss->channel['generator'];
+                    if (!empty($rss->channel['generator'])) {
+                    	$this->_generator = (string) $rss->channel['generator'];
+                    }
                     //if (!empty($rss->channel['rss_copyright']))     $this->_copyright = (string) $rss->channel['rss_copyright'];
-                    if (!empty($rss->channel['modified'])) $this->_lastbuilddate = (string) $rss->channel['modified'];
+                    if (!empty($rss->channel['modified'])) {
+                    	$this->_lastbuilddate = (string) $rss->channel['modified'];
+                    }
                     //if (!empty($rss->image['rss_url']))             $this->_imageurl = (string) $rss->image['rss_url'];
-                    if (!empty($rss->channel['link']))		    $this->_link = (string) $rss->channel['link'];
-                    if (!empty($rss->channel['title']))         $this->_title = (string) $rss->channel['title'];
+                    if (!empty($rss->channel['link'])) {
+                    	$this->_link = (string) $rss->channel['link'];
+                    }
+                    if (!empty($rss->channel['title'])) {
+                    	$this->_title = (string) $rss->channel['title'];
+                    }
                     //if (!empty($rss->channel['rss_description']))   $this->_description = (string) $rss->channel['rss_description'];
                 }
                 if (! empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))  {
                     $tmprss=xml2php($rss); $items=$tmprss['entry'];
                 } // With simplexml
-                else $items=$rss->items;                                                              // With xmlparse
+                else {
+                	$items=$rss->items;
+                }
+                // With xmlparse
                 //var_dump($items);exit;
             }
 
@@ -375,8 +441,7 @@ 
                             $itemPubDate = (string) $item->pubDate;
                             $itemId = '';
                             $itemAuthor = '';
-                        }
-                        else
+                        } else
                         {
                             $itemLink = (string) $item['link'];
                             $itemTitle = (string) $item['title'];
@@ -395,8 +460,7 @@ 
                                 $itemCategory[] = (string) $cat;
                             }
                         }
-                    }
-                    else if ($rss->_format == 'atom')
+                    } else if ($rss->_format == 'atom')
                     {
                         if (! empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
                         {
@@ -406,8 +470,7 @@ 
                             $itemPubDate = (string) $item['created'];
                             $itemId = (string) $item['id'];
                             $itemAuthor = (string) ($item['author']?$item['author']:$item['author_name']);
-                        }
-                        else
+                        } else
                         {
                             $itemLink = (isset($item['link']['href']) ? (string) $item['link']['href'] : '');
                             $itemTitle = (string) $item['title'];
@@ -416,8 +479,9 @@ 
                             $itemId = (string) $item['id'];
                             $itemAuthor = (string) ($item['author']?$item['author']:$item['author_name']);
                         }
+                    } else {
+                    	print 'ErrorBadFeedFormat';
                     }
-                    else print 'ErrorBadFeedFormat';
 
                     // Add record to result array
                     $this->_rssarray[$i] = array(
@@ -432,13 +496,15 @@ 
 
                     $i++;
 
-                    if ($i > $maxNb)    break;    // We get all records we want
+                    if ($i > $maxNb) {
+                    	break;
+                    }
+                    // We get all records we want
                 }
             }
 
             return 1;
-        }
-        else
+        } else
         {
             $this->error='ErrorFailedToLoadRSSFile';
             return -1;
@@ -477,12 +543,10 @@ 
             if ( $el == 'rdf' ) {
                 $this->_format = 'rss';
                 $this->feed_version = '1.0';
-            }
-            elseif ( $el == 'rss' ) {
+            } elseif ( $el == 'rss' ) {
                 $this->_format = 'rss';
                 $this->feed_version = $attrs['version'];
-            }
-            elseif ( $el == 'feed' ) {
+            } elseif ( $el == 'feed' ) {
                 $this->_format = 'atom';
                 $this->feed_version = $attrs['version'];
                 $this->inchannel = true;
@@ -493,8 +557,7 @@ 
         if ( $el == 'channel' )
         {
             $this->inchannel = true;
-        }
-        elseif ($el == 'item' or $el == 'entry' )
+        } elseif ($el == 'item' or $el == 'entry' )
         {
             $this->initem = true;
             if ( isset($attrs['rdf:about']) ) {
@@ -510,9 +573,7 @@ 
         $el == 'textinput' )
         {
             $this->intextinput = true;
-        }
-
-        elseif (
+        } elseif (
         $this->_format == 'rss' and
         $this->current_namespace == '' and
         $el == 'image' )
@@ -553,8 +614,7 @@ 
             if ( isset($attrs['rel']) && $attrs['rel'] == 'alternate' )
             {
                 $link_el = 'link';
-            }
-            else {
+            } else {
                 $link_el = 'link_' . $attrs['rel'];
             }
 
@@ -579,8 +639,7 @@ 
         if ($this->_format == 'atom' and $this->incontent)
         {
             $this->append_content($text);
-        }
-        else
+        } else
         {
             $current_el = join('_', array_reverse($this->stack));
             $this->append($current_el, $text);
@@ -603,37 +662,30 @@ 
             $this->items[] = $this->current_item;
             $this->current_item = array();
             $this->initem = false;
-        }
-        elseif ($this->_format == 'rss' and $this->current_namespace == '' and $el == 'textinput' )
+        } elseif ($this->_format == 'rss' and $this->current_namespace == '' and $el == 'textinput' )
         {
             $this->intextinput = false;
-        }
-        elseif ($this->_format == 'rss' and $this->current_namespace == '' and $el == 'image' )
+        } elseif ($this->_format == 'rss' and $this->current_namespace == '' and $el == 'image' )
         {
             $this->inimage = false;
-        }
-        elseif ($this->_format == 'atom' and in_array($el, $this->_CONTENT_CONSTRUCTS) )
+        } elseif ($this->_format == 'atom' and in_array($el, $this->_CONTENT_CONSTRUCTS) )
         {
             $this->incontent = false;
-        }
-        elseif ($el == 'channel' or $el == 'feed' )
+        } elseif ($el == 'channel' or $el == 'feed' )
         {
             $this->inchannel = false;
-        }
-        elseif ($this->_format == 'atom' and $this->incontent  ) {
+        } elseif ($this->_format == 'atom' and $this->incontent  ) {
             // balance tags properly
             // note:  i don't think this is actually neccessary
             if ( $this->stack[0] == $el )
             {
                 $this->append_content("</$el>");
-            }
-            else {
+            } else {
                 $this->append_content("<$el />");
             }
 
             array_shift($this->stack);
-        }
-        else {
+        } else {
             array_shift($this->stack);
         }
 
@@ -666,8 +718,7 @@ 
     {
         if ( $this->initem ) {
             $this->concat($this->current_item[ $this->incontent ], $text);
-        }
-        elseif ( $this->inchannel ) {
+        } elseif ( $this->inchannel ) {
             $this->concat($this->channel[ $this->incontent ], $text);
         }
     }
@@ -688,28 +739,21 @@ 
         {
             if ( $this->initem ) {
                 $this->concat($this->current_item[ $this->current_namespace ][ $el ], $text);
-            }
-            elseif ($this->inchannel) {
+            } elseif ($this->inchannel) {
                 $this->concat($this->channel[ $this->current_namespace][ $el ], $text);
-            }
-            elseif ($this->intextinput) {
+            } elseif ($this->intextinput) {
                 $this->concat($this->textinput[ $this->current_namespace][ $el ], $text);
-            }
-            elseif ($this->inimage) {
+            } elseif ($this->inimage) {
                 $this->concat($this->image[ $this->current_namespace ][ $el ], $text);
             }
-        }
-        else {
+        } else {
             if ( $this->initem ) {
                 $this->concat($this->current_item[ $el ], $text);
-            }
-            elseif ($this->intextinput) {
+            } elseif ($this->intextinput) {
                 $this->concat($this->textinput[ $el ], $text);
-            }
-            elseif ($this->inimage) {
+            } elseif ($this->inimage) {
                 $this->concat($this->image[ $el ], $text);
-            }
-            elseif ($this->inchannel) {
+            } elseif ($this->inchannel) {
                 $this->concat($this->channel[ $el ], $text);
             }
 
@@ -750,13 +794,11 @@ 
             $array[$key][] = $tmp;
             $array[$key][] = $child;
             $tab = true;
-        }
-        elseif($tab == true)
+        } elseif($tab == true)
         {
             //Add an element in an existing array
             $array[$key][] = $child;
-        }
-        else
+        } else
         {
             //Add a simple element
             $array[$key] = $child;