laudeco / bbc-dolibarr-flightlog

class/bbctypes.class.php

Indentation +491 added lines, -491 removed lines

@@ -41,211 +41,211 @@ 
  */
 class Bbctypes extends CommonObject
 {
-	/**
-	 * @var string Id to identify managed objects
-	 */
-	public $element = 'bbctypes';
-	/**
-	 * @var string Name of table without prefix where object is stored
-	 */
-	public $table_element = 'bbc_types';
-
-	/**
-	 * @var BbctypesLine[] Lines
-	 */
-	public $lines = array();
-
-	/**
-	 */
+    /**
+     * @var string Id to identify managed objects
+     */
+    public $element = 'bbctypes';
+    /**
+     * @var string Name of table without prefix where object is stored
+     */
+    public $table_element = 'bbc_types';
+
+    /**
+     * @var BbctypesLine[] Lines
+     */
+    public $lines = array();
+
+    /**
+     */
 	
-	public $idType;
-	public $numero;
-	public $nom;
-	public $active;
-
-	/**
-	 * Constructor
-	 *
-	 * @param DoliDb $db Database handler
-	 */
-	public function __construct(DoliDB $db)
-	{
-		$this->db = $db;
-	}
-
-	/**
-	 * Create object into database
-	 *
-	 * @param  User $user      User that creates
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 *
-	 * @return int <0 if KO, Id of created object if OK
-	 */
-	public function create(User $user, $notrigger = false)
-	{
-		dol_syslog(__METHOD__, LOG_DEBUG);
-
-		$error = 0;
-
-		// Clean parameters
+    public $idType;
+    public $numero;
+    public $nom;
+    public $active;
+
+    /**
+     * Constructor
+     *
+     * @param DoliDb $db Database handler
+     */
+    public function __construct(DoliDB $db)
+    {
+        $this->db = $db;
+    }
+
+    /**
+     * Create object into database
+     *
+     * @param  User $user      User that creates
+     * @param  bool $notrigger false=launch triggers after, true=disable triggers
+     *
+     * @return int <0 if KO, Id of created object if OK
+     */
+    public function create(User $user, $notrigger = false)
+    {
+        dol_syslog(__METHOD__, LOG_DEBUG);
+
+        $error = 0;
+
+        // Clean parameters
 		
-		if (isset($this->idType)) {
-			 $this->idType = trim($this->idType);
-		}
-		if (isset($this->numero)) {
-			 $this->numero = trim($this->numero);
-		}
-		if (isset($this->nom)) {
-			 $this->nom = trim($this->nom);
-		}
-		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 . $this->table_element . '(';
+        if (isset($this->idType)) {
+                $this->idType = trim($this->idType);
+        }
+        if (isset($this->numero)) {
+                $this->numero = trim($this->numero);
+        }
+        if (isset($this->nom)) {
+                $this->nom = trim($this->nom);
+        }
+        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 . $this->table_element . '(';
 		
-		$sql.= 'numero,';
-		$sql.= 'nom';
-		$sql.= 'active';
+        $sql.= 'numero,';
+        $sql.= 'nom';
+        $sql.= 'active';
 
 		
-		$sql .= ') VALUES (';
+        $sql .= ') VALUES (';
 		
-		$sql .= ' '.(! isset($this->numero)?'NULL':$this->numero).',';
-		$sql .= ' '.(! isset($this->nom)?'NULL':"'".$this->db->escape($this->nom)."'").',';
-		$sql .= ' '.(! isset($this->active)?'NULL':$this->active);
+        $sql .= ' '.(! isset($this->numero)?'NULL':$this->numero).',';
+        $sql .= ' '.(! isset($this->nom)?'NULL':"'".$this->db->escape($this->nom)."'").',';
+        $sql .= ' '.(! isset($this->active)?'NULL':$this->active);
 
 		
-		$sql .= ')';
-
-		$this->db->begin();
-
-		$resql = $this->db->query($sql);
-		if (!$resql) {
-			$error ++;
-			$this->errors[] = 'Error ' . $this->db->lasterror();
-			dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
-		}
-
-		if (!$error) {
-			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX . $this->table_element);
-
-			if (!$notrigger) {
-				// Uncomment this and change MYOBJECT to your own tag if you
-				// want this action to call a trigger.
-
-				//// Call triggers
-				//$result=$this->call_trigger('MYOBJECT_CREATE',$user);
-				//if ($result < 0) $error++;
-				//// End call triggers
-			}
-		}
-
-		// Commit or rollback
-		if ($error) {
-			$this->db->rollback();
-
-			return - 1 * $error;
-		} else {
-			$this->db->commit();
-
-			return $this->id;
-		}
-	}
-
-	/**
-	 * Load object in memory from the database
-	 *
-	 * @param int    $id  Id object
-	 * @param string $ref Ref
-	 *
-	 * @return int <0 if KO, 0 if not found, >0 if OK
-	 */
-	public function fetch($id, $ref = null)
-	{
-		dol_syslog(__METHOD__, LOG_DEBUG);
-
-		$sql = 'SELECT';
-		$sql .= ' t.idType,';
+        $sql .= ')';
+
+        $this->db->begin();
+
+        $resql = $this->db->query($sql);
+        if (!$resql) {
+            $error ++;
+            $this->errors[] = 'Error ' . $this->db->lasterror();
+            dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
+        }
+
+        if (!$error) {
+            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX . $this->table_element);
+
+            if (!$notrigger) {
+                // Uncomment this and change MYOBJECT to your own tag if you
+                // want this action to call a trigger.
+
+                //// Call triggers
+                //$result=$this->call_trigger('MYOBJECT_CREATE',$user);
+                //if ($result < 0) $error++;
+                //// End call triggers
+            }
+        }
+
+        // Commit or rollback
+        if ($error) {
+            $this->db->rollback();
+
+            return - 1 * $error;
+        } else {
+            $this->db->commit();
+
+            return $this->id;
+        }
+    }
+
+    /**
+     * Load object in memory from the database
+     *
+     * @param int    $id  Id object
+     * @param string $ref Ref
+     *
+     * @return int <0 if KO, 0 if not found, >0 if OK
+     */
+    public function fetch($id, $ref = null)
+    {
+        dol_syslog(__METHOD__, LOG_DEBUG);
+
+        $sql = 'SELECT';
+        $sql .= ' t.idType,';
 		
-		$sql .= " t.numero,";
-		$sql .= " t.nom,";
-		$sql .= " t.active";
+        $sql .= " t.numero,";
+        $sql .= " t.nom,";
+        $sql .= " t.active";
 
 		
-		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element . ' as t';
-		if (null !== $ref) {
-			$sql .= ' WHERE t.ref = ' . '\'' . $ref . '\'';
-		} else {
-			$sql .= ' WHERE t.idType = ' . $id;
-		}
-
-		$resql = $this->db->query($sql);
-		if ($resql) {
-			$numrows = $this->db->num_rows($resql);
-			if ($numrows) {
-				$obj = $this->db->fetch_object($resql);
-
-				$this->id = $obj->idType;
+        $sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element . ' as t';
+        if (null !== $ref) {
+            $sql .= ' WHERE t.ref = ' . '\'' . $ref . '\'';
+        } else {
+            $sql .= ' WHERE t.idType = ' . $id;
+        }
+
+        $resql = $this->db->query($sql);
+        if ($resql) {
+            $numrows = $this->db->num_rows($resql);
+            if ($numrows) {
+                $obj = $this->db->fetch_object($resql);
+
+                $this->id = $obj->idType;
 				
-				$this->idType = $obj->idType;
-				$this->numero = $obj->numero;
-				$this->nom = $obj->nom;
-				$this->active = $obj->active;
+                $this->idType = $obj->idType;
+                $this->numero = $obj->numero;
+                $this->nom = $obj->nom;
+                $this->active = $obj->active;
 
 				
-			}
-			$this->db->free($resql);
-
-			if ($numrows) {
-				return 1;
-			} else {
-				return 0;
-			}
-		} else {
-			$this->errors[] = 'Error ' . $this->db->lasterror();
-			dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
-
-			return - 1;
-		}
-	}
-
-	/**
-	 * Load object in memory from the database
-	 *
-	 * @param string $sortorder Sort Order
-	 * @param string $sortfield Sort field
-	 * @param int    $limit     offset limit
-	 * @param int    $offset    offset limit
-	 * @param array  $filter    filter array
-	 * @param string $filtermode filter mode (AND or OR)
-	 *
-	 * @return int <0 if KO, >0 if OK
-	 */
-	public function fetchAll($sortorder='', $sortfield='', $limit=0, $offset=0, array $filter = array(), $filtermode='AND')
-	{
-		dol_syslog(__METHOD__, LOG_DEBUG);
-
-		$sql = 'SELECT';
-		$sql .= " t.idType,";
-		$sql .= " t.numero,";
-		$sql .= " t.nom,";
-		$sql .= " t.active";
+            }
+            $this->db->free($resql);
+
+            if ($numrows) {
+                return 1;
+            } else {
+                return 0;
+            }
+        } else {
+            $this->errors[] = 'Error ' . $this->db->lasterror();
+            dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
+
+            return - 1;
+        }
+    }
+
+    /**
+     * Load object in memory from the database
+     *
+     * @param string $sortorder Sort Order
+     * @param string $sortfield Sort field
+     * @param int    $limit     offset limit
+     * @param int    $offset    offset limit
+     * @param array  $filter    filter array
+     * @param string $filtermode filter mode (AND or OR)
+     *
+     * @return int <0 if KO, >0 if OK
+     */
+    public function fetchAll($sortorder='', $sortfield='', $limit=0, $offset=0, array $filter = array(), $filtermode='AND')
+    {
+        dol_syslog(__METHOD__, LOG_DEBUG);
+
+        $sql = 'SELECT';
+        $sql .= " t.idType,";
+        $sql .= " t.numero,";
+        $sql .= " t.nom,";
+        $sql .= " t.active";
 
 		
-		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element. ' as t';
+        $sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element. ' as t';
 
-		// Manage filter
-		$sqlwhere = array();
+        // Manage filter
+        $sqlwhere = array();
 
-		foreach ($filter as $key => $value) {
-		    if(is_string($value)){
+        foreach ($filter as $key => $value) {
+            if(is_string($value)){
                 $sqlwhere [] = $key . ' LIKE \'%' . $this->db->escape($value) . '%\'';
                 continue;
             }
@@ -256,232 +256,232 @@ 
             }
         }
 
-		if (count($sqlwhere) > 0) {
-			$sql .= ' WHERE ' . implode(' '.$filtermode.' ', $sqlwhere);
-		}
+        if (count($sqlwhere) > 0) {
+            $sql .= ' WHERE ' . implode(' '.$filtermode.' ', $sqlwhere);
+        }
 		
-		if (!empty($sortfield)) {
-			$sql .= $this->db->order($sortfield,$sortorder);
-		}
-		if (!empty($limit)) {
-		 $sql .=  ' ' . $this->db->plimit($limit + 1, $offset);
-		}
-		$this->lines = array();
-
-		$resql = $this->db->query($sql);
-		if ($resql) {
-			$num = $this->db->num_rows($resql);
-
-			while ($obj = $this->db->fetch_object($resql)) {
-				$line = new BbctypesLine();
-
-				$line->id = $obj->idType;
-				$line->idType = $obj->idType;
-				$line->numero = $obj->numero;
-				$line->nom = $obj->nom;
-				$line->active = $obj->active;
-
-				$this->lines[$line->id] = $line;
-			}
-			$this->db->free($resql);
-
-			return $num;
-		} else {
-			$this->errors[] = 'Error ' . $this->db->lasterror();
-			dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
-
-			return - 1;
-		}
-	}
-
-	/**
-	 * Update object into database
-	 *
-	 * @param  User $user      User that modifies
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 *
-	 * @return int <0 if KO, >0 if OK
-	 */
-	public function update(User $user, $notrigger = false)
-	{
-		$error = 0;
-
-		dol_syslog(__METHOD__, LOG_DEBUG);
-
-		// Clean parameters
+        if (!empty($sortfield)) {
+            $sql .= $this->db->order($sortfield,$sortorder);
+        }
+        if (!empty($limit)) {
+            $sql .=  ' ' . $this->db->plimit($limit + 1, $offset);
+        }
+        $this->lines = array();
+
+        $resql = $this->db->query($sql);
+        if ($resql) {
+            $num = $this->db->num_rows($resql);
+
+            while ($obj = $this->db->fetch_object($resql)) {
+                $line = new BbctypesLine();
+
+                $line->id = $obj->idType;
+                $line->idType = $obj->idType;
+                $line->numero = $obj->numero;
+                $line->nom = $obj->nom;
+                $line->active = $obj->active;
+
+                $this->lines[$line->id] = $line;
+            }
+            $this->db->free($resql);
+
+            return $num;
+        } else {
+            $this->errors[] = 'Error ' . $this->db->lasterror();
+            dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
+
+            return - 1;
+        }
+    }
+
+    /**
+     * Update object into database
+     *
+     * @param  User $user      User that modifies
+     * @param  bool $notrigger false=launch triggers after, true=disable triggers
+     *
+     * @return int <0 if KO, >0 if OK
+     */
+    public function update(User $user, $notrigger = false)
+    {
+        $error = 0;
+
+        dol_syslog(__METHOD__, LOG_DEBUG);
+
+        // Clean parameters
 		
-		if (isset($this->idType)) {
-			 $this->idType = trim($this->idType);
-		}
-		if (isset($this->numero)) {
-			 $this->numero = trim($this->numero);
-		}
-		if (isset($this->nom)) {
-			 $this->nom = trim($this->nom);
-		}
-		if (isset($this->active)) {
-			 $this->active = trim($this->active);
-		}
+        if (isset($this->idType)) {
+                $this->idType = trim($this->idType);
+        }
+        if (isset($this->numero)) {
+                $this->numero = trim($this->numero);
+        }
+        if (isset($this->nom)) {
+                $this->nom = trim($this->nom);
+        }
+        if (isset($this->active)) {
+                $this->active = trim($this->active);
+        }
 
 		
 
-		// Check parameters
-		// Put here code to add a control on parameters values
+        // Check parameters
+        // Put here code to add a control on parameters values
 
-		// Update request
-		$sql = 'UPDATE ' . MAIN_DB_PREFIX . $this->table_element . ' SET';
+        // Update request
+        $sql = 'UPDATE ' . MAIN_DB_PREFIX . $this->table_element . ' SET';
 		
-		$sql .= ' numero = '.(isset($this->numero)?$this->numero:"null").',';
-		$sql .= ' nom = '.(isset($this->nom)?"'".$this->db->escape($this->nom)."'":"null").',';
-		$sql .= ' active = '.(isset($this->active)?$this->active:"null");
+        $sql .= ' numero = '.(isset($this->numero)?$this->numero:"null").',';
+        $sql .= ' nom = '.(isset($this->nom)?"'".$this->db->escape($this->nom)."'":"null").',';
+        $sql .= ' active = '.(isset($this->active)?$this->active:"null");
 
         
-		$sql .= ' WHERE idType=' . $this->id;
-
-		$this->db->begin();
-
-		$resql = $this->db->query($sql);
-		if (!$resql) {
-			$error ++;
-			$this->errors[] = 'Error ' . $this->db->lasterror();
-			dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
-		}
-
-		if (!$error && !$notrigger) {
-			// Uncomment this and change MYOBJECT to your own tag if you
-			// want this action calls a trigger.
-
-			//// Call triggers
-			//$result=$this->call_trigger('MYOBJECT_MODIFY',$user);
-			//if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
-			//// End call triggers
-		}
-
-		// Commit or rollback
-		if ($error) {
-			$this->db->rollback();
-
-			return - 1 * $error;
-		} else {
-			$this->db->commit();
-
-			return 1;
-		}
-	}
-
-	/**
-	 * Delete object in database
-	 *
-	 * @param User $user      User that deletes
-	 * @param bool $notrigger false=launch triggers after, true=disable triggers
-	 *
-	 * @return int <0 if KO, >0 if OK
-	 */
-	public function delete(User $user, $notrigger = false)
-	{
-		dol_syslog(__METHOD__, LOG_DEBUG);
-
-		$error = 0;
-
-		$this->db->begin();
-
-		if (!$error) {
-			if (!$notrigger) {
-				// Uncomment this and change MYOBJECT to your own tag if you
-				// want this action calls a trigger.
-
-				//// Call triggers
-				//$result=$this->call_trigger('MYOBJECT_DELETE',$user);
-				//if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
-				//// End call triggers
-			}
-		}
-
-		if (!$error) {
-			$sql = 'DELETE FROM ' . MAIN_DB_PREFIX . $this->table_element;
-			$sql .= ' WHERE idType=' . $this->id;
-
-			$resql = $this->db->query($sql);
-			if (!$resql) {
-				$error ++;
-				$this->errors[] = 'Error ' . $this->db->lasterror();
-				dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
-			}
-		}
-
-		// Commit or rollback
-		if ($error) {
-			$this->db->rollback();
-
-			return - 1 * $error;
-		} else {
-			$this->db->commit();
-
-			return 1;
-		}
-	}
-
-	/**
-	 * Load an object from its id and create a new one in database
-	 *
-	 * @param int $fromid Id of object to clone
-	 *
-	 * @return int New id of clone
-	 */
-	public function createFromClone($fromid)
-	{
-		dol_syslog(__METHOD__, LOG_DEBUG);
-
-		global $user;
-		$error = 0;
-		$object = new Bbctypes($this->db);
-
-		$this->db->begin();
-
-		// Load source object
-		$object->fetch($fromid);
-		// Reset object
-		$object->id = 0;
-
-		// Clear fields
-		// ...
-
-		// Create clone
-		$result = $object->create($user);
-
-		// Other options
-		if ($result < 0) {
-			$error ++;
-			$this->errors = $object->errors;
-			dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
-		}
-
-		// End
-		if (!$error) {
-			$this->db->commit();
-
-			return $object->id;
-		} else {
-			$this->db->rollback();
-
-			return - 1;
-		}
-	}
-
-	/**
-	 *  Return a link to the user card (with optionaly the picto)
-	 * 	Use this->id,this->lastname, this->firstname
-	 *
-	 *	@param	int		$withpicto			Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
-	 *	@param	string	$option				On what the link point to
+        $sql .= ' WHERE idType=' . $this->id;
+
+        $this->db->begin();
+
+        $resql = $this->db->query($sql);
+        if (!$resql) {
+            $error ++;
+            $this->errors[] = 'Error ' . $this->db->lasterror();
+            dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
+        }
+
+        if (!$error && !$notrigger) {
+            // Uncomment this and change MYOBJECT to your own tag if you
+            // want this action calls a trigger.
+
+            //// Call triggers
+            //$result=$this->call_trigger('MYOBJECT_MODIFY',$user);
+            //if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
+            //// End call triggers
+        }
+
+        // Commit or rollback
+        if ($error) {
+            $this->db->rollback();
+
+            return - 1 * $error;
+        } else {
+            $this->db->commit();
+
+            return 1;
+        }
+    }
+
+    /**
+     * Delete object in database
+     *
+     * @param User $user      User that deletes
+     * @param bool $notrigger false=launch triggers after, true=disable triggers
+     *
+     * @return int <0 if KO, >0 if OK
+     */
+    public function delete(User $user, $notrigger = false)
+    {
+        dol_syslog(__METHOD__, LOG_DEBUG);
+
+        $error = 0;
+
+        $this->db->begin();
+
+        if (!$error) {
+            if (!$notrigger) {
+                // Uncomment this and change MYOBJECT to your own tag if you
+                // want this action calls a trigger.
+
+                //// Call triggers
+                //$result=$this->call_trigger('MYOBJECT_DELETE',$user);
+                //if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
+                //// End call triggers
+            }
+        }
+
+        if (!$error) {
+            $sql = 'DELETE FROM ' . MAIN_DB_PREFIX . $this->table_element;
+            $sql .= ' WHERE idType=' . $this->id;
+
+            $resql = $this->db->query($sql);
+            if (!$resql) {
+                $error ++;
+                $this->errors[] = 'Error ' . $this->db->lasterror();
+                dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
+            }
+        }
+
+        // Commit or rollback
+        if ($error) {
+            $this->db->rollback();
+
+            return - 1 * $error;
+        } else {
+            $this->db->commit();
+
+            return 1;
+        }
+    }
+
+    /**
+     * Load an object from its id and create a new one in database
+     *
+     * @param int $fromid Id of object to clone
+     *
+     * @return int New id of clone
+     */
+    public function createFromClone($fromid)
+    {
+        dol_syslog(__METHOD__, LOG_DEBUG);
+
+        global $user;
+        $error = 0;
+        $object = new Bbctypes($this->db);
+
+        $this->db->begin();
+
+        // Load source object
+        $object->fetch($fromid);
+        // Reset object
+        $object->id = 0;
+
+        // Clear fields
+        // ...
+
+        // Create clone
+        $result = $object->create($user);
+
+        // Other options
+        if ($result < 0) {
+            $error ++;
+            $this->errors = $object->errors;
+            dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
+        }
+
+        // End
+        if (!$error) {
+            $this->db->commit();
+
+            return $object->id;
+        } else {
+            $this->db->rollback();
+
+            return - 1;
+        }
+    }
+
+    /**
+     *  Return a link to the user card (with optionaly the picto)
+     * 	Use this->id,this->lastname, this->firstname
+     *
+     *	@param	int		$withpicto			Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
+     *	@param	string	$option				On what the link point to
      *  @param	integer	$notooltip			1=Disable tooltip
      *  @param	int		$maxlen				Max length of visible user name
      *  @param  string  $morecss            Add more css on link
-	 *	@return	string						String with URL
-	 */
-	function getNomUrl($withpicto=0, $option='', $notooltip=0, $maxlen=24, $morecss='')
-	{
-		global $langs, $conf, $db;
+     *	@return	string						String with URL
+     */
+    function getNomUrl($withpicto=0, $option='', $notooltip=0, $maxlen=24, $morecss='')
+    {
+        global $langs, $conf, $db;
         global $dolibarr_main_authentication, $dolibarr_main_demo;
         global $menumanager;
 
@@ -496,92 +496,92 @@ 
         $link = '<a href="'.DOL_URL_ROOT.'/flightLog/card.php?id='.$this->id.'"';
         $link.= ($notooltip?'':' title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip'.($morecss?' '.$morecss:'').'"');
         $link.= '>';
-		$linkend='</a>';
+        $linkend='</a>';
 
         if ($withpicto)
         {
             $result.=($link.img_object(($notooltip?'':$label), 'label', ($notooltip?'':'class="classfortooltip"')).$linkend);
             if ($withpicto != 2) $result.=' ';
-		}
-		$result.= $link . $this->ref . $linkend;
-		return $result;
-	}
+        }
+        $result.= $link . $this->ref . $linkend;
+        return $result;
+    }
 	
-	/**
-	 *  Retourne le libelle du status d'un user (actif, inactif)
-	 *
-	 *  @param	int		$mode          0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
-	 *  @return	string 			       Label of status
-	 */
-	function getLibStatut($mode=0)
-	{
-		return $this->LibStatut($this->status,$mode);
-	}
-
-	/**
-	 *  Renvoi le libelle d'un status donne
-	 *
-	 *  @param	int		$status        	Id status
-	 *  @param  int		$mode          	0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
-	 *  @return string 			       	Label of status
-	 */
-	function LibStatut($status,$mode=0)
-	{
-		global $langs;
-
-		if ($mode == 0)
-		{
-			$prefix='';
-			if ($status == 1) return $langs->trans('Enabled');
-			if ($status == 0) return $langs->trans('Disabled');
-		}
-		if ($mode == 1)
-		{
-			if ($status == 1) return $langs->trans('Enabled');
-			if ($status == 0) return $langs->trans('Disabled');
-		}
-		if ($mode == 2)
-		{
-			if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled');
-			if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5').' '.$langs->trans('Disabled');
-		}
-		if ($mode == 3)
-		{
-			if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4');
-			if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5');
-		}
-		if ($mode == 4)
-		{
-			if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled');
-			if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5').' '.$langs->trans('Disabled');
-		}
-		if ($mode == 5)
-		{
-			if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'),'statut4');
-			if ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'),'statut5');
-		}
-
-		return "";
-	}
+    /**
+     *  Retourne le libelle du status d'un user (actif, inactif)
+     *
+     *  @param	int		$mode          0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
+     *  @return	string 			       Label of status
+     */
+    function getLibStatut($mode=0)
+    {
+        return $this->LibStatut($this->status,$mode);
+    }
+
+    /**
+     *  Renvoi le libelle d'un status donne
+     *
+     *  @param	int		$status        	Id status
+     *  @param  int		$mode          	0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
+     *  @return string 			       	Label of status
+     */
+    function LibStatut($status,$mode=0)
+    {
+        global $langs;
+
+        if ($mode == 0)
+        {
+            $prefix='';
+            if ($status == 1) return $langs->trans('Enabled');
+            if ($status == 0) return $langs->trans('Disabled');
+        }
+        if ($mode == 1)
+        {
+            if ($status == 1) return $langs->trans('Enabled');
+            if ($status == 0) return $langs->trans('Disabled');
+        }
+        if ($mode == 2)
+        {
+            if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled');
+            if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5').' '.$langs->trans('Disabled');
+        }
+        if ($mode == 3)
+        {
+            if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4');
+            if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5');
+        }
+        if ($mode == 4)
+        {
+            if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled');
+            if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5').' '.$langs->trans('Disabled');
+        }
+        if ($mode == 5)
+        {
+            if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'),'statut4');
+            if ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'),'statut5');
+        }
+
+        return "";
+    }
 	
 	
-	/**
-	 * Initialise object with example values
-	 * Id must be 0 if object instance is a specimen
-	 *
-	 * @return void
-	 */
-	public function initAsSpecimen()
-	{
-		$this->id = 0;
+    /**
+     * Initialise object with example values
+     * Id must be 0 if object instance is a specimen
+     *
+     * @return void
+     */
+    public function initAsSpecimen()
+    {
+        $this->id = 0;
 		
-		$this->idType = '';
-		$this->numero = '';
-		$this->nom = '';
-		$this->active = '';
+        $this->idType = '';
+        $this->numero = '';
+        $this->nom = '';
+        $this->active = '';
 
 		
-	}
+    }
 
 }
 
@@ -590,21 +590,21 @@ 
  */
 class BbctypesLine
 {
-	/**
-	 * @var int ID
-	 */
-	public $id;
-	/**
-	 * @var mixed Sample line property 1
-	 */
+    /**
+     * @var int ID
+     */
+    public $id;
+    /**
+     * @var mixed Sample line property 1
+     */
 	
-	public $idType;
-	public $numero;
-	public $nom;
-	public $active;
-
-	/**
-	 * @var mixed Sample line property 2
-	 */
+    public $idType;
+    public $numero;
+    public $nom;
+    public $active;
+
+    /**
+     * @var mixed Sample line property 2
+     */
 	
 }

Spacing +49 added lines, -49 removed lines

@@ -110,16 +110,16 @@ 
 		// Insert request
 		$sql = 'INSERT INTO ' . MAIN_DB_PREFIX . $this->table_element . '(';
 		
-		$sql.= 'numero,';
-		$sql.= 'nom';
-		$sql.= 'active';
+		$sql .= 'numero,';
+		$sql .= 'nom';
+		$sql .= 'active';
 
 		
 		$sql .= ') VALUES (';
 		
-		$sql .= ' '.(! isset($this->numero)?'NULL':$this->numero).',';
-		$sql .= ' '.(! isset($this->nom)?'NULL':"'".$this->db->escape($this->nom)."'").',';
-		$sql .= ' '.(! isset($this->active)?'NULL':$this->active);
+		$sql .= ' ' . (!isset($this->numero) ? 'NULL' : $this->numero) . ',';
+		$sql .= ' ' . (!isset($this->nom) ? 'NULL' : "'" . $this->db->escape($this->nom) . "'") . ',';
+		$sql .= ' ' . (!isset($this->active) ? 'NULL' : $this->active);
 
 		
 		$sql .= ')';
@@ -128,7 +128,7 @@ 
 
 		$resql = $this->db->query($sql);
 		if (!$resql) {
-			$error ++;
+			$error++;
 			$this->errors[] = 'Error ' . $this->db->lasterror();
 			dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
 		}
@@ -151,7 +151,7 @@ 
 		if ($error) {
 			$this->db->rollback();
 
-			return - 1 * $error;
+			return -1 * $error;
 		} else {
 			$this->db->commit();
 
@@ -212,7 +212,7 @@ 
 			$this->errors[] = 'Error ' . $this->db->lasterror();
 			dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
 
-			return - 1;
+			return -1;
 		}
 	}
 
@@ -228,7 +228,7 @@ 
 	 *
 	 * @return int <0 if KO, >0 if OK
 	 */
-	public function fetchAll($sortorder='', $sortfield='', $limit=0, $offset=0, array $filter = array(), $filtermode='AND')
+	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')
 	{
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
@@ -239,32 +239,32 @@ 
 		$sql .= " t.active";
 
 		
-		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element. ' as t';
+		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element . ' as t';
 
 		// Manage filter
 		$sqlwhere = array();
 
 		foreach ($filter as $key => $value) {
-		    if(is_string($value)){
+		    if (is_string($value)) {
                 $sqlwhere [] = $key . ' LIKE \'%' . $this->db->escape($value) . '%\'';
                 continue;
             }
 
-            if(is_int($value)){
-                $sqlwhere [] = $key . ' = ' .(int)$value;
+            if (is_int($value)) {
+                $sqlwhere [] = $key . ' = ' . (int) $value;
                 continue;
             }
         }
 
 		if (count($sqlwhere) > 0) {
-			$sql .= ' WHERE ' . implode(' '.$filtermode.' ', $sqlwhere);
+			$sql .= ' WHERE ' . implode(' ' . $filtermode . ' ', $sqlwhere);
 		}
 		
 		if (!empty($sortfield)) {
-			$sql .= $this->db->order($sortfield,$sortorder);
+			$sql .= $this->db->order($sortfield, $sortorder);
 		}
 		if (!empty($limit)) {
-		 $sql .=  ' ' . $this->db->plimit($limit + 1, $offset);
+		 $sql .= ' ' . $this->db->plimit($limit + 1, $offset);
 		}
 		$this->lines = array();
 
@@ -290,7 +290,7 @@ 
 			$this->errors[] = 'Error ' . $this->db->lasterror();
 			dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
 
-			return - 1;
+			return -1;
 		}
 	}
 
@@ -331,9 +331,9 @@ 
 		// Update request
 		$sql = 'UPDATE ' . MAIN_DB_PREFIX . $this->table_element . ' SET';
 		
-		$sql .= ' numero = '.(isset($this->numero)?$this->numero:"null").',';
-		$sql .= ' nom = '.(isset($this->nom)?"'".$this->db->escape($this->nom)."'":"null").',';
-		$sql .= ' active = '.(isset($this->active)?$this->active:"null");
+		$sql .= ' numero = ' . (isset($this->numero) ? $this->numero : "null") . ',';
+		$sql .= ' nom = ' . (isset($this->nom) ? "'" . $this->db->escape($this->nom) . "'" : "null") . ',';
+		$sql .= ' active = ' . (isset($this->active) ? $this->active : "null");
 
         
 		$sql .= ' WHERE idType=' . $this->id;
@@ -342,7 +342,7 @@ 
 
 		$resql = $this->db->query($sql);
 		if (!$resql) {
-			$error ++;
+			$error++;
 			$this->errors[] = 'Error ' . $this->db->lasterror();
 			dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
 		}
@@ -361,7 +361,7 @@ 
 		if ($error) {
 			$this->db->rollback();
 
-			return - 1 * $error;
+			return -1 * $error;
 		} else {
 			$this->db->commit();
 
@@ -403,7 +403,7 @@ 
 
 			$resql = $this->db->query($sql);
 			if (!$resql) {
-				$error ++;
+				$error++;
 				$this->errors[] = 'Error ' . $this->db->lasterror();
 				dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
 			}
@@ -413,7 +413,7 @@ 
 		if ($error) {
 			$this->db->rollback();
 
-			return - 1 * $error;
+			return -1 * $error;
 		} else {
 			$this->db->commit();
 
@@ -451,7 +451,7 @@ 
 
 		// Other options
 		if ($result < 0) {
-			$error ++;
+			$error++;
 			$this->errors = $object->errors;
 			dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
 		}
@@ -464,7 +464,7 @@ 
 		} else {
 			$this->db->rollback();
 
-			return - 1;
+			return -1;
 		}
 	}
 
@@ -479,7 +479,7 @@ 
      *  @param  string  $morecss            Add more css on link
 	 *	@return	string						String with URL
 	 */
-	function getNomUrl($withpicto=0, $option='', $notooltip=0, $maxlen=24, $morecss='')
+	function getNomUrl($withpicto = 0, $option = '', $notooltip = 0, $maxlen = 24, $morecss = '')
 	{
 		global $langs, $conf, $db;
         global $dolibarr_main_authentication, $dolibarr_main_demo;
@@ -490,20 +490,20 @@ 
         $companylink = '';
 
         $label = '<u>' . $langs->trans("MyModule") . '</u>';
-        $label.= '<div width="100%">';
-        $label.= '<b>' . $langs->trans('Ref') . ':</b> ' . $this->ref;
+        $label .= '<div width="100%">';
+        $label .= '<b>' . $langs->trans('Ref') . ':</b> ' . $this->ref;
 
-        $link = '<a href="'.DOL_URL_ROOT.'/flightLog/card.php?id='.$this->id.'"';
-        $link.= ($notooltip?'':' title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip'.($morecss?' '.$morecss:'').'"');
-        $link.= '>';
-		$linkend='</a>';
+        $link = '<a href="' . DOL_URL_ROOT . '/flightLog/card.php?id=' . $this->id . '"';
+        $link .= ($notooltip ? '' : ' title="' . dol_escape_htmltag($label, 1) . '" class="classfortooltip' . ($morecss ? ' ' . $morecss : '') . '"');
+        $link .= '>';
+		$linkend = '</a>';
 
         if ($withpicto)
         {
-            $result.=($link.img_object(($notooltip?'':$label), 'label', ($notooltip?'':'class="classfortooltip"')).$linkend);
-            if ($withpicto != 2) $result.=' ';
+            $result .= ($link . img_object(($notooltip ? '' : $label), 'label', ($notooltip ? '' : 'class="classfortooltip"')) . $linkend);
+            if ($withpicto != 2) $result .= ' ';
 		}
-		$result.= $link . $this->ref . $linkend;
+		$result .= $link . $this->ref . $linkend;
 		return $result;
 	}
 	
@@ -513,9 +513,9 @@ 
 	 *  @param	int		$mode          0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
 	 *  @return	string 			       Label of status
 	 */
-	function getLibStatut($mode=0)
+	function getLibStatut($mode = 0)
 	{
-		return $this->LibStatut($this->status,$mode);
+		return $this->LibStatut($this->status, $mode);
 	}
 
 	/**
@@ -525,13 +525,13 @@ 
 	 *  @param  int		$mode          	0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
 	 *  @return string 			       	Label of status
 	 */
-	function LibStatut($status,$mode=0)
+	function LibStatut($status, $mode = 0)
 	{
 		global $langs;
 
 		if ($mode == 0)
 		{
-			$prefix='';
+			$prefix = '';
 			if ($status == 1) return $langs->trans('Enabled');
 			if ($status == 0) return $langs->trans('Disabled');
 		}
@@ -542,23 +542,23 @@ 
 		}
 		if ($mode == 2)
 		{
-			if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled');
-			if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5').' '.$langs->trans('Disabled');
+			if ($status == 1) return img_picto($langs->trans('Enabled'), 'statut4') . ' ' . $langs->trans('Enabled');
+			if ($status == 0) return img_picto($langs->trans('Disabled'), 'statut5') . ' ' . $langs->trans('Disabled');
 		}
 		if ($mode == 3)
 		{
-			if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4');
-			if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5');
+			if ($status == 1) return img_picto($langs->trans('Enabled'), 'statut4');
+			if ($status == 0) return img_picto($langs->trans('Disabled'), 'statut5');
 		}
 		if ($mode == 4)
 		{
-			if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled');
-			if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5').' '.$langs->trans('Disabled');
+			if ($status == 1) return img_picto($langs->trans('Enabled'), 'statut4') . ' ' . $langs->trans('Enabled');
+			if ($status == 0) return img_picto($langs->trans('Disabled'), 'statut5') . ' ' . $langs->trans('Disabled');
 		}
 		if ($mode == 5)
 		{
-			if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'),'statut4');
-			if ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'),'statut5');
+			if ($status == 1) return $langs->trans('Enabled') . ' ' . img_picto($langs->trans('Enabled'), 'statut4');
+			if ($status == 0) return $langs->trans('Disabled') . ' ' . img_picto($langs->trans('Disabled'), 'statut5');
 		}
 
 		return "";

Braces +39 added lines, -13 removed lines

@@ -501,7 +501,9 @@ 
         if ($withpicto)
         {
             $result.=($link.img_object(($notooltip?'':$label), 'label', ($notooltip?'':'class="classfortooltip"')).$linkend);
-            if ($withpicto != 2) $result.=' ';
+            if ($withpicto != 2) {
+                $result.=' ';
+            }
 		}
 		$result.= $link . $this->ref . $linkend;
 		return $result;
@@ -532,33 +534,57 @@ 
 		if ($mode == 0)
 		{
 			$prefix='';
-			if ($status == 1) return $langs->trans('Enabled');
-			if ($status == 0) return $langs->trans('Disabled');
+			if ($status == 1) {
+			    return $langs->trans('Enabled');
+			}
+			if ($status == 0) {
+			    return $langs->trans('Disabled');
+			}
 		}
 		if ($mode == 1)
 		{
-			if ($status == 1) return $langs->trans('Enabled');
-			if ($status == 0) return $langs->trans('Disabled');
+			if ($status == 1) {
+			    return $langs->trans('Enabled');
+			}
+			if ($status == 0) {
+			    return $langs->trans('Disabled');
+			}
 		}
 		if ($mode == 2)
 		{
-			if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled');
-			if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5').' '.$langs->trans('Disabled');
+			if ($status == 1) {
+			    return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled');
+			}
+			if ($status == 0) {
+			    return img_picto($langs->trans('Disabled'),'statut5').' '.$langs->trans('Disabled');
+			}
 		}
 		if ($mode == 3)
 		{
-			if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4');
-			if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5');
+			if ($status == 1) {
+			    return img_picto($langs->trans('Enabled'),'statut4');
+			}
+			if ($status == 0) {
+			    return img_picto($langs->trans('Disabled'),'statut5');
+			}
 		}
 		if ($mode == 4)
 		{
-			if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled');
-			if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5').' '.$langs->trans('Disabled');
+			if ($status == 1) {
+			    return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled');
+			}
+			if ($status == 0) {
+			    return img_picto($langs->trans('Disabled'),'statut5').' '.$langs->trans('Disabled');
+			}
 		}
 		if ($mode == 5)
 		{
-			if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'),'statut4');
-			if ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'),'statut5');
+			if ($status == 1) {
+			    return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'),'statut4');
+			}
+			if ($status == 0) {
+			    return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'),'statut5');
+			}
 		}
 
 		return "";

readBalloonInc.php

Indentation +103 added lines, -103 removed lines

@@ -28,7 +28,7 @@ 
 // Protection if the user can't acces to the module
 if (!$user->rights->flightLog->vol->access)
 {
-	accessforbidden();
+    accessforbidden();
 }
 
 
@@ -42,54 +42,54 @@ 
 //l'utilisateur a le droit de selectionner le ballon qu'il veut
 if (($user->rights->flightLog->vol->detail))
 {
-	if(isset($_GET["ballon"])){
-		$idBallon = $_GET['ballon'];
-	}else{
-		$idBallon =1;
-	}
+    if(isset($_GET["ballon"])){
+        $idBallon = $_GET['ballon'];
+    }else{
+        $idBallon =1;
+    }
 	
 }else{
 	
-	//l'utilisateur n'a pas le choix du ballon
-	//il est titulaire d'un ballon
-	$query = 'SELECT * FROM llx_bbc_ballons';
-	$query.= ' WHERE `fk_responsable` = '.$user->id;
-	$resql = $db->query($query);
-	if($resql){
-		$num = $db->num_rows($resql);
-		$i = 0;
-		if($num){
-			print'</tr>';
-			while($i <$num){
-				$obj = $db->fetch_object($resql); //vol
-				if($obj){
-					$idBallon = ($obj->rowid);
-				}
-			}
-		}else{
-			//il n'est pas titulaire d'un ballon
-			accessforbidden("Vous n'&ecirc;tes pas titulaire du ballon");
-		}
-	}
+    //l'utilisateur n'a pas le choix du ballon
+    //il est titulaire d'un ballon
+    $query = 'SELECT * FROM llx_bbc_ballons';
+    $query.= ' WHERE `fk_responsable` = '.$user->id;
+    $resql = $db->query($query);
+    if($resql){
+        $num = $db->num_rows($resql);
+        $i = 0;
+        if($num){
+            print'</tr>';
+            while($i <$num){
+                $obj = $db->fetch_object($resql); //vol
+                if($obj){
+                    $idBallon = ($obj->rowid);
+                }
+            }
+        }else{
+            //il n'est pas titulaire d'un ballon
+            accessforbidden("Vous n'&ecirc;tes pas titulaire du ballon");
+        }
+    }
 }
 if($idBallon != -1){
 	
-	//balloon with ID
-	$ballon = New Bbc_ballons($db);
+    //balloon with ID
+    $ballon = New Bbc_ballons($db);
         
-	if($ballon->fetch($idBallon)==-1){
-		print "ERROR".$idBallon."<br/>";
-	}
-	//titulaire with ballon ID
+    if($ballon->fetch($idBallon)==-1){
+        print "ERROR".$idBallon."<br/>";
+    }
+    //titulaire with ballon ID
         $titulaire = new User($db);
         $titulaire->fetch($ballon->fk_responsable);
         //flight with balloon ID
-	$query = 'SELECT *, TIMEDIFF(heureA,heureD) AS time FROM llx_bbc_vols';
-	$query.= ' WHERE `BBC_ballons_idBBC_ballons` = '.$ballon->id;
-	$query.= ' AND `incidents` NOT LIKE \'RAS\'';
-	$query.= ' AND `incidents` NOT LIKE \'\'';
-	$query.= ' ORDER BY date';
-	$resql = $db->query($query);
+    $query = 'SELECT *, TIMEDIFF(heureA,heureD) AS time FROM llx_bbc_vols';
+    $query.= ' WHERE `BBC_ballons_idBBC_ballons` = '.$ballon->id;
+    $query.= ' AND `incidents` NOT LIKE \'RAS\'';
+    $query.= ' AND `incidents` NOT LIKE \'\'';
+    $query.= ' ORDER BY date';
+    $resql = $db->query($query);
 }
 
 
@@ -102,27 +102,27 @@ 
 
 llxHeader('','Carnet de vol','');
 if($msg && $idBallon != -1){
-	print $msg;
+    print $msg;
 }else{
-	$form=new Form($db);
+    $form=new Form($db);
 	
-	print '<!-- debut cartouche rapport -->
+    print '<!-- debut cartouche rapport -->
 	<div class="tabs">
 	<a  class="tab" href="readFlightsBalloon.php?ballon='.$idBallon.'">Carnet de vol</a>
 	<a id="active" class="tab" href="readBalloonInc.php?ballon='.$idBallon.'">Incidents</a>
 	</div>';
-	print '<div class="tabBar">';
-	print "<form name='readBalloon' action=\"readFlightsBalloon.php\" method=\"get\">\n";
-	print '<input type="hidden" name="mode" value="SELECT">';
-	print '<table width="100%" class="border">';
-	print '<tr><td>Ballon</td><td colspan="3">';
-	if($user->rights->flightLog->vol->detail){
-		select_balloons($idBallon);
-	}else{
-		print $ballon->immat;
-	}
+    print '<div class="tabBar">';
+    print "<form name='readBalloon' action=\"readFlightsBalloon.php\" method=\"get\">\n";
+    print '<input type="hidden" name="mode" value="SELECT">';
+    print '<table width="100%" class="border">';
+    print '<tr><td>Ballon</td><td colspan="3">';
+    if($user->rights->flightLog->vol->detail){
+        select_balloons($idBallon);
+    }else{
+        print $ballon->immat;
+    }
 	
-	print'</td></tr>';
+    print'</td></tr>';
         //titulaire
         print '<tr>';
         print '<td>Titulaire</td>';
@@ -134,10 +134,10 @@ 
         print '<td>'.dol_print_date($ballon->date, 'dayrfc').'</td>';
         print '</tr>';
         $num = 0;
-	if($resql){
-		//fetch pilot
+    if($resql){
+        //fetch pilot
 		
-		$num = $db->num_rows($resql);
+        $num = $db->num_rows($resql);
                 //>Nombre d'incidences
                 print '<tr>';
                 print '<td>Nombre d\'incidences</td>';
@@ -149,54 +149,54 @@ 
 
 
                 print '<table class="border" width="100%">';
-		$i = 0;
-		if($num){
-			print '<tr class="liste_titre">';
-			print '<td class="liste_titre"> identifiant </td>';
-			print '<td class="liste_titre"> Date </td>';
-			print '<td class="liste_titre"> Ballon </td>';
-			print '<td class="liste_titre"> Pilote </td>';
-			print '<td class="liste_titre"> Lieu depart </td>';
-			print '<td class="liste_titre"> Lieu arrivee </td>';
-			print '<td class="liste_titre"> Heure depart</td>';
-			print '<td class="liste_titre"> Heure Arrivee </td>';
-			print '<td class="liste_titre"> Duree (min) </td>';
-			print '<td class="liste_titre"> Nbr Pax </td>';
-			print '<td class="liste_titre"> Rem </td>';
-			print '<td class="liste_titre"> Incidents </td>';
-			if($user->rights->flightLog->vol->status){
-				print '<td class="liste_titre"> Statut </td>';
-			}
-			print'</tr>';
-			while($i <$num){
-				$obj = $db->fetch_object($resql); //vol
-				print '<tr>';
-				if($obj){
-					$pilot = New User($db); //pilot
-					$pilot->fetch($obj->fk_pilot);
-					print '<td><a href="fiche.php?vol='.$obj->idBBC_vols.'">'.$obj->idBBC_vols.'</a></td>';
-					print '<td>'.$obj->date.'</td>';
-					print '<td>'.$ballon->immat.'</td>';
-					print '<td>'.$pilot->getNomUrl().'</a></td>';
-					print '<td>'.$obj->lieuD.'</td>';
-					print '<td>'.$obj->lieuA.'</td>';
-					print '<td>'.$obj->heureD.'</td>';
-					print '<td>'.$obj->heureA.'</td>';
-					print '<td>'.$obj->time.'</td>';
-					print '<td>'.$obj->nbrPax.'</td>';
-					print '<td>'.$obj->remarque.'</td>';
-					print '<td>'.$obj->incidents.'</td>';
-					if($user->rights->flightLog->vol->status){
-						$vol = new Bbcvols($db);
-						$vol->fetch($obj->idBBC_vols);
+        $i = 0;
+        if($num){
+            print '<tr class="liste_titre">';
+            print '<td class="liste_titre"> identifiant </td>';
+            print '<td class="liste_titre"> Date </td>';
+            print '<td class="liste_titre"> Ballon </td>';
+            print '<td class="liste_titre"> Pilote </td>';
+            print '<td class="liste_titre"> Lieu depart </td>';
+            print '<td class="liste_titre"> Lieu arrivee </td>';
+            print '<td class="liste_titre"> Heure depart</td>';
+            print '<td class="liste_titre"> Heure Arrivee </td>';
+            print '<td class="liste_titre"> Duree (min) </td>';
+            print '<td class="liste_titre"> Nbr Pax </td>';
+            print '<td class="liste_titre"> Rem </td>';
+            print '<td class="liste_titre"> Incidents </td>';
+            if($user->rights->flightLog->vol->status){
+                print '<td class="liste_titre"> Statut </td>';
+            }
+            print'</tr>';
+            while($i <$num){
+                $obj = $db->fetch_object($resql); //vol
+                print '<tr>';
+                if($obj){
+                    $pilot = New User($db); //pilot
+                    $pilot->fetch($obj->fk_pilot);
+                    print '<td><a href="fiche.php?vol='.$obj->idBBC_vols.'">'.$obj->idBBC_vols.'</a></td>';
+                    print '<td>'.$obj->date.'</td>';
+                    print '<td>'.$ballon->immat.'</td>';
+                    print '<td>'.$pilot->getNomUrl().'</a></td>';
+                    print '<td>'.$obj->lieuD.'</td>';
+                    print '<td>'.$obj->lieuA.'</td>';
+                    print '<td>'.$obj->heureD.'</td>';
+                    print '<td>'.$obj->heureA.'</td>';
+                    print '<td>'.$obj->time.'</td>';
+                    print '<td>'.$obj->nbrPax.'</td>';
+                    print '<td>'.$obj->remarque.'</td>';
+                    print '<td>'.$obj->incidents.'</td>';
+                    if($user->rights->flightLog->vol->status){
+                        $vol = new Bbcvols($db);
+                        $vol->fetch($obj->idBBC_vols);
                         print '<td>' . $vol->getStatus().'</td>';
-					}
-				}
-				print'</tr>';
-				$i++;
-			}
-		}	
-		print'</table>';
+                    }
+                }
+                print'</tr>';
+                $i++;
+            }
+        }	
+        print'</table>';
 	
 }
 /***************************************************