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])): ?>

command/CreateOrderCommand.php

Spacing +2 added lines, -2 removed lines

@@ -228,7 +228,7 @@ 
     /**
      * @return boolean
      */
-    public function hasTVA(){
+    public function hasTVA() {
         return !empty($this->tva);
     }
 
@@ -259,7 +259,7 @@ 
     /**
      * @return bool
      */
-    public function isCommentPublic(){
+    public function isCommentPublic() {
         return $this->publicComment;
     }
 

addOrder.php

Spacing +31 added lines, -31 removed lines

@@ -12,32 +12,32 @@ 
 dol_include_once("/flightlog/lib/flightLog.lib.php");
 dol_include_once("/flightlog/validators/SimpleOrderValidator.php");
 dol_include_once("/flightlog/command/CreateOrderCommandHandler.php");
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/class/html.formcompany.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/class/html.formadmin.class.php';
 
 // Load object modCodeTiers
-$module=(! empty($conf->global->SOCIETE_CODECLIENT_ADDON)?$conf->global->SOCIETE_CODECLIENT_ADDON:'mod_codeclient_leopard');
+$module = (!empty($conf->global->SOCIETE_CODECLIENT_ADDON) ? $conf->global->SOCIETE_CODECLIENT_ADDON : 'mod_codeclient_leopard');
 if (substr($module, 0, 15) == 'mod_codeclient_' && substr($module, -3) == 'php')
 {
-    $module = substr($module, 0, dol_strlen($module)-4);
+    $module = substr($module, 0, dol_strlen($module) - 4);
 }
-$dirsociete=array_merge(array('/core/modules/societe/'),$conf->modules_parts['societe']);
+$dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
 foreach ($dirsociete as $dirroot)
 {
-    $res=dol_include_once($dirroot.$module.'.php');
+    $res = dol_include_once($dirroot . $module . '.php');
     if ($res) break;
 }
 $modCodeClient = new $module;
 // Load object modCodeFournisseur
-$module=(! empty($conf->global->SOCIETE_CODECLIENT_ADDON)?$conf->global->SOCIETE_CODECLIENT_ADDON:'mod_codeclient_leopard');
+$module = (!empty($conf->global->SOCIETE_CODECLIENT_ADDON) ? $conf->global->SOCIETE_CODECLIENT_ADDON : 'mod_codeclient_leopard');
 if (substr($module, 0, 15) == 'mod_codeclient_' && substr($module, -3) == 'php')
 {
-    $module = substr($module, 0, dol_strlen($module)-4);
+    $module = substr($module, 0, dol_strlen($module) - 4);
 }
-$dirsociete=array_merge(array('/core/modules/societe/'),$conf->modules_parts['societe']);
+$dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
 foreach ($dirsociete as $dirroot)
 {
-    $res=dol_include_once($dirroot.$module.'.php');
+    $res = dol_include_once($dirroot . $module . '.php');
     if ($res) break;
 }
 $modCodeFournisseur = new $module;
@@ -58,9 +58,9 @@ 
     if (!$_POST["cancel"]) {
 
         $formObject = new stdClass();
-        $formObject->name = GETPOST('name','alpha');
-        $formObject->firstname = GETPOST('firstname','alpha');
-        $formObject->zip = GETPOST('zipcode','alpha');
+        $formObject->name = GETPOST('name', 'alpha');
+        $formObject->firstname = GETPOST('firstname', 'alpha');
+        $formObject->zip = GETPOST('zipcode', 'alpha');
         $formObject->town = GETPOST('town', 'alpha');
         $formObject->state = GETPOST('state_id', 'int');
         $formObject->phone = GETPOST('phone', 'alpha');
@@ -77,8 +77,8 @@ 
 
         if ($validator->isValid($formObject, $_REQUEST)) {
             $createOrderCommand = new CreateOrderCommand($formObject, $user->id);
-            try{
-                $handler = new CreateOrderCommandHandler($db, $conf,$user,$langs,$modCodeClient, $modCodeFournisseur);
+            try {
+                $handler = new CreateOrderCommandHandler($db, $conf, $user, $langs, $modCodeClient, $modCodeFournisseur);
                 $handler->handle($createOrderCommand);
 
                 $msg = '<div class="success ok">Commande et tiers créés. </div>';
@@ -113,18 +113,18 @@ 
 ?>
 
     <!-- Success message with reference -->
-    <?php if($successMessage): ?>
+    <?php if ($successMessage): ?>
         <div class="bbc-style">
             <p class="cadre_msg1">
                 Vous avez généré la facture et créé un tiers.<br/>
                 Merci,
             </p>
 
-            <?php if(count($validator->getWarningMessages()) > 0):?>
+            <?php if (count($validator->getWarningMessages()) > 0):?>
                 <div class="box box-warning">
                     <p>Ceci sont des messages d'attention mais qui ne bloquent pas la création de la commande</p>
                     <ul>
-                        <?php foreach($validator->getWarningMessages() as $warningMessage): ?>
+                        <?php foreach ($validator->getWarningMessages() as $warningMessage): ?>
                             <li class="warning"><?php echo $warningMessage; ?></li>
                         <?php endforeach; ?>
                     </ul>
@@ -183,7 +183,7 @@ 
         <p>
             Cette page vous permettra de créer une commande. La commande est <b>obligatoire</b> si vous désirez faire payer les passagers directement sur le compte du club.<br>
             Si vous avre un doute sur la manière d'encoder la commande, veuillez me contacter.<br/>
-            Si vous avez <b>déjà</b> encodé une commande, et que vous voulez la retrouver veuillez vous rendre sur : <a href="<?php echo sprintf(DOL_URL_ROOT.'/commande/list.php?search_sale=%s', $user->id); ?>">mes commandes.</a>
+            Si vous avez <b>déjà</b> encodé une commande, et que vous voulez la retrouver veuillez vous rendre sur : <a href="<?php echo sprintf(DOL_URL_ROOT . '/commande/list.php?search_sale=%s', $user->id); ?>">mes commandes.</a>
         </p>
     </div>
     <form class="flight-form" name='add' method="post">
@@ -262,7 +262,7 @@ 
                     <?php echo $langs->trans('DefaultLang'); ?>
                 </td>
                 <td>
-                    <?php echo $formAdmin->select_language($conf->global->MAIN_LANG_DEFAULT,'default_lang',0,0,1,0,0,'maxwidth200onsmartphone'); ?>
+                    <?php echo $formAdmin->select_language($conf->global->MAIN_LANG_DEFAULT, 'default_lang', 0, 0, 1, 0, 0, 'maxwidth200onsmartphone'); ?>
                 </td>
             </tr>
 
@@ -272,16 +272,16 @@ 
                     <?php echo $langs->trans('Region'); ?>
                 </td>
                 <td>
-                    <?php print $formcompany->select_state($formObject->state,'BE'); ?>
+                    <?php print $formcompany->select_state($formObject->state, 'BE'); ?>
                 </td>
             </tr>
 
             <?php
             // Zip / Town
-            print '<tr><td>'.fieldLabel('Zip','zipcode').'</td><td>';
-                    print $formcompany->select_ziptown($formObject->town,'zipcode',array('town','selectcountry_id','state_id'), 0, 0, '', 'maxwidth100 quatrevingtpercent');
-                    print '</td><td>'.fieldLabel('Town','town').'</td><td>';
-                    print $formcompany->select_ziptown($formObject->zip,'town',array('zipcode','selectcountry_id','state_id'), 0, 0, '', 'maxwidth100 quatrevingtpercent');
+            print '<tr><td>' . fieldLabel('Zip', 'zipcode') . '</td><td>';
+                    print $formcompany->select_ziptown($formObject->town, 'zipcode', array('town', 'selectcountry_id', 'state_id'), 0, 0, '', 'maxwidth100 quatrevingtpercent');
+                    print '</td><td>' . fieldLabel('Town', 'town') . '</td><td>';
+                    print $formcompany->select_ziptown($formObject->zip, 'town', array('zipcode', 'selectcountry_id', 'state_id'), 0, 0, '', 'maxwidth100 quatrevingtpercent');
                     print '</td></tr>';
             ?>
 
@@ -305,16 +305,16 @@ 
                     <?php
                     if (empty($conf->global->MAIN_DISABLEVATCHECK)): ?>
 
-                        <?php if (! empty($conf->use_javascript_ajax)): ?>
+                        <?php if (!empty($conf->use_javascript_ajax)): ?>
                             <script language="JavaScript" type="text/javascript">
                             function CheckVAT(a) {
-                                <?php print "newpopup('".DOL_URL_ROOT."/societe/checkvat/checkVatPopup.php?vatNumber='+a,'".dol_escape_js($langs->trans("VATIntraCheckableOnEUSite"))."',500,300);"; ?>
+                                <?php print "newpopup('" . DOL_URL_ROOT . "/societe/checkvat/checkVatPopup.php?vatNumber='+a,'" . dol_escape_js($langs->trans("VATIntraCheckableOnEUSite")) . "',500,300);"; ?>
                             }
                             </script>
                             <a href="#" class="hideonsmartphone" onclick="javascript: CheckVAT(document.add.tva_intra.value);"><?php echo $langs->trans("VATIntraCheck"); ?></a>
-                            <?php echo $html->textwithpicto($s,$langs->trans("VATIntraCheckDesc",$langs->trans("VATIntraCheck")),1); ?>
+                            <?php echo $html->textwithpicto($s, $langs->trans("VATIntraCheckDesc", $langs->trans("VATIntraCheck")), 1); ?>
                         <?php else: ?>
-                            <a href="<?php echo $langs->transcountry("VATIntraCheckURL",$object->country_id); ?>" target="_blank"><?php echo img_picto($langs->trans("VATIntraCheckableOnEUSite"),'help'); ?></a>
+                            <a href="<?php echo $langs->transcountry("VATIntraCheckURL", $object->country_id); ?>" target="_blank"><?php echo img_picto($langs->trans("VATIntraCheckableOnEUSite"), 'help'); ?></a>
                         <?php endif; ?>
                    <?php endif; ?>
                 </td>
@@ -367,10 +367,10 @@ 
             <tr>
                 <td><?php echo $langs->trans('Le commentaire doit-il figurer sur la commande') ?></td>
                 <td>
-                    <input type="radio" id="public_comment" name="public_comment" value="1" <?php echo ($formObject->isCommentPublic == 1)?'checked="checked"' : ''; ?>/>
+                    <input type="radio" id="public_comment" name="public_comment" value="1" <?php echo ($formObject->isCommentPublic == 1) ? 'checked="checked"' : ''; ?>/>
                     <label for="public_comment">Oui</label>
                     -
-                    <input type="radio" id="private_comment" name="public_comment" value="0" <?php echo ($formObject == null || $formObject->isCommentPublic === null || $formObject->isCommentPublic === 0)?'checked="checked"' : ''; ?>/>
+                    <input type="radio" id="private_comment" name="public_comment" value="0" <?php echo ($formObject == null || $formObject->isCommentPublic === null || $formObject->isCommentPublic === 0) ? 'checked="checked"' : ''; ?>/>
                     <label for="private_comment">Non</label>
                 </td>
             </tr>