Dolibarr / dolibarr

htdocs/stripe/lib/stripe.lib.php

Indentation +50 added lines, -50 removed lines

@@ -40,15 +40,15 @@ 
 
 	$object = new stdClass();
 
-    // Show more tabs from modules
-    // Entries must be declared in modules descriptor with line
-    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
-    // $this->tabs = array('entity:-tabname);   												to remove a tab
+	// Show more tabs from modules
+	// Entries must be declared in modules descriptor with line
+	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
+	// $this->tabs = array('entity:-tabname);   												to remove a tab
 	complete_head_from_modules($conf, $langs, $object, $head, $h, 'stripeadmin');
 
 	complete_head_from_modules($conf, $langs, $object, $head, $h, 'stripeadmin', 'remove');
 
-    return $head;
+	return $head;
 }
 
 
@@ -65,16 +65,16 @@ 
 	global $conf, $langs;
 
 	$langs->load("paypal");
-    $langs->load("paybox");
+	$langs->load("paybox");
 	$langs->load("stripe");
 
-    $servicename = 'Stripe';
-    $out = '<br><br>';
-    $out .= img_picto('', 'globe').' '.$langs->trans("ToOfferALinkForOnlinePayment", $servicename).'<br>';
-    $url = getStripePaymentUrl(0, $type, $ref);
-    $out .= '<input type="text" id="stripeurl" class="quatrevingtpercent" value="'.$url.'"><br>';
-    $out .= ajax_autoselect("stripeurl", 0);
-    return $out;
+	$servicename = 'Stripe';
+	$out = '<br><br>';
+	$out .= img_picto('', 'globe').' '.$langs->trans("ToOfferALinkForOnlinePayment", $servicename).'<br>';
+	$url = getStripePaymentUrl(0, $type, $ref);
+	$out .= '<input type="text" id="stripeurl" class="quatrevingtpercent" value="'.$url.'"><br>';
+	$out .= ajax_autoselect("stripeurl", 0);
+	return $out;
 }
 
 /**
@@ -93,43 +93,43 @@ 
 
 	$ref = str_replace(' ', '', $ref);
 
-    if ($type == 'free')
-    {
-	    $out = DOL_MAIN_URL_ROOT.'/public/stripe/newpayment.php?amount='.($mode ? '<font color="#666666">' : '').$amount.($mode ? '</font>' : '').'&tag='.($mode ? '<font color="#666666">' : '').$freetag.($mode ? '</font>' : '');
-    }
-    if ($type == 'order')
-    {
-        $out = DOL_MAIN_URL_ROOT.'/public/stripe/newpayment.php?source=order&ref='.($mode ? '<font color="#666666">' : '');
-        if ($mode == 1) $out .= 'order_ref';
-        if ($mode == 0) $out .= urlencode($ref);
-	    $out .= ($mode ? '</font>' : '');
-    }
-    if ($type == 'invoice')
-    {
-        $out = DOL_MAIN_URL_ROOT.'/public/stripe/newpayment.php?source=invoice&ref='.($mode ? '<font color="#666666">' : '');
-        if ($mode == 1) $out .= 'invoice_ref';
-        if ($mode == 0) $out .= urlencode($ref);
-	    $out .= ($mode ? '</font>' : '');
-    }
-    if ($type == 'contractline')
-    {
-        $out = DOL_MAIN_URL_ROOT.'/public/stripe/newpayment.php?source=contractline&ref='.($mode ? '<font color="#666666">' : '');
-        if ($mode == 1) $out .= 'contractline_ref';
-        if ($mode == 0) $out .= urlencode($ref);
-	    $out .= ($mode ? '</font>' : '');
-    }
-    if ($type == 'membersubscription')
-    {
-        $out = DOL_MAIN_URL_ROOT.'/public/stripe/newpayment.php?source=membersubscription&ref='.($mode ? '<font color="#666666">' : '');
-        if ($mode == 1) $out .= 'member_ref';
-        if ($mode == 0) $out .= urlencode($ref);
-	    $out .= ($mode ? '</font>' : '');
-    }
-
-    // For multicompany
-    $out .= "&entity=".$conf->entity; // Check the entity because He may be the same reference in several entities
-
-    return $out;
+	if ($type == 'free')
+	{
+		$out = DOL_MAIN_URL_ROOT.'/public/stripe/newpayment.php?amount='.($mode ? '<font color="#666666">' : '').$amount.($mode ? '</font>' : '').'&tag='.($mode ? '<font color="#666666">' : '').$freetag.($mode ? '</font>' : '');
+	}
+	if ($type == 'order')
+	{
+		$out = DOL_MAIN_URL_ROOT.'/public/stripe/newpayment.php?source=order&ref='.($mode ? '<font color="#666666">' : '');
+		if ($mode == 1) $out .= 'order_ref';
+		if ($mode == 0) $out .= urlencode($ref);
+		$out .= ($mode ? '</font>' : '');
+	}
+	if ($type == 'invoice')
+	{
+		$out = DOL_MAIN_URL_ROOT.'/public/stripe/newpayment.php?source=invoice&ref='.($mode ? '<font color="#666666">' : '');
+		if ($mode == 1) $out .= 'invoice_ref';
+		if ($mode == 0) $out .= urlencode($ref);
+		$out .= ($mode ? '</font>' : '');
+	}
+	if ($type == 'contractline')
+	{
+		$out = DOL_MAIN_URL_ROOT.'/public/stripe/newpayment.php?source=contractline&ref='.($mode ? '<font color="#666666">' : '');
+		if ($mode == 1) $out .= 'contractline_ref';
+		if ($mode == 0) $out .= urlencode($ref);
+		$out .= ($mode ? '</font>' : '');
+	}
+	if ($type == 'membersubscription')
+	{
+		$out = DOL_MAIN_URL_ROOT.'/public/stripe/newpayment.php?source=membersubscription&ref='.($mode ? '<font color="#666666">' : '');
+		if ($mode == 1) $out .= 'member_ref';
+		if ($mode == 0) $out .= urlencode($ref);
+		$out .= ($mode ? '</font>' : '');
+	}
+
+	// For multicompany
+	$out .= "&entity=".$conf->entity; // Check the entity because He may be the same reference in several entities
+
+	return $out;
 }
 
 

Braces +36 added lines, -12 removed lines

@@ -100,29 +100,45 @@ 
     if ($type == 'order')
     {
         $out = DOL_MAIN_URL_ROOT.'/public/stripe/newpayment.php?source=order&ref='.($mode ? '<font color="#666666">' : '');
-        if ($mode == 1) $out .= 'order_ref';
-        if ($mode == 0) $out .= urlencode($ref);
+        if ($mode == 1) {
+        	$out .= 'order_ref';
+        }
+        if ($mode == 0) {
+        	$out .= urlencode($ref);
+        }
 	    $out .= ($mode ? '</font>' : '');
     }
     if ($type == 'invoice')
     {
         $out = DOL_MAIN_URL_ROOT.'/public/stripe/newpayment.php?source=invoice&ref='.($mode ? '<font color="#666666">' : '');
-        if ($mode == 1) $out .= 'invoice_ref';
-        if ($mode == 0) $out .= urlencode($ref);
+        if ($mode == 1) {
+        	$out .= 'invoice_ref';
+        }
+        if ($mode == 0) {
+        	$out .= urlencode($ref);
+        }
 	    $out .= ($mode ? '</font>' : '');
     }
     if ($type == 'contractline')
     {
         $out = DOL_MAIN_URL_ROOT.'/public/stripe/newpayment.php?source=contractline&ref='.($mode ? '<font color="#666666">' : '');
-        if ($mode == 1) $out .= 'contractline_ref';
-        if ($mode == 0) $out .= urlencode($ref);
+        if ($mode == 1) {
+        	$out .= 'contractline_ref';
+        }
+        if ($mode == 0) {
+        	$out .= urlencode($ref);
+        }
 	    $out .= ($mode ? '</font>' : '');
     }
     if ($type == 'membersubscription')
     {
         $out = DOL_MAIN_URL_ROOT.'/public/stripe/newpayment.php?source=membersubscription&ref='.($mode ? '<font color="#666666">' : '');
-        if ($mode == 1) $out .= 'member_ref';
-        if ($mode == 0) $out .= urlencode($ref);
+        if ($mode == 1) {
+        	$out .= 'member_ref';
+        }
+        if ($mode == 0) {
+        	$out .= urlencode($ref);
+        }
 	    $out .= ($mode ? '</font>' : '');
     }
 
@@ -159,14 +175,18 @@ 
 	if ($fromcompany->idprof1 && ($fromcompany->country_code != 'FR' || !$fromcompany->idprof2))
 	{
 		$field = $langs->transcountrynoentities("ProfId1", $fromcompany->country_code);
-		if (preg_match('/\((.*)\)/i', $field, $reg)) $field = $reg[1];
+		if (preg_match('/\((.*)\)/i', $field, $reg)) {
+			$field = $reg[1];
+		}
 		$line1 .= ($line1 ? " - " : "").$field.": ".$fromcompany->idprof1;
 	}
 	// Prof Id 2
 	if ($fromcompany->idprof2)
 	{
 		$field = $langs->transcountrynoentities("ProfId2", $fromcompany->country_code);
-		if (preg_match('/\((.*)\)/i', $field, $reg)) $field = $reg[1];
+		if (preg_match('/\((.*)\)/i', $field, $reg)) {
+			$field = $reg[1];
+		}
 		$line1 .= ($line1 ? " - " : "").$field.": ".$fromcompany->idprof2;
 	}
 
@@ -176,14 +196,18 @@ 
 	if ($fromcompany->idprof3)
 	{
 		$field = $langs->transcountrynoentities("ProfId3", $fromcompany->country_code);
-		if (preg_match('/\((.*)\)/i', $field, $reg)) $field = $reg[1];
+		if (preg_match('/\((.*)\)/i', $field, $reg)) {
+			$field = $reg[1];
+		}
 		$line2 .= ($line2 ? " - " : "").$field.": ".$fromcompany->idprof3;
 	}
 	// Prof Id 4
 	if ($fromcompany->idprof4)
 	{
 		$field = $langs->transcountrynoentities("ProfId4", $fromcompany->country_code);
-		if (preg_match('/\((.*)\)/i', $field, $reg)) $field = $reg[1];
+		if (preg_match('/\((.*)\)/i', $field, $reg)) {
+			$field = $reg[1];
+		}
 		$line2 .= ($line2 ? " - " : "").$field.": ".$fromcompany->idprof4;
 	}
 	// IntraCommunautary VAT

htdocs/societe/contact.php

Indentation +15 added lines, -15 removed lines

@@ -81,9 +81,9 @@ 
 $objcanvas = null;
 if (!empty($canvas))
 {
-    require_once DOL_DOCUMENT_ROOT.'/core/class/canvas.class.php';
-    $objcanvas = new Canvas($db, $action);
-    $objcanvas->getCanvas('thirdparty', 'card', $canvas);
+	require_once DOL_DOCUMENT_ROOT.'/core/class/canvas.class.php';
+	$objcanvas = new Canvas($db, $action);
+	$objcanvas->getCanvas('thirdparty', 'card', $canvas);
 }
 
 // Security check
@@ -103,17 +103,17 @@ 
 if (empty($reshook))
 {
 	if ($cancel)
-    {
-        $action = '';
-        if (!empty($backtopage))
-        {
-            header("Location: ".$backtopage);
-            exit;
-        }
-    }
-
-    // Selection of new fields
-    include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
+	{
+		$action = '';
+		if (!empty($backtopage))
+		{
+			header("Location: ".$backtopage);
+			exit;
+		}
+	}
+
+	// Selection of new fields
+	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 }
 
 
@@ -128,7 +128,7 @@ 
 
 if ($socid > 0 && empty($object->id))
 {
-    $result = $object->fetch($socid);
+	$result = $object->fetch($socid);
 	if ($result <= 0) dol_print_error('', $object->error);
 }
 

Braces +34 added lines, -12 removed lines

@@ -42,12 +42,20 @@ 
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
-if (!empty($conf->adherent->enabled)) require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
+if (!empty($conf->adherent->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
+}
 
 $langs->loadLangs(array("companies", "commercial", "bills", "banks", "users"));
-if (!empty($conf->categorie->enabled)) $langs->load("categories");
-if (!empty($conf->incoterm->enabled)) $langs->load("incoterm");
-if (!empty($conf->notification->enabled)) $langs->load("mails");
+if (!empty($conf->categorie->enabled)) {
+	$langs->load("categories");
+}
+if (!empty($conf->incoterm->enabled)) {
+	$langs->load("incoterm");
+}
+if (!empty($conf->notification->enabled)) {
+	$langs->load("mails");
+}
 
 $mesg = ''; $error = 0; $errors = array();
 
@@ -56,8 +64,12 @@ 
 $backtopage = GETPOST('backtopage', 'alpha');
 $confirm	= GETPOST('confirm');
 $socid = GETPOST('socid', 'int') ?GETPOST('socid', 'int') : GETPOST('id', 'int');
-if ($user->socid) $socid = $user->socid;
-if (empty($socid) && $action == 'view') $action = 'create';
+if ($user->socid) {
+	$socid = $user->socid;
+}
+if (empty($socid) && $action == 'view') {
+	$action = 'create';
+}
 
 $object = new Societe($db);
 $extrafields = new ExtraFields($db);
@@ -87,7 +99,9 @@ 
 
 // Security check
 $result = restrictedArea($user, 'societe', $socid, '&societe', '', 'fk_soc', 'rowid', 0);
-if (empty($user->rights->societe->contact->lire)) accessforbidden();
+if (empty($user->rights->societe->contact->lire)) {
+	accessforbidden();
+}
 
 
 /*
@@ -96,7 +110,9 @@ 
 
 $parameters = array('id'=>$socid, 'objcanvas'=>$objcanvas);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
 
 if (empty($reshook))
 {
@@ -127,18 +143,24 @@ 
 if ($socid > 0 && empty($object->id))
 {
     $result = $object->fetch($socid);
-	if ($result <= 0) dol_print_error('', $object->error);
-}
+	if ($result <= 0) {
+		dol_print_error('', $object->error);
+	}
+	}
 
 $title = $langs->trans("ThirdParty");
-if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) $title = $object->name." - ".$langs->trans('Card');
+if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
+	$title = $object->name." - ".$langs->trans('Card');
+}
 $help_url = 'EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
 llxHeader('', $title, $help_url);
 
 $countrynotdefined = $langs->trans("ErrorSetACountryFirst").' ('.$langs->trans("SeeAbove").')';
 
 
-if (!empty($object->id)) $res = $object->fetch_optionals();
+if (!empty($object->id)) {
+	$res = $object->fetch_optionals();
+}
 //if ($res < 0) { dol_print_error($db); exit; }
 
 

htdocs/societe/class/companybankaccount.class.php

Indentation +16 added lines, -16 removed lines

@@ -41,18 +41,18 @@ 
 	public $date_rum;
 
 	/**
-     * Date creation record (datec)
-     *
-     * @var integer
-     */
-    public $datec;
+	 * Date creation record (datec)
+	 *
+	 * @var integer
+	 */
+	public $datec;
 
 	/**
-     * Date modification record (tms)
-     *
-     * @var integer
-     */
-    public $datem;
+	 * Date modification record (tms)
+	 *
+	 * @var integer
+	 */
+	public $datem;
 
 
 	/**
@@ -78,7 +78,7 @@ 
 	 * @param   int    $notrigger   1=Disable triggers
 	 * @return	int					<0 if KO, >= 0 if OK
 	 */
-    public function create(User $user = null, $notrigger = 0)
+	public function create(User $user = null, $notrigger = 0)
 	{
 		$now	= dol_now();
 		$error = 0;
@@ -137,7 +137,7 @@ 
 	 *  @param  int     $notrigger   1=Disable triggers
 	 *	@return	int				     <=0 if KO, >0 if OK
 	 */
-    public function update(User $user = null, $notrigger = 0)
+	public function update(User $user = null, $notrigger = 0)
 	{
 		global $conf;
 		$error = 0;
@@ -210,7 +210,7 @@ 
 	 *  @param	int		$type		If id of company filled, we say if we want record of this type only
 	 * 	@return	int					<0 if KO, >0 if OK
 	 */
-    public function fetch($id, $socid = 0, $default = 1, $type = 'ban')
+	public function fetch($id, $socid = 0, $default = 1, $type = 'ban')
 	{
 		if (empty($id) && empty($socid)) return -1;
 
@@ -273,7 +273,7 @@ 
 	 *	@param  	int		$notrigger	1=Disable triggers
 	 *  @return		int		            <0 if KO, >0 if OK
 	 */
-    public function delete(User $user = null, $notrigger = 0)
+	public function delete(User $user = null, $notrigger = 0)
 	{
 		global $conf;
 
@@ -342,7 +342,7 @@ 
 	 * @param   int     $rib    RIB id
 	 * @return  int             0 if KO, 1 if OK
 	 */
-    public function setAsDefault($rib = 0)
+	public function setAsDefault($rib = 0)
 	{
 		$sql1 = "SELECT rowid as id, fk_soc  FROM ".MAIN_DB_PREFIX."societe_rib";
 		$sql1 .= " WHERE rowid = ".($rib ? $rib : $this->id);
@@ -398,7 +398,7 @@ 
 	 *
 	 *  @return	void
 	 */
-    public function initAsSpecimen()
+	public function initAsSpecimen()
 	{
 		$this->specimen        = 1;
 		$this->ref             = 'CBA';

Braces +41 added lines, -15 removed lines

@@ -88,8 +88,12 @@ 
 		if ($result)
 		{
 			$numrows = $this->db->num_rows($result);
-			if ($this->default_rib && $numrows > 0) $this->default_rib = 0;
-			if (empty($this->default_rib) && $numrows == 0) $this->default_rib = 1;
+			if ($this->default_rib && $numrows > 0) {
+				$this->default_rib = 0;
+			}
+			if (empty($this->default_rib) && $numrows == 0) {
+				$this->default_rib = 1;
+			}
 		}
 
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."societe_rib (fk_soc, type, datec)";
@@ -105,7 +109,9 @@ 
 				{
 				   	// Call trigger
 					$result = $this->call_trigger('COMPANY_RIB_CREATE', $user);
-					if ($result < 0) $error++;
+					if ($result < 0) {
+						$error++;
+					}
 					// End call triggers
 
 					if (!$error)
@@ -136,10 +142,16 @@ 
 		global $conf;
 		$error = 0;
 
-		if (!$this->id) return -1;
+		if (!$this->id) {
+			return -1;
+		}
 
-		if (dol_strlen($this->domiciliation) > 255) $this->domiciliation = dol_trunc($this->domiciliation, 254, 'right', 'UTF-8', 1);
-		if (dol_strlen($this->owner_address) > 255) $this->owner_address = dol_trunc($this->owner_address, 254, 'right', 'UTF-8', 1);
+		if (dol_strlen($this->domiciliation) > 255) {
+			$this->domiciliation = dol_trunc($this->domiciliation, 254, 'right', 'UTF-8', 1);
+		}
+		if (dol_strlen($this->owner_address) > 255) {
+			$this->owner_address = dol_trunc($this->owner_address, 254, 'right', 'UTF-8', 1);
+		}
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."societe_rib SET";
 		$sql .= " bank = '".$this->db->escape($this->bank)."'";
@@ -159,9 +171,11 @@ 
 			$sql .= ",rum = '".$this->db->escape($this->rum)."'";
 			$sql .= ",date_rum = ".($this->date_rum ? "'".$this->db->idate($this->date_rum)."'" : "null");
 		}
-		if (trim($this->label) != '')
-			$sql .= ",label = '".$this->db->escape($this->label)."'";
-		else $sql .= ",label = NULL";
+		if (trim($this->label) != '') {
+					$sql .= ",label = '".$this->db->escape($this->label)."'";
+		} else {
+			$sql .= ",label = NULL";
+		}
 		$sql .= " WHERE rowid = ".$this->id;
 
 		$result = $this->db->query($sql);
@@ -171,7 +185,9 @@ 
 			{
 				// Call trigger
 				$result = $this->call_trigger('COMPANY_RIB_MODIFY', $user);
-				if ($result < 0) $error++;
+				if ($result < 0) {
+					$error++;
+				}
 				// End call triggers
 				if (!$error)
 				{
@@ -199,17 +215,25 @@ 
 	 */
     public function fetch($id, $socid = 0, $default = 1, $type = 'ban')
 	{
-		if (empty($id) && empty($socid)) return -1;
+		if (empty($id) && empty($socid)) {
+			return -1;
+		}
 
 		$sql = "SELECT rowid, type, fk_soc, bank, number, code_banque, code_guichet, cle_rib, bic, iban_prefix as iban, domiciliation, proprio,";
 		$sql .= " owner_address, default_rib, label, datec, tms as datem, rum, frstrecur, date_rum";
 		$sql .= " FROM ".MAIN_DB_PREFIX."societe_rib";
-		if ($id)    $sql .= " WHERE rowid = ".$id;
+		if ($id) {
+			$sql .= " WHERE rowid = ".$id;
+		}
 		if ($socid)
 		{
 			$sql .= " WHERE fk_soc  = ".$socid;
-			if ($default > -1) $sql .= " AND default_rib = ".$this->db->escape($default);
-			if ($type) $sql .= " AND type ='".$this->db->escape($type)."'";
+			if ($default > -1) {
+				$sql .= " AND default_rib = ".$this->db->escape($default);
+			}
+			if ($type) {
+				$sql .= " AND type ='".$this->db->escape($type)."'";
+			}
 		}
 
 		$resql = $this->db->query($sql);
@@ -272,7 +296,9 @@ 
 		{
 			// Call trigger
 			$result = $this->call_trigger('COMPANY_RIB_DELETE', $user);
-			if ($result < 0) $error++;
+			if ($result < 0) {
+				$error++;
+			}
 			// End call triggers
 		}
 

htdocs/api/admin/explorer.php

Braces +12 added lines, -4 removed lines

@@ -94,7 +94,9 @@ 
                     $module = 'fichinter';
                 }
 
-                if (empty($conf->$module->enabled)) $enabled = false;
+                if (empty($conf->$module->enabled)) {
+                	$enabled = false;
+                }
 
                 if ($enabled) {
                     /*
@@ -189,8 +191,12 @@ 
 print $langs->trans("ListOfAvailableAPIs").':<br>';
 foreach ($listofapis['v1'] as $key => $val)
 {
-    if ($key == 'login') continue;
-    if ($key == 'index') continue;
+    if ($key == 'login') {
+    	continue;
+    }
+    if ($key == 'index') {
+    	continue;
+    }
 
     if ($key)
     {
@@ -198,7 +204,9 @@ 
         {
             $newclass = $val2['className'];
 
-            if (preg_match('/restler/i', $newclass)) continue;
+            if (preg_match('/restler/i', $newclass)) {
+            	continue;
+            }
 
             if ($oldclass != $newclass)
             {

Indentation +80 added lines, -80 removed lines

@@ -41,10 +41,10 @@ 
 // Enable and test if module Api is enabled
 if (empty($conf->global->MAIN_MODULE_API))
 {
-    dol_syslog("Call Dolibarr API interfaces with module REST disabled");
-    print $langs->trans("WarningModuleNotActive", 'Api').'.<br><br>';
-    print $langs->trans("ToActivateModule");
-    exit;
+	dol_syslog("Call Dolibarr API interfaces with module REST disabled");
+	print $langs->trans("WarningModuleNotActive", 'Api').'.<br><br>';
+	print $langs->trans("ToActivateModule");
+	exit;
 }
 
 
@@ -59,45 +59,45 @@ 
 $modulesdir = dolGetModulesDirs();
 foreach ($modulesdir as $dir)
 {
-    /*
+	/*
      * Search available module
      */
-    //dol_syslog("Scan directory ".$dir." for API modules");
-
-    $handle = @opendir(dol_osencode($dir));
-    if (is_resource($handle))
-    {
-        while (($file = readdir($handle)) !== false)
-        {
-            if (is_readable($dir.$file) && preg_match("/^(mod.*)\.class\.php$/i", $file, $reg))
-            {
-                $modulename = $reg[1];
-
-                // Defined if module is enabled
-                $enabled = true;
-                $module = $part = $obj = strtolower(preg_replace('/^mod/i', '', $modulename));
-                //if ($part == 'propale') $part='propal';
-                if ($module == 'societe') {
+	//dol_syslog("Scan directory ".$dir." for API modules");
+
+	$handle = @opendir(dol_osencode($dir));
+	if (is_resource($handle))
+	{
+		while (($file = readdir($handle)) !== false)
+		{
+			if (is_readable($dir.$file) && preg_match("/^(mod.*)\.class\.php$/i", $file, $reg))
+			{
+				$modulename = $reg[1];
+
+				// Defined if module is enabled
+				$enabled = true;
+				$module = $part = $obj = strtolower(preg_replace('/^mod/i', '', $modulename));
+				//if ($part == 'propale') $part='propal';
+				if ($module == 'societe') {
 					$obj = 'thirdparty';
 				}
-                if ($module == 'categorie') {
-                    $part = 'categories';
+				if ($module == 'categorie') {
+					$part = 'categories';
 					$obj = 'category';
 				}
-                if ($module == 'facture') {
-                    $part = 'compta/facture';
+				if ($module == 'facture') {
+					$part = 'compta/facture';
 					$obj = 'facture';
 				}
-                if ($module == 'ficheinter') {
-                    $obj = 'fichinter';
-                    $part = 'fichinter';
-                    $module = 'fichinter';
-                }
+				if ($module == 'ficheinter') {
+					$obj = 'fichinter';
+					$part = 'fichinter';
+					$module = 'fichinter';
+				}
 
-                if (empty($conf->$module->enabled)) $enabled = false;
+				if (empty($conf->$module->enabled)) $enabled = false;
 
-                if ($enabled) {
-                    /*
+				if ($enabled) {
+					/*
                      * If exists, load the API class for enable module
                      *
                      * Search files named api_<object>.class.php into /htdocs/<module>/class directory
@@ -105,25 +105,25 @@ 
                      * @todo : take care of externals module!
                      * @todo : use getElementProperties() function ?
                      */
-                    $dir_part = DOL_DOCUMENT_ROOT.'/'.$part.'/class/';
-
-                    $handle_part = @opendir(dol_osencode($dir_part));
-                    if (is_resource($handle_part))
-                    {
-                        while (($file_searched = readdir($handle_part)) !== false)
-                        {
-                            if (is_readable($dir_part.$file_searched) && preg_match("/^api_(.*)\.class\.php$/i", $file_searched, $reg))
-                            {
-                                $classname = ucwords($reg[1]);
-                                require_once $dir_part.$file_searched;
-                                if (class_exists($classname))
-                                {
-                                    dol_syslog("Found API classname=".$classname." into ".$dir);
-                                    $listofapis[] = $classname;
-                                }
-                            }
-
-                            /*
+					$dir_part = DOL_DOCUMENT_ROOT.'/'.$part.'/class/';
+
+					$handle_part = @opendir(dol_osencode($dir_part));
+					if (is_resource($handle_part))
+					{
+						while (($file_searched = readdir($handle_part)) !== false)
+						{
+							if (is_readable($dir_part.$file_searched) && preg_match("/^api_(.*)\.class\.php$/i", $file_searched, $reg))
+							{
+								$classname = ucwords($reg[1]);
+								require_once $dir_part.$file_searched;
+								if (class_exists($classname))
+								{
+									dol_syslog("Found API classname=".$classname." into ".$dir);
+									$listofapis[] = $classname;
+								}
+							}
+
+							/*
                             if (is_readable($dir_part.$file_searched) && preg_match("/^(api_.*)\.class\.php$/i",$file_searched,$reg))
                             {
                                 $classname=$reg[1];
@@ -148,12 +148,12 @@ 
                                 //     //$listofapis[]=array('classname'=>$classname, 'fullpath'=>$file_searched);
                                 // }
                             }*/
-                        }
-                    }
-                }
-            }
-        }
-    }
+						}
+					}
+				}
+			}
+		}
+	}
 }
 
 //var_dump($listofapis);
@@ -186,28 +186,28 @@ 
 print $langs->trans("ListOfAvailableAPIs").':<br>';
 foreach ($listofapis['v1'] as $key => $val)
 {
-    if ($key == 'login') continue;
-    if ($key == 'index') continue;
-
-    if ($key)
-    {
-        foreach ($val as $method => $val2)
-        {
-            $newclass = $val2['className'];
-
-            if (preg_match('/restler/i', $newclass)) continue;
-
-            if ($oldclass != $newclass)
-            {
-                print "\n<br>\n".$langs->trans("Class").': '.$newclass.'<br>'."\n";
-                $oldclass = $newclass;
-            }
-            //print $key.' - '.$val['classname'].' - '.$val['fullpath']." - ".DOL_MAIN_URL_ROOT.'/api/index.php/'.strtolower(preg_replace('/Api$/','',$val['classname']))."/xxx<br>\n";
-            $url = $urlwithroot.'/api/index.php/'.$key;
-            $url .= '?api_key=token';
-            print img_picto('', 'globe').' '.$method.' <a href="'.$url.'" target="_blank">'.$url."</a><br>\n";
-        }
-    }
+	if ($key == 'login') continue;
+	if ($key == 'index') continue;
+
+	if ($key)
+	{
+		foreach ($val as $method => $val2)
+		{
+			$newclass = $val2['className'];
+
+			if (preg_match('/restler/i', $newclass)) continue;
+
+			if ($oldclass != $newclass)
+			{
+				print "\n<br>\n".$langs->trans("Class").': '.$newclass.'<br>'."\n";
+				$oldclass = $newclass;
+			}
+			//print $key.' - '.$val['classname'].' - '.$val['fullpath']." - ".DOL_MAIN_URL_ROOT.'/api/index.php/'.strtolower(preg_replace('/Api$/','',$val['classname']))."/xxx<br>\n";
+			$url = $urlwithroot.'/api/index.php/'.$key;
+			$url .= '?api_key=token';
+			print img_picto('', 'globe').' '.$method.' <a href="'.$url.'" target="_blank">'.$url."</a><br>\n";
+		}
+	}
 }
 
 print '<br>';

htdocs/accountancy/journal/purchasesjournal.php

Indentation +2 added lines, -2 removed lines

@@ -726,8 +726,8 @@
 	}
 
 	$listofchoices = array('notyet'=>$langs->trans("NotYetInGeneralLedger"), 'already'=>$langs->trans("AlreadyInGeneralLedger"));
-    $period = $form->selectDate($date_start ? $date_start : -1, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end ? $date_end : -1, 'date_end', 0, 0, 0, '', 1, 0);
-    $period .= ' -  '.$langs->trans("JournalizationInLedgerStatus").' '.$form->selectarray('in_bookkeeping', $listofchoices, $in_bookkeeping, 1);
+	$period = $form->selectDate($date_start ? $date_start : -1, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end ? $date_end : -1, 'date_end', 0, 0, 0, '', 1, 0);
+	$period .= ' -  '.$langs->trans("JournalizationInLedgerStatus").' '.$form->selectarray('in_bookkeeping', $listofchoices, $in_bookkeeping, 1);
 
 	$varlink = 'id_journal='.$id_journal;
 

Braces +97 added lines, -36 removed lines

@@ -51,13 +51,16 @@ 
 $date_endday = GETPOST('date_endday');
 $date_endyear = GETPOST('date_endyear');
 $in_bookkeeping = GETPOST('in_bookkeeping');
-if ($in_bookkeeping == '') $in_bookkeeping = 'notyet';
+if ($in_bookkeeping == '') {
+	$in_bookkeeping = 'notyet';
+}
 
 $now = dol_now();
 
 // Security check
-if ($user->socid > 0)
+if ($user->socid > 0) {
 	accessforbidden();
+}
 
 $hookmanager->initHooks(array('purchasesjournal'));
 $parameters = array();
@@ -88,9 +91,11 @@ 
 	$pastmonth = $dates['pastmonth'];
 }
 
-if (!GETPOSTISSET('date_startmonth') && (empty($date_start) || empty($date_end))) // We define date_start and date_end, only if we did not submit the form
+if (!GETPOSTISSET('date_startmonth') && (empty($date_start) || empty($date_end))) {
+	// We define date_start and date_end, only if we did not submit the form
 {
 	$date_start = dol_get_first_day($pastmonthyear, $pastmonth, false);
+}
 	$date_end = dol_get_last_day($pastmonthyear, $pastmonth, false);
 }
 
@@ -111,8 +116,9 @@ 
 } else {
 	$sql .= " AND f.type IN (".FactureFournisseur::TYPE_STANDARD.",".FactureFournisseur::TYPE_REPLACEMENT.",".FactureFournisseur::TYPE_CREDIT_NOTE.",".FactureFournisseur::TYPE_DEPOSIT.",".FactureFournisseur::TYPE_SITUATION.")";
 }
-if ($date_start && $date_end)
+if ($date_start && $date_end) {
 	$sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
+}
 // Define begin binding date
 if (!empty($conf->global->ACCOUNTING_DATE_START_BINDING)) {
 	$sql .= " AND f.datef >= '".$db->idate($conf->global->ACCOUNTING_DATE_START_BINDING)."'";
@@ -156,9 +162,9 @@ 
 
 		$compta_prod = $obj->compte;
 		if (empty($compta_prod)) {
-			if ($obj->product_type == 0)
-				$compta_prod = (!empty($conf->global->ACCOUNTING_PRODUCT_BUY_ACCOUNT)) ? $conf->global->ACCOUNTING_PRODUCT_BUY_ACCOUNT : 'NotDefined';
-			else {
+			if ($obj->product_type == 0) {
+							$compta_prod = (!empty($conf->global->ACCOUNTING_PRODUCT_BUY_ACCOUNT)) ? $conf->global->ACCOUNTING_PRODUCT_BUY_ACCOUNT : 'NotDefined';
+			} else {
 				$compta_prod = (!empty($conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT)) ? $conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT : 'NotDefined';
 			}
 		}
@@ -189,19 +195,31 @@ 
 		//$tabfac[$obj->rowid]["fk_facturefourndet"] = $obj->fdid;
 
 		// Avoid warnings
-		if (!isset($tabttc[$obj->rowid][$compta_soc])) $tabttc[$obj->rowid][$compta_soc] = 0;
-		if (!isset($tabht[$obj->rowid][$compta_prod])) $tabht[$obj->rowid][$compta_prod] = 0;
-		if (!isset($tabtva[$obj->rowid][$compta_tva])) $tabtva[$obj->rowid][$compta_tva] = 0;
-		if (!isset($tablocaltax1[$obj->rowid][$compta_localtax1])) $tablocaltax1[$obj->rowid][$compta_localtax1] = 0;
-		if (!isset($tablocaltax2[$obj->rowid][$compta_localtax2])) $tablocaltax2[$obj->rowid][$compta_localtax2] = 0;
+		if (!isset($tabttc[$obj->rowid][$compta_soc])) {
+			$tabttc[$obj->rowid][$compta_soc] = 0;
+		}
+		if (!isset($tabht[$obj->rowid][$compta_prod])) {
+			$tabht[$obj->rowid][$compta_prod] = 0;
+		}
+		if (!isset($tabtva[$obj->rowid][$compta_tva])) {
+			$tabtva[$obj->rowid][$compta_tva] = 0;
+		}
+		if (!isset($tablocaltax1[$obj->rowid][$compta_localtax1])) {
+			$tablocaltax1[$obj->rowid][$compta_localtax1] = 0;
+		}
+		if (!isset($tablocaltax2[$obj->rowid][$compta_localtax2])) {
+			$tablocaltax2[$obj->rowid][$compta_localtax2] = 0;
+		}
 
 		$tabttc[$obj->rowid][$compta_soc] += $obj->total_ttc;
 		$tabht[$obj->rowid][$compta_prod] += $obj->total_ht;
 		$tabtva[$obj->rowid][$compta_tva] += $obj->total_tva;
-		if (!empty($line->tva_npr))	// Add an entry for counterpart
+		if (!empty($line->tva_npr)) {
+			// Add an entry for counterpart
 		{
 			$tabother[$obj->rowid][$compta_counterpart_tva_npr] += $obj->total_tva;
 		}
+		}
 		$tablocaltax1[$obj->rowid][$compta_localtax1] += $obj->total_localtax1;
 		$tablocaltax2[$obj->rowid][$compta_localtax2] += $obj->total_localtax2;
 		$tabcompany[$obj->rowid] = array(
@@ -233,8 +251,10 @@ 
 		{
 			$errorforinvoice[$key] = 'somelinesarenotbound';
 		}
-	} else dol_print_error($db);
-}
+	} else {
+		dol_print_error($db);
+	}
+	}
 //var_dump($errorforinvoice);exit;
 
 
@@ -278,7 +298,9 @@ 
 		{
 			$replacedinvoice = 1;
 			$alreadydispatched = $invoicestatic->getVentilExportCompta(); // Test if replaced invoice already into bookkeeping.
-			if ($alreadydispatched) $replacedinvoice = 2;
+			if ($alreadydispatched) {
+				$replacedinvoice = 2;
+			}
 		}
 
 		// If not already into bookkeeping, we won't add it. If yes, do nothing (should not happen because creating replacement not possible if invoice is accounted)
@@ -331,9 +353,11 @@ 
 
 				$result = $bookkeeping->create($user);
 				if ($result < 0) {
-					if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
+					if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists') {
+						// Already exists
 					{
 						$error++;
+					}
 						$errorforline++;
 						$errorforinvoice[$key] = 'alreadyjournalized';
 						//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->fk_doc.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
@@ -381,9 +405,11 @@ 
 
 					$result = $bookkeeping->create($user);
 					if ($result < 0) {
-						if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
+						if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists') {
+							// Already exists
 						{
 							$error++;
+						}
 							$errorforline++;
 							$errorforinvoice[$key] = 'alreadyjournalized';
 							//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->fk_doc.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
@@ -406,8 +432,12 @@ 
 			foreach ($listoftax as $numtax)
 			{
 				$arrayofvat = $tabtva;
-				if ($numtax == 1) $arrayofvat = $tablocaltax1;
-				if ($numtax == 2) $arrayofvat = $tablocaltax2;
+				if ($numtax == 1) {
+					$arrayofvat = $tablocaltax1;
+				}
+				if ($numtax == 2) {
+					$arrayofvat = $tablocaltax2;
+				}
 
 				foreach ($arrayofvat[$key] as $k => $mt) {
 					if ($mt) {
@@ -442,9 +472,11 @@ 
 
 						$result = $bookkeeping->create($user);
 						if ($result < 0) {
-							if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
+							if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists') {
+								// Already exists
 							{
 								$error++;
+							}
 								$errorforline++;
 								$errorforinvoice[$key] = 'alreadyjournalized';
 								//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->fk_doc.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
@@ -493,9 +525,11 @@ 
 
 					$result = $bookkeeping->create($user);
 					if ($result < 0) {
-						if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
+						if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists') {
+							// Already exists
 						{
 							$error++;
+						}
 							$errorforline++;
 							$errorforinvoice[$key] = 'alreadyjournalized';
 							//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->fk_doc.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
@@ -604,7 +638,9 @@ 
 		{
 			$replacedinvoice = 1;
 			$alreadydispatched = $invoicestatic->getVentilExportCompta(); // Test if replaced invoice already into bookkeeping.
-			if ($alreadydispatched) $replacedinvoice = 2;
+			if ($alreadydispatched) {
+				$replacedinvoice = 2;
+			}
 		}
 
 		// If not already into bookkeeping, we won't add it. If yes, do nothing (should not happen because creating replacement not possible if invoice is accounted)
@@ -657,8 +693,12 @@ 
 		$listoftax = array(0, 1, 2);
 		foreach ($listoftax as $numtax) {
 			$arrayofvat = $tabtva;
-			if ($numtax == 1) $arrayofvat = $tablocaltax1;
-			if ($numtax == 2) $arrayofvat = $tablocaltax2;
+			if ($numtax == 1) {
+				$arrayofvat = $tablocaltax1;
+			}
+			if ($numtax == 2) {
+				$arrayofvat = $tablocaltax2;
+			}
 
 			foreach ($arrayofvat[$key] as $k => $mt) {
 				if ($mt) {
@@ -733,12 +773,17 @@ 
 		print ' : '.$langs->trans("AccountancyAreaDescMisc", 4, '<strong>'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("MenuDefaultAccounts").'</strong>');
 	}
 	print '<div class="tabsAction tabsActionNoBottom">';
-	if (!empty($conf->global->ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL) && $in_bookkeeping == 'notyet') print '<input type="button" class="butAction" name="exportcsv" value="'.$langs->trans("ExportDraftJournal").'" onclick="launch_export();" />';
+	if (!empty($conf->global->ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL) && $in_bookkeeping == 'notyet') {
+		print '<input type="button" class="butAction" name="exportcsv" value="'.$langs->trans("ExportDraftJournal").'" onclick="launch_export();" />';
+	}
 	if (($conf->global->ACCOUNTING_ACCOUNT_SUPPLIER == "") || $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER == '-1') {
 		print '<input type="button" class="butActionRefused classfortooltip" title="'.dol_escape_htmltag($langs->trans("SomeMandatoryStepsOfSetupWereNotDone")).'" value="'.$langs->trans("WriteBookKeeping").'" />';
 	} else {
-		if ($in_bookkeeping == 'notyet') print '<input type="button" class="butAction" name="writebookkeeping" value="'.$langs->trans("WriteBookKeeping").'" onclick="writebookkeeping();" />';
-		else print '<a href="#" class="butActionRefused classfortooltip" name="writebookkeeping">'.$langs->trans("WriteBookKeeping").'</a>';
+		if ($in_bookkeeping == 'notyet') {
+			print '<input type="button" class="butAction" name="writebookkeeping" value="'.$langs->trans("WriteBookKeeping").'" onclick="writebookkeeping();" />';
+		} else {
+			print '<a href="#" class="butActionRefused classfortooltip" name="writebookkeeping">'.$langs->trans("WriteBookKeeping").'</a>';
+		}
 	}
 	print '</div>';
 
@@ -806,7 +851,9 @@ 
 		{
 			$replacedinvoice = 1;
 			$alreadydispatched = $invoicestatic->getVentilExportCompta(); // Test if replaced invoice already into bookkeeping.
-			if ($alreadydispatched) $replacedinvoice = 2;
+			if ($alreadydispatched) {
+				$replacedinvoice = 2;
+			}
 		}
 
 		// If not already into bookkeeping, we won't add it, if yes, add the counterpart ???.
@@ -863,7 +910,9 @@ 
 			if (($accountoshow == "") || $accountoshow == 'NotDefined')
 			{
 				print '<span class="error">'.$langs->trans("MainAccountForSuppliersNotDefined").'</span>';
-			} else print $accountoshow;
+			} else {
+				print $accountoshow;
+			}
 			print '</td>';
 			// Subledger account
 			print "<td>";
@@ -871,7 +920,9 @@ 
 			if (($accountoshow == "") || $accountoshow == 'NotDefined')
 			{
 				print '<span class="error">'.$langs->trans("ThirdpartyAccountNotDefined").'</span>';
-			} else print $accountoshow;
+			} else {
+				print $accountoshow;
+			}
 			print '</td>';
 			print "<td>".$companystatic->getNomUrl(0, 'supplier', 16).' - '.$invoicestatic->ref_supplier.' - '.$langs->trans("SubledgerAccount")."</td>";
 			print '<td class="right nowraponall">'.($mt < 0 ? price(-$mt) : '')."</td>";
@@ -894,7 +945,9 @@ 
 			if (($accountoshow == "") || $accountoshow == 'NotDefined')
 			{
 				print '<span class="error">'.$langs->trans("ProductAccountNotDefined").'</span>';
-			} else print $accountoshow;
+			} else {
+				print $accountoshow;
+			}
 			print "</td>";
 			// Subledger account
 			print "<td>";
@@ -911,8 +964,12 @@ 
 		$listoftax = array(0, 1, 2);
 		foreach ($listoftax as $numtax) {
 			$arrayofvat = $tabtva;
-			if ($numtax == 1) $arrayofvat = $tablocaltax1;
-			if ($numtax == 2) $arrayofvat = $tablocaltax2;
+			if ($numtax == 1) {
+				$arrayofvat = $tablocaltax1;
+			}
+			if ($numtax == 2) {
+				$arrayofvat = $tablocaltax2;
+			}
 
 			foreach ($arrayofvat[$key] as $k => $mt) {
 				if ($mt) {
@@ -926,7 +983,9 @@ 
 					if (($accountoshow == "") || $accountoshow == 'NotDefined')
 					{
 						print '<span class="error">'.$langs->trans("VATAccountNotDefined").' ('.$langs->trans("Purchase").')</span>';
-					} else print $accountoshow;
+					} else {
+						print $accountoshow;
+					}
 					print "</td>";
 					// Subledger account
 					print "<td>";
@@ -956,7 +1015,9 @@ 
 					if ($accountoshow == '' || $accountoshow == 'NotDefined')
 					{
 						print '<span class="error">'.$langs->trans("VATAccountNotDefined").' ('.$langs->trans("NPR counterpart").'). Set ACCOUNTING_COUNTERPART_VAT_NPR to the subvention account</span>';
-					} else print $accountoshow;
+					} else {
+						print $accountoshow;
+					}
 					print '</td>';
 					// Subledger account
 					print "<td>";

htdocs/accountancy/admin/export.php

Indentation +68 added lines, -68 removed lines

@@ -45,7 +45,7 @@ 
 
 // Parameters ACCOUNTING_EXPORT_*
 $main_option = array(
-    'ACCOUNTING_EXPORT_PREFIX_SPEC',
+	'ACCOUNTING_EXPORT_PREFIX_SPEC',
 );
 
 $configuration = AccountancyExport::getTypeConfig();
@@ -58,22 +58,22 @@ 
 
 
 $model_option = array(
-    '1' => array(
-        'label' => 'ACCOUNTING_EXPORT_FORMAT',
-        'param' => $listformat,
-    ),
-    '2' => array(
-        'label' => 'ACCOUNTING_EXPORT_SEPARATORCSV',
-        'param' => '',
-    ),
-    '3' => array(
-        'label' => 'ACCOUNTING_EXPORT_ENDLINE',
-        'param' => $listcr,
-    ),
-    '4' => array(
-        'label' => 'ACCOUNTING_EXPORT_DATE',
-        'param' => '',
-    ),
+	'1' => array(
+		'label' => 'ACCOUNTING_EXPORT_FORMAT',
+		'param' => $listformat,
+	),
+	'2' => array(
+		'label' => 'ACCOUNTING_EXPORT_SEPARATORCSV',
+		'param' => '',
+	),
+	'3' => array(
+		'label' => 'ACCOUNTING_EXPORT_ENDLINE',
+		'param' => $listcr,
+	),
+	'4' => array(
+		'label' => 'ACCOUNTING_EXPORT_DATE',
+		'param' => '',
+	),
 );
 
 
@@ -105,22 +105,22 @@ 
 		}
 	}
 
-    foreach ($listparam[$modelcsv] as $key => $value) {
-        $constante = $key;
+	foreach ($listparam[$modelcsv] as $key => $value) {
+		$constante = $key;
 
-        if (strpos($constante, 'ACCOUNTING') !== false) {
-            $constvalue = GETPOST($key, 'alpha');
-            if (!dolibarr_set_const($db, $constante, $constvalue, 'chaine', 0, '', $conf->entity)) {
-                $error++;
-            }
-        }
-    }
+		if (strpos($constante, 'ACCOUNTING') !== false) {
+			$constvalue = GETPOST($key, 'alpha');
+			if (!dolibarr_set_const($db, $constante, $constvalue, 'chaine', 0, '', $conf->entity)) {
+				$error++;
+			}
+		}
+	}
 
 	if (!$error) {
-        // reload
-        $configuration = AccountancyExport::getTypeConfig();
-        $listparam = $configuration['param'];
-        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+		// reload
+		$configuration = AccountancyExport::getTypeConfig();
+		$listparam = $configuration['param'];
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
@@ -148,36 +148,36 @@ 
 print '    function initfields()'."\n";
 print '    {'."\n";
 foreach ($listparam as $key => $param) {
-    print '        if (jQuery("#ACCOUNTING_EXPORT_MODELCSV").val()=="'.$key.'")'."\n";
-    print '        {'."\n";
-    print '            //console.log("'.$param['label'].'");'."\n";
-    if (empty($param['ACCOUNTING_EXPORT_FORMAT'])) {
-        print '            jQuery("#ACCOUNTING_EXPORT_FORMAT").val("'.$conf->global->ACCOUNTING_EXPORT_FORMAT.'");'."\n";
-        print '            jQuery("#ACCOUNTING_EXPORT_FORMAT").prop("disabled", true);'."\n";
-    } else {
-        print '            jQuery("#ACCOUNTING_EXPORT_FORMAT").val("'.$param['ACCOUNTING_EXPORT_FORMAT'].'");'."\n";
-        print '            jQuery("#ACCOUNTING_EXPORT_FORMAT").removeAttr("disabled");'."\n";
-    }
-    if (empty($param['ACCOUNTING_EXPORT_SEPARATORCSV'])) {
-        print '            jQuery("#ACCOUNTING_EXPORT_SEPARATORCSV").val("");'."\n";
-        print '            jQuery("#ACCOUNTING_EXPORT_SEPARATORCSV").prop("disabled", true);'."\n";
-    } else {
-        print '            jQuery("#ACCOUNTING_EXPORT_SEPARATORCSV").val("'.$conf->global->ACCOUNTING_EXPORT_SEPARATORCSV.'");'."\n";
-        print '            jQuery("#ACCOUNTING_EXPORT_SEPARATORCSV").removeAttr("disabled");'."\n";
-    }
-    if (empty($param['ACCOUNTING_EXPORT_ENDLINE'])) {
-        print '            jQuery("#ACCOUNTING_EXPORT_ENDLINE").prop("disabled", true);'."\n";
-    } else {
-        print '            jQuery("#ACCOUNTING_EXPORT_ENDLINE").removeAttr("disabled");'."\n";
-    }
-    if (empty($param['ACCOUNTING_EXPORT_DATE'])) {
-        print '            jQuery("#ACCOUNTING_EXPORT_DATE").val("");'."\n";
-        print '            jQuery("#ACCOUNTING_EXPORT_DATE").prop("disabled", true);'."\n";
-    } else {
-        print '            jQuery("#ACCOUNTING_EXPORT_DATE").val("'.$conf->global->ACCOUNTING_EXPORT_DATE.'");'."\n";
-        print '            jQuery("#ACCOUNTING_EXPORT_DATE").removeAttr("disabled");'."\n";
-    }
-    print '        }'."\n";
+	print '        if (jQuery("#ACCOUNTING_EXPORT_MODELCSV").val()=="'.$key.'")'."\n";
+	print '        {'."\n";
+	print '            //console.log("'.$param['label'].'");'."\n";
+	if (empty($param['ACCOUNTING_EXPORT_FORMAT'])) {
+		print '            jQuery("#ACCOUNTING_EXPORT_FORMAT").val("'.$conf->global->ACCOUNTING_EXPORT_FORMAT.'");'."\n";
+		print '            jQuery("#ACCOUNTING_EXPORT_FORMAT").prop("disabled", true);'."\n";
+	} else {
+		print '            jQuery("#ACCOUNTING_EXPORT_FORMAT").val("'.$param['ACCOUNTING_EXPORT_FORMAT'].'");'."\n";
+		print '            jQuery("#ACCOUNTING_EXPORT_FORMAT").removeAttr("disabled");'."\n";
+	}
+	if (empty($param['ACCOUNTING_EXPORT_SEPARATORCSV'])) {
+		print '            jQuery("#ACCOUNTING_EXPORT_SEPARATORCSV").val("");'."\n";
+		print '            jQuery("#ACCOUNTING_EXPORT_SEPARATORCSV").prop("disabled", true);'."\n";
+	} else {
+		print '            jQuery("#ACCOUNTING_EXPORT_SEPARATORCSV").val("'.$conf->global->ACCOUNTING_EXPORT_SEPARATORCSV.'");'."\n";
+		print '            jQuery("#ACCOUNTING_EXPORT_SEPARATORCSV").removeAttr("disabled");'."\n";
+	}
+	if (empty($param['ACCOUNTING_EXPORT_ENDLINE'])) {
+		print '            jQuery("#ACCOUNTING_EXPORT_ENDLINE").prop("disabled", true);'."\n";
+	} else {
+		print '            jQuery("#ACCOUNTING_EXPORT_ENDLINE").removeAttr("disabled");'."\n";
+	}
+	if (empty($param['ACCOUNTING_EXPORT_DATE'])) {
+		print '            jQuery("#ACCOUNTING_EXPORT_DATE").val("");'."\n";
+		print '            jQuery("#ACCOUNTING_EXPORT_DATE").prop("disabled", true);'."\n";
+	} else {
+		print '            jQuery("#ACCOUNTING_EXPORT_DATE").val("'.$conf->global->ACCOUNTING_EXPORT_DATE.'");'."\n";
+		print '            jQuery("#ACCOUNTING_EXPORT_DATE").removeAttr("disabled");'."\n";
+	}
+	print '        }'."\n";
 }
 print '    }'."\n";
 print '    initfields();'."\n";
@@ -262,17 +262,17 @@ 
 	foreach ($model_option as $key) {
 		print '<tr class="oddeven value">';
 
-        // Param
-        $label = $key['label'];
+		// Param
+		$label = $key['label'];
 		print '<td width="50%">'.$langs->trans($label).'</td>';
 
 		// Value
-        print '<td>';
-        if (is_array($key['param'])) {
-            print $form->selectarray($label, $key['param'], $conf->global->$label, 0);
-        } else {
-            print '<input type="text" size="20" id="'.$label.'" name="'.$key['label'].'" value="'.$conf->global->$label.'">';
-        }
+		print '<td>';
+		if (is_array($key['param'])) {
+			print $form->selectarray($label, $key['param'], $conf->global->$label, 0);
+		} else {
+			print '<input type="text" size="20" id="'.$label.'" name="'.$key['label'].'" value="'.$conf->global->$label.'">';
+		}
 
 		print '</td></tr>';
 	}

htdocs/accountancy/admin/fiscalyear.php

Indentation +1 added lines, -1 removed lines

@@ -112,7 +112,7 @@
 	$i = 0;
 
 
-    $addbutton .= dolGetButtonTitle($langs->trans('NewFiscalYear'), '', 'fa fa-plus-circle', 'fiscalyear_card.php?action=create', '', $user->rights->accounting->fiscalyear->write);
+	$addbutton .= dolGetButtonTitle($langs->trans('NewFiscalYear'), '', 'fa fa-plus-circle', 'fiscalyear_card.php?action=create', '', $user->rights->accounting->fiscalyear->write);
 
 
 	$title = $langs->trans('AccountingPeriods');

Braces +17 added lines, -6 removed lines

@@ -36,17 +36,25 @@ 
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (!$sortfield) $sortfield = "f.rowid"; // Set here default search field
-if (!$sortorder) $sortorder = "ASC";
+if (!$sortfield) {
+	$sortfield = "f.rowid";
+}
+// Set here default search field
+if (!$sortorder) {
+	$sortorder = "ASC";
+}
 
 // Load translation files required by the page
 $langs->loadLangs(array("admin", "compta"));
 
 // Security check
-if ($user->socid > 0)
+if ($user->socid > 0) {
 	accessforbidden();
-if (!$user->rights->accounting->fiscalyear->write)              // If we can read accounting records, we should be able to see fiscal year.
+}
+if (!$user->rights->accounting->fiscalyear->write) {
+	// If we can read accounting records, we should be able to see fiscal year.
 	accessforbidden();
+}
 
 $error = 0;
 
@@ -58,8 +66,9 @@ 
 $statut2label = array(
 		''
 );
-foreach ($tmpstatut2label as $key => $val)
+foreach ($tmpstatut2label as $key => $val) {
 	$statut2label[$key] = $langs->trans($val);
+}
 
 $errors = array();
 
@@ -95,9 +104,11 @@ 
 {
 	$result = $db->query($sql);
 	$nbtotalofrecords = $db->num_rows($result);
-	if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+	if (($page * $limit) > $nbtotalofrecords) {
+		// if total resultset is smaller then paging size (filtering), goto and load page 0
 	{
 		$page = 0;
+	}
 		$offset = 0;
 	}
 }

htdocs/accountancy/closure/validate.php

Indentation +20 added lines, -20 removed lines

@@ -64,24 +64,24 @@ 
 
 if ($action == 'validate')
 {
-    $now = dol_now();
-
-    // Update database
-    $db->begin();
-    $sql = "UPDATE ".MAIN_DB_PREFIX."accounting_bookkeeping as b";
-    $sql .= " SET b.date_validated = '".$db->idate($now)."'";
-    $sql .= ' WHERE b.date_validated IS NULL';
-
-    dol_syslog("htdocs/accountancy/closure/validate.php validate", LOG_DEBUG);
-    $resql = $db->query($sql);
-    if (!$resql1) {
-        $error++;
-        $db->rollback();
-        setEventMessages($db->lasterror(), null, 'errors');
-    } else {
-        $db->commit();
-    }
-    // End clean database
+	$now = dol_now();
+
+	// Update database
+	$db->begin();
+	$sql = "UPDATE ".MAIN_DB_PREFIX."accounting_bookkeeping as b";
+	$sql .= " SET b.date_validated = '".$db->idate($now)."'";
+	$sql .= ' WHERE b.date_validated IS NULL';
+
+	dol_syslog("htdocs/accountancy/closure/validate.php validate", LOG_DEBUG);
+	$resql = $db->query($sql);
+	if (!$resql1) {
+		$error++;
+		$db->rollback();
+		setEventMessages($db->lasterror(), null, 'errors');
+	} else {
+		$db->commit();
+	}
+	// End clean database
 }
 
 
@@ -136,8 +136,8 @@ 
 	while ($row = $db->fetch_row($resql)) {
 		for ($i = 1; $i <= 12; $i++) {
 			print '<td class="nowrap center">'.$row[$i].'<br><br>';
-            print '<input id="cb'.$row[$i].'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$row[$i].'"'.($selected ? ' checked="checked"' : '').'>';
-            print '</td>';
+			print '<input id="cb'.$row[$i].'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$row[$i].'"'.($selected ? ' checked="checked"' : '').'>';
+			print '</td>';
 		}
 		print '<td class="valigntop"><b>'.$row[13].'</b></td>';
 	}

Braces +18 added lines, -8 removed lines

@@ -34,17 +34,23 @@ 
 if (empty($conf->accounting->enabled)) {
 	accessforbidden();
 }
-if ($user->socid > 0)
-	accessforbidden();
-	if (!$user->rights->accounting->fiscalyear->write)
+if ($user->socid > 0) {
 	accessforbidden();
+}
+	if (!$user->rights->accounting->fiscalyear->write) {
+		accessforbidden();
+	}
 
 
 $month_start = ($conf->global->SOCIETE_FISCAL_MONTH_START ? ($conf->global->SOCIETE_FISCAL_MONTH_START) : 1);
-if (GETPOST("year", 'int')) $year_start = GETPOST("year", 'int');
-else {
+if (GETPOST("year", 'int')) {
+	$year_start = GETPOST("year", 'int');
+} else {
 	$year_start = dol_print_date(dol_now(), '%Y');
-	if (dol_print_date(dol_now(), '%m') < $month_start) $year_start--; // If current month is lower that starting fiscal month, we start last year
+	if (dol_print_date(dol_now(), '%m') < $month_start) {
+		$year_start--;
+	}
+	// If current month is lower that starting fiscal month, we start last year
 }
 $year_end = $year_start + 1;
 $month_end = $month_start - 1;
@@ -109,7 +115,9 @@ 
 print '<tr class="oddeven">';
 for ($i = 1; $i <= 12; $i++) {
 	$j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1) - 1;
-	if ($j > 12) $j -= 12;
+	if ($j > 12) {
+		$j -= 12;
+	}
 	print '<td class="center">'.$langs->trans('MonthShort'.str_pad($j, 2, '0', STR_PAD_LEFT)).'</td>';
 }
 print '<td><b>'.$langs->trans("Total").'</b></td></tr>';
@@ -118,7 +126,9 @@ 
 $sql = "SELECT COUNT(b.rowid) as detail,";
 for ($i = 1; $i <= 12; $i++) {
 	$j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1) - 1;
-	if ($j > 12) $j -= 12;
+	if ($j > 12) {
+		$j -= 12;
+	}
 	$sql .= "  SUM(".$db->ifsql('MONTH(b.doc_date)='.$j, '1', '0').") AS month".str_pad($j, 2, '0', STR_PAD_LEFT).",";
 }
 $sql .= " COUNT(b.rowid) as total";

htdocs/opensurvey/results.php

Indentation +1 added lines, -1 removed lines

@@ -1056,7 +1056,7 @@
 		if ($object->format == "D") {
 			$meilleursujetexport = $toutsujet[$i];
 			//var_dump($toutsujet);
-            if (strpos($toutsujet[$i], '@') !== false) {
+			if (strpos($toutsujet[$i], '@') !== false) {
 				$toutsujetdate = explode("@", $toutsujet[$i]);
 				$meilleursujet .= dol_print_date($toutsujetdate[0], 'daytext').($toutsujetdate[0] ? ' ('.dol_print_date($toutsujetdate[0], '%A').')' : '').' - '.$toutsujetdate[1];
 			} else {

Braces +184 added lines, -70 removed lines

@@ -31,7 +31,9 @@ 
 
 
 // Security check
-if (!$user->rights->opensurvey->read) accessforbidden();
+if (!$user->rights->opensurvey->read) {
+	accessforbidden();
+}
 
 
 // Init vars
@@ -40,7 +42,9 @@ 
 
 $object = new Opensurveysondage($db);
 $result = $object->fetch(0, $numsondage);
-if ($result <= 0) dol_print_error('', 'Failed to get survey id '.$numsondage);
+if ($result <= 0) {
+	dol_print_error('', 'Failed to get survey id '.$numsondage);
+}
 
 $nblines = $object->fetch_lines();
 
@@ -58,11 +62,13 @@ 
 $nbcolonnes = substr_count($object->sujet, ',') + 1;
 
 // Add vote
-if (GETPOST("boutonp") || GETPOST("boutonp.x") || GETPOST("boutonp_x"))		// boutonp for chrome, boutonp.x for firefox
+if (GETPOST("boutonp") || GETPOST("boutonp.x") || GETPOST("boutonp_x")) {
+	// boutonp for chrome, boutonp.x for firefox
 {
 	if (GETPOST('nom'))
 	{
 		$erreur_prenom = false;
+}
 
 		$nouveauchoix = '';
 		for ($i = 0; $i < $nbcolonnes; $i++)
@@ -95,7 +101,9 @@ 
 			$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'opensurvey_user_studs (nom, id_sondage, reponses)';
 			$sql .= " VALUES ('".$db->escape($nom)."', '".$db->escape($numsondage)."','".$db->escape($nouveauchoix)."')";
 			$resql = $db->query($sql);
-			if (!$resql) dol_print_error($db);
+			if (!$resql) {
+				dol_print_error($db);
+			}
 		}
 	}
 }
@@ -122,7 +130,9 @@ 
 if ($testmodifier)
 {
 	// Security check
-	if (!$user->rights->opensurvey->write) accessforbidden();
+	if (!$user->rights->opensurvey->write) {
+		accessforbidden();
+	}
 
 	$nouveauchoix = '';
 	for ($i = 0; $i < $nbcolonnes; $i++)
@@ -145,14 +155,18 @@ 
 	$sql .= " WHERE id_users = '".$db->escape($idtomodify)."'";
 
 	$resql = $db->query($sql);
-	if (!$resql) dol_print_error($db);
-}
+	if (!$resql) {
+		dol_print_error($db);
+	}
+	}
 
 // Add column (not for date)
 if (GETPOST("ajoutercolonne") && GETPOST('nouvellecolonne') && $object->format == "A")
 {
 	// Security check
-	if (!$user->rights->opensurvey->write) accessforbidden();
+	if (!$user->rights->opensurvey->write) {
+		accessforbidden();
+	}
 
 	$nouveauxsujets = $object->sujet;
 
@@ -165,8 +179,9 @@ 
 	$sql .= " SET sujet = '".$db->escape($nouveauxsujets)."'";
 	$sql .= " WHERE id_sondage = '".$db->escape($numsondage)."'";
 	$resql = $db->query($sql);
-	if (!$resql) dol_print_error($db);
-	else {
+	if (!$resql) {
+		dol_print_error($db);
+	} else {
 		header('Location: results.php?id='.$object->id_sondage);
 	}
 }
@@ -175,7 +190,9 @@ 
 if (isset($_POST["ajoutercolonne"]) && $object->format == "D")
 {
 	// Security check
-	if (!$user->rights->opensurvey->write) accessforbidden();
+	if (!$user->rights->opensurvey->write) {
+		accessforbidden();
+	}
 
 	$nouveauxsujets = $object->sujet;
 
@@ -248,8 +265,9 @@ 
 			$sql .= " SET sujet = '".$db->escape($dateinsertion)."'";
 			$sql .= " WHERE id_sondage = '".$db->escape($numsondage)."'";
 			$resql = $db->query($sql);
-			if (!$resql) dol_print_error($db);
-			else {
+			if (!$resql) {
+				dol_print_error($db);
+			} else {
 				header('Location: results.php?id='.$object->id_sondage);
 			}
 		}
@@ -263,10 +281,12 @@ 
 // Delete line
 for ($i = 0; $i < $nblines; $i++)
 {
-	if (GETPOST("effaceligne".$i) || GETPOST("effaceligne".$i."_x") || GETPOST("effaceligne".$i.".x"))	// effacelignei for chrome, effacelignei_x for firefox
+	if (GETPOST("effaceligne".$i) || GETPOST("effaceligne".$i."_x") || GETPOST("effaceligne".$i.".x")) {
+		// effacelignei for chrome, effacelignei_x for firefox
 	{
 		// Security check
 		if (!$user->rights->opensurvey->write) accessforbidden();
+	}
 
 		$compteur = 0;
 
@@ -276,7 +296,9 @@ 
 		$sql .= " FROM ".MAIN_DB_PREFIX."opensurvey_user_studs";
 		$sql .= " WHERE id_sondage = '".$db->escape($numsondage)."'";
 		$resql = $db->query($sql);
-		if (!$resql) dol_print_error($db);
+		if (!$resql) {
+			dol_print_error($db);
+		}
 		$num = $db->num_rows($resql);
 		while ($compteur < $num)
 		{
@@ -298,10 +320,12 @@ 
 for ($i = 0; $i < $nbcolonnes; $i++)
 {
 	if ((GETPOST("effacecolonne".$i) || GETPOST("effacecolonne".$i."_x") || GETPOST("effacecolonne".$i.".x"))
-		&& $nbcolonnes > 1)	// effacecolonnei for chrome, effacecolonnei_x for firefox
+		&& $nbcolonnes > 1) {
+		// effacecolonnei for chrome, effacecolonnei_x for firefox
 	{
 		// Security check
 		if (!$user->rights->opensurvey->write) accessforbidden();
+	}
 
 		$db->begin();
 
@@ -315,7 +339,9 @@ 
 			//si le sujet n'est pas celui qui a été effacé alors on concatene
 			if ($i != $j)
 			{
-				if (!empty($nouveauxsujets)) $nouveauxsujets .= ',';
+				if (!empty($nouveauxsujets)) {
+					$nouveauxsujets .= ',';
+				}
 				$nouveauxsujets .= $toutsujet[$j];
 			}
 
@@ -326,7 +352,9 @@ 
 		$sql = 'UPDATE '.MAIN_DB_PREFIX."opensurvey_sondage";
 		$sql .= " SET sujet = '".$db->escape($nouveauxsujets)."' WHERE id_sondage = '".$db->escape($numsondage)."'";
 		$resql = $db->query($sql);
-		if (!$resql) dol_print_error($db);
+		if (!$resql) {
+			dol_print_error($db);
+		}
 
 		// Clean current answer to remove deleted columns
 		$compteur = 0;
@@ -450,11 +478,14 @@ 
 
 // Expire date
 print '<tr><td>'.$langs->trans('ExpireDate').'</td><td colspan="2">';
-if ($action == 'edit') print $form->selectDate($expiredate ? $expiredate : $object->date_fin, 'expire', 0, 0, 0, '', 1, 0);
-else {
+if ($action == 'edit') {
+	print $form->selectDate($expiredate ? $expiredate : $object->date_fin, 'expire', 0, 0, 0, '', 1, 0);
+} else {
 	print dol_print_date($object->date_fin, 'day');
-	if ($object->date_fin && $object->date_fin < dol_now() && $object->status == Opensurveysondage::STATUS_VALIDATED) print img_warning($langs->trans("Expired"));
-}
+	if ($object->date_fin && $object->date_fin < dol_now() && $object->status == Opensurveysondage::STATUS_VALIDATED) {
+		print img_warning($langs->trans("Expired"));
+	}
+	}
 print '</td></tr>';
 
 // Author
@@ -512,7 +543,9 @@ 
 if (GETPOST('ajoutsujet'))
 {
 	// Security check
-	if (!$user->rights->opensurvey->write) accessforbidden();
+	if (!$user->rights->opensurvey->write) {
+		accessforbidden();
+	}
 
 	print '<form name="formulaire" action="" method="POST">'."\n";
 	print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -651,15 +684,21 @@ 
 		}
 
 		$currenty = 0;
-		if ($current) $currenty = strftime("%Y", $current);
+		if ($current) {
+			$currenty = strftime("%Y", $current);
+		}
 		$next = 0;
-		if ($next) $nexty = strftime("%Y", $next);
+		if ($next) {
+			$nexty = strftime("%Y", $next);
+		}
 		if (isset($toutsujet[$i + 1]) && ($currenty == $nexty))
 		{
 			$colspan++;
 		} else {
 			print '<td colspan='.$colspan.' class="annee">';
-			if ($current) print strftime("%Y", $current);
+			if ($current) {
+				print strftime("%Y", $current);
+			}
 			print '</td>'."\n";
 			$colspan = 1;
 		}
@@ -805,33 +844,64 @@ 
 
 			if (empty($listofanswers[$i]['format']) || !in_array($listofanswers[$i]['format'], array('yesno', 'foragainst')))
 			{
-				if (((string) $car) == "1") print '<td class="ok">OK</td>'."\n";
-				else print '<td class="non">KO</td>'."\n";
+				if (((string) $car) == "1") {
+					print '<td class="ok">OK</td>'."\n";
+				} else {
+					print '<td class="non">KO</td>'."\n";
+				}
 				// Total
-				if (!isset($sumfor[$i])) $sumfor[$i] = 0;
-				if (((string) $car) == "1") $sumfor[$i]++;
+				if (!isset($sumfor[$i])) {
+					$sumfor[$i] = 0;
+				}
+				if (((string) $car) == "1") {
+					$sumfor[$i]++;
+				}
 			}
 			if (!empty($listofanswers[$i]['format']) && $listofanswers[$i]['format'] == 'yesno')
 			{
-				if (((string) $car) == "1") print '<td class="ok">'.$langs->trans("Yes").'</td>'."\n";
-				elseif (((string) $car) == "0") print '<td class="non">'.$langs->trans("No").'</td>'."\n";
-				else print '<td class="vide">&nbsp;</td>'."\n";
+				if (((string) $car) == "1") {
+					print '<td class="ok">'.$langs->trans("Yes").'</td>'."\n";
+				} elseif (((string) $car) == "0") {
+					print '<td class="non">'.$langs->trans("No").'</td>'."\n";
+				} else {
+					print '<td class="vide">&nbsp;</td>'."\n";
+				}
 				// Total
-				if (!isset($sumfor[$i])) $sumfor[$i] = 0;
-				if (!isset($sumagainst[$i])) $sumagainst[$i] = 0;
-				if (((string) $car) == "1") $sumfor[$i]++;
-				if (((string) $car) == "0") $sumagainst[$i]++;
+				if (!isset($sumfor[$i])) {
+					$sumfor[$i] = 0;
+				}
+				if (!isset($sumagainst[$i])) {
+					$sumagainst[$i] = 0;
+				}
+				if (((string) $car) == "1") {
+					$sumfor[$i]++;
+				}
+				if (((string) $car) == "0") {
+					$sumagainst[$i]++;
+				}
 			}
 			if (!empty($listofanswers[$i]['format']) && $listofanswers[$i]['format'] == 'foragainst')
 			{
-				if (((string) $car) == "1") print '<td class="ok">'.$langs->trans("For").'</td>'."\n";
-				elseif (((string) $car) == "0") print '<td class="non">'.$langs->trans("Against").'</td>'."\n";
-				else print '<td class="vide">&nbsp;</td>'."\n";
+				if (((string) $car) == "1") {
+					print '<td class="ok">'.$langs->trans("For").'</td>'."\n";
+				} elseif (((string) $car) == "0") {
+					print '<td class="non">'.$langs->trans("Against").'</td>'."\n";
+				} else {
+					print '<td class="vide">&nbsp;</td>'."\n";
+				}
 				// Total
-				if (!isset($sumfor[$i])) $sumfor[$i] = 0;
-				if (!isset($sumagainst[$i])) $sumagainst[$i] = 0;
-				if (((string) $car) == "1") $sumfor[$i]++;
-				if (((string) $car) == "0") $sumagainst[$i]++;
+				if (!isset($sumfor[$i])) {
+					$sumfor[$i] = 0;
+				}
+				if (!isset($sumagainst[$i])) {
+					$sumagainst[$i] = 0;
+				}
+				if (((string) $car) == "1") {
+					$sumfor[$i]++;
+				}
+				if (((string) $car) == "0") {
+					$sumagainst[$i]++;
+				}
 			}
 		}
 	} else {
@@ -845,7 +915,9 @@ 
 				if (empty($listofanswers[$i]['format']) || !in_array($listofanswers[$i]['format'], array('yesno', 'foragainst')))
 				{
 					print '<input type="checkbox" name="choix'.$i.'" value="1" ';
-					if ($car == '1') print 'checked';
+					if ($car == '1') {
+						print 'checked';
+					}
 					print '>';
 				}
 				if (!empty($listofanswers[$i]['format']) && $listofanswers[$i]['format'] == 'yesno')
@@ -866,33 +938,64 @@ 
 				$car = substr($ensemblereponses, $i, 1);
 				if (empty($listofanswers[$i]['format']) || !in_array($listofanswers[$i]['format'], array('yesno', 'foragainst')))
 				{
-					if (((string) $car) == "1") print '<td class="ok">OK</td>'."\n";
-					else print '<td class="non">KO</td>'."\n";
+					if (((string) $car) == "1") {
+						print '<td class="ok">OK</td>'."\n";
+					} else {
+						print '<td class="non">KO</td>'."\n";
+					}
 					// Total
-					if (!isset($sumfor[$i])) $sumfor[$i] = 0;
-					if (((string) $car) == "1") $sumfor[$i]++;
+					if (!isset($sumfor[$i])) {
+						$sumfor[$i] = 0;
+					}
+					if (((string) $car) == "1") {
+						$sumfor[$i]++;
+					}
 				}
 				if (!empty($listofanswers[$i]['format']) && $listofanswers[$i]['format'] == 'yesno')
 				{
-					if (((string) $car) == "1") print '<td class="ok">'.$langs->trans("For").'</td>'."\n";
-					elseif (((string) $car) == "0") print '<td class="non">'.$langs->trans("Against").'</td>'."\n";
-					else print '<td class="vide">&nbsp;</td>'."\n";
+					if (((string) $car) == "1") {
+						print '<td class="ok">'.$langs->trans("For").'</td>'."\n";
+					} elseif (((string) $car) == "0") {
+						print '<td class="non">'.$langs->trans("Against").'</td>'."\n";
+					} else {
+						print '<td class="vide">&nbsp;</td>'."\n";
+					}
 					// Total
-					if (!isset($sumfor[$i])) $sumfor[$i] = 0;
-					if (!isset($sumagainst[$i])) $sumagainst[$i] = 0;
-					if (((string) $car) == "1") $sumfor[$i]++;
-					if (((string) $car) == "0") $sumagainst[$i]++;
+					if (!isset($sumfor[$i])) {
+						$sumfor[$i] = 0;
+					}
+					if (!isset($sumagainst[$i])) {
+						$sumagainst[$i] = 0;
+					}
+					if (((string) $car) == "1") {
+						$sumfor[$i]++;
+					}
+					if (((string) $car) == "0") {
+						$sumagainst[$i]++;
+					}
 				}
 				if (!empty($listofanswers[$i]['format']) && $listofanswers[$i]['format'] == 'foragainst')
 				{
-					if (((string) $car) == "1") print '<td class="ok">'.$langs->trans("For").'</td>'."\n";
-					elseif (((string) $car) == "0") print '<td class="non">'.$langs->trans("Against").'</td>'."\n";
-					else print '<td class="vide">&nbsp;</td>'."\n";
+					if (((string) $car) == "1") {
+						print '<td class="ok">'.$langs->trans("For").'</td>'."\n";
+					} elseif (((string) $car) == "0") {
+						print '<td class="non">'.$langs->trans("Against").'</td>'."\n";
+					} else {
+						print '<td class="vide">&nbsp;</td>'."\n";
+					}
 					// Total
-					if (!isset($sumfor[$i])) $sumfor[$i] = 0;
-					if (!isset($sumagainst[$i])) $sumagainst[$i] = 0;
-					if (((string) $car) == "1") $sumfor[$i]++;
-					if (((string) $car) == "0") $sumagainst[$i]++;
+					if (!isset($sumfor[$i])) {
+						$sumfor[$i] = 0;
+					}
+					if (!isset($sumagainst[$i])) {
+						$sumagainst[$i] = 0;
+					}
+					if (((string) $car) == "1") {
+						$sumfor[$i]++;
+					}
+					if (((string) $car) == "0") {
+						$sumagainst[$i]++;
+					}
 				}
 			}
 		}
@@ -966,8 +1069,9 @@ 
 $nbofcheckbox = 0;
 for ($i = 0; $i < $nbcolonnes + 1; $i++)
 {
-	if (empty($listofanswers[$i]['format']) || !in_array($listofanswers[$i]['format'], array('yesno', 'foragainst')))
-	$nbofcheckbox++;
+	if (empty($listofanswers[$i]['format']) || !in_array($listofanswers[$i]['format'], array('yesno', 'foragainst'))) {
+		$nbofcheckbox++;
+	}
 	if (isset($sumfor[$i]))
 	{
 		if ($i == 0)
@@ -990,13 +1094,23 @@ 
 {
 	$showsumfor = isset($sumfor[$i]) ? $sumfor[$i] : '';
 	$showsumagainst = isset($sumagainst[$i]) ? $sumagainst[$i] : '';
-	if (empty($showsumfor)) $showsumfor = 0;
-	if (empty($showsumagainst)) $showsumagainst = 0;
+	if (empty($showsumfor)) {
+		$showsumfor = 0;
+	}
+	if (empty($showsumagainst)) {
+		$showsumagainst = 0;
+	}
 
 	print '<td>';
-	if (empty($listofanswers[$i]['format']) || !in_array($listofanswers[$i]['format'], array('yesno', 'foragainst'))) print $showsumfor;
-	if (!empty($listofanswers[$i]['format']) && $listofanswers[$i]['format'] == 'yesno') print $langs->trans("Yes").': '.$showsumfor.'<br>'.$langs->trans("No").': '.$showsumagainst;
-	if (!empty($listofanswers[$i]['format']) && $listofanswers[$i]['format'] == 'foragainst') print $langs->trans("For").': '.$showsumfor.'<br>'.$langs->trans("Against").': '.$showsumagainst;
+	if (empty($listofanswers[$i]['format']) || !in_array($listofanswers[$i]['format'], array('yesno', 'foragainst'))) {
+		print $showsumfor;
+	}
+	if (!empty($listofanswers[$i]['format']) && $listofanswers[$i]['format'] == 'yesno') {
+		print $langs->trans("Yes").': '.$showsumfor.'<br>'.$langs->trans("No").': '.$showsumagainst;
+	}
+	if (!empty($listofanswers[$i]['format']) && $listofanswers[$i]['format'] == 'foragainst') {
+		print $langs->trans("For").': '.$showsumfor.'<br>'.$langs->trans("Against").': '.$showsumagainst;
+	}
 	print '</td>'."\n";
 }
 print '</tr>';