laudeco / bbc-dolibarr-flightlog

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

core/modules/modFlightLog.class.php

Spacing +1 added lines, -1 removed lines

@@ -341,7 +341,7 @@
      */
     private function initPermissions()
     {
-        $this->rights = array();        // Permission array used by this module
+        $this->rights = array(); // Permission array used by this module
         $r = 0;
 
         $this->rights[$r][0] = 9993;

admin/vol.php

Spacing +7 added lines, -7 removed lines

@@ -25,15 +25,15 @@ 
  * Actions
  */
 // Save
-if($action === ACTION_SAVE){
-    foreach($services as $flightTypeId => $serviceId){
+if ($action === ACTION_SAVE) {
+    foreach ($services as $flightTypeId => $serviceId) {
         $res = $flightType->fetch($flightTypeId);
-        if($res > 0 ){
+        if ($res > 0) {
             $flightType->fkService = $serviceId;
             $flightType->update($user);
         }
 
-        dolibarr_set_const($db, 'BBC_POINTS_BONUS_'.$flightTypeId, GETPOST('points_bonus_'.$flightTypeId), 'chaine', 0, 'Points pour le vol T'.$flightTypeId, $conf->entity);
+        dolibarr_set_const($db, 'BBC_POINTS_BONUS_' . $flightTypeId, GETPOST('points_bonus_' . $flightTypeId), 'chaine', 0, 'Points pour le vol T' . $flightTypeId, $conf->entity);
     }
 
     dolibarr_set_const($db, 'BBC_FLIGHT_TYPE_CUSTOMER', GETPOST('customer_product'), 'chaine', 0, '', $conf->entity);
@@ -71,7 +71,7 @@ 
                 <tr class="<?= $flightTypeLine->id % 2 == 0 ? "pair" : "impair" ?>">
                     <td>(T<?= $flightTypeLine->numero ?>) - <?= $flightTypeLine->nom ?></td>
                     <td>
-                        <?php $form->select_produits($flightTypeLine->fkService, 'idprod['.$flightTypeLine->id.']', $filtertype, $conf->product->limit_size, $buyer->price_level, 1, 2, '', 1, array(),$buyer->id); ?>
+                        <?php $form->select_produits($flightTypeLine->fkService, 'idprod[' . $flightTypeLine->id . ']', $filtertype, $conf->product->limit_size, $buyer->price_level, 1, 2, '', 1, array(), $buyer->id); ?>
                     </td>
                 </tr>
             <?php endforeach; ?>
@@ -83,7 +83,7 @@ 
                 </td>
                 <td>
                     <?php $form->select_produits($conf->global->BBC_FLIGHT_TYPE_CUSTOMER, 'customer_product',
-                        $filtertype, $conf->product->limit_size, $buyer->price_level, 1, 2, '', 1, array(),$buyer->id); ?>
+                        $filtertype, $conf->product->limit_size, $buyer->price_level, 1, 2, '', 1, array(), $buyer->id); ?>
                 </td>
             </tr>
 
@@ -106,7 +106,7 @@ 
                     <label for="points_bonus_<?php echo $flightTypeLine->numero; ?>">
                         (T<?php echo $flightTypeLine->numero ?>) - <?php echo $flightTypeLine->nom ?>
                     </label>
-                    <?php $prop = 'BBC_POINTS_BONUS_'.$flightTypeLine->numero; ?>
+                    <?php $prop = 'BBC_POINTS_BONUS_' . $flightTypeLine->numero; ?>
                     <input type="number" id="points_bonus_<?php echo $flightTypeLine->numero; ?>" name="points_bonus_<?php echo $flightTypeLine->numero; ?>" value="<?php echo $conf->global->$prop?>" />
                     <br/>
                 <?php endforeach; ?>

command/CreateFlightBillCommandHandlerFactory.php

Spacing +3 added lines, -3 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
-require_once __DIR__.'/CreateFlightBillCommandHandler.php';
-require_once __DIR__.'/CreateFlightBillTransactionalCommandHandler.php';
+require_once __DIR__ . '/CreateFlightBillCommandHandler.php';
+require_once __DIR__ . '/CreateFlightBillTransactionalCommandHandler.php';
 
 /**
  * @author Laurent De Coninck <lau.deconinck@gmail.com>
@@ -11,7 +11,7 @@ 
     /**
      * @return CreateFlightBillCommandHandler
      */
-    public static function factory($db, $conf, $user, $langs){
+    public static function factory($db, $conf, $user, $langs) {
         return new CreateFlightBillTransactionalCommandHandler($db, $conf, $user, $langs);
     }
 

generateMonthlyBilling.php

Spacing +1 added lines, -1 removed lines

@@ -95,7 +95,7 @@
 if ($action == EXPENSE_REPORT_GENERATOR_ACTION_GENERATE) {
     try {
 
-        $command = new CreateMonthBillCommand( $type, $publicNote, $privateNote, $year, $month);
+        $command = new CreateMonthBillCommand($type, $publicNote, $privateNote, $year, $month);
         $handler->handle($command);
         dol_htmloutput_mesg('Génération : OK');
     } catch (Exception $e) {

core/cron/BbcMonthlyFlightsBillCron.php

Spacing +1 added lines, -1 removed lines

@@ -53,7 +53,7 @@
 
         try {
 
-            if(date('d')>=15){
+            if (date('d') >= 15) {
                 dol_syslog('Monthly bill generation : date over');
                 return -2;
             }

tabs/project/instructions.php

Spacing +1 added lines, -1 removed lines

@@ -232,7 +232,7 @@
                                     <?php echo !empty($flight->linkedObjectsIds) && in_array($currentTask->id,
                                         $flight->linkedObjectsIds[$currentTask->table_element]) ? 'checked' : '' ?>
                                 />
-                            <?php else: ?>
+                            <?php else : ?>
 
                                 <?php if (!empty($flight->linkedObjectsIds) && in_array($currentTask->id,
                                         $flight->linkedObjectsIds[$currentTask->table_element])): ?>

addFlight.php

Indentation +1 added lines, -1 removed lines

@@ -262,7 +262,7 @@
                 <td class="fieldrequired"><?php echo $langs->trans('Commande du vol')?></td>
                 <td class="js-order">
                     <?php
-                     echo $html->selectarray('order_id',$commande->liste_array(2),$_POST['order_id'], 1,0,0,'',0,0,0,'','minwidth200',1);
+                        echo $html->selectarray('order_id',$commande->liste_array(2),$_POST['order_id'], 1,0,0,'',0,0,0,'','minwidth200',1);
                     ?>
                 </td>
             </tr>

Spacing +7 added lines, -7 removed lines

@@ -60,7 +60,7 @@ 
             ->setGroupedFlight($isGroupedFlight)
             ->setOrderId($orderId);
 
-        try{
+        try {
             $vol = $createFlightHandler->handle($volCommand);
 
             include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
@@ -69,7 +69,7 @@ 
 
             $msg = '<div class="ok">L\'ajout du vol du : ' . $_POST["reday"] . '/' . $_POST["remonth"] . '/' . $_POST["reyear"] . ' s\'est correctement effectue ! </div>';
             Header("Location: card.php?id=" . $vol->id);
-        }catch (\Exception $e){
+        } catch (\Exception $e) {
             $msg = '<div class="error">Erreur lors de l\'ajout du vol : ' . $vol->error . '! </div>';
         }
 
@@ -149,7 +149,7 @@ 
             //Pilote
             print "<tr>";
             print '<td class="fieldrequired"> Pilote </td><td >';
-            print $html->select_dolusers($_POST["pilot"] ? $_POST["pilot"] : $user->id, 'pilot', 0, null, 0, '', '', 0,0,0,'',0,'','', true);
+            print $html->select_dolusers($_POST["pilot"] ? $_POST["pilot"] : $user->id, 'pilot', 0, null, 0, '', '', 0, 0, 0, '', 0, '', '', true);
             print '</td></tr>';
 
             //Ballon
@@ -195,7 +195,7 @@ 
                 <td>
                 <?php
                     //organisateur
-                    print $html->select_dolusers($_POST["orga"] ? $_POST["orga"] : $user->id, 'orga', 0, null, 0, '', '', 0,0,0,'',0,'','', true);
+                    print $html->select_dolusers($_POST["orga"] ? $_POST["orga"] : $user->id, 'orga', 0, null, 0, '', '', 0, 0, 0, '', 0, '', '', true);
                 ?>
                 </td>
             </tr>
@@ -236,7 +236,7 @@ 
                     <input type="number"
                            name="nbrPax"
                            class="flat <?php echo $validator->hasError('nbrPax') ? 'error' : '' ?>"
-                           value="<?php echo $_POST['nbrPax']?: 0 ?>"/>
+                           value="<?php echo $_POST['nbrPax'] ?: 0 ?>"/>
                 </td>
             </tr>
 
@@ -260,7 +260,7 @@ 
                 <td class="fieldrequired"><?php echo $langs->trans('Commande du vol')?></td>
                 <td class="js-order">
                     <?php
-                     echo $html->selectarray('order_id',$commande->liste_array(2),$_POST['order_id'], 1,0,0,'',0,0,0,'','minwidth200',1);
+                     echo $html->selectarray('order_id', $commande->liste_array(2), $_POST['order_id'], 1, 0, 0, '', 0, 0, 0, '', 'minwidth200', 1);
                     ?>
                 </td>
             </tr>
@@ -269,7 +269,7 @@ 
             <tr class="js-hide-order js-billable-field">
                 <td class="fieldrequired"><?php echo $langs->trans('Qui a perçu l\'argent')?></td><td>
                     <?php print $html->select_dolusers($_POST["fk_receiver"] ? $_POST["fk_receiver"] : $user->id,
-                        'fk_receiver', true, null, 0, '', '', 0,0,0,'',0,'','', true); ?>
+                        'fk_receiver', true, null, 0, '', '', 0, 0, 0, '', 0, '', '', true); ?>
                 </td>
             </tr>
 

card_tab_financial.php

Spacing +10 added lines, -10 removed lines

@@ -43,7 +43,7 @@ 
 
 $id = GETPOST('id', 'int') ?: GETPOST('idBBC_vols', 'int');
 $action = GETPOST('action', 'alpha');
-$permissiondellink=$user->rights->flightlog->vol->financial;
+$permissiondellink = $user->rights->flightlog->vol->financial;
 
 $object = new Bbcvols($db);
 $extrafields = new ExtraFields($db);
@@ -62,8 +62,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'));
@@ -93,16 +93,16 @@ 
 print '<tr><td class="fieldrequired">' . $langs->trans("Fielddate") . '</td><td>' . dol_print_date($object->date) . '</td></tr>';
 
 if ($user->rights->flightlog->vol->financial) {
-    print '<tr><td class="fieldrequired">' . $langs->trans("Fieldis_facture") . '</td><td>' . $object->getLibStatut(5). '</td></tr>';
+    print '<tr><td class="fieldrequired">' . $langs->trans("Fieldis_facture") . '</td><td>' . $object->getLibStatut(5) . '</td></tr>';
 }
 
 print '<tr><td class="fieldrequired">' . $langs->trans("Fieldkilometers") . '</td><td>' . $object->kilometers . ' KM</td></tr>';
 print '<tr><td class="fieldrequired">' . $langs->trans("Fieldjustif_kilometers") . '</td><td>' . $object->justif_kilometers . '</td></tr>';
-if(!$object->isLinkedToOrder()){
+if (!$object->isLinkedToOrder()) {
     print '<tr><td class="fieldrequired">' . $langs->trans("Fieldcost") . '</td><td>' . $object->cost . " " . $langs->getCurrencySymbol($conf->currency) . '</td></tr>';
     print '<tr><td class="fieldrequired">' . $langs->trans("Fieldfk_receiver") . '</td><td>' . $receiver->getNomUrl(1) . '</td></tr>';
-}else{
-    print '<tr><td class="fieldrequired">' . $langs->trans("Order") . '</td><td>' . $object->getOrder()->getNomUrl(1). '</td></tr>';
+} else {
+    print '<tr><td class="fieldrequired">' . $langs->trans("Order") . '</td><td>' . $object->getOrder()->getNomUrl(1) . '</td></tr>';
 }
 print '</table>';
 
@@ -111,13 +111,13 @@ 
 // Buttons
 print '<div class="tabsAction">' . "\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>';