laudeco / bbc-dolibarr-flightlog

class/bbcvols.class.php

Doc Comments +2 added lines, -2 removed lines

@@ -86,7 +86,7 @@ 
     private $pilot;
 
     /**
-     * @return int
+     * @return string
      */
     public function getIdBBCVols()
     {
@@ -94,7 +94,7 @@ 
     }
 
     /**
-     * @return int
+     * @return string
      */
     public function getId()
     {

Spacing +3 added lines, -3 removed lines

@@ -885,7 +885,7 @@ 
     /**
      * @return boolean 
      */
-    public function hasFacture(){
+    public function hasFacture() {
         return count($this->linkedObjectsIds) > 0;
     }
 
@@ -918,7 +918,7 @@ 
      */
     public function getBalloon()
     {
-        if(!$this->balloon){
+        if (!$this->balloon) {
             $this->balloon = $this->fetchBalloon();
         }
 
@@ -930,7 +930,7 @@ 
      */
     public function getPilot()
     {
-        if(!$this->pilot){
+        if (!$this->pilot) {
             $this->pilot = $this->fetchUser($this->fk_pilot);
         }
 

readFlights.php

Spacing +2 added lines, -2 removed lines

@@ -155,7 +155,7 @@ 
     print '<td class="liste_titre" colspan="2">' . $langs->trans("Type 2 : Baptême") . '</td>';
     print '<td class="liste_titre" colspan="2">' . $langs->trans("Organisateur (T1/T2)") . '</td>';
     print '<td class="liste_titre" colspan="2">' . $langs->trans("Instructeur (orga T6)") . '</td>';
-    print '<td class="liste_titre" >'            . $langs->trans("Total bonus") . '</td>';
+    print '<td class="liste_titre" >' . $langs->trans("Total bonus") . '</td>';
     print '<td class="liste_titre" colspan="2">' . $langs->trans("Type 3 : Privé") . '</td>';
     print '<td class="liste_titre" colspan="2">' . $langs->trans("Type 4: Meeting") . '</td>';
     print '<td class="liste_titre" colspan="1">' . $langs->trans("Type 5: Chambley") . '</td>';
@@ -259,7 +259,7 @@ 
     print "<tr>";
     print "<td colspan='20'></td>";
     print "<td>Total à reçevoir</td>";
-    print "<td>".price($total)."€</td>";
+    print "<td>" . price($total) . "€</td>";
     print "</tr>";
 
     print '</tbody>';

card.php

Spacing +9 added lines, -9 removed lines

@@ -66,7 +66,7 @@ 
 
 $isAllowedEdit = ($user->rights->flightlog->vol->edit || ($user->rights->flightlog->vol->add && $object->fk_pilot == $user->id));
 $isAllowedDelete = ($user->rights->flightlog->vol->delete || ($user->rights->flightlog->vol->add && $object->fk_pilot == $user->id && !$object->is_facture));
-$permissiondellink=$user->rights->flightlog->vol->financial;
+$permissiondellink = $user->rights->flightlog->vol->financial;
 
 $search_idBBC_vols = GETPOST('search_idBBC_vols', 'int');
 $search_lieuD = GETPOST('search_lieuD', 'alpha');
@@ -113,8 +113,8 @@ 
 $extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
 
 // Load object
-include DOL_DOCUMENT_ROOT . '/core/actions_fetchobject.inc.php';  // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
-include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php';
+include DOL_DOCUMENT_ROOT . '/core/actions_fetchobject.inc.php'; // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
+include DOL_DOCUMENT_ROOT . '/core/actions_dellink.inc.php';
 
 // Initialize technical object to manage hooks of modules. Note that conf->hooks_modules contains array array
 $hookmanager->initHooks(array('bbcvols'));
@@ -139,7 +139,7 @@ 
 
 $parameters = array();
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object,
-    $action);    // Note that $action and $object may have been modified by some hooks
+    $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) {
     setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 }
@@ -197,7 +197,7 @@ 
                 header("Location: " . $urltogo);
                 exit;
             }
-            else{
+            else {
                 // Creation KO
                 if (!empty($object->errors)) {
                     setEventMessages(null, $object->errors, 'errors');
@@ -481,7 +481,7 @@ 
     print '<div class="tabsAction">' . "\n";
     $parameters = array();
     $reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object,
-        $action);    // Note that $action and $object may have been modified by hook
+        $action); // Note that $action and $object may have been modified by hook
     if ($reshook < 0) {
         setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
     }
@@ -494,13 +494,13 @@ 
         print '<div class="inline-block divButAction"><a class="butActionDelete" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=delete">' . $langs->trans('Delete') . '</a></div>' . "\n";
     }
 
-    if($user->rights->flightlog->vol->financial && $object->fk_type == 2 && !$object->hasFacture()){
-        print '<div class="inline-block divButAction"><a class="butAction" href="' . DOL_URL_ROOT . '/flightlog/facture.php?id=' . $object->id.'">' . $langs->trans("Facturer") . '</a></div>' . "\n";
+    if ($user->rights->flightlog->vol->financial && $object->fk_type == 2 && !$object->hasFacture()) {
+        print '<div class="inline-block divButAction"><a class="butAction" href="' . DOL_URL_ROOT . '/flightlog/facture.php?id=' . $object->id . '">' . $langs->trans("Facturer") . '</a></div>' . "\n";
     }
 
     print '</div>' . "\n";
 
-    if($user->rights->flightlog->vol->financial){
+    if ($user->rights->flightlog->vol->financial) {
         print '<div class="fichecenter"><div class="fichehalfleft">';
         $form->showLinkedObjectBlock($object);
         print '</div></div>';

Braces +1 added lines, -2 removed lines

@@ -196,8 +196,7 @@
                 $urltogo = $backtopage ? $backtopage : dol_buildpath('/flightlog/list.php', 1);
                 header("Location: " . $urltogo);
                 exit;
-            }
-            else{
+            } else{
                 // Creation KO
                 if (!empty($object->errors)) {
                     setEventMessages(null, $object->errors, 'errors');

core/triggers/interface_50001_modFlightLog_mailOnIncident.class.php

Indentation +54 added lines, -54 removed lines

@@ -26,58 +26,58 @@ 
  */
 class InterfaceMailOnIncident extends DolibarrTriggers
 {
-	/**
-	 * @var DoliDB Database handler
-	 */
-	protected $db;
-
-	/**
-	 * Constructor
-	 *
-	 * @param DoliDB $db Database handler
-	 */
-	public function __construct($db)
-	{
-		$this->db = $db;
-
-		$this->name = preg_replace('/^Interface/i', '', get_class($this));
-		$this->family = "Belgian balloon club";
-		$this->description = "Trigger that send an e-mail on flight incident.";
-		$this->version = '1.0';
-		$this->picto = 'flightlog@flightlog';
-	}
-
-	/**
-	 * Trigger name
-	 *
-	 * @return string Name of trigger file
-	 */
-	public function getName()
-	{
-		return $this->name;
-	}
-
-	/**
-	 * Trigger description
-	 *
-	 * @return string Description of trigger file
-	 */
-	public function getDesc()
-	{
-		return $this->description;
-	}
-
-
-	/**
-	 * @param string 		$action 	Event action code
-	 * @param Bbcvols 	    $object 	Object
-	 * @param User 			$user 		Object user
-	 * @param Translate 	$langs 		Object langs
-	 * @param Conf 			$conf 		Object conf
-	 * @return int              		<0 if KO, 0 if no triggered ran, >0 if OK
-	 */
-	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
-	{
+    /**
+     * @var DoliDB Database handler
+     */
+    protected $db;
+
+    /**
+     * Constructor
+     *
+     * @param DoliDB $db Database handler
+     */
+    public function __construct($db)
+    {
+        $this->db = $db;
+
+        $this->name = preg_replace('/^Interface/i', '', get_class($this));
+        $this->family = "Belgian balloon club";
+        $this->description = "Trigger that send an e-mail on flight incident.";
+        $this->version = '1.0';
+        $this->picto = 'flightlog@flightlog';
+    }
+
+    /**
+     * Trigger name
+     *
+     * @return string Name of trigger file
+     */
+    public function getName()
+    {
+        return $this->name;
+    }
+
+    /**
+     * Trigger description
+     *
+     * @return string Description of trigger file
+     */
+    public function getDesc()
+    {
+        return $this->description;
+    }
+
+
+    /**
+     * @param string 		$action 	Event action code
+     * @param Bbcvols 	    $object 	Object
+     * @param User 			$user 		Object user
+     * @param Translate 	$langs 		Object langs
+     * @param Conf 			$conf 		Object conf
+     * @return int              		<0 if KO, 0 if no triggered ran, >0 if OK
+     */
+    public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
+    {
         if (empty($conf->flightlog->enabled) || empty($conf->workflow->enabled)){
             return 0;
         }
@@ -132,6 +132,6 @@ 
             dol_syslog("Error while sending mail in flight log module : incident", LOG_ERR);
         }
 
-		return 0;
-	}
+        return 0;
+    }
 }

Spacing +7 added lines, -7 removed lines

@@ -16,7 +16,7 @@ 
  */
 
 
-require_once DOL_DOCUMENT_ROOT.'/core/triggers/dolibarrtriggers.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/triggers/dolibarrtriggers.class.php';
 dol_include_once('/flightlog/class/bbcvols.class.php');
 dol_include_once('/core/class/CMailFile.class.php');
 
@@ -78,23 +78,23 @@ 
 	 */
 	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
 	{
-        if (empty($conf->flightlog->enabled) || empty($conf->workflow->enabled)){
+        if (empty($conf->flightlog->enabled) || empty($conf->workflow->enabled)) {
             return 0;
         }
 
-        if(empty($conf->global->WORKFLOW_BBC_FLIGHTLOG_SEND_MAIL_ON_INCIDENT)){
+        if (empty($conf->global->WORKFLOW_BBC_FLIGHTLOG_SEND_MAIL_ON_INCIDENT)) {
             return 0;
         }
 
-        if($action !== 'BBC_FLIGHT_LOG_ADD_FLIGHT'){
+        if ($action !== 'BBC_FLIGHT_LOG_ADD_FLIGHT') {
             return 0;
         }
 
-        if(empty(trim($object->incidents)) && empty(trim($object->remarque))){
+        if (empty(trim($object->incidents)) && empty(trim($object->remarque))) {
             return 0;
         }
 
-        if(!empty($conf->global->MAIN_DISABLE_ALL_MAILS)){
+        if (!empty($conf->global->MAIN_DISABLE_ALL_MAILS)) {
             return 0;
         }
 
@@ -127,7 +127,7 @@ 
         );
 
 
-        if (! $mailfile->sendfile())
+        if (!$mailfile->sendfile())
         {
             dol_syslog("Error while sending mail in flight log module : incident", LOG_ERR);
         }